Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
Merged

Handle dependent protos when generating CelLiteDescriptor #692

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
6 changes: 3 additions & 3 deletions common/src/test/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
"//common/internal:proto_message_factory",
"//common/internal:well_known_proto",
"//common/src/test/resources:default_instance_message_test_protos_java_proto",
"//common/src/test/resources:multi_file_java_proto",
"//common/src/test/resources:service_conflicting_name_java_proto",
"//common/src/test/resources:single_file_java_proto",
"//common/testing",
"//protobuf:cel_lite_descriptor",
"//testing:test_all_types_cel_java_proto3",
"//testing/protos:multi_file_java_proto",
"//testing/protos:single_file_java_proto",
"//testing/protos:test_all_types_cel_java_proto3",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@com_google_googleapis//google/type:type_java_proto",
Expand Down
4 changes: 2 additions & 2 deletions common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
public void findDescriptor_success() {
DefaultLiteDescriptorPool descriptorPool =
DefaultLiteDescriptorPool.newInstance(
ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

MessageLiteDescriptor liteDescriptor =
descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
"//common/values:proto_message_lite_value_provider",
"//common/values:proto_message_value",
"//common/values:proto_message_value_provider",
"//testing:test_all_types_cel_java_proto3",
"//testing/protos:test_all_types_cel_java_proto3",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@maven//:com_google_guava_guava",
Expand Down
4 changes: 2 additions & 2 deletions common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
DefaultLiteDescriptorPool.newInstance(
ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down
4 changes: 2 additions & 2 deletions common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

@Test
public void newValue_unknownType_returnsEmpty() {
Expand Down
4 changes: 2 additions & 2 deletions common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
DefaultLiteDescriptorPool.newInstance(
ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down
20 changes: 0 additions & 20 deletions common/src/test/resources/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
],
)

proto_library(
name = "multi_file_proto",
srcs = ["multi_file.proto"],
)

java_proto_library(
name = "multi_file_java_proto",
deps = [":multi_file_proto"],
)

proto_library(
name = "single_file_proto",
srcs = ["single_file.proto"],
)

java_proto_library(
name = "single_file_java_proto",
deps = [":single_file_proto"],
)

proto_library(
name = "default_instance_message_test_protos",
srcs = [
Expand Down
22 changes: 14 additions & 8 deletions java_lite_proto_cel_library.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
debug = False):
"""Generates a CelLiteDescriptor

Args:
name: name of this target.
deps: The list of proto_library rules to generate Java code for.
proto_src: Name of the proto_library target.
java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
suffixed as the class name. Use this field to override this name.
java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
Default is "CelLiteDescriptor".
debug: (optional) If true, prints additional information during codegen for debugging purposes.
"""
if not name:
fail("You must provide a name.")

if not deps or len(deps) < 1:
fail("You must provide at least one proto_library dependency.")

java_proto_library_dep = name + "_java_lite_proto_dep"
java_lite_proto_library(
name = java_proto_library_dep,
deps = [proto_src],
deps = deps,
)

java_lite_proto_cel_library_impl(
name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
java_proto_library_dep = java_proto_library_dep,
debug = debug,
)
53 changes: 32 additions & 21 deletions java_lite_proto_cel_library_impl.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
name,
proto_src,
deps,
java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
debug = False):
"""Generates a CelLiteDescriptor

Args:
name: name of this target.
proto_src: Name of the proto_library target.
java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
suffixed as the class name. Use this field to override this name.
name: Name of this target.
deps: The list of proto_library rules to generate Java code for.
java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
Default is "CelLiteDescriptor".
java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
debug: (optional) If true, prints additional information during codegen for debugging purposes.
"""
if not name:
fail("You must provide a name.")

if not proto_src:
fail("You must provide a proto_library dependency.")
if not deps or len(deps) < 1:
fail("You must provide at least one proto_library dependency.")

generated = name + "_cel_lite_descriptor"
java_lite_proto_cel_library_rule(
name = generated,
descriptor = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
debug = debug,
descriptors = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
)

if not java_proto_library_dep:
java_proto_library_dep = name + "_java_lite_proto_dep"
java_lite_proto_library(
name = java_proto_library_dep,
deps = [proto_src],
deps = deps,
)

descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
java_file_path = srcjar_output.path

proto_info = ctx.attr.descriptor[ProtoInfo]
transitive_descriptors = proto_info.transitive_descriptor_sets
direct_descriptor_set = depset(
direct = [
descriptor[ProtoInfo].direct_descriptor_set
for descriptor in ctx.attr.descriptors
],
)
transitive_descriptor_set = depset(
transitive = [
descriptor[ProtoInfo].transitive_descriptor_sets
for descriptor in ctx.attr.descriptors
],
)

args = ctx.actions.args()
args.add("--version", CEL_VERSION)
args.add("--descriptor", proto_info.direct_descriptor_set)
args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
args.add("--out", java_file_path)

if ctx.attr.java_descriptor_class_name:
args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
if ctx.attr.java_descriptor_class_suffix:
args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

if ctx.attr.debug:
args.add("--debug")

ctx.actions.run(
mnemonic = "CelLiteDescriptorGenerator",
arguments = [args],
inputs = transitive_descriptors,
inputs = transitive_descriptor_set,
outputs = [srcjar_output],
progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
implementation = _generate_cel_lite_descriptor_class,
attrs = {
"java_descriptor_class_name": attr.string(),
"descriptor": attr.label(
"java_descriptor_class_suffix": attr.string(),
"descriptors": attr.label_list(
providers = [ProtoInfo],
),
"debug": attr.bool(),
Expand Down
1 change: 0 additions & 1 deletion protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
":cel_lite_descriptor",
":debug_printer",
":lite_descriptor_codegen_metadata",
"//common:cel_descriptors",
"//common/internal:proto_java_qualified_names",
"//common/internal:well_known_proto",
"@maven//:com_google_guava_guava",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading

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

Skip to content
Handle dependent protos when generating CelLiteDescriptor#692

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 14, 2025
 Merged


Handle dependent protos when generating CelLiteDescriptor
#692
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


6 changes: 3 additions & 3 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,12 +30,12 @@ java_library(
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:multi_file_java_proto",
 "//testing/protos:single_file_java_proto",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
Expand DownExpand Up@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 public void findDescriptor_success() {
 DefaultLiteDescriptorPool descriptorPool =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 MessageLiteDescriptor liteDescriptor =
 descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ java_library(
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//testing:test_all_types_cel_java_proto3",
 "//testing/protos:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import java.util.LinkedHashMap;
import org.junit.Test;
Expand All@@ -49,7 +49,7 @@
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueProviderTest {
 private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
 ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());

 @Test
 public void newValue_unknownType_returnsEmpty() {
Expand Down

4 changes: 2 additions & 2 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Duration;
import java.time.Instant;
import org.junit.Test;
Expand All@@ -46,7 +46,7 @@
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);
Expand Down

20 changes: 0 additions & 20 deletions
common/src/test/resources/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,26 +18,6 @@ filegroup(
 ],
)

proto_library(
 name = "multi_file_proto",
 srcs = ["multi_file.proto"],
)

java_proto_library(
 name = "multi_file_java_proto",
 deps = [":multi_file_proto"],
)

proto_library(
 name = "single_file_proto",
 srcs = ["single_file.proto"],
)

java_proto_library(
 name = "single_file_java_proto",
 deps = [":single_file_proto"],
)

proto_library(
 name = "default_instance_message_test_protos",
 srcs = [
Expand Down

22 changes: 14 additions & 8 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto

def java_lite_proto_cel_library(
 name,
proto_src,
java_descriptor_class_name = None,
deps,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 deps: The list of proto_library rules to generate Java code for.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 java_lite_proto_cel_library_impl(
 name = name,
proto_src = proto_src,
java_descriptor_class_name = java_descriptor_class_name,
deps = deps,
java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
 )

53 changes: 32 additions & 21 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")

def java_lite_proto_cel_library_impl(
 name,
proto_src,
deps,
 java_proto_library_dep,
java_descriptor_class_name = None,
java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor

 Args:
 name: name of this target.
 proto_src: Name of the proto_library target.
 java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
 By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
 suffixed as the class name. Use this field to override this name.
 name: Name of this target.
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 if not name:
 fail("You must provide a name.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")
 if not deps or len(deps) < 1:
 fail("You must provide at least one proto_library dependency.")

 generated = name + "_cel_lite_descriptor"
 java_lite_proto_cel_library_rule(
 name = generated,
 descriptor = proto_src,
 java_descriptor_class_name = java_descriptor_class_name,
 debug = debug,
 descriptors = deps,
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 )

 if not java_proto_library_dep:
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 deps = deps,
 )

 descriptor_codegen_deps = [
Expand All@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
 srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
 java_file_path = srcjar_output.path

 proto_info = ctx.attr.descriptor[ProtoInfo]
 transitive_descriptors = proto_info.transitive_descriptor_sets
 direct_descriptor_set = depset(
 direct = [
 descriptor[ProtoInfo].direct_descriptor_set
 for descriptor in ctx.attr.descriptors
 ],
 )
 transitive_descriptor_set = depset(
 transitive = [
 descriptor[ProtoInfo].transitive_descriptor_sets
 for descriptor in ctx.attr.descriptors
 ],
 )

 args = ctx.actions.args()
 args.add("--version", CEL_VERSION)
 args.add("--descriptor", proto_info.direct_descriptor_set)
 args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
 args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
 args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
 args.add("--out", java_file_path)

 if ctx.attr.java_descriptor_class_name:
 args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
 if ctx.attr.java_descriptor_class_suffix:
 args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)

 if ctx.attr.debug:
 args.add("--debug")

 ctx.actions.run(
 mnemonic = "CelLiteDescriptorGenerator",
 arguments = [args],
 inputs = transitive_descriptors,
 inputs = transitive_descriptor_set,
 outputs = [srcjar_output],
 progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
 executable = ctx.executable._tool,
Expand All@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
java_lite_proto_cel_library_rule = rule(
 implementation = _generate_cel_lite_descriptor_class,
 attrs = {
 "java_descriptor_class_name": attr.string(),
 "descriptor": attr.label(
 "java_descriptor_class_suffix": attr.string(),
 "descriptors": attr.label_list(
 providers = [ProtoInfo],
 ),
 "debug": attr.bool(),
Expand Down

1 change: 0 additions & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 ":cel_lite_descriptor",
 ":debug_printer",
 ":lite_descriptor_codegen_metadata",
 "//common:cel_descriptors",
 "//common/internal:proto_java_qualified_names",
 "//common/internal:well_known_proto",
 "@maven//:com_google_guava_guava",
Expand Down
Loading