Fix type-checker to respect the ordering of type providers (protobuf then user provided)

PiperOrigin-RevId: 992491032

Author: l46kok

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

@@ -1982,10 +1982,13 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
 
   @Test
   public void program_comprehensionDisabled_throws() throws Exception {
-    // TODO: Planner ExecutionFrame ignores CelOptions.enableComprehension(false).
     Cel cel =
-        legacyCelBuilderWithMacros()
-            .setOptions(CelOptions.current().enableComprehension(false).build())
+        plannerCelBuilderWithMacros()
+            .setOptions(
+                CelOptions.current()
+                    .enableHeterogeneousNumericComparisons(true)
+                    .enableComprehension(false)
+                    .build())
             .build();
     CelAbstractSyntaxTree ast = cel.compile("['foo', 'bar'].map(x, x)").getAst();
 

checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

@@ -446,7 +446,7 @@ public CelCheckerLegacyImpl build() {
       } else if (celTypeProvider != null) {
         messageTypeProvider =
             new CelTypeProvider.CombinedCelTypeProvider(
-                ImmutableList.of(celTypeProvider, messageTypeProvider));
+                ImmutableList.of(messageTypeProvider, celTypeProvider));
       }
 
       // Configure the declaration set, and possibly alter the type provider if ProtoDecl values

checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java

@@ -19,6 +19,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.protobuf.Duration;
 import com.google.protobuf.FieldMask;
 import com.google.protobuf.Timestamp;
@@ -40,6 +41,7 @@
 import dev.cel.common.types.ListType;
 import dev.cel.common.types.MapType;
 import dev.cel.common.types.SimpleType;
+import dev.cel.common.types.StructType;
 import dev.cel.common.types.StructTypeReference;
 import dev.cel.common.types.TypeType;
 import dev.cel.compiler.CelCompiler;
@@ -409,6 +411,41 @@ public Optional<CelType> findType(String typeName) {
     assertThat(ast.getResultType()).isEqualTo(preWrappedType);
   }
 
+  @Test
+  public void check_combinedTypeProviders_protoMessageTakesPrecedenceOverCustom() throws Exception {
+    StructType shadowingStructType =
+        StructType.create(
+            TestAllTypes.getDescriptor().getFullName(),
+            ImmutableSet.of("single_int64"),
+            fieldName -> Optional.of(SimpleType.STRING));
+    CelTypeProvider customTypeProvider =
+        new CelTypeProvider() {
+          @Override
+          public ImmutableList<CelType> types() {
+            return ImmutableList.of(shadowingStructType);
+          }
+
+          @Override
+          public Optional<CelType> findType(String typeName) {
+            return typeName.equals(shadowingStructType.name())
+                ? Optional.of(shadowingStructType)
+                : Optional.empty();
+          }
+        };
+    CelCompiler celCompiler =
+        CelCompilerFactory.standardCelCompilerBuilder()
+            .addMessageTypes(TestAllTypes.getDescriptor())
+            .setTypeProvider(customTypeProvider)
+            .build();
+
+    CelAbstractSyntaxTree ast =
+        celCompiler
+            .compile("cel.expr.conformance.proto3.TestAllTypes{single_int64: 1}.single_int64")
+            .getAst();
+
+    assertThat(ast.getResultType()).isEqualTo(SimpleType.INT);
+  }
+
   private enum FieldTypeTestCase {
     REPEATED_PRIMITIVE("msg.repeated_int64", ListType.create(SimpleType.INT)),
     MAP_PRIMITIVE("msg.map_string_string", MapType.create(SimpleType.STRING, SimpleType.STRING)),

runtime/src/main/java/dev/cel/runtime/planner/ExecutionFrame.java

@@ -46,7 +46,7 @@ static ExecutionFrame create(
       @Nullable CelEvaluationListener listener) {
     return new ExecutionFrame(
         functionResolver,
-        celOptions.comprehensionMaxIterations(),
+        getComprehensionMaxIterations(celOptions),
         partialVars,
         listener,
         /* asyncTracker= */ null);
@@ -61,12 +61,16 @@ static ExecutionFrame createForAsync(
     checkNotNull(asyncTracker, "asyncTracker");
     return new ExecutionFrame(
         functionResolver,
-        celOptions.comprehensionMaxIterations(),
+        getComprehensionMaxIterations(celOptions),
         partialVars,
         listener,
         asyncTracker);
   }
 
+  private static int getComprehensionMaxIterations(CelOptions celOptions) {
+    return celOptions.enableComprehension() ? celOptions.comprehensionMaxIterations() : 0;
+  }
+
   Optional<CelResolvedOverload> findOverload(
       String functionName, Collection<String> overloadIds, Object[] args)
       throws CelEvaluationException {

runtime/src/test/java/dev/cel/runtime/DescriptorTypeResolverTest.java

@@ -45,9 +45,6 @@ public class DescriptorTypeResolverTest {
   private static final Cel CEL =
       CelFactory.plannerCelBuilder()
           .setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
-          // TODO: Replace setValueProvider with
-          // addMessageTypes(TestAllTypes.getDescriptor()) once CelRuntimeImpl prioritizes custom
-          // CelTypeProvider over its internal messageTypeProvider.
           .setValueProvider(
               (structType, fields) ->
                   structType.equals(TestAllTypes.getDescriptor().getFullName())