Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 5 additions & 49 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.checker.CelCheckerLegacyImpl;
import dev.cel.checker.DescriptorTypeProvider;
import dev.cel.checker.ProtoTypeMask;
Expand DownExpand Up@@ -232,9 +231,7 @@ public void check() throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile(boolean useProtoResultType) throws Exception {
public void compile(@TestParameter boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
Expand All@@ -246,9 +243,7 @@ public void compile(boolean useProtoResultType) throws Exception {
}

@Test
@TestParameters("{useProtoResultType: false}")
@TestParameters("{useProtoResultType: true}")
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
public void compile_resultTypeCheckFailure(@TestParameter boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelProtoTypes.STRING);
Expand DownExpand Up@@ -563,23 +558,6 @@ public void program_withVars() throws Exception {
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().enableCelValue(true).build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();

CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());

assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
}

@Test
public void program_withProtoVars() throws Exception {
Expand DownExpand Up@@ -1006,9 +984,8 @@ public void program_protoActivation() throws Exception {
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) throws Exception {
public void program_enumTypeDirectResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
Expand All@@ -1029,9 +1006,7 @@ public void program_enumTypeDirectResolution(boolean resolveTypeDependencies) th
}

@Test
@TestParameters("{resolveTypeDependencies: false}")
@TestParameters("{resolveTypeDependencies: true}")
public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies)
public void program_enumTypeReferenceResolution(@TestParameter boolean resolveTypeDependencies)
throws Exception {
Cel cel =
standardCelBuilderWithMacros()
Expand DownExpand Up@@ -1429,25 +1404,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
.addFunctionBindings()
.setResultType(SimpleType.BOOL)
.build();
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());

assertThat(
program.advanceEvaluation(
UnknownContext.create(
fromMap(ImmutableMap.of()),
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
}

@Test
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
Expand Down
5 changes: 5 additions & 0 deletions common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:container"],
)

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

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
6 changes: 6 additions & 0 deletions common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,12 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block"],
)

cel_android_library(
name = "cel_block_android",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common/ast:cel_block_android"],
)

cel_android_library(
name = "ast_android",
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
Expand Down
6 changes: 6 additions & 0 deletions common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -15,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/navigation"],
)

cel_android_library(
name = "navigation_android",
exports = ["//common/src/main/java/dev/cel/common/navigation:navigation_android"],
)

java_library(
name = "mutable_navigation",
exports = ["//common/src/main/java/dev/cel/common/navigation:mutable_navigation"],
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ java_library(
],
)

cel_android_library(
name = "container_android",
srcs = ["CelContainer.java"],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "operator",
srcs = ["Operator.java"],
Expand Down
14 changes: 14 additions & 0 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,20 @@ java_library(
],
)

cel_android_library(
name = "cel_block_android",
srcs = ["CelBlock.java"],
tags = [
],
deps = [
":ast_android",
"//common:cel_ast_android",
"//common/annotations",
"//common/navigation:navigation_android",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "expr_converter",
srcs = EXPR_CONVERTER_SOURCES,
Expand Down
39 changes: 39 additions & 0 deletions common/src/main/java/dev/cel/common/navigation/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand DownExpand Up@@ -28,6 +29,25 @@ java_library(
],
)

cel_android_library(
name = "common_android",
srcs = [
"BaseNavigableExpr.java",
"CelNavigableExprVisitor.java",
"ExprPropertyCalculator.java",
"TraversalOrder.java",
],
tags = [
],
deps = [
"//:auto_value",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "navigation",
srcs = [
Expand All@@ -47,6 +67,25 @@ java_library(
],
)

cel_android_library(
name = "navigation_android",
srcs = [
"CelNavigableAst.java",
"CelNavigableExpr.java",
],
tags = [
],
deps = [
":common_android",
"//:auto_value",
"//common:cel_ast_android",
"//common/ast:ast_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "mutable_navigation",
srcs = [
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,7 @@ java_library(
],
deps = [
"//common/annotations",
"//common/values",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -423,6 +424,7 @@ cel_android_library(
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,9 @@
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();

@Override
public CelValueConverter celValueConverter() {
return protoCelValueConverter();
}
}
23 changes: 23 additions & 0 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,11 +226,21 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter_util"],
)

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

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

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

cel_android_library(
name = "standard_functions_android",
exports = [
Expand DownExpand Up@@ -352,7 +362,20 @@ java_library(
],
)

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

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

cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand All@@ -10,6 +11,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

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

java_library(
name = "planned_program",
visibility = ["//:internal"],
Expand Down
Loading
Loading