Add aliasing support to type-checker#757

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
Jul 24, 2025
Merged

Add aliasing support to type-checker #757

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
"//common:cel_ast",
"//common:cel_source",
"//common:compiler_common",
"//common:container",
"//common:options",
"//common/internal:env_visitor",
"//common/internal:file_descriptor_converter",
Expand Down
12 changes: 10 additions & 2 deletions bundle/src/main/java/dev/cel/bundle/CelBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
CelBuilder addMacros(Iterable<CelMacro> macros);

/**
* Set the {@code container} name to use as the namespace for resolving CEL expression variables
* and functions.
* @deprecated Use {@link #setContainer(CelContainer)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
CelBuilder setContainer(String container);

/**
* Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
* functions.
*/
@CanIgnoreReturnValue
CelBuilder setContainer(CelContainer container);

/** Add a variable declaration with a given {@code name} and {@link Type}. */
@CanIgnoreReturnValue
CelBuilder addVar(String name, Type type);
Expand Down
7 changes: 7 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
return this;
}

@Override
public CelBuilder setContainer(CelContainer container) {
compilerBuilder.setContainer(container);
return this;
}

@Override
public CelBuilder addVar(String name, Type type) {
compilerBuilder.addVar(name, type);
Expand Down
3 changes: 3 additions & 0 deletions checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
"//common:cel_descriptors",
"//common:cel_source",
"//common:compiler_common",
"//common:container",
"//common:options",
"//common:source_location",
"//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
":standard_decl",
"//common:cel_ast",
"//common:compiler_common",
"//common:container",
"//common:options",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
"//:auto_value",
"//common:cel_ast",
"//common:compiler_common",
"//common:container",
"//common:options",
"//common:proto_ast",
"//common/annotations",
Expand Down
12 changes: 10 additions & 2 deletions checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
CelCheckerBuilder setOptions(CelOptions options);

/**
* Set the {@code container} name to use as the namespace for resolving CEL expression variables
* and functions.
* @deprecated Use {@link #setContainer(CelContainer)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
CelCheckerBuilder setContainer(String container);

/**
* Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
* functions.
*/
@CanIgnoreReturnValue
CelCheckerBuilder setContainer(CelContainer container);

/** Add variable and function {@code declarations} to the CEL environment. */
@CanIgnoreReturnValue
CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down
86 changes: 51 additions & 35 deletions checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

private final CelOptions celOptions;
private final String container;
private final CelContainer container;
private final ImmutableSet<CelIdentDecl> identDeclarations;
private final ImmutableSet<CelFunctionDecl> functionDeclarations;
private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

private final CelStandardDeclarations overriddenStandardDeclarations;

// Builder is mutable by design. APIs must make defensive copies in and out of this class.
// This does not affect the type-checking behavior in any manner.
@SuppressWarnings("Immutable")
private final Builder checkerBuilder;
private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

private final ImmutableSet<FileDescriptor> fileDescriptors;
private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

@Override
public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

@Override
public CelCheckerBuilder toCheckerBuilder() {
return new Builder(checkerBuilder);
CelCheckerBuilder builder =
new Builder()
.addIdentDeclarations(identDeclarations)
.setOptions(celOptions)
.setTypeProvider(celTypeProvider)
.setContainer(container)
.setStandardEnvironmentEnabled(standardEnvironmentEnabled)
.addFunctionDeclarations(functionDeclarations)
.addLibraries(checkerLibraries)
.addFileTypes(fileDescriptors)
.addProtoTypeMasks(protoTypeMasks);

if (expectedResultType.isPresent()) {
builder.setResultType(expectedResultType.get());
}

return builder;
}

@Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
private final ImmutableSet.Builder<Descriptor> messageTypes;
private final ImmutableSet.Builder<FileDescriptor> fileTypes;
private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
private CelContainer container;
private CelOptions celOptions;
private String container;
private CelType expectedResultType;
private TypeProvider customTypeProvider;
private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

@Override
public CelCheckerBuilder setContainer(String container) {
checkNotNull(container);
return setContainer(CelContainer.ofName(container));
}

@Override
public CelCheckerBuilder setContainer(CelContainer container) {
checkNotNull(container);
this.container = container;
return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
return this;
}

@CanIgnoreReturnValue
Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
this.identDeclarations.addAll(identDeclarations);
return this;
}

// The following getters exist for asserting immutability for collections held by this builder,
// and shouldn't be exposed to the public.
@VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
"setStandardEnvironmentEnabled must be set to false to override standard"
+ " declarations.");
}

// Add libraries, such as extensions
celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

// Configure the type provider.
ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
messageTypeProvider,
standardEnvironmentEnabled,
standardDeclarations,
this);
checkerLibraries,
fileTypeSet,
protoTypeMaskSet);
}

private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
this.messageTypes = ImmutableSet.builder();
this.protoTypeMasks = ImmutableSet.builder();
this.celCheckerLibraries = ImmutableSet.builder();
this.container = "";
}

private Builder(Builder builder) {
// The following properties are either immutable or simple primitives, thus can be assigned
// directly.
this.celOptions = builder.celOptions;
this.celTypeProvider = builder.celTypeProvider;
this.container = builder.container;
this.customTypeProvider = builder.customTypeProvider;
this.expectedResultType = builder.expectedResultType;
this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
// The following needs to be deep copied as they are collection builders
this.functionDeclarations = deepCopy(builder.functionDeclarations);
this.identDeclarations = deepCopy(builder.identDeclarations);
this.fileTypes = deepCopy(builder.fileTypes);
this.messageTypes = deepCopy(builder.messageTypes);
this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
}

private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
newBuilder.addAll(builderToCopy.build());
return newBuilder;
this.container = CelContainer.ofName("");
}
}

private CelCheckerLegacyImpl(
CelOptions celOptions,
String container,
CelContainer container,
ImmutableSet<CelIdentDecl> identDeclarations,
ImmutableSet<CelFunctionDecl> functionDeclarations,
Optional<CelType> expectedResultType,
TypeProvider typeProvider,
CelTypeProvider celTypeProvider,
boolean standardEnvironmentEnabled,
CelStandardDeclarations overriddenStandardDeclarations,
Builder checkerBuilder) {
ImmutableSet<CelCheckerLibrary> checkerLibraries,
ImmutableSet<FileDescriptor> fileDescriptors,
ImmutableSet<ProtoTypeMask> protoTypeMasks) {
this.celOptions = celOptions;
this.container = container;
this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
this.celTypeProvider = celTypeProvider;
this.standardEnvironmentEnabled = standardEnvironmentEnabled;
this.overriddenStandardDeclarations = overriddenStandardDeclarations;
this.checkerBuilder = new Builder(checkerBuilder);
this.checkerLibraries = checkerLibraries;
this.fileDescriptors = fileDescriptors;
this.protoTypeMasks = protoTypeMasks;
}

private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add aliasing support to type-checker#757

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

Jul 24, 2025
 Merged


Add aliasing support to type-checker
#757
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ java_library(
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
Expand Down

12 changes: 10 additions & 2 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import com.google.protobuf.Message;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand DownExpand Up@@ -81,12 +82,19 @@ public interface CelBuilder {
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelBuilder setContainer(CelContainer container);

 /** Add a variable declaration with a given {@code name} and {@link Type}. */
 @CanIgnoreReturnValue
 CelBuilder addVar(String name, Type type);
Expand Down

7 changes: 7 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import dev.cel.checker.ProtoTypeMask;
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
Expand DownExpand Up@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
 return this;
 }

 @Override
 public CelBuilder setContainer(CelContainer container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelBuilder addVar(String name, Type type) {
 compilerBuilder.addVar(name, type);
Expand Down

3 changes: 3 additions & 0 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ java_library(
 "//common:cel_descriptors",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:source_location",
 "//common/annotations",
Expand DownExpand Up@@ -104,6 +105,7 @@ java_library(
 ":standard_decl",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:checked_java_proto",
Expand DownExpand Up@@ -175,6 +177,7 @@ java_library(
 "//:auto_value",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:container",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

12 changes: 10 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelVarDecl;
Expand All@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * Set the {@code container} name to use as the namespace for resolving CEL expression variables
 * and functions.
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
 @CanIgnoreReturnValue
 CelCheckerBuilder setContainer(CelContainer container);

 /** Add variable and function {@code declarations} to the CEL environment. */
 @CanIgnoreReturnValue
 CelCheckerBuilder addDeclarations(Decl... declarations);
Expand Down

86 changes: 51 additions & 35 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
Expand DownExpand Up@@ -67,7 +68,7 @@
public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelOptions celOptions;
 private final String container;
 private final CelContainer container;
 private final ImmutableSet<CelIdentDecl> identDeclarations;
 private final ImmutableSet<CelFunctionDecl> functionDeclarations;
 private final Optional<CelType> expectedResultType;
Expand All@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {

 private final CelStandardDeclarations overriddenStandardDeclarations;

 // Builder is mutable by design. APIs must make defensive copies in and out of this class.
 // This does not affect the type-checking behavior in any manner.
 @SuppressWarnings("Immutable")
 private final Builder checkerBuilder;
 private final ImmutableSet<CelCheckerLibrary> checkerLibraries;

 private final ImmutableSet<FileDescriptor> fileDescriptors;
 private final ImmutableSet<ProtoTypeMask> protoTypeMasks;

 @Override
 public CelValidationResult check(CelAbstractSyntaxTree ast) {
Expand All@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {

 @Override
 public CelCheckerBuilder toCheckerBuilder() {
 return new Builder(checkerBuilder);
 CelCheckerBuilder builder =
 new Builder()
 .addIdentDeclarations(identDeclarations)
 .setOptions(celOptions)
 .setTypeProvider(celTypeProvider)
 .setContainer(container)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .addFunctionDeclarations(functionDeclarations)
 .addLibraries(checkerLibraries)
 .addFileTypes(fileDescriptors)
 .addProtoTypeMasks(protoTypeMasks);

 if (expectedResultType.isPresent()) {
 builder.setResultType(expectedResultType.get());
 }

 return builder;
 }

 @Override
Expand DownExpand Up@@ -163,8 +183,8 @@ public static final class Builder implements CelCheckerBuilder {
 private final ImmutableSet.Builder<Descriptor> messageTypes;
 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
 private CelContainer container;
 private CelOptions celOptions;
 private String container;
 private CelType expectedResultType;
 private TypeProvider customTypeProvider;
 private CelTypeProvider celTypeProvider;
Expand All@@ -179,6 +199,12 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
 this.container = container;
 return this;
Expand DownExpand Up@@ -348,6 +374,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
 return this;
 }

 @CanIgnoreReturnValue
 Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
 this.identDeclarations.addAll(identDeclarations);
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
Expand DownExpand Up@@ -388,8 +420,10 @@ public CelCheckerLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard"
 + " declarations.");
 }

 // Add libraries, such as extensions
 celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
 checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));

 // Configure the type provider.
 ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
Expand DownExpand Up@@ -447,7 +481,9 @@ public CelCheckerLegacyImpl build() {
 messageTypeProvider,
 standardEnvironmentEnabled,
 standardDeclarations,
 this);
 checkerLibraries,
 fileTypeSet,
 protoTypeMaskSet);
 }

 private Builder() {
Expand All@@ -458,45 +494,23 @@ private Builder() {
 this.messageTypes = ImmutableSet.builder();
 this.protoTypeMasks = ImmutableSet.builder();
 this.celCheckerLibraries = ImmutableSet.builder();
 this.container = "";
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.celOptions = builder.celOptions;
 this.celTypeProvider = builder.celTypeProvider;
 this.container = builder.container;
 this.customTypeProvider = builder.customTypeProvider;
 this.expectedResultType = builder.expectedResultType;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 // The following needs to be deep copied as they are collection builders
 this.functionDeclarations = deepCopy(builder.functionDeclarations);
 this.identDeclarations = deepCopy(builder.identDeclarations);
 this.fileTypes = deepCopy(builder.fileTypes);
 this.messageTypes = deepCopy(builder.messageTypes);
 this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
 this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 this.container = CelContainer.ofName("");
 }
 }

 private CelCheckerLegacyImpl(
 CelOptions celOptions,
String container,
CelContainer container,
 ImmutableSet<CelIdentDecl> identDeclarations,
 ImmutableSet<CelFunctionDecl> functionDeclarations,
 Optional<CelType> expectedResultType,
 TypeProvider typeProvider,
 CelTypeProvider celTypeProvider,
 boolean standardEnvironmentEnabled,
 CelStandardDeclarations overriddenStandardDeclarations,
 Builder checkerBuilder) {
 ImmutableSet<CelCheckerLibrary> checkerLibraries,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<ProtoTypeMask> protoTypeMasks) {
 this.celOptions = celOptions;
 this.container = container;
 this.identDeclarations = identDeclarations;
Expand All@@ -506,7 +520,9 @@ private CelCheckerLegacyImpl(
 this.celTypeProvider = celTypeProvider;
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.overriddenStandardDeclarations = overriddenStandardDeclarations;
 this.checkerBuilder = new Builder(checkerBuilder);
 this.checkerLibraries = checkerLibraries;
 this.fileDescriptors = fileDescriptors;
 this.protoTypeMasks = protoTypeMasks;
 }

 private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {
Expand Down
Loading
Loading