From ffc29895d190b1dae899b5272b7a1b748b6baffc Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Wed, 22 Jan 2025 15:20:47 -0800
Subject: [PATCH] Convert proto output from internal string encoding to Unicode

Work towards #374

Closes #24935.

PiperOrigin-RevId: 718549143
Change-Id: Ibe6c685a2f8dd75430cae7f770d392de35bdeb68
---
 .../lib/packages/AttributeFormatter.java      | 39 ++++----
 .../google/devtools/build/lib/packages/BUILD  |  1 +
 .../build/lib/query2/query/output/BUILD       |  1 +
 .../query/output/ProtoOutputFormatter.java    | 76 +++++++++------
 .../AttributeInfoExtractor.java               | 13 ++-
 .../build/lib/starlarkdocextract/BUILD        |  3 +
 .../ModuleInfoExtractor.java                  | 97 +++++++++++++------
 .../ProviderNameGroupExtractor.java           | 11 ++-
 .../starlarkdocextract/RuleInfoExtractor.java | 15 ++-
 .../StarlarkFunctionInfoExtractor.java        | 31 +++---
 .../shell/integration/bazel_query_test.sh     | 65 +++++++++++++
 11 files changed, 257 insertions(+), 95 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
index fbad4294eb679e..f124e6c8bc866a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
@@ -36,6 +36,7 @@
 import static com.google.devtools.build.lib.packages.Types.STRING_DICT;
 import static com.google.devtools.build.lib.packages.Types.STRING_LIST;
 import static com.google.devtools.build.lib.packages.Types.STRING_LIST_DICT;
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
@@ -131,7 +132,7 @@ private static Build.Attribute getAttributeProto(
       boolean includeAttributeSourceAspects,
       LabelPrinter labelPrinter) {
     Build.Attribute.Builder attrPb = Build.Attribute.newBuilder();
-    attrPb.setName(name);
+    attrPb.setName(internalToUnicode(name));
     attrPb.setExplicitlySpecified(explicitlySpecified);
     maybeSetNoDep(type, attrPb);
 
@@ -149,7 +150,7 @@ private static Build.Attribute getAttributeProto(
 
     if (includeAttributeSourceAspects) {
       attrPb.setSourceAspectName(
-          sourceAspect != null ? sourceAspect.getAspectClass().getName() : "");
+          sourceAspect != null ? internalToUnicode(sourceAspect.getAspectClass().getName()) : "");
     }
 
     return attrPb.build();
@@ -174,7 +175,7 @@ private static void writeSelectorListToBuilder(
     for (Selector<?> selector : selectorList.getSelectors()) {
       Build.Attribute.Selector.Builder selectorBuilder =
           Build.Attribute.Selector.newBuilder()
-              .setNoMatchError(selector.getNoMatchError())
+              .setNoMatchError(internalToUnicode(selector.getNoMatchError()))
               .setHasDefaultValue(selector.hasDefault());
 
       // Note that the order of entries returned by selector.getEntries is stable. The map's
@@ -184,7 +185,7 @@ private static void writeSelectorListToBuilder(
           (condition, conditionValue) -> {
             SelectorEntry.Builder selectorEntryBuilder =
                 SelectorEntry.newBuilder()
-                    .setLabel(labelPrinter.toString(condition))
+                    .setLabel(internalToUnicode(labelPrinter.toString(condition)))
                     .setIsDefaultValue(!selector.isValueSet(condition));
 
             if (conditionValue != null) {
@@ -211,16 +212,16 @@ private static void writeAttributeValueToBuilder(
     if (type == INTEGER) {
       builder.setIntValue(((StarlarkInt) value).toIntUnchecked());
     } else if (type == STRING || type == STRING_NO_INTERN) {
-      builder.setStringValue(value.toString());
+      builder.setStringValue(internalToUnicode(value.toString()));
     } else if (type == LABEL
         || type == NODEP_LABEL
         || type == OUTPUT
         || type == GENQUERY_SCOPE_TYPE
         || type == DORMANT_LABEL) {
-      builder.setStringValue(labelPrinter.toString((Label) value));
+      builder.setStringValue(internalToUnicode(labelPrinter.toString((Label) value)));
     } else if (type == STRING_LIST || type == DISTRIBUTIONS) {
       for (Object entry : (Collection<?>) value) {
-        builder.addStringListValue(entry.toString());
+        builder.addStringListValue(internalToUnicode(entry.toString()));
       }
     } else if (type == LABEL_LIST
         || type == NODEP_LABEL_LIST
@@ -228,7 +229,7 @@ private static void writeAttributeValueToBuilder(
         || type == GENQUERY_SCOPE_TYPE_LIST
         || type == DORMANT_LABEL_LIST) {
       for (Label entry : (Collection<Label>) value) {
-        builder.addStringListValue(labelPrinter.toString(entry));
+        builder.addStringListValue(internalToUnicode(labelPrinter.toString(entry)));
       }
     } else if (type == INTEGER_LIST) {
       for (Object elem : (Collection<?>) value) {
@@ -242,10 +243,10 @@ private static void writeAttributeValueToBuilder(
       License license = (License) value;
       Build.License.Builder licensePb = Build.License.newBuilder();
       for (License.LicenseType licenseType : license.getLicenseTypes()) {
-        licensePb.addLicenseType(licenseType.toString());
+        licensePb.addLicenseType(internalToUnicode(licenseType.toString()));
       }
       for (Label exception : license.getExceptions()) {
-        licensePb.addException(exception.toString());
+        licensePb.addException(internalToUnicode(exception.toString()));
       }
       builder.setLicense(licensePb);
     } else if (type == STRING_DICT) {
@@ -253,17 +254,17 @@ private static void writeAttributeValueToBuilder(
       for (Map.Entry<String, String> keyValueList : dict.entrySet()) {
         StringDictEntry.Builder entry =
             StringDictEntry.newBuilder()
-                .setKey(keyValueList.getKey())
-                .setValue(keyValueList.getValue());
+                .setKey(internalToUnicode(keyValueList.getKey()))
+                .setValue(internalToUnicode(keyValueList.getValue()));
         builder.addStringDictValue(entry);
       }
     } else if (type == STRING_LIST_DICT) {
       Map<String, List<String>> dict = (Map<String, List<String>>) value;
       for (Map.Entry<String, List<String>> dictEntry : dict.entrySet()) {
         StringListDictEntry.Builder entry =
-            StringListDictEntry.newBuilder().setKey(dictEntry.getKey());
-        for (Object dictEntryValue : dictEntry.getValue()) {
-          entry.addValue(dictEntryValue.toString());
+            StringListDictEntry.newBuilder().setKey(internalToUnicode(dictEntry.getKey()));
+        for (String dictEntryValue : dictEntry.getValue()) {
+          entry.addValue(internalToUnicode(dictEntryValue));
         }
         builder.addStringListDictValue(entry);
       }
@@ -272,8 +273,8 @@ private static void writeAttributeValueToBuilder(
       for (Map.Entry<String, Label> dictEntry : dict.entrySet()) {
         LabelDictUnaryEntry.Builder entry =
             LabelDictUnaryEntry.newBuilder()
-                .setKey(dictEntry.getKey())
-                .setValue(labelPrinter.toString(dictEntry.getValue()));
+                .setKey(internalToUnicode(dictEntry.getKey()))
+                .setValue(internalToUnicode(labelPrinter.toString(dictEntry.getValue())));
         builder.addLabelDictUnaryValue(entry);
       }
     } else if (type == LABEL_KEYED_STRING_DICT) {
@@ -281,8 +282,8 @@ private static void writeAttributeValueToBuilder(
       for (Map.Entry<Label, String> dictEntry : dict.entrySet()) {
         LabelKeyedStringDictEntry.Builder entry =
             LabelKeyedStringDictEntry.newBuilder()
-                .setKey(labelPrinter.toString(dictEntry.getKey()))
-                .setValue(dictEntry.getValue());
+                .setKey(internalToUnicode(labelPrinter.toString(dictEntry.getKey())))
+                .setValue(internalToUnicode(dictEntry.getValue()));
         builder.addLabelKeyedStringDictValue(entry);
       }
     } else {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD
index 13bd7ce80c92fd..aa4ed1eccab27f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -104,6 +104,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/util:hash_codes",
         "//src/main/java/com/google/devtools/build/lib/util:string",
+        "//src/main/java/com/google/devtools/build/lib/util:string_encoding",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
diff --git a/src/main/java/com/google/devtools/build/lib/query2/query/output/BUILD b/src/main/java/com/google/devtools/build/lib/query2/query/output/BUILD
index c121dd718bd291..8fa8d0cbc70948 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/query/output/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/query/output/BUILD
@@ -30,6 +30,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers",
         "//src/main/java/com/google/devtools/build/lib/starlarkdocextract:labelrenderer",
         "//src/main/java/com/google/devtools/build/lib/starlarkdocextract:ruleinfoextractor",
+        "//src/main/java/com/google/devtools/build/lib/util:string_encoding",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/common/options",
diff --git a/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
index 084fe15b94b31b..dd94346c025482 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
@@ -18,6 +18,7 @@
 import static com.google.devtools.build.lib.query2.proto.proto2api.Build.Target.Discriminator.PACKAGE_GROUP;
 import static com.google.devtools.build.lib.query2.proto.proto2api.Build.Target.Discriminator.RULE;
 import static com.google.devtools.build.lib.query2.proto.proto2api.Build.Target.Discriminator.SOURCE_FILE;
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
@@ -202,10 +203,12 @@ public Build.Target toTargetProtoBuffer(
     if (target instanceof Rule rule) {
       Build.Rule.Builder rulePb =
           Build.Rule.newBuilder()
-              .setName(labelPrinter.toString(rule.getLabel()))
-              .setRuleClass(rule.getRuleClass());
+              .setName(internalToUnicode(labelPrinter.toString(rule.getLabel())))
+              .setRuleClass(internalToUnicode(rule.getRuleClass()));
       if (includeLocations) {
-        rulePb.setLocation(FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot));
+        rulePb.setLocation(
+            internalToUnicode(
+                FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot)));
       }
       addAttributes(rulePb, rule, extraDataForAttrHash, labelPrinter);
       byte[] transitiveDigest = rule.getRuleClassObject().getRuleDefinitionEnvironmentDigest();
@@ -258,19 +261,22 @@ public Build.Target toTargetProtoBuffer(
           aspectsDependencies.values().stream()
               .flatMap(m -> m.values().stream())
               .distinct()
-              .forEach(dep -> rulePb.addRuleInput(labelPrinter.toString(dep)));
+              .forEach(dep -> rulePb.addRuleInput(internalToUnicode(labelPrinter.toString(dep))));
         }
         // Include explicit elements for all direct inputs and outputs of a rule; this goes beyond
         // what is available from the attributes above, since it may also (depending on options)
         // include implicit outputs, exec-configuration outputs, and default values.
         rule.getSortedLabels(dependencyFilter)
-            .forEach(input -> rulePb.addRuleInput(labelPrinter.toString(input)));
+            .forEach(input -> rulePb.addRuleInput(internalToUnicode(labelPrinter.toString(input))));
         rule.getOutputFiles().stream()
             .distinct()
-            .forEach(output -> rulePb.addRuleOutput(labelPrinter.toString(output.getLabel())));
+            .forEach(
+                output ->
+                    rulePb.addRuleOutput(
+                        internalToUnicode(labelPrinter.toString(output.getLabel()))));
       }
       for (String feature : rule.getPackage().getPackageArgs().features().toStringList()) {
-        rulePb.addDefaultSetting(feature);
+        rulePb.addDefaultSetting(internalToUnicode(feature));
       }
 
       if (includeInstantiationStack) {
@@ -278,7 +284,10 @@ public Build.Target toTargetProtoBuffer(
           // Always report relative locations.
           // (New fields needn't honor relativeLocations.)
           rulePb.addInstantiationStack(
-              FormatUtils.getRootRelativeLocation(fr.location, rule.getPackage()) + ": " + fr.name);
+              internalToUnicode(
+                  FormatUtils.getRootRelativeLocation(fr.location, rule.getPackage())
+                      + ": "
+                      + fr.name));
         }
       }
 
@@ -287,7 +296,10 @@ public Build.Target toTargetProtoBuffer(
           // Always report relative locations.
           // (New fields needn't honor relativeLocations.)
           rulePb.addDefinitionStack(
-              FormatUtils.getRootRelativeLocation(fr.location, rule.getPackage()) + ": " + fr.name);
+              internalToUnicode(
+                  FormatUtils.getRootRelativeLocation(fr.location, rule.getPackage())
+                      + ": "
+                      + fr.name));
         }
       }
 
@@ -302,11 +314,14 @@ public Build.Target toTargetProtoBuffer(
       Rule generatingRule = outputFile.getGeneratingRule();
       GeneratedFile.Builder output =
           GeneratedFile.newBuilder()
-              .setGeneratingRule(labelPrinter.toString(generatingRule.getLabel()))
-              .setName(labelPrinter.toString(label));
+              .setGeneratingRule(
+                  internalToUnicode(labelPrinter.toString(generatingRule.getLabel())))
+              .setName(internalToUnicode(labelPrinter.toString(label)));
 
       if (includeLocations) {
-        output.setLocation(FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot));
+        output.setLocation(
+            internalToUnicode(
+                FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot)));
       }
       targetPb.setType(GENERATED_FILE);
       targetPb.setGeneratedFile(output.build());
@@ -314,10 +329,12 @@ public Build.Target toTargetProtoBuffer(
       Label label = inputFile.getLabel();
 
       Build.SourceFile.Builder input =
-          Build.SourceFile.newBuilder().setName(labelPrinter.toString(label));
+          Build.SourceFile.newBuilder().setName(internalToUnicode(labelPrinter.toString(label)));
 
       if (includeLocations) {
-        input.setLocation(FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot));
+        input.setLocation(
+            internalToUnicode(
+                FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot)));
       }
 
       if (inputFile.getName().equals("BUILD")) {
@@ -327,11 +344,11 @@ public Build.Target toTargetProtoBuffer(
                 : aspectResolver.computeBuildFileDependencies(inputFile.getPackage());
 
         for (Label starlarkLoadLabel : starlarkLoadLabels) {
-          input.addSubinclude(labelPrinter.toString(starlarkLoadLabel));
+          input.addSubinclude(internalToUnicode(labelPrinter.toString(starlarkLoadLabel)));
         }
 
         for (String feature : inputFile.getPackage().getPackageArgs().features().toStringList()) {
-          input.addFeature(feature);
+          input.addFeature(internalToUnicode(feature));
         }
 
         input.setPackageContainsErrors(inputFile.getPackage().containsErrors());
@@ -341,45 +358,50 @@ public Build.Target toTargetProtoBuffer(
       // default_visibility in the target. For files we do, but for rules we don't.
 
       for (Label visibilityDependency : target.getVisibilityDependencyLabels()) {
-        input.addPackageGroup(labelPrinter.toString(visibilityDependency));
+        input.addPackageGroup(internalToUnicode(labelPrinter.toString(visibilityDependency)));
       }
 
       for (Label visibilityDeclaration : target.getVisibilityDeclaredLabels()) {
-        input.addVisibilityLabel(labelPrinter.toString(visibilityDeclaration));
+        input.addVisibilityLabel(internalToUnicode(labelPrinter.toString(visibilityDeclaration)));
       }
 
       targetPb.setType(SOURCE_FILE);
       targetPb.setSourceFile(input);
     } else if (target instanceof FakeLoadTarget) {
       Label label = target.getLabel();
-      SourceFile.Builder input = SourceFile.newBuilder().setName(labelPrinter.toString(label));
+      SourceFile.Builder input =
+          SourceFile.newBuilder().setName(internalToUnicode(labelPrinter.toString(label)));
 
       if (includeLocations) {
-        input.setLocation(FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot));
+        input.setLocation(
+            internalToUnicode(
+                FormatUtils.getLocation(target, relativeLocations, overrideSourceRoot)));
       }
       targetPb.setType(SOURCE_FILE);
       targetPb.setSourceFile(input.build());
     } else if (target instanceof PackageGroup packageGroup) {
       Build.PackageGroup.Builder packageGroupPb =
-          Build.PackageGroup.newBuilder().setName(labelPrinter.toString(packageGroup.getLabel()));
+          Build.PackageGroup.newBuilder()
+              .setName(internalToUnicode(labelPrinter.toString(packageGroup.getLabel())));
       for (String containedPackage :
           packageGroup.getContainedPackages(packageGroupIncludesDoubleSlash)) {
-        packageGroupPb.addContainedPackage(containedPackage);
+        packageGroupPb.addContainedPackage(internalToUnicode(containedPackage));
       }
       for (Label include : packageGroup.getIncludes()) {
-        packageGroupPb.addIncludedPackageGroup(labelPrinter.toString(include));
+        packageGroupPb.addIncludedPackageGroup(internalToUnicode(labelPrinter.toString(include)));
       }
 
       targetPb.setType(PACKAGE_GROUP);
       targetPb.setPackageGroup(packageGroupPb);
     } else if (target instanceof EnvironmentGroup envGroup) {
       Build.EnvironmentGroup.Builder envGroupPb =
-          Build.EnvironmentGroup.newBuilder().setName(labelPrinter.toString(envGroup.getLabel()));
+          Build.EnvironmentGroup.newBuilder()
+              .setName(internalToUnicode(labelPrinter.toString(envGroup.getLabel())));
       for (Label env : envGroup.getEnvironments()) {
-        envGroupPb.addEnvironment(labelPrinter.toString(env));
+        envGroupPb.addEnvironment(internalToUnicode(labelPrinter.toString(env)));
       }
       for (Label defaultEnv : envGroup.getDefaults()) {
-        envGroupPb.addDefault(labelPrinter.toString(defaultEnv));
+        envGroupPb.addDefault(internalToUnicode(labelPrinter.toString(defaultEnv)));
       }
       targetPb.setType(ENVIRONMENT_GROUP);
       targetPb.setEnvironmentGroup(envGroupPb);
@@ -581,7 +603,7 @@ private static class RuleClassInfoFormatter {
      */
     public void addRuleClassKeyAndInfoIfNeeded(Build.Rule.Builder rulePb, Rule rule) {
       String ruleClassKey = rule.getRuleClassObject().getKey();
-      rulePb.setRuleClassKey(ruleClassKey);
+      rulePb.setRuleClassKey(internalToUnicode(ruleClassKey));
       if (ruleClassKeys.add(ruleClassKey)) {
         // TODO(b/368091415): instead of rule.getRuleClass(), we should be using the rule's public
         // name. But to find the public name, we would need access to the globals dictionary of
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/AttributeInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/AttributeInfoExtractor.java
index d23a95a5975d3f..630821576cfd26 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/AttributeInfoExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/AttributeInfoExtractor.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.starlarkdocextract;
 
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.packages.Attribute;
@@ -23,6 +25,7 @@
 import com.google.devtools.build.lib.packages.Types;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.AttributeInfo;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.AttributeType;
+import com.google.devtools.build.lib.util.StringEncoding;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -36,10 +39,12 @@ public final class AttributeInfoExtractor {
   static AttributeInfo buildAttributeInfo(ExtractorContext context, Attribute attribute) {
     AttributeInfo.Builder builder =
         AttributeInfo.newBuilder()
-            .setName(attribute.getPublicName())
+            .setName(internalToUnicode(attribute.getPublicName()))
             .setType(getAttributeType(context, attribute.getType(), attribute.getPublicName()))
             .setMandatory(attribute.isMandatory());
-    Optional.ofNullable(attribute.getDoc()).ifPresent(builder::setDocString);
+    Optional.ofNullable(attribute.getDoc())
+        .map(StringEncoding::internalToUnicode)
+        .ifPresent(builder::setDocString);
     if (!attribute.isConfigurable()) {
       builder.setNonconfigurable(true);
     }
@@ -57,7 +62,9 @@ static AttributeInfo buildAttributeInfo(ExtractorContext context, Attribute attr
     if (!attribute.isMandatory()) {
       try {
         Object defaultValue = Attribute.valueToStarlark(attribute.getDefaultValueUnchecked());
-        builder.setDefaultValue(context.labelRenderer().reprWithoutLabelConstructor(defaultValue));
+        builder.setDefaultValue(
+            StringEncoding.internalToUnicode(
+                context.labelRenderer().reprWithoutLabelConstructor(defaultValue)));
       } catch (InvalidStarlarkValueException e) {
         builder.setDefaultValue(UNREPRESENTABLE_VALUE);
       }
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/BUILD
index 338b853c7adc8c..05a88394a8fba0 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/BUILD
@@ -32,6 +32,7 @@ java_library(
         ":extractionexception",
         ":labelrenderer",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
+        "//src/main/java/com/google/devtools/build/lib/util:string_encoding",
         "//src/main/java/net/starlark/java/eval",
         "//src/main/java/net/starlark/java/syntax",
         "//src/main/protobuf:stardoc_output_java_proto",
@@ -53,6 +54,7 @@ java_library(
         ":labelrenderer",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/packages",
+        "//src/main/java/com/google/devtools/build/lib/util:string_encoding",
         "//src/main/java/net/starlark/java/eval",
         "//src/main/protobuf:stardoc_output_java_proto",
         "//third_party:auto_value",
@@ -75,6 +77,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/starlark",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/packages",
+        "//src/main/java/com/google/devtools/build/lib/util:string_encoding",
         "//src/main/java/net/starlark/java/eval",
         "//src/main/protobuf:stardoc_output_java_proto",
         "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
index 79e403784edea2..984266ff514398 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.starlarkdocextract;
 
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleClassFunctions.MacroFunction;
@@ -39,6 +41,7 @@
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.ProviderFieldInfo;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.ProviderInfo;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.RepositoryRuleInfo;
+import com.google.devtools.build.lib.util.StringEncoding;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -124,9 +127,13 @@ public ModuleInfoExtractor(Predicate<String> isWantedQualifiedName, LabelRendere
   /** Extracts structured documentation for the loadable symbols of a given module. */
   public ModuleInfo extractFrom(Module module) throws ExtractionException {
     ModuleInfo.Builder builder = ModuleInfo.newBuilder();
-    Optional.ofNullable(module.getDocumentation()).ifPresent(builder::setModuleDocstring);
+    Optional.ofNullable(module.getDocumentation())
+        .map(StringEncoding::internalToUnicode)
+        .ifPresent(builder::setModuleDocstring);
     Optional.ofNullable(BazelModuleContext.of(module))
-        .map(bazelModuleContext -> labelRenderer.render(bazelModuleContext.label()))
+        .map(
+            bazelModuleContext ->
+                internalToUnicode(labelRenderer.render(bazelModuleContext.label())))
         .ifPresent(builder::setFile);
 
     // We do two traversals over the module's globals: (1) find qualified names (including any
@@ -365,13 +372,18 @@ protected void visitMacroFunction(String qualifiedName, MacroFunction macroFunct
       MacroInfo.Builder macroInfoBuilder = MacroInfo.newBuilder();
       // Record the name under which this symbol is made accessible, which may differ from the
       // symbol's exported name
-      macroInfoBuilder.setMacroName(qualifiedName);
+      macroInfoBuilder.setMacroName(internalToUnicode(qualifiedName));
       // ... but record the origin rule key for cross references.
       macroInfoBuilder.setOriginKey(
           OriginKey.newBuilder()
-              .setName(macroFunction.getName())
-              .setFile(context.labelRenderer().render(macroFunction.getExtensionLabel())));
-      macroFunction.getDocumentation().ifPresent(macroInfoBuilder::setDocString);
+              .setName(internalToUnicode(macroFunction.getName()))
+              .setFile(
+                  internalToUnicode(
+                      context.labelRenderer().render(macroFunction.getExtensionLabel()))));
+      macroFunction
+          .getDocumentation()
+          .map(StringEncoding::internalToUnicode)
+          .ifPresent(macroInfoBuilder::setDocString);
 
       MacroClass macroClass = macroFunction.getMacroClass();
       if (macroClass.isFinalizer()) {
@@ -407,20 +419,28 @@ protected void visitProvider(String qualifiedName, StarlarkProvider provider)
       // existing Stardoc templates). Note that for backwards compatibility,
       // ProviderNameGroup.provider_name would still need to refer to only the first qualified name
       // under which a given provider is made accessible by the module.
-      providerInfoBuilder.setProviderName(qualifiedName);
+      providerInfoBuilder.setProviderName(internalToUnicode(qualifiedName));
       // Record the origin provider key for cross references.
       providerInfoBuilder.setOriginKey(
           OriginKey.newBuilder()
-              .setName(provider.getName())
-              .setFile(context.labelRenderer().render(provider.getKey().getExtensionLabel())));
-      provider.getDocumentation().ifPresent(providerInfoBuilder::setDocString);
+              .setName(internalToUnicode(provider.getName()))
+              .setFile(
+                  internalToUnicode(
+                      context.labelRenderer().render(provider.getKey().getExtensionLabel()))));
+      provider
+          .getDocumentation()
+          .map(StringEncoding::internalToUnicode)
+          .ifPresent(providerInfoBuilder::setDocString);
       ImmutableMap<String, Optional<String>> schema = provider.getSchema();
       if (schema != null) {
         for (Map.Entry<String, Optional<String>> entry : schema.entrySet()) {
           if (ExtractorContext.isPublicName(entry.getKey())) {
             ProviderFieldInfo.Builder fieldInfoBuilder = ProviderFieldInfo.newBuilder();
-            fieldInfoBuilder.setName(entry.getKey());
-            entry.getValue().ifPresent(fieldInfoBuilder::setDocString);
+            fieldInfoBuilder.setName(internalToUnicode(entry.getKey()));
+            entry
+                .getValue()
+                .map(StringEncoding::internalToUnicode)
+                .ifPresent(fieldInfoBuilder::setDocString);
             providerInfoBuilder.addFieldInfo(fieldInfoBuilder.build());
           }
         }
@@ -443,14 +463,20 @@ protected void visitAspect(String qualifiedName, StarlarkDefinedAspect aspect)
       AspectInfo.Builder aspectInfoBuilder = AspectInfo.newBuilder();
       // Record the name under which this symbol is made accessible, which may differ from the
       // symbol's exported name
-      aspectInfoBuilder.setAspectName(qualifiedName);
+      aspectInfoBuilder.setAspectName(internalToUnicode(qualifiedName));
       // ... but record the origin aspect key for cross references.
       aspectInfoBuilder.setOriginKey(
           OriginKey.newBuilder()
-              .setName(aspect.getAspectClass().getExportedName())
+              .setName(internalToUnicode(aspect.getAspectClass().getExportedName()))
               .setFile(
-                  context.labelRenderer().render(aspect.getAspectClass().getExtensionLabel())));
-      aspect.getDocumentation().ifPresent(aspectInfoBuilder::setDocString);
+                  internalToUnicode(
+                      context
+                          .labelRenderer()
+                          .render(aspect.getAspectClass().getExtensionLabel()))));
+      aspect
+          .getDocumentation()
+          .map(StringEncoding::internalToUnicode)
+          .ifPresent(aspectInfoBuilder::setDocString);
       for (String aspectAttribute : aspect.getAttributeAspects()) {
         if (ExtractorContext.isPublicName(aspectAttribute)) {
           aspectInfoBuilder.addAspectAttribute(aspectAttribute);
@@ -465,7 +491,7 @@ protected void visitAspect(String qualifiedName, StarlarkDefinedAspect aspect)
     protected void visitModuleExtension(String qualifiedName, ModuleExtension moduleExtension)
         throws ExtractionException {
       ModuleExtensionInfo.Builder moduleExtensionInfoBuilder = ModuleExtensionInfo.newBuilder();
-      moduleExtensionInfoBuilder.setExtensionName(qualifiedName);
+      moduleExtensionInfoBuilder.setExtensionName(internalToUnicode(qualifiedName));
       moduleExtensionInfoBuilder.setOriginKey(
           OriginKey.newBuilder()
               // TODO(arostovtsev): attempt to retrieve the name under which the module was
@@ -473,13 +499,22 @@ protected void visitModuleExtension(String qualifiedName, ModuleExtension module
               // make ModuleExtension a StarlarkExportable (partially reverting cl/513213080).
               // Alternatively, we'd need to search the defining module's globals, similarly to what
               // we do in FunctionUtil#getFunctionOriginKey.
-              .setFile(context.labelRenderer().render(moduleExtension.definingBzlFileLabel())));
-      moduleExtension.doc().ifPresent(moduleExtensionInfoBuilder::setDocString);
+              .setFile(
+                  internalToUnicode(
+                      context.labelRenderer().render(moduleExtension.definingBzlFileLabel()))));
+      moduleExtension
+          .doc()
+          .map(StringEncoding::internalToUnicode)
+          .ifPresent(moduleExtensionInfoBuilder::setDocString);
       for (Map.Entry<String, TagClass> entry : moduleExtension.tagClasses().entrySet()) {
         ModuleExtensionTagClassInfo.Builder tagClassInfoBuilder =
             ModuleExtensionTagClassInfo.newBuilder();
-        tagClassInfoBuilder.setTagName(entry.getKey());
-        entry.getValue().doc().ifPresent(tagClassInfoBuilder::setDocString);
+        tagClassInfoBuilder.setTagName(internalToUnicode(entry.getKey()));
+        entry
+            .getValue()
+            .doc()
+            .map(StringEncoding::internalToUnicode)
+            .ifPresent(tagClassInfoBuilder::setDocString);
         AttributeInfoExtractor.addDocumentableAttributes(
             context,
             ImmutableMap.of(),
@@ -495,21 +530,29 @@ protected void visitRepositoryRule(
         String qualifiedName, RepositoryRuleFunction repositoryRuleFunction)
         throws ExtractionException {
       RepositoryRuleInfo.Builder repositoryRuleInfoBuilder = RepositoryRuleInfo.newBuilder();
-      repositoryRuleInfoBuilder.setRuleName(qualifiedName);
-      repositoryRuleFunction.getDocumentation().ifPresent(repositoryRuleInfoBuilder::setDocString);
+      repositoryRuleInfoBuilder.setRuleName(internalToUnicode(qualifiedName));
+      repositoryRuleFunction
+          .getDocumentation()
+          .map(StringEncoding::internalToUnicode)
+          .ifPresent(repositoryRuleInfoBuilder::setDocString);
       RuleClass ruleClass = repositoryRuleFunction.getRuleClass();
       repositoryRuleInfoBuilder.setOriginKey(
           OriginKey.newBuilder()
-              .setName(ruleClass.getName())
-              .setFile(context.labelRenderer().render(repositoryRuleFunction.getExtensionLabel())));
+              .setName(internalToUnicode(ruleClass.getName()))
+              .setFile(
+                  internalToUnicode(
+                      context.labelRenderer().render(repositoryRuleFunction.getExtensionLabel()))));
       AttributeInfoExtractor.addDocumentableAttributes(
           context,
           IMPLICIT_REPOSITORY_RULE_ATTRIBUTES,
           ruleClass.getAttributes(),
           repositoryRuleInfoBuilder::addAttribute);
       if (ruleClass.hasAttr("$environ", Types.STRING_LIST)) {
-        repositoryRuleInfoBuilder.addAllEnviron(
-            Types.STRING_LIST.cast(ruleClass.getAttributeByName("$environ").getDefaultValue(null)));
+        for (String env :
+            Types.STRING_LIST.cast(
+                ruleClass.getAttributeByName("$environ").getDefaultValue(null))) {
+          repositoryRuleInfoBuilder.addEnviron(internalToUnicode(env));
+        }
       }
       moduleInfoBuilder.addRepositoryRuleInfo(repositoryRuleInfoBuilder);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ProviderNameGroupExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ProviderNameGroupExtractor.java
index 107c82580d1fbf..46c002b3dad539 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ProviderNameGroupExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ProviderNameGroupExtractor.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.starlarkdocextract;
 
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
+
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.BuiltinProvider;
@@ -31,12 +33,15 @@ static ProviderNameGroup buildProviderNameGroup(
       ExtractorContext context, ImmutableSet<StarlarkProviderIdentifier> providerGroup) {
     ProviderNameGroup.Builder providerNameGroupBuilder = ProviderNameGroup.newBuilder();
     for (StarlarkProviderIdentifier provider : providerGroup) {
-      providerNameGroupBuilder.addProviderName(context.getDocumentedProviderName(provider));
-      OriginKey.Builder providerKeyBuilder = OriginKey.newBuilder().setName(provider.toString());
+      providerNameGroupBuilder.addProviderName(
+          internalToUnicode(context.getDocumentedProviderName(provider)));
+      OriginKey.Builder providerKeyBuilder =
+          OriginKey.newBuilder().setName(internalToUnicode(provider.toString()));
       if (!provider.isLegacy()) {
         if (provider.getKey() instanceof StarlarkProvider.Key) {
           Label definingModule = ((StarlarkProvider.Key) provider.getKey()).getExtensionLabel();
-          providerKeyBuilder.setFile(context.labelRenderer().render(definingModule));
+          providerKeyBuilder.setFile(
+              internalToUnicode(context.labelRenderer().render(definingModule)));
         } else if (provider.getKey() instanceof BuiltinProvider.Key) {
           providerKeyBuilder.setFile("<native>");
         }
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/RuleInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/RuleInfoExtractor.java
index aa4c4b18a8d9ba..64eeba8626381c 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/RuleInfoExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/RuleInfoExtractor.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.starlarkdocextract;
 
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -54,21 +56,24 @@ public static RuleInfo buildRuleInfo(
     RuleInfo.Builder ruleInfoBuilder = RuleInfo.newBuilder();
     // Record the name under which this symbol is made accessible, which may differ from the
     // symbol's exported name
-    ruleInfoBuilder.setRuleName(qualifiedName);
+    ruleInfoBuilder.setRuleName(internalToUnicode(qualifiedName));
     // ... but record the origin rule key for cross references.
-    OriginKey.Builder originKeyBuilder = OriginKey.newBuilder().setName(ruleClass.getName());
+    OriginKey.Builder originKeyBuilder =
+        OriginKey.newBuilder().setName(internalToUnicode(ruleClass.getName()));
     if (ruleClass.isStarlark()) {
       if (ruleClass.getStarlarkExtensionLabel() != null) {
         // Most common case: exported Starlark-defined rule class
         originKeyBuilder.setFile(
-            context.labelRenderer().render(ruleClass.getStarlarkExtensionLabel()));
+            internalToUnicode(
+                context.labelRenderer().render(ruleClass.getStarlarkExtensionLabel())));
       } else {
         // Unexported Starlark-defined rule class; this only possible for a repository rule. Fall
         // back to the rule definition environment label. (Note that we cannot unconditionally call
         // getRuleDefinitionEnvironmentLabel() because for an analysis test rule class, the rule
         // definition environment label is a dummy value; see b/366027483.)
         originKeyBuilder.setFile(
-            context.labelRenderer().render(ruleClass.getRuleDefinitionEnvironmentLabel()));
+            internalToUnicode(
+                context.labelRenderer().render(ruleClass.getRuleDefinitionEnvironmentLabel())));
       }
     } else {
       // Non-Starlark-defined rule class
@@ -77,7 +82,7 @@ public static RuleInfo buildRuleInfo(
     ruleInfoBuilder.setOriginKey(originKeyBuilder.build());
 
     if (ruleClass.getStarlarkDocumentation() != null) {
-      ruleInfoBuilder.setDocString(ruleClass.getStarlarkDocumentation());
+      ruleInfoBuilder.setDocString(internalToUnicode(ruleClass.getStarlarkDocumentation()));
     }
 
     if (ruleClass.getRuleClassType() == RuleClassType.TEST) {
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/StarlarkFunctionInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/StarlarkFunctionInfoExtractor.java
index 52f3fc52ddfd23..52e4978ab2d426 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/StarlarkFunctionInfoExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/StarlarkFunctionInfoExtractor.java
@@ -19,6 +19,7 @@
 import static com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.FunctionParamRole.PARAM_ROLE_KWARGS;
 import static com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.FunctionParamRole.PARAM_ROLE_ORDINARY;
 import static com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.FunctionParamRole.PARAM_ROLE_VARARGS;
+import static com.google.devtools.build.lib.util.StringEncoding.internalToUnicode;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -30,6 +31,7 @@
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.FunctionReturnInfo;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.OriginKey;
 import com.google.devtools.build.lib.starlarkdocextract.StardocOutputProtos.StarlarkFunctionInfo;
+import com.google.devtools.build.lib.util.StringEncoding;
 import com.google.devtools.starlark.common.DocstringUtils;
 import com.google.devtools.starlark.common.DocstringUtils.DocstringInfo;
 import com.google.devtools.starlark.common.DocstringUtils.DocstringParseError;
@@ -71,7 +73,7 @@ private StarlarkFunctionInfo extract(String functionName, StarlarkFunction fn)
       throws ExtractionException {
     Map<String, String> paramNameToDocMap = Maps.newLinkedHashMap();
     StarlarkFunctionInfo.Builder functionInfoBuilder =
-        StarlarkFunctionInfo.newBuilder().setFunctionName(functionName);
+        StarlarkFunctionInfo.newBuilder().setFunctionName(internalToUnicode(functionName));
     functionInfoBuilder.setOriginKey(getFunctionOriginKey(fn));
     String doc = fn.getDocumentation();
     if (doc != null) {
@@ -85,19 +87,21 @@ private StarlarkFunctionInfo extract(String functionName, StarlarkFunction fn)
         functionDescription.append("\n\n");
       }
       functionDescription.append(docstringInfo.getLongDescription());
-      functionInfoBuilder.setDocString(functionDescription.toString());
+      functionInfoBuilder.setDocString(internalToUnicode(functionDescription.toString()));
       for (ParameterDoc paramDoc : docstringInfo.getParameters()) {
         paramNameToDocMap.put(paramDoc.getParameterName(), paramDoc.getDescription());
       }
       String returns = docstringInfo.getReturns();
       if (!returns.isEmpty()) {
         functionInfoBuilder.setReturn(
-            FunctionReturnInfo.newBuilder().setDocString(returns).build());
+            FunctionReturnInfo.newBuilder().setDocString(internalToUnicode(returns)).build());
       }
       String deprecated = docstringInfo.getDeprecated();
       if (!deprecated.isEmpty()) {
         functionInfoBuilder.setDeprecated(
-            FunctionDeprecationInfo.newBuilder().setDocString(deprecated).build());
+            FunctionDeprecationInfo.newBuilder()
+                .setDocString(internalToUnicode(deprecated))
+                .build());
       }
     }
     functionInfoBuilder.addAllParameter(parameterInfos(fn, paramNameToDocMap));
@@ -129,12 +133,14 @@ private FunctionParamInfo forParam(
       @Nullable Object defaultValue,
       FunctionParamRole role) {
     FunctionParamInfo.Builder paramBuilder =
-        FunctionParamInfo.newBuilder().setName(name).setRole(role);
-    docString.ifPresent(paramBuilder::setDocString);
+        FunctionParamInfo.newBuilder().setName(internalToUnicode(name)).setRole(role);
+    docString.map(StringEncoding::internalToUnicode).ifPresent(paramBuilder::setDocString);
     if (defaultValue == null) {
       paramBuilder.setMandatory(true);
     } else {
-      paramBuilder.setDefaultValue(labelRenderer.repr(defaultValue)).setMandatory(false);
+      paramBuilder
+          .setDefaultValue(internalToUnicode(labelRenderer.repr(defaultValue)))
+          .setMandatory(false);
     }
     return paramBuilder.build();
   }
@@ -143,8 +149,11 @@ private FunctionParamInfo forParam(
   private static FunctionParamInfo forSpecialParam(
       String name, Optional<String> docString, FunctionParamRole role) {
     FunctionParamInfo.Builder paramBuilder =
-        FunctionParamInfo.newBuilder().setName(name).setRole(role).setMandatory(false);
-    docString.ifPresent(paramBuilder::setDocString);
+        FunctionParamInfo.newBuilder()
+            .setName(internalToUnicode(name))
+            .setRole(role)
+            .setMandatory(false);
+    docString.map(StringEncoding::internalToUnicode).ifPresent(paramBuilder::setDocString);
     return paramBuilder.build();
   }
 
@@ -196,7 +205,7 @@ private OriginKey getFunctionOriginKey(StarlarkFunction fn) {
     // change with any edits to the .bzl file, resulting in lots of churn in golden tests.
     for (Map.Entry<String, Object> entry : fn.getModule().getGlobals().entrySet()) {
       if (fn.equals(entry.getValue())) {
-        builder.setName(entry.getKey());
+        builder.setName(internalToUnicode(entry.getKey()));
         break;
       }
     }
@@ -204,7 +213,7 @@ private OriginKey getFunctionOriginKey(StarlarkFunction fn) {
 
     BazelModuleContext moduleContext = BazelModuleContext.of(fn.getModule());
     if (moduleContext != null) {
-      builder.setFile(labelRenderer.render(moduleContext.label()));
+      builder.setFile(internalToUnicode(labelRenderer.render(moduleContext.label())));
     }
     return builder.build();
   }
diff --git a/src/test/shell/integration/bazel_query_test.sh b/src/test/shell/integration/bazel_query_test.sh
index fb8c9bfc6b8c58..1c7d122092ffb0 100755
--- a/src/test/shell/integration/bazel_query_test.sh
+++ b/src/test/shell/integration/bazel_query_test.sh
@@ -1269,4 +1269,69 @@ EOF
   expect_log "\"//foo:c.sh\"$"
 }
 
+function test_proto_non_ascii_attributes() {
+  rm -rf foo
+  mkdir -p foo
+  cat > foo/defs.bzl <<'EOF'
+def _impl(ctx): pass
+r = rule(
+  implementation = _impl,
+  attrs = {
+    "label": attr.label(),
+    "label_keyed_string_dict": attr.label_keyed_string_dict(),
+    "label_list": attr.label_list(),
+    "output": attr.output(),
+    "output_list": attr.output_list(),
+    "string": attr.string(),
+    "string_dict": attr.string_dict(),
+    "string_keyed_label_dict": attr.string_keyed_label_dict(),
+    "string_list": attr.string_list(),
+    "string_list_dict": attr.string_list_dict(),
+  },
+)
+
+def test_case(name, with_select):
+  def maybe_select(x):
+    if with_select:
+      return select({"//conditions:default": x})
+    return x
+
+  r(
+    name = name,
+    label = maybe_select("leaf🌱"),
+    label_keyed_string_dict = maybe_select({"fire🔥": "ice❄️"}),
+    label_list = maybe_select(["star⭐"]),
+    output = name + "flower🌸",
+    output_list = [name + "party🎉"],
+    string = maybe_select("ball⚽"),
+    string_dict = maybe_select({"sun☀️": "moon🌙"}),
+    string_keyed_label_dict = maybe_select({"heart❤️": "skull💀"}),
+    string_list = maybe_select(["rocket🚀"]),
+    string_list_dict = maybe_select({"dog🐶": ["cat🐱"]}),
+  )
+EOF
+  cat > foo/BUILD <<'EOF'
+load(":defs.bzl", "test_case")
+test_case(name = "without_select", with_select = False)
+test_case(name = "with_select", with_select = True)
+EOF
+
+  declare -a items=("leaf🌱" "fire🔥" "ice❄️" "star⭐" "flower🌸" "party🎉"
+    "ball⚽" "sun☀️" "moon🌙" "heart❤️" "skull💀" "rocket🚀" "dog🐶" "cat🐱")
+
+  bazel query --output=proto //foo:without_select >& $TEST_log \
+      || fail "Expected success"
+
+  for x in "${items[@]}"; do
+    grep -q "$x" $TEST_log || fail "Expected $x in query output for //foo:without_select"
+  done
+
+  bazel query --output=proto //foo:with_select >& $TEST_log \
+      || fail "Expected success"
+
+  for x in "${items[@]}"; do
+    grep -q "$x" $TEST_log || fail "Expected $x in query output for //foo:with_select"
+  done
+}
+
 run_suite "${PRODUCT_NAME} query tests"