Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 12, 2026
Merged

Add a validation pass for ID uniqueness in optimizers #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
srcs = [
"CelOptimizer.java",
"CelOptimizerBuilder.java",
"CelOptimizerOptions.java",
],
tags = [
],
deps = [
":ast_optimizer",
":optimization_exception",
"//:auto_value",
"//common:cel_ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -57,6 +59,8 @@ java_library(
"//bundle:cel",
"//common:cel_ast",
"//common:compiler_common",
"//common/ast",
"//common/navigation",
"@maven//:com_google_guava_guava",
],
)
Expand Down
32 changes: 29 additions & 3 deletions optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
CelOptimizerOptions.newBuilder().build();

/** Create a new builder for constructing a {@link CelOptimizer} instance. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
return CelOptimizerImpl.newBuilder(cel);
return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
}

/** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(
Cel cel, CelOptimizerOptions optimizerOptions) {
return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
}

/** Create a new builder for constructing a {@link CelOptimizer} instance. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(
CelCompiler celCompiler, CelRuntime celRuntime) {
return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
}

/** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(
CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
return standardCelOptimizerBuilder(
CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
}

/** Create a new builder for constructing a {@link CelOptimizer} instance. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(
CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
return standardCelOptimizerBuilder(
CelCompilerFactory.combine(celParser, celChecker), celRuntime);
celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
}

/** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
public static CelOptimizerBuilder standardCelOptimizerBuilder(
CelParser celParser,
CelChecker celChecker,
CelRuntime celRuntime,
CelOptimizerOptions optimizerOptions) {
return standardCelOptimizerBuilder(
CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
}

private CelOptimizerFactory() {}
Expand Down
80 changes: 76 additions & 4 deletions optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
private final Cel cel;
private final ImmutableSet<CelAstOptimizer> astOptimizers;
private final CelOptimizerOptions optimizerOptions;

CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
CelOptimizerImpl(
Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
this.cel = cel;
this.astOptimizers = astOptimizers;
this.optimizerOptions = optimizerOptions;
}

@Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
.build();
}
optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
if (optimizerOptions.enableAstValidation()) {
assertAstIdCorrectness(optimizedAst);
}
}
} catch (CelValidationException e) {
throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
return optimizedAst;
}

private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
Map<Long, CelExpr> allExprs = new HashMap<>();
CelNavigableAst.fromAst(ast)
.getRoot()
.allNodes()
.forEach(
navExpr -> {
CelExpr expr = navExpr.expr();
CelExpr existing = allExprs.put(expr.id(), expr);
if (existing != null) {
throw new IllegalStateException(
String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
}
});

for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
if (macroCall.id() != 0) {
throw new IllegalStateException(
String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
}
CelNavigableExpr.fromExpr(macroCall)
.descendants()
.forEach(
navExpr -> {
CelExpr macroExpr = navExpr.expr();
CelExpr astExpr = allExprs.get(macroExpr.id());
// A node may not exist in the AST if it is a synthetic macro node or was eliminated
// during optimization passes.
if (astExpr == null) {
return;
}

if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
throw new IllegalStateException(
String.format(
"Expected macro call node %d to be NOT_SET for comprehension, but"
+ " was %s.",
macroExpr.id(), macroExpr.exprKind().getKind()));
}
} else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
throw new IllegalStateException(
String.format(
"Macro call node %d kind mismatch: expected %s (from AST), but was %s"
+ " (in macro call).",
macroExpr.id(),
astExpr.exprKind().getKind(),
macroExpr.exprKind().getKind()));
}
});
}
}

/** Create a new builder for constructing a {@link CelOptimizer} instance. */
static CelOptimizerImpl.Builder newBuilder(Cel cel) {
return new CelOptimizerImpl.Builder(cel);
return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
}

/** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
return new CelOptimizerImpl.Builder(cel, optimizerOptions);
}

/** Builder class for {@link CelOptimizerImpl}. */
static final class Builder implements CelOptimizerBuilder {
private final Cel cel;
private final CelOptimizerOptions optimizerOptions;
private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

private Builder(Cel cel) {
private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
this.cel = cel;
this.optimizerOptions = checkNotNull(optimizerOptions);
this.astOptimizers = ImmutableSet.builder();
}

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

@Override
public CelOptimizer build() {
return new CelOptimizerImpl(cel, astOptimizers.build());
return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
}
}
}
51 changes: 51 additions & 0 deletions optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

/**
* Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
* invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
*/
public abstract boolean enableAstValidation();

/** Builder for configuring the {@link CelOptimizerOptions}. */
@AutoValue.Builder
public abstract static class Builder {

/**
* Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
* expression IDs are unique and macro calls in the AST source are consistent with the
* expression nodes.
*/
public abstract Builder enableAstValidation(boolean value);

public abstract CelOptimizerOptions build();

Builder() {}
}

/** Returns a new options builder with recommended defaults pre-configured. */
public static Builder newBuilder() {
return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
}

CelOptimizerOptions() {}
}
36 changes: 36 additions & 0 deletions optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
assertThat(builder.build()).isNotNull();
}

@Test
public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
CelOptimizerBuilder builder =
CelOptimizerFactory.standardCelOptimizerBuilder(
CelParserFactory.standardCelParserBuilder().build(),
CelCompilerFactory.standardCelCheckerBuilder().build(),
CelRuntimeFactory.standardCelRuntimeBuilder().build(),
CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

assertThat(builder).isNotNull();
assertThat(builder.build()).isNotNull();
}

@Test
public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
assertThat(builder.build()).isNotNull();
}

@Test
public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
CelOptimizerBuilder builder =
CelOptimizerFactory.standardCelOptimizerBuilder(
CelCompilerFactory.standardCelCompilerBuilder().build(),
CelRuntimeFactory.standardCelRuntimeBuilder().build(),
CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

assertThat(builder).isNotNull();
assertThat(builder.build()).isNotNull();
}

@Test
public void standardCelOptimizerBuilder_withCel() {
CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
assertThat(builder).isNotNull();
assertThat(builder.build()).isNotNull();
}

@Test
public void standardCelOptimizerBuilder_withCelAndOptions() {
CelOptimizerBuilder builder =
CelOptimizerFactory.standardCelOptimizerBuilder(
CelFactory.standardCelBuilder().build(),
CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

assertThat(builder).isNotNull();
assertThat(builder.build()).isNotNull();
}
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
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
Add a validation pass for ID uniqueness in optimizers#1178

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 12, 2026
 Merged


Add a validation pass for ID uniqueness in optimizers
#1178
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,12 +32,14 @@ java_library(
 srcs = [
 "CelOptimizer.java",
 "CelOptimizerBuilder.java",
 "CelOptimizerOptions.java",
 ],
 tags = [
 ],
 deps = [
 ":ast_optimizer",
 ":optimization_exception",
 "//:auto_value",
 "//common:cel_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
Expand All@@ -57,6 +59,8 @@ java_library(
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common/ast",
 "//common/navigation",
 "@maven//:com_google_guava_guava",
 ],
)
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,22 +25,48 @@
/** Factory class for constructing an {@link CelOptimizer} instance. */
public final class CelOptimizerFactory {

 private static final CelOptimizerOptions DEFAULT_OPTIMIZER_OPTIONS =
 CelOptimizerOptions.newBuilder().build();

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(Cel cel) {
 return CelOptimizerImpl.newBuilder(cel);
 return standardCelOptimizerBuilder(cel, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 Cel cel, CelOptimizerOptions optimizerOptions) {
 return CelOptimizerImpl.newBuilder(cel, optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(CelFactory.combine(celCompiler, celRuntime));
 return standardCelOptimizerBuilder(celCompiler, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelCompiler celCompiler, CelRuntime celRuntime, CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelFactory.combine(celCompiler, celRuntime), optimizerOptions);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser, CelChecker celChecker, CelRuntime celRuntime) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime);
 celParser, celChecker, celRuntime, DEFAULT_OPTIMIZER_OPTIONS);
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 public static CelOptimizerBuilder standardCelOptimizerBuilder(
 CelParser celParser,
 CelChecker celChecker,
 CelRuntime celRuntime,
 CelOptimizerOptions optimizerOptions) {
 return standardCelOptimizerBuilder(
 CelCompilerFactory.combine(celParser, celChecker), celRuntime, optimizerOptions);
 }

 private CelOptimizerFactory() {}
Expand Down

80 changes: 76 additions & 4 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,25 @@
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.navigation.CelNavigableAst;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.optimizer.CelAstOptimizer.OptimizationResult;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

final class CelOptimizerImpl implements CelOptimizer {
 private final Cel cel;
 private final ImmutableSet<CelAstOptimizer> astOptimizers;
 private final CelOptimizerOptions optimizerOptions;

 CelOptimizerImpl(Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers) {
 CelOptimizerImpl(
 Cel cel, ImmutableSet<CelAstOptimizer> astOptimizers, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.astOptimizers = astOptimizers;
 this.optimizerOptions = optimizerOptions;
 }

 @Override
Expand All@@ -52,6 +61,9 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 .build();
 }
 optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
 if (optimizerOptions.enableAstValidation()) {
 assertAstIdCorrectness(optimizedAst);
 }
 }
 } catch (CelValidationException e) {
 throw new CelOptimizationException(
Expand All@@ -63,18 +75,78 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
 return optimizedAst;
 }

 private static void assertAstIdCorrectness(CelAbstractSyntaxTree ast) {
 Map<Long, CelExpr> allExprs = new HashMap<>();
 CelNavigableAst.fromAst(ast)
 .getRoot()
 .allNodes()
 .forEach(
 navExpr -> {
 CelExpr expr = navExpr.expr();
 CelExpr existing = allExprs.put(expr.id(), expr);
 if (existing != null) {
 throw new IllegalStateException(
 String.format("Duplicate expr ID %d detected in the AST.", expr.id()));
 }
 });

 for (CelExpr macroCall : ast.getSource().getMacroCalls().values()) {
 if (macroCall.id() != 0) {
 throw new IllegalStateException(
 String.format("Expected macro call root ID to be 0, but was %d.", macroCall.id()));
 }
 CelNavigableExpr.fromExpr(macroCall)
 .descendants()
 .forEach(
 navExpr -> {
 CelExpr macroExpr = navExpr.expr();
 CelExpr astExpr = allExprs.get(macroExpr.id());
 // A node may not exist in the AST if it is a synthetic macro node or was eliminated
 // during optimization passes.
 if (astExpr == null) {
 return;
 }

 if (astExpr.exprKind().getKind().equals(Kind.COMPREHENSION)) {
 if (!macroExpr.exprKind().getKind().equals(Kind.NOT_SET)) {
 throw new IllegalStateException(
 String.format(
 "Expected macro call node %d to be NOT_SET for comprehension, but"
 + " was %s.",
 macroExpr.id(), macroExpr.exprKind().getKind()));
 }
 } else if (!macroExpr.exprKind().getKind().equals(astExpr.exprKind().getKind())) {
 throw new IllegalStateException(
 String.format(
 "Macro call node %d kind mismatch: expected %s (from AST), but was %s"
 + " (in macro call).",
 macroExpr.id(),
 astExpr.exprKind().getKind(),
 macroExpr.exprKind().getKind()));
 }
 });
 }
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel) {
 return new CelOptimizerImpl.Builder(cel);
 return newBuilder(cel, CelOptimizerOptions.newBuilder().build());
 }

 /** Create a new builder for constructing a {@link CelOptimizer} instance with custom options. */
 static CelOptimizerImpl.Builder newBuilder(Cel cel, CelOptimizerOptions optimizerOptions) {
 return new CelOptimizerImpl.Builder(cel, optimizerOptions);
 }

 /** Builder class for {@link CelOptimizerImpl}. */
 static final class Builder implements CelOptimizerBuilder {
 private final Cel cel;
 private final CelOptimizerOptions optimizerOptions;
 private final ImmutableSet.Builder<CelAstOptimizer> astOptimizers;

 private Builder(Cel cel) {
 private Builder(Cel cel, CelOptimizerOptions optimizerOptions) {
 this.cel = cel;
 this.optimizerOptions = checkNotNull(optimizerOptions);
 this.astOptimizers = ImmutableSet.builder();
 }

Expand All@@ -93,7 +165,7 @@ public CelOptimizerBuilder addAstOptimizers(Iterable<CelAstOptimizer> astOptimiz

 @Override
 public CelOptimizer build() {
 return new CelOptimizerImpl(cel, astOptimizers.build());
 return new CelOptimizerImpl(cel, astOptimizers.build(), optimizerOptions);
 }
 }
}

51 changes: 51 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/CelOptimizerOptions.java

View file


Open in desktop

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

package dev.cel.optimizer;

import com.google.auto.value.AutoValue;

/** Options to configure how {@link CelOptimizer} behaves. */
@AutoValue
public abstract class CelOptimizerOptions {

 /**
 * Returns true if AST validation is enabled. When enabled, each optimizer pass verifies AST
 * invariants (such as expression ID uniqueness and macro source consistency) after type-checking.
 */
 public abstract boolean enableAstValidation();

 /** Builder for configuring the {@link CelOptimizerOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {

 /**
 * Enables or disables post-pass AST validation. When enabled, each optimizer pass verifies that
 * expression IDs are unique and macro calls in the AST source are consistent with the
 * expression nodes.
 */
 public abstract Builder enableAstValidation(boolean value);

 public abstract CelOptimizerOptions build();

 Builder() {}
 }

 /** Returns a new options builder with recommended defaults pre-configured. */
 public static Builder newBuilder() {
 return new AutoValue_CelOptimizerOptions.Builder().enableAstValidation(false);
 }

 CelOptimizerOptions() {}
}

36 changes: 36 additions & 0 deletions
optimizer/src/test/java/dev/cel/optimizer/CelOptimizerFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,19 @@ public void standardCelOptimizerBuilder_withParserCheckerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withParserCheckerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelParserFactory.standardCelParserBuilder().build(),
 CelCompilerFactory.standardCelCheckerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 CelOptimizerBuilder builder =
Expand All@@ -50,6 +63,18 @@ public void standardCelOptimizerBuilder_withCompilerAndRuntime() {
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCompilerRuntimeAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelCompilerFactory.standardCelCompilerBuilder().build(),
 CelRuntimeFactory.standardCelRuntimeBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCel() {
 CelOptimizerBuilder builder =
Expand All@@ -58,4 +83,15 @@ public void standardCelOptimizerBuilder_withCel() {
 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }

 @Test
 public void standardCelOptimizerBuilder_withCelAndOptions() {
 CelOptimizerBuilder builder =
 CelOptimizerFactory.standardCelOptimizerBuilder(
 CelFactory.standardCelBuilder().build(),
 CelOptimizerOptions.newBuilder().enableAstValidation(true).build());

 assertThat(builder).isNotNull();
 assertThat(builder.build()).isNotNull();
 }
}
Loading
Loading