Add late bound function resolver to lite runtime's program interface#693

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

Add late bound function resolver to lite runtime's program interface #693

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
12 changes: 3 additions & 9 deletions runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down
24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
"CelFunctionResolver.java",
"CelLateFunctionBindings.java",
"CelResolvedOverload.java",
"CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
],
)

java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
":function_overload_impl",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
":function_binding",
":function_overload",
":function_overload_impl",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
deps = [
":evaluation_exception",
":function_binding",
":function_resolver",
":standard_functions",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
name = "evaluation_listener_android",
srcs = ["CelEvaluationListener.java"],
tags = [
],
visibility = ["//visibility:private"],
deps = [
"//common/ast:ast_android",
"@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":standard_functions_android",
"//:auto_value",
"//common:cel_ast_android",
Expand Down
10 changes: 10 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
/** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
@Immutable
interface Program {

/** Evaluate the expression without any variables. */
Object eval() throws CelEvaluationException;

/** Evaluate the expression using a {@code mapValue} as the source of input variables. */
Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

/**
* Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
* lateBoundFunctionResolver}.
*/
Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException;
}
}
7 changes: 1 addition & 6 deletions runtime/src/main/java/dev/cel/runtime/CelRuntime.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
@Immutable
abstract class Program implements CelLiteRuntime.Program {

/** Evaluate the expression without any variables. */
@Override
public Object eval() throws CelEvaluationException {
return evalInternal(Activation.EMPTY);
}

/** Evaluate the expression using a {@code mapValue} as the source of input variables. */
@Override
public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
CelEvaluationListener.noOpListener());
}

/**
* Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
* lateBoundFunctionResolver}.
*/
@Override
public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException {
return evalInternal(
Expand Down
8 changes: 8 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
}

@Override
public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException {
return eval(resolver,
lateBoundFunctionResolver,
CelEvaluationListener.noOpListener());
}

@Override
public Object eval(
GlobalResolver resolver,
Expand Down
11 changes: 11 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/Interpretable.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
Object eval(GlobalResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException;

/**
* Runs interpretation with the given activation which supplies name/value bindings.
*
* <p>This method allows for late-binding functions to be provided per-evaluation, which can be
* useful for binding functions which might have side-effects that are not observable to CEL
* directly such as recording telemetry or evaluation state in a more granular fashion than a more
* general evaluation listener might permit.
*/
Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException;

/**
* Runs interpretation with the given activation which supplies name/value bindings.
*
Expand Down
10 changes: 10 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
return interpretable().eval(Activation.copyOf(mapValue));
}

@Override
public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException {
return interpretable()
.eval(
Activation.copyOf(mapValue),
lateBoundFunctionResolver,
CelEvaluationListener.noOpListener());
}

static CelLiteRuntime.Program plan(Interpretable interpretable) {
return new AutoValue_LiteProgramImpl(interpretable);
}
Expand Down
28 changes: 28 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

@Test
public void eval_withLateBoundFunction() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
"lateBoundFunc",
CelOverloadDecl.newGlobalOverload(
"lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
.build();
CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

String result =
(String)
celRuntime
.createProgram(ast)
.eval(
ImmutableMap.of(),
CelLateFunctionBindings.from(
CelFunctionBinding.from(
"lateBoundFunc_string", String.class, arg -> arg + " world")));

assertThat(result).isEqualTo("hello world");
}
}
1 change: 0 additions & 1 deletion testing/src/test/resources/protos/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
name = "multi_file_cel_java_proto",
debug = True,
java_descriptor_class_suffix = "CelDescriptor",
java_proto_library_dep = ":multi_file_java_proto",
deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
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
Add late bound function resolver to lite runtime's program interface#693

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


Add late bound function resolver to lite runtime's program interface
#693
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


12 changes: 3 additions & 9 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,25 +51,19 @@ java_library(

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

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

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

java_library(
Expand Down

24 changes: 21 additions & 3 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@@ -448,7 +448,6 @@ java_library(

# keep sorted
RUNTIME_SOURCES = [
 "CelFunctionResolver.java",
 "CelLateFunctionBindings.java",
 "CelResolvedOverload.java",
 "CelRuntime.java",
Expand DownExpand Up@@ -603,6 +602,19 @@ cel_android_library(
 ],
)

java_library(
 name = "function_resolver",
 srcs = ["CelFunctionResolver.java"],
 # used_by_android
 tags = [
 ],
 deps = [
 ":function_overload_impl",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "function_overload",
 srcs = [
Expand DownExpand Up@@ -652,6 +664,7 @@ java_library(
 ":function_binding",
 ":function_overload",
 ":function_overload_impl",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -689,6 +702,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":function_binding",
 ":function_resolver",
 ":standard_functions",
 "//:auto_value",
 "//common:cel_ast",
Expand All@@ -710,7 +724,9 @@ java_library(
 ":cel_value_runtime_type_provider",
 ":dispatcher",
 ":evaluation_exception",
 ":evaluation_listener",
 ":function_binding",
 ":function_resolver",
 ":interpretable",
 ":interpreter",
 ":lite_runtime",
Expand DownExpand Up@@ -738,7 +754,9 @@ cel_android_library(
 ":cel_value_runtime_type_provider_android",
 ":dispatcher_android",
 ":evaluation_exception",
 ":evaluation_listener_android",
 ":function_binding_android",
 ":function_resolver",
 ":interpretable_android",
 ":interpreter_android",
 ":lite_runtime_android",
Expand DownExpand Up@@ -923,8 +941,7 @@ java_library(
cel_android_library(
 name = "evaluation_listener_android",
 srcs = ["CelEvaluationListener.java"],
 tags = [
 ],
 visibility = ["//visibility:private"],
 deps = [
 "//common/ast:ast_android",
 "@maven//:com_google_code_findbugs_annotations",
Expand All@@ -940,6 +957,7 @@ cel_android_library(
 deps = [
 ":evaluation_exception",
 ":function_binding_android",
 ":function_resolver",
 ":standard_functions_android",
 "//:auto_value",
 "//common:cel_ast_android",
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,18 @@ public interface CelLiteRuntime {
 /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
 @Immutable
 interface Program {

 /** Evaluate the expression without any variables. */
 Object eval() throws CelEvaluationException;

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 Object eval(Map<String, ?> mapValue) throws CelEvaluationException;

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;
 }
}

7 changes: 1 addition & 6 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntime.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,11 @@ public interface CelRuntime {
 @Immutable
 abstract class Program implements CelLiteRuntime.Program {

 /** Evaluate the expression without any variables. */
 @Override
 public Object eval() throws CelEvaluationException {
 return evalInternal(Activation.EMPTY);
 }

 /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
 @Override
 public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return evalInternal(Activation.copyOf(mapValue));
Expand DownExpand Up@@ -77,10 +75,7 @@ public Object eval(CelVariableResolver resolver, CelFunctionResolver lateBoundFu
 CelEvaluationListener.noOpListener());
 }

 /**
 * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
 * lateBoundFunctionResolver}.
 */
 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return evalInternal(
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,14 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 RuntimeUnknownResolver.fromResolver(resolver), Optional.empty(), listener);
 }

 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 @Override
 public Object eval(
 GlobalResolver resolver,
Expand Down

11 changes: 11 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Interpretable.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,17 @@ public interface Interpretable {
 Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
 * <p>This method allows for late-binding functions to be provided per-evaluation, which can be
 * useful for binding functions which might have side-effects that are not observable to CEL
 * directly such as recording telemetry or evaluation state in a more granular fashion than a more
 * general evaluation listener might permit.
 */
 Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException;

 /**
 * Runs interpretation with the given activation which supplies name/value bindings.
 *
Expand Down

10 changes: 10 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,16 @@ public Object eval(Map<String, ?> mapValue) throws CelEvaluationException {
 return interpretable().eval(Activation.copyOf(mapValue));
 }

 @Override
 public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return interpretable()
 .eval(
 Activation.copyOf(mapValue),
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 }

 static CelLiteRuntime.Program plan(Interpretable interpretable) {
 return new AutoValue_LiteProgramImpl(interpretable);
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
Expand DownExpand Up@@ -605,4 +607,30 @@ public void nestedMessage_fromImportedProto() throws Exception {

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

 @Test
 public void eval_withLateBoundFunction() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "lateBoundFunc",
 CelOverloadDecl.newGlobalOverload(
 "lateBoundFunc_string", SimpleType.STRING, SimpleType.STRING)))
 .build();
 CelLiteRuntime celRuntime = CelLiteRuntimeFactory.newLiteRuntimeBuilder().build();
 CelAbstractSyntaxTree ast = celCompiler.compile("lateBoundFunc('hello')").getAst();

 String result =
 (String)
 celRuntime
 .createProgram(ast)
 .eval(
 ImmutableMap.of(),
 CelLateFunctionBindings.from(
 CelFunctionBinding.from(
 "lateBoundFunc_string", String.class, arg -> arg + " world")));

 assertThat(result).isEqualTo("hello world");
 }
}

1 change: 0 additions & 1 deletion
testing/src/test/resources/protos/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ java_lite_proto_cel_library(

java_lite_proto_cel_library_impl(
 name = "multi_file_cel_java_proto",
 debug = True,
 java_descriptor_class_suffix = "CelDescriptor",
 java_proto_library_dep = ":multi_file_java_proto",
 deps = [
Expand Down