Add support for macro inclusion/exclusion to CelEnvironmentExporter

PiperOrigin-RevId: 785497910

Author: dmitriplotnikov

bundle/BUILD.bazel

@@ -24,3 +24,9 @@ java_library(
     name = "environment_yaml_parser",
     exports = ["//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser"],
 )
+
+java_library(
+    name = "environment_exporter",
+    visibility = ["//:internal"],
+    exports = ["//bundle/src/main/java/dev/cel/bundle:environment_exporter"],
+)

bundle/src/main/java/dev/cel/bundle/BUILD.bazel

@@ -111,6 +111,33 @@ java_library(
     ],
 )
 
+java_library(
+    name = "environment_exporter",
+    srcs = [
+        "CelEnvironmentExporter.java",
+    ],
+    tags = [
+    ],
+    deps = [
+        ":environment",
+        "//:auto_value",
+        "//bundle:cel",
+        "//checker:standard_decl",
+        "//common:compiler_common",
+        "//common:options",
+        "//common/internal:env_visitor",
+        "//common/types:cel_proto_types",
+        "//common/types:cel_types",
+        "//common/types:type_providers",
+        "//extensions",
+        "//extensions:inventory",
+        "//parser:macro",
+        "@cel_spec//proto/cel/expr:checked_java_proto",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
 java_library(
     name = "required_fields_checker",
     srcs = [

bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

@@ -185,7 +185,7 @@ public static Builder newBuilder() {
         .setVariables(ImmutableSet.of())
         .setFunctions(ImmutableSet.of());
   }
-  
+
   /** Extends the provided {@link CelCompiler} environment with this configuration. */
   public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
       throws CelEnvironmentException {
@@ -275,12 +275,12 @@ private void applyStandardLibrarySubset(CelCompilerBuilder compilerBuilder) {
     } else if (!librarySubset.includedMacros().isEmpty()) {
       compilerBuilder.setStandardMacros(
           librarySubset.includedMacros().stream()
-              .map(CelEnvironment::getStandardMacroOrThrow)
+              .flatMap(name -> getStandardMacrosOrThrow(name).stream())
               .collect(toImmutableSet()));
     } else if (!librarySubset.excludedMacros().isEmpty()) {
       ImmutableSet<CelStandardMacro> set =
           librarySubset.excludedMacros().stream()
-              .map(CelEnvironment::getStandardMacroOrThrow)
+              .flatMap(name -> getStandardMacrosOrThrow(name).stream())
               .collect(toImmutableSet());
       compilerBuilder.setStandardMacros(
           CelStandardMacro.STANDARD_MACROS.stream()
@@ -311,13 +311,18 @@ private void applyStandardLibrarySubset(CelCompilerBuilder compilerBuilder) {
     }
   }
 
-  private static CelStandardMacro getStandardMacroOrThrow(String macroName) {
+  private static ImmutableSet<CelStandardMacro> getStandardMacrosOrThrow(String macroName) {
+    ImmutableSet.Builder<CelStandardMacro> builder = ImmutableSet.builder();
     for (CelStandardMacro macro : CelStandardMacro.STANDARD_MACROS) {
       if (macro.getFunction().equals(macroName)) {
-        return macro;
+        builder.add(macro);
       }
     }
-    throw new IllegalArgumentException("unrecognized standard macro `" + macroName + "'");
+    ImmutableSet<CelStandardMacro> macros = builder.build();
+    if (macros.isEmpty()) {
+      throw new IllegalArgumentException("unrecognized standard macro `" + macroName + "'");
+    }
+    return macros;
   }
 
   private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {