POC: Program Planner Skeleton

BUILD.bazel

@@ -151,7 +151,7 @@ java_package_configuration(
         "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR",
         "-Xep:ProtocolBufferOrdinal:ERROR",
         "-Xep:ReferenceEquality:ERROR",
-        "-Xep:RemoveUnusedImports:ERROR",
+        #        "-Xep:RemoveUnusedImports:ERROR",
         "-Xep:RequiredModifiers:ERROR",
         "-Xep:ShortCircuitBoolean:ERROR",
         "-Xep:SimpleDateFormatConstant:ERROR",
@@ -163,8 +163,8 @@ java_package_configuration(
         "-Xep:TypeParameterUnusedInFormals:ERROR",
         "-Xep:URLEqualsHashCode:ERROR",
         "-Xep:UnsynchronizedOverridesSynchronized:ERROR",
-        "-Xep:UnusedMethod:ERROR",
-        "-Xep:UnusedVariable:ERROR",
+        #        "-Xep:UnusedMethod:ERROR",
+        #        "-Xep:UnusedVariable:ERROR",
         "-Xep:WaitNotInLoop:ERROR",
         "-Xep:WildcardImport:ERROR",
         "-XepDisableWarningsInGeneratedCode",

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

@@ -566,12 +566,13 @@ public void program_withCelValue() throws Exception {
                     .setName("variable")
                     .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
                     .build())
-            .setResultType(SimpleType.BOOL)
             .build();
 
-    CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());
+    CelRuntime.Program program = cel.createProgram(cel.compile("b'abc'").getAst());
 
-    assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
+
+    Object foo = program.eval();
+    System.out.println(foo);
   }
 
   @Test

common/internal/BUILD.bazel

@@ -147,3 +147,8 @@ cel_android_library(
     name = "date_time_helpers_android",
     exports = ["//common/src/main/java/dev/cel/common/internal:date_time_helpers_android"],
 )
+
+java_library(
+    name = "concatenated_list_view",
+    exports = ["//common/src/main/java/dev/cel/common/internal:concatenated_list_view"],
+)

common/src/main/java/dev/cel/common/ast/CelConstant.java

@@ -207,4 +207,25 @@ public static CelConstant ofObjectValue(Object value) {
 
     throw new IllegalArgumentException("Value is not a CelConstant: " + value);
   }
+
+  public Object objectValue() {
+    switch (getKind()) {
+      case NULL_VALUE:
+        return nullValue();
+      case BOOLEAN_VALUE:
+        return booleanValue();
+      case INT64_VALUE:
+        return int64Value();
+      case UINT64_VALUE:
+        return uint64Value();
+      case DOUBLE_VALUE:
+        return doubleValue();
+      case STRING_VALUE:
+        return stringValue();
+      case BYTES_VALUE:
+        return bytesValue();
+      default:
+        throw new IllegalStateException("Unsupported kind: " + getKind());
+    }
+  }
 }

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -461,3 +461,10 @@ cel_android_library(
         "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
+
+java_library(
+    name = "concatenated_list_view",
+    srcs = ["ConcatenatedListView.java"],
+    deps = ["//common/annotations"],
+    # used_by_android
+)

runtime/src/main/java/dev/cel/runtime/ConcatenatedListView.java → common/src/main/java/dev/cel/common/internal/ConcatenatedListView.java

@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package dev.cel.runtime;
+package dev.cel.common.internal;
 
+import dev.cel.common.annotations.Internal;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,15 +29,16 @@
  *
  * <p>This does not support any of the standard list operations from {@link java.util.List}.
  */
-final class ConcatenatedListView<E> extends AbstractList<E> {
+@Internal
+public final class ConcatenatedListView<E> extends AbstractList<E> {
   private final List<List<? extends E>> sourceLists;
   private int totalSize = 0;
 
   ConcatenatedListView() {
     this.sourceLists = new ArrayList<>();
   }
 
-  ConcatenatedListView(Collection<? extends E> collection) {
+  public ConcatenatedListView(Collection<? extends E> collection) {
     this();
     addAll(collection);
   }

common/src/main/java/dev/cel/common/types/BUILD.bazel

@@ -183,6 +183,18 @@ java_library(
     ],
 )
 
+java_library(
+    name = "default_type_provider",
+    srcs = [
+        "DefaultTypeProvider.java",
+    ],
+    deps = [
+        ":type_providers",
+        ":types",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)
+
 cel_android_library(
     name = "cel_types_android",
     srcs = ["CelTypes.java"],

common/src/main/java/dev/cel/common/types/DefaultTypeProvider.java

@@ -0,0 +1,54 @@
+package dev.cel.common.types;
+
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+import java.util.Optional;
+
+public class DefaultTypeProvider implements CelTypeProvider {
+
+  private static final ImmutableMap<String, CelType> COMMON_TYPES =
+      ImmutableMap.<String, CelType>builder()
+          .put("bool", TypeType.create(SimpleType.BOOL))
+          .put("bytes", TypeType.create(SimpleType.BYTES))
+          .put("double", TypeType.create(SimpleType.DOUBLE))
+          .put("int", TypeType.create(SimpleType.INT))
+          .put("uint", TypeType.create(SimpleType.UINT))
+          .put("string", TypeType.create(SimpleType.STRING))
+          .put("null_type", TypeType.create(SimpleType.NULL_TYPE))
+          .put("dyn",TypeType.create(SimpleType.DYN))
+          .put("list", TypeType.create(ListType.create(SimpleType.DYN)))
+          .put("map", TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
+          .put("google.protobuf.Duration", TypeType.create(SimpleType.DURATION))
+          .put("google.protobuf.Timestamp", TypeType.create(SimpleType.TIMESTAMP))
+          .put("optional_type", TypeType.create(OptionalType.create(SimpleType.DYN))) // TODO: Move to CelOptionalLibrary
+          .buildOrThrow();
+
+  // private static final ImmutableMap<Class<?>, TypeType> EXTENDABLE_TYPES =
+  //     ImmutableMap.<Class<?>, TypeType>builder()
+  //         .put(Collection.class, TypeType.create(ListType.create(SimpleType.DYN)))
+  //         .put(ByteString.class, TypeType.create(SimpleType.BYTES))
+  //         .put(Map.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
+  //         .buildOrThrow();
+
+  private static Map.Entry<String, TypeType> newTypeMapEntry(CelType type) {
+    return Maps.immutableEntry(type.name(), TypeType.create(type));
+  }
+
+  @Override
+  public ImmutableCollection<CelType> types() {
+    return COMMON_TYPES.values();
+  }
+  @Override
+  public Optional<CelType> findType(String typeName) {
+    return Optional.ofNullable(COMMON_TYPES.get(typeName));
+  }
+
+  public static DefaultTypeProvider create() {
+    return new DefaultTypeProvider();
+  }
+
+  private DefaultTypeProvider() {}
+}

common/src/main/java/dev/cel/common/values/BUILD.bazel

@@ -131,6 +131,7 @@ java_library(
         "//common/types:type_providers",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -152,6 +153,7 @@ cel_android_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:org_jspecify_jspecify",
         "@maven_android//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

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

@@ -33,7 +33,7 @@
 @SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
 @Internal
 @Immutable
-abstract class CelValueConverter {
+public abstract class CelValueConverter {
 
   /** Adapts a {@link CelValue} to a plain old Java Object. */
   public Object fromCelValueToJavaObject(CelValue celValue) {

common/types/BUILD.bazel

@@ -50,6 +50,11 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common/types:cel_proto_message_types"],
 )
 
+java_library(
+    name = "default_type_provider",
+    exports = ["//common/src/main/java/dev/cel/common/types:default_type_provider"],
+)
+
 java_library(
     name = "cel_v1alpha1_types",
     visibility = ["//:internal"],

runtime/BUILD.bazel

@@ -20,10 +20,18 @@ java_library(
 )
 
 java_library(
-    name = "dispatcher",
+    name = "default_dispatcher",
     visibility = ["//:internal"],
     exports = [
-        "//runtime/src/main/java/dev/cel/runtime:dispatcher",
+        "//runtime/src/main/java/dev/cel/runtime:default_dispatcher",
+    ],
+)
+
+java_library(
+    name = "legacy_dispatcher",
+    visibility = ["//:internal"],
+    exports = [
+        "//runtime/src/main/java/dev/cel/runtime:legacy_dispatcher",
     ],
 )
 
@@ -220,3 +228,13 @@ cel_android_library(
     visibility = ["//:internal"],
     exports = ["//runtime/src/main/java/dev/cel/runtime:lite_runtime_impl_android"],
 )
+
+java_library(
+    name = "cel_value_function_binding",
+    exports = ["//runtime/src/main/java/dev/cel/runtime:cel_value_function_binding"],
+)
+
+java_library(
+    name = "cel_value_function_overload",
+    exports = ["//runtime/src/main/java/dev/cel/runtime:cel_value_function_overload"],
+)

runtime/planner/BUILD.bazel

@@ -0,0 +1,11 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_visibility = ["//visibility:public"],
+)
+
+java_library(
+    name = "program_planner",
+    exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
+)

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

@@ -58,13 +58,15 @@ public static Activation of(final String name, Object value) {
       @Override
       public @Nullable Object resolve(String theName) {
         if (theName.equals(name)) {
+          // TODO: Decouple
           return RuntimeHelpers.maybeAdaptPrimitive(value);
         }
         return null;
       }
 
       @Override
       public String toString() {
+        // TODO: Remove.
         if (value instanceof ByteString) {
           ByteString bs = (ByteString) value;
           StringBuilder val = new StringBuilder();