Implement codegen for CelLiteDescriptor#659

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
Apr 22, 2025
Merged

Implement codegen for CelLiteDescriptor #659

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
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
name = "cel_spec",
sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
urls = [
"https://github.com/google/cel-spec/archive/" +
Expand Down
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions codelab/src/main/codelab/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
"@maven//:com_google_guava_guava", # unuseddeps: keep
"@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
"@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
"@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
],
)
1 change: 1 addition & 0 deletions codelab/src/main/codelab/solutions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
5 changes: 5 additions & 0 deletions common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
name = "internal_android",
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
name = "proto_java_qualified_names",
exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)
1 change: 1 addition & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
"//:auto_value",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down
10 changes: 7 additions & 3 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
":proto_java_qualified_names",
"//common/annotations",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -152,7 +153,7 @@ java_library(
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -174,6 +175,7 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -191,6 +193,7 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -207,6 +210,7 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
tags = [
],
deps = [
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
Expand Down
10 changes: 8 additions & 2 deletions common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
* Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
*
* <p>CEL Library Internals. Do Not Use.
*/
@Internal
public final class ProtoJavaQualifiedNames {
// Controls how many times we should recursively inspect a nested message for building fully
// qualified java class name before aborting.
private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions common/src/test/java/dev/cel/common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@maven//:junit_junit",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions common/src/test/java/dev/cel/common/ast/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions 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,6 +33,7 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 2 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -132,6 +132,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
1 change: 1 addition & 0 deletions extensions/src/test/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

Args:
name: name of this target.
java_descriptor_class_name: Name of the generated descriptor java class.
proto_src: Name of the proto_library target.
debug: (optional) If true, prints additional information during codegen for debugging purposes.
"""
java_proto_library_dep = name + "_java_lite_proto_dep"
java_lite_proto_library(
name = java_proto_library_dep,
deps = [proto_src],
)

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

Args:
name: name of this target.
java_descriptor_class_name: Name of the generated descriptor java class.
proto_src: Name of the proto_library target.
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 java_descriptor_class_name:
fail("You must provide a descriptor_class_prefix.")

if not proto_src:
fail("You must provide a proto_library dependency.")

_generate_cel_lite_descriptor_class(
name,
java_descriptor_class_name,
proto_src,
debug,
)

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],
)

descriptor_codegen_deps = [
"//protobuf:cel_lite_descriptor",
java_proto_library_dep,
]

java_library(
name = name,
srcs = [":" + name + "_cel_lite_descriptor"],
deps = descriptor_codegen_deps,
)

def _generate_cel_lite_descriptor_class(
name,
descriptor_class_name,
proto_src,
debug):
outfile = "%s.java" % descriptor_class_name

transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
proto_descriptor_set(
name = transitive_descriptor_set_name,
deps = [proto_src],
)

direct_descriptor_set_name = proto_src

debug_flag = "--debug" if debug else ""

cmd = (
"$(location //protobuf:cel_lite_descriptor_generator) " +
"--descriptor $(location %s) " % direct_descriptor_set_name +
"--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
"--descriptor_class_name %s " % descriptor_class_name +
"--out $(location %s) " % outfile +
"--version %s " % CEL_VERSION +
debug_flag
)

native.genrule(
name = name + "_cel_lite_descriptor",
srcs = [
transitive_descriptor_set_name,
direct_descriptor_set_name,
],
cmd = cmd,
outs = [outfile],
tools = ["//protobuf:cel_lite_descriptor_generator"],
)
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
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
Implement codegen for CelLiteDescriptor#659

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

Apr 22, 2025
 Merged


Implement codegen for CelLiteDescriptor
#659
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


4 changes: 2 additions & 2 deletions
WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,11 +242,11 @@ http_archive(
)

# cel-spec api/expr canonical protos
CEL_SPEC_VERSION = "0.20.0"
CEL_SPEC_VERSION = "0.23.1"

http_archive(
 name = "cel_spec",
 sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
 sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
 strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
 urls = [
 "https://github.com/google/cel-spec/archive/" +
Expand Down

1 change: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,5 +39,6 @@ java_library(
 "@maven//:com_google_guava_guava", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
 "@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
 "@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
 ],
)

1 change: 1 addition & 0 deletions
codelab/src/main/codelab/solutions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,5 +40,6 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,3 +97,8 @@ cel_android_library(
 name = "internal_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

java_library(
 name = "proto_java_qualified_names",
 exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
)

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,6 +208,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

4 changes: 2 additions & 2 deletions
common/src/main/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -114,7 +115,7 @@ java_library(
 ":ast",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -138,7 +139,6 @@ cel_android_library(
 "//:auto_value",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand Down

10 changes: 7 additions & 3 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -61,7 +62,6 @@ cel_android_library(
 "//common/ast:ast_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
Expand DownExpand Up@@ -140,6 +140,7 @@ java_library(
 ":proto_java_qualified_names",
 "//common/annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -152,7 +153,7 @@ java_library(
 ":reflection_util",
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -174,6 +175,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -191,6 +193,7 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -207,6 +210,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand DownExpand Up@@ -245,7 +249,6 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -309,6 +312,7 @@ java_library(
 tags = [
 ],
 deps = [
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand Down

10 changes: 8 additions & 2 deletions
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,16 @@
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.GenericDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import dev.cel.common.annotations.Internal;
import java.util.ArrayDeque;

/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
final class ProtoJavaQualifiedNames {
/**
 * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Internal
public final class ProtoJavaQualifiedNames {
 // Controls how many times we should recursively inspect a nested message for building fully
 // qualified java class name before aborting.
 private static final int SAFE_RECURSE_LIMIT = 50;
Expand Down

1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ java_library(
 "@maven//:com_google_truth_extensions_truth_proto_extension",
 "@maven//:junit_junit",
 "@maven//:org_antlr_antlr4_runtime",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/ast/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 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@@ -40,6 +40,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
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,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ java_library(
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -132,6 +132,7 @@ java_library(
 "//runtime:function_binding",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

1 change: 1 addition & 0 deletions
extensions/src/test/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
 "@maven//:junit_junit",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand Down

45 changes: 45 additions & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

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

"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""

load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 debug: (optional) If true, prints additional information during codegen for debugging purposes.
 """
 java_proto_library_dep = name + "_java_lite_proto_dep"
 java_lite_proto_library(
 name = java_proto_library_dep,
 deps = [proto_src],
 )

 java_lite_proto_cel_library_impl(
 name,
 java_descriptor_class_name,
 proto_src,
 java_proto_library_dep,
 debug,
 )

110 changes: 110 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

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

"""
Starlark rule for generating descriptors that is compatible with Protolite Messages.
This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
"""

load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
load("//publish:cel_version.bzl", "CEL_VERSION")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")

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

 Args:
 name: name of this target.
 java_descriptor_class_name: Name of the generated descriptor java class.
 proto_src: Name of the proto_library target.
 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 java_descriptor_class_name:
 fail("You must provide a descriptor_class_prefix.")

 if not proto_src:
 fail("You must provide a proto_library dependency.")

 _generate_cel_lite_descriptor_class(
 name,
 java_descriptor_class_name,
 proto_src,
 debug,
 )

 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],
 )

 descriptor_codegen_deps = [
 "//protobuf:cel_lite_descriptor",
 java_proto_library_dep,
 ]

 java_library(
 name = name,
 srcs = [":" + name + "_cel_lite_descriptor"],
 deps = descriptor_codegen_deps,
 )

def _generate_cel_lite_descriptor_class(
 name,
 descriptor_class_name,
 proto_src,
 debug):
 outfile = "%s.java" % descriptor_class_name

 transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
 proto_descriptor_set(
 name = transitive_descriptor_set_name,
 deps = [proto_src],
 )

 direct_descriptor_set_name = proto_src

 debug_flag = "--debug" if debug else ""

 cmd = (
 "$(location //protobuf:cel_lite_descriptor_generator) " +
 "--descriptor $(location %s) " % direct_descriptor_set_name +
 "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
 "--descriptor_class_name %s " % descriptor_class_name +
 "--out $(location %s) " % outfile +
 "--version %s " % CEL_VERSION +
 debug_flag
 )

 native.genrule(
 name = name + "_cel_lite_descriptor",
 srcs = [
 transitive_descriptor_set_name,
 direct_descriptor_set_name,
 ],
 cmd = cmd,
 outs = [outfile],
 tools = ["//protobuf:cel_lite_descriptor_generator"],
 )
Loading