Separately generate lite descriptors per message#705

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
May 28, 2025
Merged

Separately generate lite descriptors per message #705

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
67 changes: 34 additions & 33 deletions protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
targetDescriptorProtoPath));
}

GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
debugPrinter.print("Generated Class:\n" + generatedClass.code());

generatedClassesBuilder.add(generatedClass);
ImmutableList<GeneratedClass> generatedClasses =
codegenCelLiteDescriptors(targetFileDescriptor);
generatedClassesBuilder.addAll(generatedClasses);
}

JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

return 0;
}

private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
throws Exception {
private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
String javaClassName;

// Derive the java class name. Use first encountered message/enum in the FDS as a default,
// with a suffix applied for uniqueness (we don't want to collide with java protoc default
// generated class name).
if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
} else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
} else {
throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
if (descriptors.isEmpty()) {
throw new IllegalArgumentException("File descriptor does not contain any messages!");
}

String javaSuffixName =
overriddenDescriptorClassSuffix.isEmpty()
? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
: overriddenDescriptorClassSuffix;
javaClassName += javaSuffixName;

ProtoDescriptorCollector descriptorCollector =
ProtoDescriptorCollector.newInstance(debugPrinter);

debugPrinter.print(
String.format(
"Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

return JavaFileGenerator.generateClass(
JavaFileGeneratorOption.newBuilder()
.setVersion(version)
.setDescriptorClassName(javaClassName)
.setPackageName(javaPackageName)
.setDescriptorMetadataList(
descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
.build());
ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
for (Descriptor messageDescriptor : descriptors) {
javaClassName = messageDescriptor.getName();
String javaSuffixName =
overriddenDescriptorClassSuffix.isEmpty()
? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
: overriddenDescriptorClassSuffix;
javaClassName += javaSuffixName;

debugPrinter.print(
String.format(
"Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

generatedClassBuilder.add(
JavaFileGenerator.generateClass(
JavaFileGeneratorOption.newBuilder()
.setVersion(version)
.setDescriptorClassName(javaClassName)
.setPackageName(javaPackageName)
.setDescriptorMetadataList(
descriptorCollector.collectCodegenMetadata(messageDescriptor))
.build()));
}

return generatedClassBuilder.build();
}

private String extractProtoPath(String descriptorPath) {
Expand Down
30 changes: 14 additions & 16 deletions protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

private final DebugPrinter debugPrinter;

ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
FileDescriptor targetFileDescriptor) {
ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
ImmutableList.builder();
ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
// Don't collect WKTs. They are included in the default descriptor pool.
.filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
.collect(toImmutableList());

for (Descriptor descriptor : descriptorList) {
for (Descriptor messageDescriptor : descriptorList) {
LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
LiteDescriptorCodegenMetadata.newBuilder();
for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
FieldLiteDescriptorMetadata.newBuilder()
.setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
debugPrinter.print(
String.format(
"Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
fieldDescriptor.getFullName(),
fieldDescriptor.getType()));
}

descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
// Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
if (!descriptor.getOptions().getMapEntry()) {
if (!messageDescriptor.getOptions().getMapEntry()) {
String sanitizedJavaClassName =
ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
.replace('$', '.');
descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
}

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
throw new IllegalArgumentException("Unknown JavaType: " + javaType);
}

private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
collect(builder, descriptor);
}

collectNested(builder, descriptor);
return builder.build();
}

private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
private static void collectNested(
ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
builder.add(descriptor);
for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
}
}

Expand Down
2 changes: 0 additions & 2 deletions protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
assertThat(protoNamesToDescriptors)
.containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
assertThat(protoNamesToDescriptors)
.containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
}

@Test
Expand Down
14 changes: 9 additions & 5 deletions protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
ProtoDescriptorCollector collector =
ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

// All proto messages, including transitive ones + maps
assertThat(descriptors).hasSize(166);
assertThat(testAllTypesDescriptors).hasSize(165);
assertThat(nestedTestAllTypesDescriptors).hasSize(1);
}

@Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
collector.collectCodegenMetadata(MultiFile.getDescriptor());

assertThat(descriptors).hasSize(3);
assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
collector.collectCodegenMetadata(MultiFile.getDescriptor());

assertThat(
descriptors.stream()
Expand Down
2 changes: 2 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
"//runtime:type_resolver",
"//runtime:unknown_attributes",
"//runtime:unknown_options",
"//testing/protos:message_with_enum_cel_java_proto",
"//testing/protos:message_with_enum_java_proto",
"//testing/protos:multi_file_cel_java_proto",
"//testing/protos:multi_file_java_proto",
"//testing/protos:single_file_java_proto",
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
.setValueProvider(
ProtoMessageLiteValueProvider.newInstance(
dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor()))
dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor(),
NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
.build();
// Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
// are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
.setValueProvider(
ProtoMessageLiteValueProvider.newInstance(
dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor()))
dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor(),
NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
.build();
// Expr: proto2.oneof_type.payload.repeated_string
CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
.setValueProvider(
ProtoMessageLiteValueProvider.newInstance(
dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor()))
dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
.getDescriptor(),
TestAllTypesCelLiteDescriptor.getDescriptor(),
NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
.build();
// Expr: proto2.oneof_type.payload.repeated_string
CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down
31 changes: 31 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

assertThat(result).isEqualToDefaultInstance();
}

@Test
public void eval_withEnumField() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar(
"msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
.addMessageTypes(MessageWithEnum.getDescriptor())
.build();
CelLiteRuntime celLiteRuntime =
CelLiteRuntimeFactory.newLiteRuntimeBuilder()
.setStandardFunctions(CelStandardFunctions.newBuilder().build())
.setValueProvider(
ProtoMessageLiteValueProvider.newInstance(
MessageWithEnumCelDescriptor.getDescriptor()))
.build();
CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

Long result =
(Long)
celLiteRuntime
.createProgram(ast)
.eval(
ImmutableMap.of(
"msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
}
}
10 changes: 10 additions & 0 deletions testing/protos/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@ alias(
actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto",
)

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

alias(
name = "multi_file_cel_java_proto_lite",
actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
name = "test_all_types_cel_java_proto3",
actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

alias(
name = "message_with_enum_cel_java_proto",
actual = "//testing/src/test/resources/protos:message_with_enum_cel_java_proto",
)
17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
deps = [":single_file_proto"],
)

proto_library(
name = "message_with_enum_proto",
srcs = ["message_with_enum.proto"],
)

java_proto_library(
name = "message_with_enum_java_proto",
deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
name = "message_with_enum_cel_java_proto",
java_descriptor_class_suffix = "CelDescriptor",
java_proto_library_dep = ":message_with_enum_java_proto",
deps = [":message_with_enum_proto"],
)
31 changes: 31 additions & 0 deletions testing/src/test/resources/protos/message_with_enum.proto
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
FOO = 0;
BAR = 1;
BAZ = 2;
}
, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}

, '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
Separately generate lite descriptors per message#705

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

May 28, 2025
 Merged


Separately generate lite descriptors per message
#705
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


67 changes: 34 additions & 33 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptorGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.common.io.Files;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.ExtensionRegistry;
import dev.cel.common.CelDescriptorUtil;
Expand DownExpand Up@@ -104,54 +105,54 @@ public Integer call() throws Exception {
 targetDescriptorProtoPath));
 }

 GeneratedClass generatedClass = codegenCelLiteDescriptor(targetFileDescriptor);
 debugPrinter.print("Generated Class:\n" + generatedClass.code());

 generatedClassesBuilder.add(generatedClass);
 ImmutableList<GeneratedClass> generatedClasses =
 codegenCelLiteDescriptors(targetFileDescriptor);
 generatedClassesBuilder.addAll(generatedClasses);
 }

 JavaFileGenerator.writeSrcJar(outPath, generatedClassesBuilder.build());

 return 0;
 }

 private GeneratedClass codegenCelLiteDescriptor(FileDescriptor targetFileDescriptor)
 throws Exception {
 private ImmutableList<GeneratedClass> codegenCelLiteDescriptors(
FileDescriptor targetFileDescriptor) throws Exception {
 String javaPackageName = ProtoJavaQualifiedNames.getJavaPackageName(targetFileDescriptor);
 String javaClassName;

 // Derive the java class name. Use first encountered message/enum in the FDS as a default,
 // with a suffix applied for uniqueness (we don't want to collide with java protoc default
 // generated class name).
 if (!targetFileDescriptor.getMessageTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getMessageTypes().get(0).getName();
 } else if (!targetFileDescriptor.getEnumTypes().isEmpty()) {
 javaClassName = targetFileDescriptor.getEnumTypes().get(0).getName();
 } else {
 throw new IllegalArgumentException("File descriptor does not contain any messages or enums!");
 List<Descriptor> descriptors = targetFileDescriptor.getMessageTypes();
 if (descriptors.isEmpty()) {
 throw new IllegalArgumentException("File descriptor does not contain any messages!");
 }

 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 ProtoDescriptorCollector descriptorCollector =
 ProtoDescriptorCollector.newInstance(debugPrinter);

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 return JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(targetFileDescriptor))
 .build());
 ImmutableList.Builder<GeneratedClass> generatedClassBuilder = ImmutableList.builder();
 for (Descriptor messageDescriptor : descriptors) {
 javaClassName = messageDescriptor.getName();
 String javaSuffixName =
 overriddenDescriptorClassSuffix.isEmpty()
 ? DEFAULT_CEL_LITE_DESCRIPTOR_CLASS_SUFFIX
 : overriddenDescriptorClassSuffix;
 javaClassName += javaSuffixName;

 debugPrinter.print(
 String.format(
 "Fully qualified descriptor java class name: %s.%s", javaPackageName, javaClassName));

 generatedClassBuilder.add(
 JavaFileGenerator.generateClass(
 JavaFileGeneratorOption.newBuilder()
 .setVersion(version)
 .setDescriptorClassName(javaClassName)
 .setPackageName(javaPackageName)
 .setDescriptorMetadataList(
 descriptorCollector.collectCodegenMetadata(messageDescriptor))
 .build()));
 }

 return generatedClassBuilder.build();
 }

 private String extractProtoPath(String descriptorPath) {
Expand Down

30 changes: 14 additions & 16 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,20 +37,19 @@ final class ProtoDescriptorCollector {

 private final DebugPrinter debugPrinter;

 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 FileDescriptor targetFileDescriptor) {
 ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(Descriptor descriptor) {
 ImmutableList.Builder<LiteDescriptorCodegenMetadata> descriptorListBuilder =
 ImmutableList.builder();
 ImmutableList<Descriptor> descriptorList =
collect(targetFileDescriptor).stream()
collectNested(descriptor).stream()
 // Don't collect WKTs. They are included in the default descriptor pool.
 .filter(d -> !WellKnownProto.getByTypeName(d.getFullName()).isPresent())
 .collect(toImmutableList());

 for (Descriptor descriptor : descriptorList) {
 for (Descriptor messageDescriptor : descriptorList) {
 LiteDescriptorCodegenMetadata.Builder descriptorCodegenBuilder =
 LiteDescriptorCodegenMetadata.newBuilder();
 for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getFields()) {
 for (Descriptors.FieldDescriptor fieldDescriptor : messageDescriptor.getFields()) {
 FieldLiteDescriptorMetadata.Builder fieldDescriptorCodegenBuilder =
 FieldLiteDescriptorMetadata.newBuilder()
 .setFieldNumber(fieldDescriptor.getNumber())
Expand DownExpand Up@@ -85,16 +84,17 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 debugPrinter.print(
 String.format(
 "Collecting message %s, for field %s, type: %s",
descriptor.getFullName(),
messageDescriptor.getFullName(),
 fieldDescriptor.getFullName(),
 fieldDescriptor.getType()));
 }

 descriptorCodegenBuilder.setProtoTypeName(descriptor.getFullName());
 descriptorCodegenBuilder.setProtoTypeName(messageDescriptor.getFullName());
 // Maps are resolved as an actual Java map, and doesn't have a MessageLite.Builder associated.
 if (!descriptor.getOptions().getMapEntry()) {
 if (!messageDescriptor.getOptions().getMapEntry()) {
 String sanitizedJavaClassName =
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor).replace('$', '.');
 ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(messageDescriptor)
 .replace('$', '.');
 descriptorCodegenBuilder.setJavaClassName(sanitizedJavaClassName);
 }

Expand DownExpand Up@@ -177,19 +177,17 @@ private static FieldLiteDescriptor.JavaType adaptJavaType(JavaType javaType) {
 throw new IllegalArgumentException("Unknown JavaType: " + javaType);
 }

 private static ImmutableSet<Descriptor> collect(FileDescriptor fileDescriptor) {
 private static ImmutableSet<Descriptor> collectNested(Descriptor descriptor) {
 ImmutableSet.Builder<Descriptor> builder = ImmutableSet.builder();
 for (Descriptor descriptor : fileDescriptor.getMessageTypes()) {
 collect(builder, descriptor);
 }

 collectNested(builder, descriptor);
 return builder.build();
 }

 private static void collect(ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 private static void collectNested(
 ImmutableSet.Builder<Descriptor> builder, Descriptor descriptor) {
 builder.add(descriptor);
 for (Descriptor nested : descriptor.getNestedTypes()) {
collect(builder, nested);
collectNested(builder, nested);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@ public void getProtoTypeNamesToDescriptors_containsAllMessages() {
 assertThat(protoNamesToDescriptors).containsKey("cel.expr.conformance.proto3.TestAllTypes");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
 assertThat(protoNamesToDescriptors)
 .containsKey("cel.expr.conformance.proto3.NestedTestAllTypes");
 }

 @Test
Expand Down

14 changes: 9 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/ProtoDescriptorCollectorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import com.google.common.collect.ImmutableList;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.testing.testdata.MultiFile;
import org.junit.Test;
Expand All@@ -31,11 +32,14 @@ public void collectCodegenMetadata_containsAllDescriptors() {
 ProtoDescriptorCollector collector =
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor().getFile());
 ImmutableList<LiteDescriptorCodegenMetadata> testAllTypesDescriptors =
 collector.collectCodegenMetadata(TestAllTypes.getDescriptor());
 ImmutableList<LiteDescriptorCodegenMetadata> nestedTestAllTypesDescriptors =
 collector.collectCodegenMetadata(NestedTestAllTypes.getDescriptor());

 // All proto messages, including transitive ones + maps
 assertThat(descriptors).hasSize(166);
 assertThat(testAllTypesDescriptors).hasSize(165);
 assertThat(nestedTestAllTypesDescriptors).hasSize(1);
 }

 @Test
Expand All@@ -44,7 +48,7 @@ public void collectCodegenMetadata_withProtoDependencies_containsAllDescriptors(
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(descriptors).hasSize(3);
 assertThat(
Expand All@@ -60,7 +64,7 @@ public void collectCodegenMetadata_withProtoDependencies_doesNotContainImportedP
 ProtoDescriptorCollector.newInstance(DebugPrinter.newInstance(false));

 ImmutableList<LiteDescriptorCodegenMetadata> descriptors =
 collector.collectCodegenMetadata(MultiFile.getDescriptor().getFile());
 collector.collectCodegenMetadata(MultiFile.getDescriptor());

 assertThat(
 descriptors.stream()
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,8 @@ java_library(
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "//testing/protos:message_with_enum_cel_java_proto",
 "//testing/protos:message_with_enum_java_proto",
 "//testing/protos:multi_file_cel_java_proto",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
Expand Down

16 changes: 13 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageLiteValueProvider;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.NestedTestAllTypesCelLiteDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.extensions.CelLiteExtensions;
Expand DownExpand Up@@ -320,7 +321,10 @@ public void eval_protoMessage_primitiveWithDefaults(String checkedExpr) throws E
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Ensures that all branches of the OR conditions are evaluated, and that appropriate defaults
 // are returned for primitives.
Expand DownExpand Up@@ -454,7 +458,10 @@ public void eval_protoMessage_safeTraversal(String checkedExpr) throws Exception
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand DownExpand Up@@ -483,7 +490,10 @@ public void eval_protoMessage_deepTraversalReturnsRepeatedStrings(String checked
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 dev.cel.expr.conformance.proto2.TestAllTypesCelLiteDescriptor.getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor()))
 dev.cel.expr.conformance.proto2.NestedTestAllTypesCelLiteDescriptor
 .getDescriptor(),
 TestAllTypesCelLiteDescriptor.getDescriptor(),
 NestedTestAllTypesCelLiteDescriptor.getDescriptor()))
 .build();
 // Expr: proto2.oneof_type.payload.repeated_string
 CelAbstractSyntaxTree ast = readCheckedExpr(checkedExpr);
Expand Down

31 changes: 31 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,11 @@
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.parser.CelStandardMacro;
import dev.cel.testing.testdata.MessageWithEnum;
import dev.cel.testing.testdata.MessageWithEnumCelDescriptor;
import dev.cel.testing.testdata.MultiFile;
import dev.cel.testing.testdata.MultiFileCelDescriptor;
import dev.cel.testing.testdata.SimpleEnum;
import dev.cel.testing.testdata.SingleFileCelDescriptor;
import dev.cel.testing.testdata.SingleFileProto.SingleFile;
import java.util.ArrayList;
Expand DownExpand Up@@ -660,4 +663,32 @@ public void eval_dynFunctionReturnsProto() throws Exception {

 assertThat(result).isEqualToDefaultInstance();
 }

 @Test
 public void eval_withEnumField() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addVar(
 "msg", StructTypeReference.create(MessageWithEnum.getDescriptor().getFullName()))
 .addMessageTypes(MessageWithEnum.getDescriptor())
 .build();
 CelLiteRuntime celLiteRuntime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .setValueProvider(
 ProtoMessageLiteValueProvider.newInstance(
 MessageWithEnumCelDescriptor.getDescriptor()))
 .build();
 CelAbstractSyntaxTree ast = celCompiler.compile("msg.simple_enum").getAst();

 Long result =
 (Long)
 celLiteRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(
 "msg", MessageWithEnum.newBuilder().setSimpleEnum(SimpleEnum.BAR)));

 assertThat(result).isEqualTo(SimpleEnum.BAR.getNumber());
 }
}

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

View file


Open in desktop

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

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

alias(
 name = "multi_file_cel_java_proto_lite",
 actual = "//testing/src/test/resources/protos:multi_file_cel_java_proto_lite",
Expand All@@ -43,3 +48,8 @@ alias(
 name = "test_all_types_cel_java_proto3",
 actual = "//testing/src/test/resources/protos:test_all_types_cel_java_proto3",
)

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

17 changes: 17 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@@ -31,6 +31,16 @@ proto_library(
 deps = [":single_file_proto"],
)

proto_library(
 name = "message_with_enum_proto",
 srcs = ["message_with_enum.proto"],
)

java_proto_library(
 name = "message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

# Test only. java_proto_library supports generating a jar with multiple proto deps,
# so we must test this case as well for lite descriptors.
# buildifier: disable=LANG_proto_library-single-deps
Expand DownExpand Up@@ -86,3 +96,10 @@ java_lite_proto_cel_library_impl(
 java_proto_library_dep = "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 deps = ["@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto"],
)

java_lite_proto_cel_library_impl(
 name = "message_with_enum_cel_java_proto",
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":message_with_enum_java_proto",
 deps = [":message_with_enum_proto"],
)

31 changes: 31 additions & 0 deletions
testing/src/test/resources/protos/message_with_enum.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package dev.cel.testing.testdata;

option java_multiple_files = true;
option java_package = "dev.cel.testing.testdata";
option java_outer_classname = "MessageWithEnumProto";

message MessageWithEnum {
 SimpleEnum simple_enum = 1;
}

enum SimpleEnum {
 FOO = 0;
 BAR = 1;
 BAZ = 2;
}