Expose Late function bindings target for Android.#698

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
May 15, 2025
Merged

Expose Late function bindings target for Android. #698

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
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@@ -47,6 +47,7 @@ java_library(
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_binding",
"//runtime:late_function_binding",
"//runtime:unknown_attributes",
"@cel_spec//proto/cel/expr:checked_java_proto",
"@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down
1 change: 1 addition & 0 deletions java_lite_proto_cel_library.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
java_lite_proto_cel_library_impl(
name = name,
deps = deps,
# used_by_android
java_descriptor_class_suffix = java_descriptor_class_suffix,
java_proto_library_dep = java_proto_library_dep,
debug = debug,
Expand Down
3 changes: 3 additions & 0 deletions java_lite_proto_cel_library_impl.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
name,
deps,
java_proto_library_dep,
constraints = [],
java_descriptor_class_suffix = None,
debug = False):
"""Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
deps: The list of proto_library rules to generate Java code for.
java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
Default is "CelLiteDescriptor".
constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
name = name,
srcs = [":" + generated],
deps = descriptor_codegen_deps,
javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
)

def _generate_cel_lite_descriptor_class(ctx):
Expand Down
1 change: 1 addition & 0 deletions policy/src/test/java/dev/cel/policy/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
"//policy:validation_exception",
"//runtime",
"//runtime:function_binding",
"//runtime:late_function_binding",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down
1 change: 1 addition & 0 deletions protobuf/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
name = "cel_lite_descriptor",
# used_by_android
visibility = ["//:android_allow_list"],
exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down
12 changes: 12 additions & 0 deletions runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
name = "runtime",
exports = [
":evaluation_exception",
":late_function_binding",
"//runtime/src/main/java/dev/cel/runtime",
"//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
"//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
name = "late_function_binding",
exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
name = "late_function_binding_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
name = "function_overload_impl",
# used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
name = "evaluation_exception",
# used_by_android
exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down
45 changes: 41 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
"CelLateFunctionBindings.java",
"CelResolvedOverload.java",
"CelRuntime.java",
"CelRuntimeBuilder.java",
"CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
"UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
"CelLateFunctionBindings.java",
"CelResolvedOverload.java",
]

java_library(
name = "late_function_binding",
srcs = LATE_FUNCTION_BINDING_SOURCES,
tags = [
],
deps = [
":dispatcher",
":evaluation_exception",
":function_binding",
":function_overload",
":function_overload_impl",
":function_resolver",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "late_function_binding_android",
srcs = LATE_FUNCTION_BINDING_SOURCES,
tags = [
],
deps = [
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "lite_runtime_library",
srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_overload",
":function_overload_impl",
":function_resolver",
":interpretable",
":interpreter",
Expand Down
2 changes: 2 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
"//runtime:interpretable",
"//runtime:interpreter",
"//runtime:interpreter_util",
"//runtime:late_function_binding",
"//runtime:lite_runtime",
"//runtime:lite_runtime_factory",
"//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
"//extensions:sets_function",
"//runtime:evaluation_exception",
"//runtime:function_binding_android",
"//runtime:late_function_binding_android",
"//runtime:lite_runtime_android",
"//runtime:lite_runtime_factory_android",
"//runtime:lite_runtime_impl_android",
Expand Down
23 changes: 23 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
assertThat(result).isTrue();
}

@Test
@SuppressWarnings("rawtypes")
public void eval_customFunctions_asLateBoundFunctions() throws Exception {
CelLiteRuntime runtime =
CelLiteRuntimeFactory.newLiteRuntimeBuilder()
.addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
.setStandardFunctions(CelStandardFunctions.newBuilder().build())
.build();
// Expr: ''.isEmpty() && [].isEmpty()
CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
Program program = runtime.createProgram(ast);

boolean result =
(boolean)
program.eval(
ImmutableMap.of(),
CelLateFunctionBindings.from(
CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

assertThat(result).isTrue();
}

@Test
@TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
@TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
"//extensions:optional_library",
"//runtime",
"//runtime:function_binding",
"//runtime:late_function_binding",
"//runtime:unknown_attributes",
"@cel_spec//proto/cel/expr:checked_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down

, '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
Expose Late function bindings target for Android.#698

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 15, 2025
 Merged


Expose Late function bindings target for Android.
#698
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


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@@ -47,6 +47,7 @@ java_library(
 "//runtime:evaluation_exception_builder",
 "//runtime:evaluation_listener",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr:syntax_java_proto",
Expand Down

1 change: 1 addition & 0 deletions
java_lite_proto_cel_library.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ def java_lite_proto_cel_library(
 java_lite_proto_cel_library_impl(
 name = name,
 deps = deps,
 # used_by_android
 java_descriptor_class_suffix = java_descriptor_class_suffix,
 java_proto_library_dep = java_proto_library_dep,
 debug = debug,
Expand Down

3 changes: 3 additions & 0 deletions
java_lite_proto_cel_library_impl.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ def java_lite_proto_cel_library_impl(
 name,
 deps,
 java_proto_library_dep,
 constraints = [],
 java_descriptor_class_suffix = None,
 debug = False):
 """Generates a CelLiteDescriptor
Expand All@@ -35,6 +36,7 @@ def java_lite_proto_cel_library_impl(
 deps: The list of proto_library rules to generate Java code for.
 java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
 Default is "CelLiteDescriptor".
 constraints: (optional) List of strings that denote which environment the produced java_library label is associated in.
 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.
Expand DownExpand Up@@ -69,6 +71,7 @@ def java_lite_proto_cel_library_impl(
 name = name,
 srcs = [":" + generated],
 deps = descriptor_codegen_deps,
 javacopts = ["-Xep:PackageLocation:OFF"], # TODO: Add generated annotation
 )

def _generate_cel_lite_descriptor_class(ctx):
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ java_library(
 "//policy:validation_exception",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_testparameterinjector_test_parameter_injector",
Expand Down

1 change: 1 addition & 0 deletions
protobuf/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ package(
java_library(
 name = "cel_lite_descriptor",
 # used_by_android
 visibility = ["//:android_allow_list"],
 exports = ["//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor"],
)

Expand Down

12 changes: 12 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
 name = "runtime",
 exports = [
 ":evaluation_exception",
 ":late_function_binding",
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:descriptor_message_provider",
 "//runtime/src/main/java/dev/cel/runtime:function_overload",
Expand DownExpand Up@@ -59,6 +60,16 @@ cel_android_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:function_binding_android"],
)

java_library(
 name = "late_function_binding",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding"],
)

cel_android_library(
 name = "late_function_binding_android",
 exports = ["//runtime/src/main/java/dev/cel/runtime:late_function_binding_android"],
)

java_library(
 name = "function_overload_impl",
 # used_by_android
Expand All@@ -85,6 +96,7 @@ java_library(

java_library(
 name = "evaluation_exception",
 # used_by_android
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception"],
)

Expand Down

45 changes: 41 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,8 +451,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
 "CelRuntimeBuilder.java",
 "CelRuntimeFactory.java",
Expand All@@ -463,6 +461,47 @@ RUNTIME_SOURCES = [
 "UnknownContext.java",
]

LATE_FUNCTION_BINDING_SOURCES = [
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
]

java_library(
 name = "late_function_binding",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher",
 ":evaluation_exception",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "late_function_binding_android",
 srcs = LATE_FUNCTION_BINDING_SOURCES,
 tags = [
 ],
 deps = [
 ":dispatcher_android",
 ":evaluation_exception",
 ":function_binding_android",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "lite_runtime_library",
 srcs = ["CelLiteRuntimeLibrary.java"],
Expand DownExpand Up@@ -677,8 +716,6 @@ java_library(
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,7 @@ java_library(
 "//runtime:interpretable",
 "//runtime:interpreter",
 "//runtime:interpreter_util",
 "//runtime:late_function_binding",
 "//runtime:lite_runtime",
 "//runtime:lite_runtime_factory",
 "//runtime:proto_message_activation_factory",
Expand DownExpand Up@@ -307,6 +308,7 @@ cel_android_local_test(
 "//extensions:sets_function",
 "//runtime:evaluation_exception",
 "//runtime:function_binding_android",
 "//runtime:late_function_binding_android",
 "//runtime:lite_runtime_android",
 "//runtime:lite_runtime_factory_android",
 "//runtime:lite_runtime_impl_android",
Expand Down

23 changes: 23 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,6 +274,29 @@ public void eval_customFunctions() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 @SuppressWarnings("rawtypes")
 public void eval_customFunctions_asLateBoundFunctions() throws Exception {
 CelLiteRuntime runtime =
 CelLiteRuntimeFactory.newLiteRuntimeBuilder()
 .addFunctionBindings(CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty))
 .setStandardFunctions(CelStandardFunctions.newBuilder().build())
 .build();
 // Expr: ''.isEmpty() && [].isEmpty()
 CelAbstractSyntaxTree ast = readCheckedExpr("compiled_custom_functions");
 Program program = runtime.createProgram(ast);

 boolean result =
 (boolean)
 program.eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from("string_isEmpty", String.class, String::isEmpty),
 CelFunctionBinding.from("list_isEmpty", List.class, List::isEmpty)));

 assertThat(result).isTrue();
 }

 @Test
 @TestParameters("{checkedExpr: 'compiled_proto2_select_primitives'}")
 @TestParameters("{checkedExpr: 'compiled_proto3_select_primitives'}")
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ java_library(
 "//extensions:optional_library",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:late_function_binding",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:checked_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down