JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 26, 2026
Merged

JSON field name resolution fix for shadowed cases #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//bundle:cel_impl",
"//bundle:environment",
"//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
"//runtime:evaluation_listener",
"//runtime:function_binding",
"//runtime:unknown_attributes",
"//testing/protos:single_file_extension_java_proto",
"//testing/protos:single_file_java_proto",
"@cel_spec//proto/cel/expr:checked_java_proto",
"@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down
135 changes: 119 additions & 16 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
}

@Test
public void eval_withJsonFieldName() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
.addMessageTypes(SingleFile.getDescriptor())
.setOptions(CelOptions.current().enableJsonFieldNames(true).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
Cel cel = runtimeEnv.cel;
CelAbstractSyntaxTree ast =
cel.compile(
"file.int32_snake_case_json_name == 1 && "
+ "file.int64CamelCaseJsonName == 2 && "
+ "file.uint32DefaultJsonName == 3u && "
+ "file.`uint64-custom-json-name` == 4u && "
+ "file.single_string == 'shadows' && "
+ "file.singleString == 'shadowed'")
.getAst();

boolean result =
(boolean)
cel.createProgram(ast)
.eval(
ImmutableMap.of(
"file",
SingleFile.newBuilder()
.setInt32SnakeCaseJsonName(1)
.setInt64CamelCaseJsonName(2L)
.setUint32DefaultJsonName(3)
.setUint64CustomJsonName(4)
.setStringJsonNameShadows("shadows")
.setSingleString("shadowed")
.setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
.build()));

Object result =
cel.createProgram(ast)
.eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
assertThat(result).isTrue();
}

@Test
public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
Cel cel = runtimeEnv.cel;
CelAbstractSyntaxTree ast =
cel.compile(
"dyn(file).int32_snake_case_json_name == 1 && "
+ "dyn(file).`uint64-custom-json-name` == 4u && "
+ "dyn(file).single_string == 'shadows' && "
+ "dyn(file).string_json_name_shadows == 'shadows' && "
+ "dyn(file).singleString == 'shadowed'")
.getAst();

boolean result =
(boolean)
cel.createProgram(ast)
.eval(
ImmutableMap.of(
"file",
SingleFile.newBuilder()
.setInt32SnakeCaseJsonName(1)
.setInt64CamelCaseJsonName(2L)
.setUint32DefaultJsonName(3)
.setUint64CustomJsonName(4)
.setStringJsonNameShadows("shadows")
.setSingleString("shadowed")
.build()));

assertThat(result).isEqualTo("foo");
assertThat(result).isTrue();
}

@Test
public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
Cel cel = runtimeEnv.cel;
CelAbstractSyntaxTree ast =
cel.compile(
"proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
+ " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
.getAst();

boolean result =
(boolean)
cel.createProgram(ast)
.eval(
ImmutableMap.of(
"file",
SingleFile.newBuilder()
.setInt64CamelCaseJsonName(2L)
.setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
.setSingleString("This should not be used")
.setExtension(SingleFileExtensionsProto.singleString, "foo")
.build()));

assertThat(result).isTrue();
}

@Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
.addMessageTypes(SingleFile.getDescriptor())
.setOptions(CelOptions.current().enableJsonFieldNames(false).build())
.build();
CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

CelEvaluationException e =
assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
assertThat(e)
.hasMessageThat()
.contains(
"field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
"field 'int64CamelCaseJsonName' is not declared in message"
+ " 'dev.cel.testing.testdata.SingleFile");
}

@Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
.addMessageTypes(SingleFile.getDescriptor())
.setOptions(CelOptions.current().enableJsonFieldNames(true).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

assertThat(ast.getSource().getExtensions())
.contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
}
};
}

private enum RuntimeEnv {
LEGACY(setupEnv(CelFactory.standardCelBuilder())),
PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
;

private final Cel cel;

private static Cel setupEnv(CelBuilder celBuilder) {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
return celBuilder
.addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
.addMessageTypes(SingleFile.getDescriptor())
.addFileTypes(SingleFileExtensionsProto.getDescriptor())
.addCompilerLibraries(CelExtensions.protos())
.setExtensionRegistry(extensionRegistry)
.setOptions(
CelOptions.current()
.enableJsonFieldNames(true)
.enableHeterogeneousNumericComparisons(true)
.enableQuotedIdentifierSyntax(true)
.build())
.build();
}

RuntimeEnv(Cel cel) {
this.cel = cel;
}
}
}
10 changes: 5 additions & 5 deletions common/src/main/java/dev/cel/common/values/ProtoMessageValue.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

private FieldDescriptor findField(
CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
return fieldDescriptor;
}

if (enableJsonFieldNames()) {
for (FieldDescriptor fd : descriptor.getFields()) {
if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
}
}

FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
return fieldDescriptor;
}

return celDescriptorPool
.findExtensionDescriptor(descriptor, fieldName)
.orElseThrow(
Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
}

private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
return fieldDescriptor;
}

if (celOptions.enableJsonFieldNames()) {
for (FieldDescriptor fd : descriptor.getFields()) {
if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
}
}

FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
return fieldDescriptor;
}

return protoMessageFactory
.getDescriptorPool()
.findExtensionDescriptor(descriptor, fieldName)
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
6 changes: 3 additions & 3 deletions common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
(ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

// Note that these are the same fields, with json_name option set
Optional<Field> snakeCasedField = msgType.findField("snake_cased");
Optional<Field> jsonNameField = msgType.findField("camelCased");
Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

assertThat(snakeCasedField).isEmpty();
assertThat(jsonNameField).isPresent();
Expand Down
2 changes: 1 addition & 1 deletion policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down
32 changes: 15 additions & 17 deletions runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
}

private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor == null) {
Optional<FieldDescriptor> maybeFieldDescriptor =
protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
if (maybeFieldDescriptor.isPresent()) {
fieldDescriptor = maybeFieldDescriptor.get();
}
}

if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
if (celOptions.enableJsonFieldNames()) {
for (FieldDescriptor fd : descriptor.getFields()) {
if (fd.getJsonName().equals(fieldName)) {
fieldDescriptor = fd;
break;
return fd;
}
}
}

if (fieldDescriptor == null) {
throw new IllegalArgumentException(
String.format(
"field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
return fieldDescriptor;
}
fieldDescriptor =
protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
if (fieldDescriptor != null) {
return fieldDescriptor;
}
return fieldDescriptor;


throw new IllegalArgumentException(
String.format(
"field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
}

private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down
5 changes: 5 additions & 0 deletions testing/protos/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
name = "single_file_extension_java_proto",
actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
name = "multi_file_java_proto",
actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down
13 changes: 13 additions & 0 deletions testing/src/test/resources/protos/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
deps = [":single_file_proto"],
)

proto_library(
name = "single_file_extension_proto",
srcs = ["single_file_extensions.proto"],
deps = [":single_file_proto"],
)

java_proto_library(
name = "single_file_extension_java_proto",
tags = [
],
deps = [":single_file_extension_proto"],
)

proto_library(
name = "multi_file_proto",
srcs = [
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
JSON field name resolution fix for shadowed cases#995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 26, 2026
 Merged


JSON field name resolution fix for shadowed cases
#995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ java_library(
 deps = [
 "//:java_truth",
 "//bundle:cel",
 "//bundle:cel_experimental_factory",
 "//bundle:cel_impl",
 "//bundle:environment",
 "//bundle:environment_exception",
Expand DownExpand Up@@ -55,6 +56,7 @@ java_library(
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:unknown_attributes",
 "//testing/protos:single_file_extension_java_proto",
 "//testing/protos:single_file_java_proto",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

135 changes: 119 additions & 16 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.extensions.CelExtensions;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelAttribute;
Expand All@@ -113,7 +114,8 @@
import dev.cel.runtime.CelUnknownSet;
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileExtensionsProto;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.time.Instant;
import java.util.ArrayList;
Expand DownExpand Up@@ -2142,20 +2144,90 @@ public void toBuilder_isImmutable() {
 }

 @Test
 public void eval_withJsonFieldName() throws Exception {
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "file.int32_snake_case_json_name == 1 && "
 + "file.int64CamelCaseJsonName == 2 && "
 + "file.uint32DefaultJsonName == 3u && "
 + "file.`uint64-custom-json-name` == 4u && "
 + "file.single_string == 'shadows' && "
 + "file.singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .build()));

 Object result =
 cel.createProgram(ast)
 .eval(ImmutableMap.of("file", SingleFile.newBuilder().setSnakeCased("foo").build()));
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "dyn(file).int32_snake_case_json_name == 1 && "
 + "dyn(file).`uint64-custom-json-name` == 4u && "
 + "dyn(file).single_string == 'shadows' && "
 + "dyn(file).string_json_name_shadows == 'shadows' && "
 + "dyn(file).singleString == 'shadowed'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt32SnakeCaseJsonName(1)
 .setInt64CamelCaseJsonName(2L)
 .setUint32DefaultJsonName(3)
 .setUint64CustomJsonName(4)
 .setStringJsonNameShadows("shadows")
 .setSingleString("shadowed")
 .build()));

 assertThat(result).isEqualTo("foo");
 assertThat(result).isTrue();
 }

 @Test
 public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
 Cel cel = runtimeEnv.cel;
 CelAbstractSyntaxTree ast =
 cel.compile(
 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
 + " proto.getExt(file, dev.cel.testing.testdata.single_string) == 'foo'")
 .getAst();

 boolean result =
 (boolean)
 cel.createProgram(ast)
 .eval(
 ImmutableMap.of(
 "file",
 SingleFile.newBuilder()
 .setInt64CamelCaseJsonName(2L)
 .setExtension(SingleFileExtensionsProto.int64CamelCaseJsonName, 5L)
 .setSingleString("This should not be used")
 .setExtension(SingleFileExtensionsProto.singleString, "foo")
 .build()));

 assertThat(result).isTrue();
 }

 @Test
Expand All@@ -2171,7 +2243,7 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(false).build())
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = celCompiler.compile("file.int64CamelCaseJsonName").getAst();

 CelEvaluationException e =
 assertThrows(
Expand All@@ -2183,7 +2255,8 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti
 assertThat(e)
 .hasMessageThat()
 .contains(
 "field 'camelCased' is not declared in message 'dev.cel.testing.testdata.SingleFile");
 "field 'int64CamelCaseJsonName' is not declared in message"
 + " 'dev.cel.testing.testdata.SingleFile");
 }

 @Test
Expand All@@ -2194,7 +2267,7 @@ public void compile_withJsonFieldName_astTagged() throws Exception {
 .addMessageTypes(SingleFile.getDescriptor())
 .setOptions(CelOptions.current().enableJsonFieldNames(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("file.camelCased").getAst();
 CelAbstractSyntaxTree ast = cel.compile("file.int64CamelCaseJsonName").getAst();

 assertThat(ast.getSource().getExtensions())
 .contains(
Expand DownExpand Up@@ -2243,4 +2316,34 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 }
 };
 }

 private enum RuntimeEnv {
 LEGACY(setupEnv(CelFactory.standardCelBuilder())),
 PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
 ;

 private final Cel cel;

 private static Cel setupEnv(CelBuilder celBuilder) {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
 return celBuilder
 .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
 .addMessageTypes(SingleFile.getDescriptor())
 .addFileTypes(SingleFileExtensionsProto.getDescriptor())
 .addCompilerLibraries(CelExtensions.protos())
 .setExtensionRegistry(extensionRegistry)
 .setOptions(
 CelOptions.current()
 .enableJsonFieldNames(true)
 .enableHeterogeneousNumericComparisons(true)
 .enableQuotedIdentifierSyntax(true)
 .build())
 .build();
 }

 RuntimeEnv(Cel cel) {
 this.cel = cel;
 }
 }
}

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,11 +92,6 @@ public static ProtoMessageValue create(

 private FieldDescriptor findField(
 CelDescriptorPool celDescriptorPool, Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -105,6 +100,11 @@ private FieldDescriptor findField(
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return celDescriptorPool
 .findExtensionDescriptor(descriptor, fieldName)
 .orElseThrow(
Expand Down

10 changes: 5 additions & 5 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,11 +68,6 @@ public Optional<Object> newValue(String structType, Map<String, Object> fields)
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
Expand All@@ -81,6 +76,11 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 }
 }

 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }

 return protoMessageFactory
 .getDescriptorPool()
 .findExtensionDescriptor(descriptor, fieldName)
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/internal/DynamicProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelDescriptors;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/types/ProtoMessageTypeProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
import dev.cel.common.types.StructType.Field;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -269,8 +269,8 @@ public void findField_withJsonNameOption() {
 (ProtoMessageType) typeProvider.findType(SingleFile.getDescriptor().getFullName()).get();

 // Note that these are the same fields, with json_name option set
 Optional<Field> snakeCasedField = msgType.findField("snake_cased");
 Optional<Field> jsonNameField = msgType.findField("camelCased");
 Optional<Field> snakeCasedField = msgType.findField("int64_camel_case_json_name");
 Optional<Field> jsonNameField = msgType.findField("int64CamelCaseJsonName");

 assertThat(snakeCasedField).isEmpty();
 assertThat(jsonNameField).isPresent();
Expand Down

2 changes: 1 addition & 1 deletion
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import dev.cel.policy.PolicyTestHelper.TestYamlPolicy;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLateFunctionBindings;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import java.io.IOException;
import java.util.Map;
Expand Down

32 changes: 15 additions & 17 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,30 +173,28 @@ public Object hasField(Object message, String fieldName) {
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor == null) {
 Optional<FieldDescriptor> maybeFieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName);
 if (maybeFieldDescriptor.isPresent()) {
 fieldDescriptor = maybeFieldDescriptor.get();
 }
 }

 if (fieldDescriptor == null && celOptions.enableJsonFieldNames()) {
 if (celOptions.enableJsonFieldNames()) {
 for (FieldDescriptor fd : descriptor.getFields()) {
 if (fd.getJsonName().equals(fieldName)) {
 fieldDescriptor = fd;
 break;
 return fd;
 }
 }
 }

 if (fieldDescriptor == null) {
 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 fieldDescriptor =
 protoMessageFactory.getDescriptorPool().findExtensionDescriptor(descriptor, fieldName).orElse(null);
 if (fieldDescriptor != null) {
 return fieldDescriptor;
 }
 return fieldDescriptor;


 throw new IllegalArgumentException(
 String.format(
 "field '%s' is not declared in message '%s'", fieldName, descriptor.getFullName()));
 }

 private static MessageOrBuilder assertFullProtoMessage(Object candidate, String fieldName) {
Expand Down

2 changes: 1 addition & 1 deletion
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,8 +59,8 @@
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFile;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
Expand Down

5 changes: 5 additions & 0 deletions
testing/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,11 @@ alias(
 actual = "//testing/src/test/resources/protos:single_file_java_proto",
)

alias(
 name = "single_file_extension_java_proto",
 actual = "//testing/src/test/resources/protos:single_file_extension_java_proto",
)

alias(
 name = "multi_file_java_proto",
 actual = "//testing/src/test/resources/protos:multi_file_java_proto",
Expand Down

13 changes: 13 additions & 0 deletions
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,19 @@ java_proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "single_file_extension_proto",
 srcs = ["single_file_extensions.proto"],
 deps = [":single_file_proto"],
)

java_proto_library(
 name = "single_file_extension_java_proto",
 tags = [
 ],
 deps = [":single_file_extension_proto"],
)

proto_library(
 name = "multi_file_proto",
 srcs = [
Expand Down
Loading
Loading