Update the "strings" extension to be compatible with CelEnvironmentExporter

dmitriplotnikov · copybara-github · commit 261b651d322b · 2025-07-29T21:22:11.000-07:00
PiperOrigin-RevId: 786914253
diff --git a/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java b/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java
@@ -117,7 +117,10 @@ public Builder addStandardExtensions(CelOptions options) {
           CelExtensions.getExtensionLibrary("encoders", options),
           CelExtensions.getExtensionLibrary("lists", options),
           CelExtensions.getExtensionLibrary("math", options),
-          CelExtensions.getExtensionLibrary("protos", options));
+          CelExtensions.getExtensionLibrary("protos", options),
+          CelExtensions.getExtensionLibrary("regex", options),
+          CelExtensions.getExtensionLibrary("sets", options),
+          CelExtensions.getExtensionLibrary("strings", options));
       // TODO: add support for remaining standard extensions
       return this;
     }
diff --git a/extensions/src/main/java/dev/cel/extensions/BUILD.bazel b/extensions/src/main/java/dev/cel/extensions/BUILD.bazel
@@ -85,6 +85,7 @@ java_library(
         "//common/internal",
         "//common/types",
         "//compiler:compiler_builder",
+        "//extensions:extension_library",
         "//runtime",
         "//runtime:evaluation_exception_builder",
         "//runtime:function_binding",
@@ -203,6 +204,7 @@ java_library(
         "//common/internal:dynamic_proto",
         "//common/types",
         "//compiler:compiler_builder",
+        "//extensions:extension_library",
         "//runtime",
         "//runtime:proto_message_runtime_equality",
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -278,6 +280,7 @@ java_library(
         "//common:compiler_common",
         "//common/types",
         "//compiler:compiler_builder",
+        "//extensions:extension_library",
         "//runtime",
         "//runtime:function_binding",
         "@maven//:com_google_errorprone_error_prone_annotations",
diff --git a/extensions/src/main/java/dev/cel/extensions/CelExtensions.java b/extensions/src/main/java/dev/cel/extensions/CelExtensions.java
@@ -313,6 +313,12 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
         return CelMathExtensions.library(options);
       case "protos":
         return CelProtoExtensions.library();
+      case "regex":
+        return CelRegexExtensions.library();
+      case "sets":
+        return CelSetsExtensions.library(options);
+      case "strings":
+        return CelStringExtensions.library();
       // TODO: add support for remaining standard extensions
       default:
         throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
diff --git a/extensions/src/main/java/dev/cel/extensions/CelRegexExtensions.java b/extensions/src/main/java/dev/cel/extensions/CelRegexExtensions.java
@@ -14,6 +14,8 @@
 
 package dev.cel.extensions;
 
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.annotations.Immutable;
@@ -35,7 +37,8 @@
 
 /** Internal implementation of CEL regex extensions. */
 @Immutable
-final class CelRegexExtensions implements CelCompilerLibrary, CelRuntimeLibrary {
+final class CelRegexExtensions
+    implements CelCompilerLibrary, CelRuntimeLibrary, CelExtensionLibrary.FeatureSet {
 
   private static final String REGEX_REPLACE_FUNCTION = "regex.replace";
   private static final String REGEX_EXTRACT_FUNCTION = "regex.extract";
@@ -124,6 +127,25 @@ String getFunction() {
     }
   }
 
+  private static final CelExtensionLibrary<CelRegexExtensions> LIBRARY =
+      new CelExtensionLibrary<CelRegexExtensions>() {
+        private final CelRegexExtensions version0 = new CelRegexExtensions();
+
+        @Override
+        public String name() {
+          return "regex";
+        }
+
+        @Override
+        public ImmutableSet<CelRegexExtensions> versions() {
+          return ImmutableSet.of(version0);
+        }
+      };
+
+  static CelExtensionLibrary<CelRegexExtensions> library() {
+    return LIBRARY;
+  }
+
   private final ImmutableSet<Function> functions;
 
   CelRegexExtensions() {
@@ -134,6 +156,16 @@ String getFunction() {
     this.functions = ImmutableSet.copyOf(functions);
   }
 
+  @Override
+  public int version() {
+    return 0;
+  }
+
+  @Override
+  public ImmutableSet<CelFunctionDecl> functions() {
+    return functions.stream().map(f -> f.functionDecl).collect(toImmutableSet());
+  }
+
   @Override
   public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
     functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
diff --git a/extensions/src/main/java/dev/cel/extensions/CelSetsExtensions.java b/extensions/src/main/java/dev/cel/extensions/CelSetsExtensions.java
@@ -41,7 +41,8 @@
  * rewrite the AST into a map to achieve a O(1) lookup.
  */
 @Immutable
-final class CelSetsExtensions implements CelCompilerLibrary, CelRuntimeLibrary {
+final class CelSetsExtensions
+    implements CelCompilerLibrary, CelRuntimeLibrary, CelExtensionLibrary.FeatureSet {
 
   private static final String SET_CONTAINS_OVERLOAD_DOC =
       "Returns whether the first list argument contains all elements in the second list"
@@ -90,6 +91,28 @@ final class CelSetsExtensions implements CelCompilerLibrary, CelRuntimeLibrary {
                   ListType.create(TypeParamType.create("T")),
                   ListType.create(TypeParamType.create("T")))));
 
+  private static final class Library implements CelExtensionLibrary<CelSetsExtensions> {
+    private final CelSetsExtensions version0;
+
+    Library(CelOptions celOptions) {
+      version0 = new CelSetsExtensions(celOptions);
+    }
+
+    @Override
+    public String name() {
+      return "sets";
+    }
+
+    @Override
+    public ImmutableSet<CelSetsExtensions> versions() {
+      return ImmutableSet.of(version0);
+    }
+  }
+
+  static CelExtensionLibrary<CelSetsExtensions> library(CelOptions options) {
+    return new Library(options);
+  }
+
   private final ImmutableSet<SetsFunction> functions;
   private final SetsExtensionsRuntimeImpl setsExtensionsRuntime;
 
@@ -105,6 +128,16 @@ final class CelSetsExtensions implements CelCompilerLibrary, CelRuntimeLibrary {
     this.setsExtensionsRuntime = new SetsExtensionsRuntimeImpl(runtimeEquality, functions);
   }
 
+  @Override
+  public int version() {
+    return 0;
+  }
+
+  @Override
+  public ImmutableSet<CelFunctionDecl> functions() {
+    return ImmutableSet.copyOf(FUNCTION_DECL_MAP.values());
+  }
+
   @Override
   public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
     functions.forEach(
diff --git a/extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java b/extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java
@@ -14,6 +14,7 @@
 
 package dev.cel.extensions;
 
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 
@@ -42,7 +43,8 @@
 
 /** Internal implementation of CEL string extensions. */
 @Immutable
-public final class CelStringExtensions implements CelCompilerLibrary, CelRuntimeLibrary {
+public final class CelStringExtensions
+    implements CelCompilerLibrary, CelRuntimeLibrary, CelExtensionLibrary.FeatureSet {
 
   /** Denotes the string extension function */
   @SuppressWarnings({"unchecked"}) // Unchecked: Type-checker guarantees casting safety.
@@ -250,6 +252,35 @@ String getFunction() {
     this.functions = ImmutableSet.copyOf(functions);
   }
 
+  private static final CelExtensionLibrary<CelStringExtensions> LIBRARY =
+      new CelExtensionLibrary<CelStringExtensions>() {
+        private final CelStringExtensions version0 = new CelStringExtensions();
+
+        @Override
+        public String name() {
+          return "strings";
+        }
+
+        @Override
+        public ImmutableSet<CelStringExtensions> versions() {
+          return ImmutableSet.of(version0);
+        }
+      };
+
+  static CelExtensionLibrary<CelStringExtensions> library() {
+    return LIBRARY;
+  }
+
+  @Override
+  public int version() {
+    return 0;
+  }
+
+  @Override
+  public ImmutableSet<CelFunctionDecl> functions() {
+    return functions.stream().map(f -> f.functionDecl).collect(toImmutableSet());
+  }
+
   @Override
   public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
     functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
diff --git a/extensions/src/test/java/dev/cel/extensions/CelRegexExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelRegexExtensionsTest.java
@@ -21,6 +21,8 @@
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.common.CelAbstractSyntaxTree;
+import dev.cel.common.CelFunctionDecl;
+import dev.cel.common.CelOptions;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
 import dev.cel.runtime.CelEvaluationException;
@@ -38,6 +40,17 @@ public final class CelRegexExtensionsTest {
   private static final CelRuntime RUNTIME =
       CelRuntimeFactory.standardCelRuntimeBuilder().addLibraries(CelExtensions.regex()).build();
 
+  @Test
+  public void library() {
+    CelExtensionLibrary<?> library =
+        CelExtensions.getExtensionLibrary("regex", CelOptions.DEFAULT);
+    assertThat(library.name()).isEqualTo("regex");
+    assertThat(library.latest().version()).isEqualTo(0);
+    assertThat(library.version(0).functions().stream().map(CelFunctionDecl::name))
+        .containsExactly("regex.replace", "regex.extract", "regex.extractAll");
+    assertThat(library.version(0).macros()).isEmpty();
+  }
+
   @Test
   @TestParameters("{target: 'abc', regex: '^', replaceStr: 'start_', res: 'start_abc'}")
   @TestParameters("{target: 'abc', regex: '$', replaceStr: '_end', res: 'abc_end'}")
diff --git a/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java
@@ -72,6 +72,17 @@ public final class CelSetsExtensionsTest {
                   Math::toIntExact))
           .build();
 
+  @Test
+  public void library() {
+    CelExtensionLibrary<?> library =
+        CelExtensions.getExtensionLibrary("sets", CelOptions.DEFAULT);
+    assertThat(library.name()).isEqualTo("sets");
+    assertThat(library.latest().version()).isEqualTo(0);
+    assertThat(library.version(0).functions().stream().map(CelFunctionDecl::name))
+        .containsExactly("sets.contains", "sets.equivalent", "sets.intersects");
+    assertThat(library.version(0).macros()).isEmpty();
+  }
+
   @Test
   public void contains_integerListWithSameValue_succeeds() throws Exception {
     ImmutableList<Integer> list = ImmutableList.of(1, 2, 3, 4);
diff --git a/extensions/src/test/java/dev/cel/extensions/CelStringExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelStringExtensionsTest.java
@@ -23,6 +23,8 @@
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.common.CelAbstractSyntaxTree;
+import dev.cel.common.CelFunctionDecl;
+import dev.cel.common.CelOptions;
 import dev.cel.common.CelValidationException;
 import dev.cel.common.types.SimpleType;
 import dev.cel.compiler.CelCompiler;
@@ -54,6 +56,27 @@ public final class CelStringExtensionsTest {
   private static final CelRuntime RUNTIME =
       CelRuntimeFactory.standardCelRuntimeBuilder().addLibraries(CelExtensions.strings()).build();
 
+  @Test
+  public void library() {
+    CelExtensionLibrary<?> library =
+        CelExtensions.getExtensionLibrary("strings", CelOptions.DEFAULT);
+    assertThat(library.name()).isEqualTo("strings");
+    assertThat(library.latest().version()).isEqualTo(0);
+    assertThat(library.version(0).functions().stream().map(CelFunctionDecl::name))
+        .containsExactly(
+            "charAt",
+            "indexOf",
+            "join",
+            "lastIndexOf",
+            "lowerAscii",
+            "replace",
+            "split",
+            "substring",
+            "trim",
+            "upperAscii");
+    assertThat(library.version(0).macros()).isEmpty();
+  }
+
   @Test
   @TestParameters("{string: 'abcd', beginIndex: 0, expectedResult: 'abcd'}")
   @TestParameters("{string: 'abcd', beginIndex: 1, expectedResult: 'bcd'}")
