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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
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
64 changes: 64 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License aj
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

/**
* An internal representation used for fast accumulation of unknown expr IDs and attributes. For
* safety, this object should never be returned as an evaluated result and instead be adapted into
* an immutable CelUnknownSet.
*/
final class AccumulatedUnknowns {

private final List<Long> exprIds;
private final List<CelAttribute> attributes;

List<Long> exprIds() {
return exprIds;
}

List<CelAttribute> attributes() {
return attributes;
}

@CanIgnoreReturnValue
AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
return this;
}

static AccumulatedUnknowns create(Long... ids) {
return create(Arrays.asList(ids));
}

static AccumulatedUnknowns create(Collection<Long> ids) {
return create(ids, new ArrayList<>());
}

static AccumulatedUnknowns create(Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new ArrayList<>(exprIds), new ArrayList<>(attributes));
}

private AccumulatedUnknowns(List<Long> exprIds, List<CelAttribute> attributes) {
this.exprIds = exprIds;
this.attributes = attributes;
}
}
28 changes: 24 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ java_library(
],
exports = [":base"],
deps = [
":accumulated_unknowns",
":base",
":concatenated_list_view",
":dispatcher",
Expand DownExpand Up@@ -306,6 +307,7 @@ cel_android_library(
srcs = INTERPRETER_SOURCES,
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":base_android",
":concatenated_list_view",
":dispatcher_android",
Expand DownExpand Up@@ -849,15 +851,13 @@ java_library(
":cel_value_runtime_type_provider",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":interpretable",
":interpreter",
":lite_runtime",
":runtime_equality",
":runtime_helpers",
":standard_functions",
":type_resolver",
"//:auto_value",
"//common:cel_ast",
Expand All@@ -880,15 +880,13 @@ cel_android_library(
":cel_value_runtime_type_provider_android",
":dispatcher_android",
":evaluation_exception",
":evaluation_listener_android",
":function_binding_android",
":function_resolver",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
":runtime_equality_android",
":runtime_helpers_android",
":standard_functions_android",
":type_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
Expand DownExpand Up@@ -1034,6 +1032,7 @@ java_library(
tags = [
],
deps = [
":accumulated_unknowns",
":evaluation_exception",
":unknown_attributes",
"//common/annotations",
Expand All@@ -1047,6 +1046,7 @@ cel_android_library(
srcs = ["InterpreterUtil.java"],
visibility = ["//visibility:private"],
deps = [
":accumulated_unknowns_android",
":evaluation_exception",
":unknown_attributes_android",
"//common/annotations",
Expand DownExpand Up@@ -1105,3 +1105,23 @@ java_library(
# used_by_android
visibility = ["//visibility:private"],
)

java_library(
name = "accumulated_unknowns",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "accumulated_unknowns_android",
srcs = ["AccumulatedUnknowns.java"],
visibility = ["//visibility:private"],
deps = [
":unknown_attributes_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
25 changes: 13 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;
private Optional<AccumulatedUnknowns> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
this.exprIds = new ArrayList<>();
Expand DownExpand Up@@ -61,29 +61,30 @@ static CallArgumentChecker createAcceptingPartial(RuntimeUnknownResolver resolve
return new CallArgumentChecker(resolver, true);
}

private static Optional<CelUnknownSet> mergeOptionalUnknowns(
Optional<CelUnknownSet> lhs, Optional<CelUnknownSet> rhs) {
private static Optional<AccumulatedUnknowns> mergeOptionalUnknowns(
Optional<AccumulatedUnknowns> lhs, Optional<AccumulatedUnknowns> rhs) {
return lhs.isPresent() ? rhs.isPresent() ? Optional.of(lhs.get().merge(rhs.get())) : lhs : rhs;
}

/** Determine if the call argument is unknown and accumulate if so. */
void checkArg(DefaultInterpreter.IntermediateResult arg) {
// Handle attribute tracked unknowns.
Optional<CelUnknownSet> argUnknowns = maybeUnknownFromArg(arg);
Optional<AccumulatedUnknowns> argUnknowns = maybeUnknownFromArg(arg);
unknowns = mergeOptionalUnknowns(unknowns, argUnknowns);

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
if (InterpreterUtil.isAccumulatedUnknowns(arg.value())) {
AccumulatedUnknowns unknownSet = (AccumulatedUnknowns) arg.value();
exprIds.addAll(unknownSet.exprIds());
}
}

private Optional<CelUnknownSet> maybeUnknownFromArg(DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof CelUnknownSet) {
CelUnknownSet celUnknownSet = (CelUnknownSet) arg.value();
private Optional<AccumulatedUnknowns> maybeUnknownFromArg(
DefaultInterpreter.IntermediateResult arg) {
if (arg.value() instanceof AccumulatedUnknowns) {
AccumulatedUnknowns celUnknownSet = (AccumulatedUnknowns) arg.value();
if (!celUnknownSet.attributes().isEmpty()) {
return Optional.of((CelUnknownSet) arg.value());
return Optional.of((AccumulatedUnknowns) arg.value());
}
}
if (!acceptPartial) {
Expand All@@ -99,7 +100,7 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(CelUnknownSet.create(exprIds));
return Optional.of(AccumulatedUnknowns.create(exprIds));
}

return Optional.empty();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,4 @@ public interface CelEvaluationListener {
* @param evaluatedResult Evaluated result.
*/
void callback(CelExpr expr, Object evaluatedResult);

/** Construct a listener that does nothing. */
static CelEvaluationListener noOpListener() {
return (arg1, arg2) -> {};
}
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}
Expand Down
Loading
Loading