Enable conformance tests for two-var comprehensions.

Add existsOne (preferred alternative to older exists_one)

PiperOrigin-RevId: 853942944

Author: jnthntatum

bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java

@@ -110,7 +110,7 @@ public void standardLibrarySubset_favorExclusion() throws Exception {
                         FunctionSelector.create("matches", ImmutableSet.of()),
                         FunctionSelector.create(
                             "timestamp", ImmutableSet.of("string_to_timestamp"))))
-                .setExcludedMacros(ImmutableSet.of("map", "filter"))
+                .setExcludedMacros(ImmutableSet.of("map", "existsOne", "filter"))
                 .build());
   }
 

common/src/main/java/dev/cel/common/Operator.java

@@ -45,7 +45,9 @@ public enum Operator {
   HAS("has"),
   ALL("all"),
   EXISTS("exists"),
+  // Prefer EXISTS_ONE_NEW in new usages.
   EXISTS_ONE("exists_one"),
+  EXISTS_ONE_NEW("existsOne"),
   MAP("map"),
   FILTER("filter"),
   NOT_STRICTLY_FALSE("@not_strictly_false"),
@@ -109,6 +111,7 @@ public static Optional<Operator> find(String text) {
           .put(EQUALS.getFunction(), EQUALS)
           .put(EXISTS.getFunction(), EXISTS)
           .put(EXISTS_ONE.getFunction(), EXISTS_ONE)
+          .put(EXISTS_ONE_NEW.getFunction(), EXISTS_ONE_NEW)
           .put(FILTER.getFunction(), FILTER)
           .put(GREATER.getFunction(), GREATER)
           .put(GREATER_EQUALS.getFunction(), GREATER_EQUALS)

conformance/src/test/java/dev/cel/conformance/BUILD.bazel

@@ -75,6 +75,7 @@ _ALL_TESTS = [
     "@cel_spec//tests/simple:testdata/lists.textproto",
     "@cel_spec//tests/simple:testdata/logic.textproto",
     "@cel_spec//tests/simple:testdata/macros.textproto",
+    "@cel_spec//tests/simple:testdata/macros2.textproto",
     "@cel_spec//tests/simple:testdata/math_ext.textproto",
     "@cel_spec//tests/simple:testdata/namespace.textproto",
     "@cel_spec//tests/simple:testdata/optionals.textproto",

conformance/src/test/java/dev/cel/conformance/ConformanceTest.java

@@ -66,6 +66,7 @@ public final class ConformanceTest extends Statement {
           .setOptions(OPTIONS)
           .addLibraries(
               CelExtensions.bindings(),
+              CelExtensions.comprehensions(),
               CelExtensions.encoders(OPTIONS),
               CelExtensions.math(OPTIONS),
               CelExtensions.protos(),
@@ -80,6 +81,7 @@ public final class ConformanceTest extends Statement {
           .setOptions(OPTIONS)
           .addLibraries(
               CelExtensions.bindings(),
+              CelExtensions.comprehensions(),
               CelExtensions.encoders(OPTIONS),
               CelExtensions.math(OPTIONS),
               CelExtensions.protos(),
@@ -106,10 +108,12 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
         .addFileTypes(dev.cel.expr.conformance.proto2.TestAllTypesExtensions.getDescriptor())
         .addLibraries(
             CelExtensions.bindings(),
+            CelExtensions.comprehensions(),
             CelExtensions.encoders(OPTIONS),
             CelExtensions.math(OPTIONS),
             CelExtensions.sets(OPTIONS),
             CelExtensions.strings(),
+            CelExtensions.comprehensions(),
             CelOptionalLibrary.INSTANCE)
         .addMessageTypes(dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor())
         .addMessageTypes(dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor())
@@ -120,6 +124,7 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
       CelRuntimeFactory.standardCelRuntimeBuilder()
           .setOptions(OPTIONS)
           .addLibraries(
+              CelExtensions.comprehensions(),
               CelExtensions.encoders(OPTIONS),
               CelExtensions.math(OPTIONS),
               CelExtensions.sets(OPTIONS),
@@ -182,6 +187,7 @@ public void evaluate() throws Throwable {
     CelValidationResult response = getParser(test).parse(test.getExpr(), test.getName());
     assertThat(response.hasError()).isFalse();
     response = getChecker(test).check(response.getAst());
+    System.out.println("response: " + response.getIssueString());
     assertThat(response.hasError()).isFalse();
     Type resultType = CelProtoTypes.celTypeToType(response.getAst().getResultType());
 

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

@@ -159,6 +159,10 @@ public ImmutableSet<CelMacro> macros() {
             Operator.EXISTS_ONE.getFunction(),
             3,
             CelComprehensionsExtensions::expandExistsOneMacro),
+        CelMacro.newReceiverMacro(
+            Operator.EXISTS_ONE_NEW.getFunction(),
+            3,
+            CelComprehensionsExtensions::expandExistsOneMacro),
         CelMacro.newReceiverMacro(
             "transformList", 3, CelComprehensionsExtensions::transformListMacro),
         CelMacro.newReceiverMacro(

parser/src/main/java/dev/cel/parser/CelStandardMacro.java

@@ -54,6 +54,14 @@ public enum CelStandardMacro {
       CelMacro.newReceiverMacro(
           Operator.EXISTS_ONE.getFunction(), 2, CelStandardMacro::expandExistsOneMacro)),
 
+  /**
+   * Boolean comprehension which asserts that a predicate holds true for exactly one element in the
+   * input range.
+   */
+  EXISTS_ONE_NEW(
+      CelMacro.newReceiverMacro(
+          Operator.EXISTS_ONE_NEW.getFunction(), 2, CelStandardMacro::expandExistsOneMacro)),
+
   /**
    * Comprehension which applies a transform to each element in the input range and produces a list
    * of equivalent size as output.

parser/src/test/java/dev/cel/parser/CelStandardMacroTest.java

@@ -32,6 +32,8 @@ public void getFunction() {
     assertThat(CelStandardMacro.EXISTS.getFunction()).isEqualTo(Operator.EXISTS.getFunction());
     assertThat(CelStandardMacro.EXISTS_ONE.getFunction())
         .isEqualTo(Operator.EXISTS_ONE.getFunction());
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getFunction())
+        .isEqualTo(Operator.EXISTS_ONE_NEW.getFunction());
     assertThat(CelStandardMacro.FILTER.getFunction()).isEqualTo(Operator.FILTER.getFunction());
     assertThat(CelStandardMacro.MAP.getFunction()).isEqualTo(Operator.MAP.getFunction());
     assertThat(CelStandardMacro.MAP_FILTER.getFunction()).isEqualTo(Operator.MAP.getFunction());
@@ -90,6 +92,21 @@ public void testExistsOne() {
         .isEqualTo(CelStandardMacro.EXISTS_ONE.getDefinition().getKey().hashCode());
   }
 
+  @Test
+  public void testExistsOneNew() {
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getFunction())
+        .isEqualTo(Operator.EXISTS_ONE_NEW.getFunction());
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getArgumentCount()).isEqualTo(2);
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().isReceiverStyle()).isTrue();
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getKey())
+        .isEqualTo("existsOne:2:true");
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().isVariadic()).isFalse();
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().toString())
+        .isEqualTo(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getKey());
+    assertThat(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().hashCode())
+        .isEqualTo(CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getKey().hashCode());
+  }
+
   @Test
   public void testMap2() {
     assertThat(CelStandardMacro.MAP.getFunction()).isEqualTo(Operator.MAP.getFunction());