Fix planner runtime to respect the ordering of user provided type provider

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();
 

runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java

@@ -551,13 +551,14 @@ public CelRuntime build() {
               .setResolveTypeDependencies(options().resolveTypeDependencies())
               .build();
 
-      CelTypeProvider combinedTypeProvider =
-          new CelTypeProvider.CombinedCelTypeProvider(
-              DefaultTypeProvider.getInstance(), messageTypeProvider);
+      ImmutableList.Builder<CelTypeProvider> typeProviders = ImmutableList.builder();
+      typeProviders.add(DefaultTypeProvider.getInstance());
       if (typeProvider() != null) {
-        combinedTypeProvider =
-            new CelTypeProvider.CombinedCelTypeProvider(combinedTypeProvider, typeProvider());
+        typeProviders.add(typeProvider());
       }
+      typeProviders.add(messageTypeProvider);
+      CelTypeProvider combinedTypeProvider =
+          new CelTypeProvider.CombinedCelTypeProvider(typeProviders.build());
 
       DescriptorTypeResolver descriptorTypeResolver =
           DescriptorTypeResolver.create(combinedTypeProvider, celValueConverter);

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

@@ -32,7 +32,6 @@
 import dev.cel.common.values.OpaqueValue;
 import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.extensions.CelOptionalLibrary;
-import java.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -45,16 +44,9 @@ 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())
-                      ? Optional.of(TestAllTypes.getDefaultInstance())
-                      : Optional.empty())
           .addCompilerLibraries(CelOptionalLibrary.INSTANCE)
           .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
+          .addMessageTypes(TestAllTypes.getDescriptor())
           .setContainer(CelContainer.ofName(TestAllTypes.getDescriptor().getFullName()))
           .build();