Plan message creation

Author: l46kok

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

@@ -207,8 +207,7 @@ public static CelConstant ofObjectValue(Object value) {
 
     throw new IllegalArgumentException("Value is not a CelConstant: " + value);
   }
-   * TODO
-   */
+
   public Object objectValue() {
     switch (getKind()) {
       case NULL_VALUE:
@@ -229,6 +228,4 @@ public Object objectValue() {
         throw new IllegalStateException("Unsupported kind: " + getKind());
     }
   }
-
-  /**
 }

runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel

@@ -17,7 +17,7 @@ java_library(
         ":eval_and",
         ":eval_attribute",
         ":eval_const",
-        ":eval_create_object",
+        ":eval_create_struct",
         ":eval_or",
         ":eval_unary",
         ":eval_var_args_call",
@@ -201,8 +201,8 @@ java_library(
 )
 
 java_library(
-    name = "eval_create_object",
-    srcs = ["EvalCreateObject.java"],
+    name = "eval_create_struct",
+    srcs = ["EvalCreateStruct.java"],
     deps = [
         ":attribute",
         ":cel_value_interpretable",

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

@@ -0,0 +1,52 @@
+package dev.cel.runtime.planner;
+
+import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.values.CelValue;
+import dev.cel.common.values.CelValueProvider;
+import dev.cel.runtime.CelEvaluationException;
+import dev.cel.runtime.GlobalResolver;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+@Immutable
+final class EvalCreateStruct implements CelValueInterpretable {
+
+  private final CelValueProvider valueProvider;
+  private final String typeName;
+
+  // Regular hashmap used for performance. Planner must not mutate the map post-construction.
+  @SuppressWarnings("Immutable")
+  private final Map<String, CelValueInterpretable> fields;
+
+  @Override
+  public CelValue eval(GlobalResolver resolver) throws CelEvaluationException {
+    Map<String, Object> fieldValues = new HashMap<>();
+    for (Entry<String, CelValueInterpretable> entry : fields.entrySet()) {
+      Object value = entry.getValue().eval(resolver).value();
+      fieldValues.put(entry.getKey(), value);
+    }
+
+    return valueProvider.newValue(typeName, Collections.unmodifiableMap(fieldValues))
+        .orElseThrow(() -> new IllegalArgumentException("Type name not found: " + typeName));
+  }
+
+  static EvalCreateStruct create(
+      CelValueProvider valueProvider,
+      String typeName,
+      Map<String, CelValueInterpretable> fields
+  ) {
+    return new EvalCreateStruct(valueProvider, typeName, fields);
+  }
+
+  private EvalCreateStruct(
+      CelValueProvider valueProvider,
+      String typeName,
+      Map<String, CelValueInterpretable> fields
+  ) {
+    this.valueProvider = valueProvider;
+    this.typeName = typeName;
+    this.fields = fields;
+  }
+}

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

@@ -11,6 +11,7 @@
 import dev.cel.common.ast.CelExpr;
 import dev.cel.common.ast.CelExpr.CelCall;
 import dev.cel.common.ast.CelExpr.CelStruct;
+import dev.cel.common.ast.CelExpr.CelStruct.Entry;
 import dev.cel.common.ast.CelReference;
 import dev.cel.common.types.CelKind;
 import dev.cel.common.types.CelType;
@@ -23,6 +24,7 @@
 import dev.cel.runtime.CelLiteRuntime.Program;
 import dev.cel.runtime.DefaultDispatcher;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -153,7 +155,14 @@ private CelValueInterpretable planCreateObject(CelExpr celExpr, PlannerContext c
     valueProvider.newValue(struct.messageName(), new HashMap<>())
         .orElseThrow(() -> new IllegalArgumentException("Undefined type name: " + struct.messageName()));
 
-    return EvalCreateObject.create(valueProvider, struct.messageName());
+    HashMap<String, CelValueInterpretable> fieldMap = new HashMap<>();
+    for (Entry entry : struct.entries()) {
+      CelValueInterpretable value = plan(entry.value(), ctx);
+      fieldMap.put(entry.fieldKey(), value);
+    }
+
+    return EvalCreateStruct.create(valueProvider, struct.messageName(),
+        Collections.unmodifiableMap(fieldMap));
   }
 
   /**

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

@@ -45,6 +45,7 @@ java_library(
         "//common/values:cel_value_provider",
         "//common/values:proto_message_lite_value",
         "//common/values:proto_message_lite_value_provider",
+        "//common/values:proto_message_value_provider",
         "//compiler",
         "//compiler:compiler_builder",
         "//extensions:optional_library",

runtime/src/test/java/dev/cel/runtime/planner/BUILD.bazel

@@ -16,8 +16,13 @@
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.common.CelAbstractSyntaxTree;
+import dev.cel.common.CelDescriptorUtil;
 import dev.cel.common.CelErrorCode;
 import dev.cel.common.CelOptions;
+import dev.cel.common.internal.CelDescriptorPool;
+import dev.cel.common.internal.DefaultDescriptorPool;
+import dev.cel.common.internal.DefaultMessageFactory;
+import dev.cel.common.internal.DynamicProto;
 import dev.cel.common.types.CelType;
 import dev.cel.common.types.DefaultTypeProvider;
 import dev.cel.common.types.ListType;
@@ -28,11 +33,10 @@
 import dev.cel.common.values.CelByteString;
 import dev.cel.common.values.CelValueConverter;
 import dev.cel.common.values.NullValue;
-import dev.cel.common.values.ProtoMessageLiteValueProvider;
+import dev.cel.common.values.ProtoMessageValueProvider;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
 import dev.cel.expr.conformance.proto3.TestAllTypes;
-import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
 import dev.cel.extensions.CelOptionalLibrary;
 import dev.cel.parser.Operator;
 import dev.cel.runtime.CelEvaluationException;
@@ -75,10 +79,13 @@ public final class ProgramPlannerTest {
               .addMessageTypes(TestAllTypes.getDescriptor())
               .build();
 
+  private static final CelDescriptorPool DESCRIPTOR_POOL =
+      DefaultDescriptorPool.create(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(TestAllTypes.getDescriptor().getFile()));
   private static final ProgramPlanner PLANNER = ProgramPlanner.newPlanner(
       DefaultTypeProvider.create(),
-      ProtoMessageLiteValueProvider.newInstance(
-          TestAllTypesCelDescriptor.getDescriptor()
+      ProtoMessageValueProvider.newInstance(
+          CEL_OPTIONS,
+          DynamicProto.create(DefaultMessageFactory.create(DESCRIPTOR_POOL))
       ),
       new CelValueConverter(),
       newDispatcher()