Update the "protos" extension to be compatible with CelEnvironmentExporter

PiperOrigin-RevId: 788724386

Author: dmitriplotnikov

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

@@ -115,8 +115,9 @@ public Builder addStandardExtensions(CelOptions options) {
       addExtensionLibraries(
           CelExtensions.getExtensionLibrary("bindings", options),
           CelExtensions.getExtensionLibrary("encoders", options),
+          CelExtensions.getExtensionLibrary("lists", options),
           CelExtensions.getExtensionLibrary("math", options),
-          CelExtensions.getExtensionLibrary("lists", options));
+          CelExtensions.getExtensionLibrary("protos", options));
       // TODO: add support for remaining standard extensions
       return this;
     }

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

@@ -101,6 +101,7 @@ java_library(
         "//common/ast",
         "//common/internal",
         "//compiler:compiler_builder",
+        "//extensions:extension_library",
         "//parser:macro",
         "//parser:parser_builder",
         "@maven//:com_google_errorprone_error_prone_annotations",

extensions/src/main/java/dev/cel/extensions/CelExtensions.java

@@ -307,10 +307,12 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
         return CelBindingsExtensions.library();
       case "encoders":
         return CelEncoderExtensions.library();
-      case "math":
-        return CelMathExtensions.library(options);
       case "lists":
         return CelListsExtensions.library();
+      case "math":
+        return CelMathExtensions.library(options);
+      case "protos":
+        return CelProtoExtensions.library();
       // TODO: add support for remaining standard extensions
       default:
         throw new IllegalArgumentException("Unknown standard extension '" + name + "'");

extensions/src/main/java/dev/cel/extensions/CelProtoExtensions.java

@@ -18,6 +18,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.annotations.Immutable;
 import dev.cel.common.CelIssue;
 import dev.cel.common.ast.CelExpr;
@@ -30,18 +31,47 @@
 
 /** Internal implementation of CEL proto extensions. */
 @Immutable
-final class CelProtoExtensions implements CelCompilerLibrary {
+final class CelProtoExtensions implements CelCompilerLibrary, CelExtensionLibrary.FeatureSet {
 
   private static final String PROTO_NAMESPACE = "proto";
   private static final CelExpr ERROR = CelExpr.newBuilder().setConstant(Constants.ERROR).build();
 
+  private static final CelExtensionLibrary<CelProtoExtensions> LIBRARY =
+      new CelExtensionLibrary<CelProtoExtensions>() {
+        private final CelProtoExtensions version0 = new CelProtoExtensions();
+
+        @Override
+        public String name() {
+          return "protos";
+        }
+
+        @Override
+        public ImmutableSet<CelProtoExtensions> versions() {
+          return ImmutableSet.of(version0);
+        }
+      };
+
+  static CelExtensionLibrary<CelProtoExtensions> library() {
+    return LIBRARY;
+  }
+
   @Override
-  public void setParserOptions(CelParserBuilder parserBuilder) {
-    parserBuilder.addMacros(
+  public int version() {
+    return 0;
+  }
+
+  @Override
+  public ImmutableSet<CelMacro> macros() {
+    return ImmutableSet.of(
         CelMacro.newReceiverMacro("hasExt", 2, CelProtoExtensions::expandHasProtoExt),
         CelMacro.newReceiverMacro("getExt", 2, CelProtoExtensions::expandGetProtoExt));
   }
 
+  @Override
+  public void setParserOptions(CelParserBuilder parserBuilder) {
+    parserBuilder.addMacros(macros());
+  }
+
   private static Optional<CelExpr> expandHasProtoExt(
       CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
     return expandProtoExt(exprFactory, target, arguments, true);

extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

@@ -30,6 +30,7 @@
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.CelContainer;
 import dev.cel.common.CelFunctionDecl;
+import dev.cel.common.CelOptions;
 import dev.cel.common.CelOverloadDecl;
 import dev.cel.common.CelValidationException;
 import dev.cel.common.types.SimpleType;
@@ -40,6 +41,7 @@
 import dev.cel.expr.conformance.proto2.TestAllTypes;
 import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
 import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
+import dev.cel.parser.CelMacro;
 import dev.cel.parser.CelStandardMacro;
 import dev.cel.runtime.CelFunctionBinding;
 import dev.cel.runtime.CelRuntime;
@@ -85,6 +87,17 @@ public final class CelProtoExtensionsTest {
           .setExtension(Proto2ExtensionScopedMessage.int64Ext, 1L)
           .build();
 
+  @Test
+  public void library() {
+    CelExtensionLibrary<?> library =
+        CelExtensions.getExtensionLibrary("protos", CelOptions.DEFAULT);
+    assertThat(library.name()).isEqualTo("protos");
+    assertThat(library.latest().version()).isEqualTo(0);
+    assertThat(library.version(0).functions()).isEmpty();
+    assertThat(library.version(0).macros().stream().map(CelMacro::getFunction))
+        .containsExactly("hasExt", "getExt");
+  }
+
   @Test
   @TestParameters("{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.int32_ext)'}")
   @TestParameters("{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.nested_ext)'}")