Restructure cel.@attribute type format to have a dummy value

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

@@ -156,10 +156,6 @@ private static Object decodeWireField(
     }
 
     int typeCode = field.typeCode();
-    if (typeCode == SelectField.CEL_MAP_TYPE_CODE) {
-      throw new UnsupportedOperationException(
-          "Decoding unknown map field from wire bytes is unsupported: " + field.fieldName());
-    }
     if (typeCode == SelectField.NO_TYPE_CODE) {
       throw CelAttributeNotFoundException.forFieldResolution(field.fieldName());
     }

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

@@ -155,6 +155,8 @@ public static SelectField create(
       long typeCode,
       @Nullable Object defaultValue,
       String protoTypeName) {
+    checkArgument(
+        typeCode != CEL_MAP_TYPE_CODE, "Map fields must be created via createMap: %s", fieldName);
     return newInstance(
         fieldNumber, fieldName, typeCode, defaultValue, protoTypeName, /* mapEntrySpec= */ null);
   }

common/src/test/java/dev/cel/common/values/SelectFieldTest.java

@@ -152,6 +152,16 @@ public void create_typeCodeGroupProto_throwsIllegalArgumentException() {
     assertThat(thrown).hasMessageThat().contains("Invalid protobuf type code: 10");
   }
 
+  @Test
+  public void create_mapTypeCode_throwsIllegalArgumentException() {
+    IllegalArgumentException thrown =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> SelectField.create(1L, "foo", SelectField.CEL_MAP_TYPE_CODE));
+
+    assertThat(thrown).hasMessageThat().contains("Map fields must be created via createMap: foo");
+  }
+
   @Test
   public void createMap_threeArguments_success() {
     SelectField.MapEntrySpec mapEntrySpec = SelectField.MapEntrySpec.create(9, 9);

optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

@@ -122,7 +122,6 @@ java_library(
         ":default_optimizer_constants",
         "//:auto_value",
         "//bundle:cel",
-        "//checker:standard_decl",
         "//common:cel_ast",
         "//common:cel_descriptor_util",
         "//common:cel_descriptors",
@@ -134,7 +133,6 @@ java_library(
         "//common/ast:mutable_expr",
         "//common/internal:cel_descriptor_pools",
         "//common/navigation:common",
-        "//common/navigation:expr_util",
         "//common/navigation:mutable_navigation",
         "//common/types",
         "//common/types:cel_types",

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

@@ -16,7 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertThrows;
 
 import com.google.api.expr.v1alpha1.CheckedExpr;
 import com.google.common.collect.ImmutableList;
@@ -512,14 +511,12 @@ public void select_unsetUnknownMapField_returnsBakedDefault() throws Exception {
   }
 
   @Test
-  public void select_populatedUnknownMapField_throwsEvaluationException() {
+  public void select_populatedUnknownMapField_decodesMapFromWire() throws Exception {
     TestAllTypes msg = TestAllTypes.newBuilder().putMapInt32Int32(1, 2).build();
 
-    CelEvaluationException thrown =
-        assertThrows(CelEvaluationException.class, () -> eval("msg.map_int32_int32", msg));
+    Object result = eval("msg.map_int32_int32", msg);
 
-    assertThat(thrown).hasCauseThat().isInstanceOf(UnsupportedOperationException.class);
-    assertThat(thrown).hasCauseThat().hasMessageThat().contains("map_int32_int32");
+    assertThat(result).isEqualTo(ImmutableMap.of(1L, 2L));
   }
 
   @SuppressWarnings("ImmutableEnumChecker") // Test only
@@ -944,17 +941,6 @@ public void celBind_unknownSubmessageWithUnknownInnerField_whenUnset_evaluatesDe
     assertThat(result).isEqualTo(-1L);
   }
 
-  @Test
-  public void shortCircuiting_hasGuardOnPopulatedUnknownMap_skipsMapEvaluation() throws Exception {
-    // msg.map_int32_int32 is populated on POPULATED_SERVER_MESSAGE and would throw
-    // UnsupportedOperationException if selected, but short-circuiting avoids evaluating it.
-    Object result =
-        eval(
-            "!has(msg.map_int32_int32) ? size(msg.map_int32_int32) : 99", POPULATED_SERVER_MESSAGE);
-
-    assertThat(result).isEqualTo(99L);
-  }
-
   @Test
   public void shortCircuiting_hasGuardOnUnsetUnknownMap_evaluatesEmptyMapSize() throws Exception {
     Object result =
@@ -1450,21 +1436,17 @@ public void celBind_unknownOuterSubmessageWithKnownInnerMapFields_decodesMapEntr
             .setOneofType(NestedTestAllTypes.newBuilder().setPayload(POPULATED_RENAMED_MESSAGE))
             .build();
 
-    // TODO: Restore assertion once SelectOptimizer emits MapEntrySpec in cl/990623531.
-    CelEvaluationException thrown =
-        assertThrows(
-            CelEvaluationException.class,
-            () ->
-                eval(
-                    "cel.bind(sub, msg.oneof_type,"
-                        + " has(sub.payload.map_string_string) &&"
-                        + " sub.payload.map_string_string['k'] == 'v' &&"
-                        + " has(sub.payload.map_string_string.k) &&"
-                        + " !has(sub.payload.map_string_string.missing) &&"
-                        + " sub.payload.map_int64_message[1].bb == 100)",
-                    msg));
+    Object result =
+        eval(
+            "cel.bind(sub, msg.oneof_type,"
+                + " has(sub.payload.map_string_string) &&"
+                + " sub.payload.map_string_string['k'] == 'v' &&"
+                + " has(sub.payload.map_string_string.k) &&"
+                + " !has(sub.payload.map_string_string.missing) &&"
+                + " sub.payload.map_int64_message[1].bb == 100)",
+            msg);
 
-    assertThat(thrown).hasCauseThat().isInstanceOf(UnsupportedOperationException.class);
+    assertThat(result).isEqualTo(true);
   }
 
   @Test
@@ -1495,20 +1477,16 @@ public void celBind_unknownOuterSubmessageWithKnownInnerMapFields_decodesMapEntr
             .setOneofType(NestedTestAllTypes.newBuilder().setPayload(innerPayload))
             .build();
 
-    // TODO: Restore assertion once SelectOptimizer emits MapEntrySpec in cl/990623531.
-    CelEvaluationException thrown =
-        assertThrows(
-            CelEvaluationException.class,
-            () ->
-                eval(
-                    "cel.bind(sub, msg.oneof_type,"
-                        + " size(sub.payload.map_string_string) == 3 &&"
-                        + " sub.payload.map_string_string['dup'] == 'second' &&"
-                        + " sub.payload.map_string_string[''] == 'val_for_default_key' &&"
-                        + " sub.payload.map_string_string['key_with_default_val'] == '')",
-                    msg));
+    Object result =
+        eval(
+            "cel.bind(sub, msg.oneof_type,"
+                + " size(sub.payload.map_string_string) == 3 &&"
+                + " sub.payload.map_string_string['dup'] == 'second' &&"
+                + " sub.payload.map_string_string[''] == 'val_for_default_key' &&"
+                + " sub.payload.map_string_string['key_with_default_val'] == '')",
+            msg);
 
-    assertThat(thrown).hasCauseThat().isInstanceOf(UnsupportedOperationException.class);
+    assertThat(result).isEqualTo(true);
   }
 
   @SuppressWarnings("ImmutableEnumChecker") // Test only
@@ -1692,21 +1670,6 @@ public void wellKnownTypes_negativeDurationAndPreEpochTimestampOnUnknownFields_d
     assertThat(result).isEqualTo(true);
   }
 
-  @Test
-  public void comprehension_shortCircuitingPreventsEvaluatingPopulatedUnknownMap()
-      throws Exception {
-    // msg.map_int32_int32 is populated on POPULATED_SERVER_MESSAGE and throws
-    // UnsupportedOperationException if evaluated; short-circuiting on the first element (bb == 10)
-    // must avoid evaluating the map branch.
-    String expression =
-        "msg.repeated_nested_message.exists(x, x.bb == 10 || size(msg.map_int32_int32) > 0) &&"
-            + " !msg.repeated_nested_message.all(x, x.bb > 15 && size(msg.map_int32_int32) > 0)";
-
-    Object result = eval(expression, POPULATED_SERVER_MESSAGE);
-
-    assertThat(result).isEqualTo(true);
-  }
-
   @Test
   public void heterogeneousNumericComparisons_onUnknownWireDecodedFields_evaluatesCorrectly()
       throws Exception {