Promote planner runtime builders to the main factories

PiperOrigin-RevId: 904040881

Author: l46kok

bundle/BUILD.bazel

@@ -13,14 +13,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "cel_experimental_factory",
-    visibility = ["//:internal"],
-    exports = [
-        "//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
-    ],
-)
-
 java_library(
     name = "environment",
     exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],

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

@@ -35,7 +35,6 @@ java_library(
         "@cel_spec//proto/cel/expr:checked_java_proto",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
-        "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
@@ -54,22 +53,6 @@ java_library(
         "//compiler:compiler_builder",
         "//parser",
         "//runtime",
-    ],
-)
-
-java_library(
-    name = "cel_experimental_factory",
-    srcs = ["CelExperimentalFactory.java"],
-    tags = [
-    ],
-    deps = [
-        ":cel",
-        ":cel_impl",
-        "//checker",
-        "//common:options",
-        "//common/annotations",
-        "//compiler",
-        "//parser",
         "//runtime:runtime_planner_impl",
     ],
 )
@@ -117,7 +100,6 @@ java_library(
     tags = [
     ],
     deps = [
-        ":cel_factory",
         ":environment_exception",
         ":required_fields_checker",
         "//:auto_value",
@@ -190,7 +172,6 @@ java_library(
         "//common:options",
         "//common/internal:env_visitor",
         "//common/types:cel_proto_types",
-        "//common/types:cel_types",
         "//common/types:type_providers",
         "//compiler:compiler_builder",
         "//extensions",

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

@@ -165,6 +165,14 @@ public interface CelBuilder {
   @CanIgnoreReturnValue
   CelBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings);
 
+  /** Adds bindings for functions that are allowed to be late-bound (resolved at execution time). */
+  @CanIgnoreReturnValue
+  CelBuilder addLateBoundFunctions(String... lateBoundFunctionNames);
+
+  /** Adds bindings for functions that are allowed to be late-bound (resolved at execution time). */
+  @CanIgnoreReturnValue
+  CelBuilder addLateBoundFunctions(Iterable<String> lateBoundFunctionNames);
+
   /** Set the expected {@code resultType} for the type-checked expression. */
   @CanIgnoreReturnValue
   CelBuilder setResultType(CelType resultType);

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

@@ -20,6 +20,7 @@
 import dev.cel.compiler.CelCompilerImpl;
 import dev.cel.parser.CelParserImpl;
 import dev.cel.runtime.CelRuntime;
+import dev.cel.runtime.CelRuntimeImpl;
 import dev.cel.runtime.CelRuntimeLegacyImpl;
 
 /** Helper class to configure the entire CEL stack in a common interface. */
@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
         .setStandardEnvironmentEnabled(true);
   }
 
+  /**
+   * Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
+   * of expressions using the Program Planner.
+   *
+   * <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
+   * #standardCelBuilder()}:
+   *
+   * <ul>
+   *   <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
+   *   <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
+   *       supplying type-checked expressions, this architecture handles both parsed-only and
+   *       type-checked expressions.
+   * </ul>
+   */
+  public static CelBuilder plannerCelBuilder() {
+    return CelImpl.newBuilder(
+            CelCompilerImpl.newBuilder(
+                CelParserImpl.newBuilder(),
+                CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
+            CelRuntimeImpl.newBuilder())
+        // CEL-Internal-2
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
+  }
+
   /** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
   public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
     return CelImpl.combine(celCompiler, celRuntime);

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

@@ -281,6 +281,18 @@ public CelBuilder addFunctionBindings(Iterable<dev.cel.runtime.CelFunctionBindin
       return this;
     }
 
+    @Override
+    public CelBuilder addLateBoundFunctions(String... lateBoundFunctionNames) {
+      runtimeBuilder.addLateBoundFunctions(lateBoundFunctionNames);
+      return this;
+    }
+
+    @Override
+    public CelBuilder addLateBoundFunctions(Iterable<String> lateBoundFunctionNames) {
+      runtimeBuilder.addLateBoundFunctions(lateBoundFunctionNames);
+      return this;
+    }
+
     @Override
     public CelBuilder setResultType(CelType resultType) {
       checkNotNull(resultType);

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

@@ -117,7 +117,7 @@ protected Object normalizePrimitive(Object value) {
   }
 
   /** Adapts a {@link CelValue} to a plain old Java Object. */
-  private static Object unwrap(CelValue celValue) {
+  private Object unwrap(CelValue celValue) {
     Preconditions.checkNotNull(celValue);
 
     if (celValue instanceof OptionalValue) {
@@ -126,7 +126,7 @@ private static Object unwrap(CelValue celValue) {
         return Optional.empty();
       }
 
-      return Optional.of(optionalValue.value());
+      return Optional.of(maybeUnwrap(optionalValue.value()));
     }
 
     if (celValue instanceof ErrorValue) {

common/src/main/java/dev/cel/common/values/CelValueConverter.java

@@ -122,7 +122,6 @@ java_library(
         ":extension_library",
         "//checker:checker_builder",
         "//common:compiler_common",
-        "//common:options",
         "//common/ast",
         "//common/exceptions:numeric_overflow",
         "//common/internal:comparison_functions",

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

@@ -10,7 +10,6 @@ java_library(
     deps = [
         "//:java_truth",
         "//bundle:cel",
-        "//bundle:cel_experimental_factory",
         "//common:cel_ast",
         "//common:cel_exception",
         "//common:compiler_common",

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

@@ -29,8 +29,8 @@
  * planner runtime, along with parsed-only and checked expression evaluations for the planner.
  */
 abstract class CelExtensionTestBase {
-  @TestParameter public CelRuntimeFlavor runtimeFlavor;
-  @TestParameter public boolean isParseOnly;
+  @TestParameter CelRuntimeFlavor runtimeFlavor;
+  @TestParameter boolean isParseOnly;
 
   @Before
   public void setUpBase() {