Implement context_variable support in YAML environment#1046

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
May 5, 2026
Merged

Implement context_variable support in YAML environment #1046

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@@ -104,6 +104,7 @@ java_library(
":required_fields_checker",
"//:auto_value",
"//bundle:cel",
"//checker:proto_type_mask",
"//checker:standard_decl",
"//common:compiler_common",
"//common:container",
Expand Down
23 changes: 23 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
/** Limits to set in the environment. */
public abstract ImmutableSet<Limit> limits();

/** Context variable to enable in the environment. */
public abstract Optional<ContextVariable> contextVariable();

/** Builder for {@link CelEnvironment}. */
@AutoValue.Builder
public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

public abstract Builder setLimits(ImmutableSet<Limit> limits);

public abstract Builder setContextVariable(ContextVariable contextVariable);

abstract CelEnvironment autoBuild();

@CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

applyStandardLibrarySubset(compilerBuilder);

contextVariable()
.ifPresent(
cv ->
compilerBuilder.addProtoTypeMasks(
ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

return compilerBuilder.build();
} catch (RuntimeException e) {
throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
return extension;
}

/** Represents a context variable declaration. */
@AutoValue
public abstract static class ContextVariable {
/** Fully qualified type name of the context variable. */
public abstract String typeName();

public static ContextVariable create(String typeName) {
return new AutoValue_CelEnvironment_ContextVariable(typeName);
}
}

/** Represents a policy variable declaration. */
@AutoValue
public abstract static class VariableDecl {
Expand Down
34 changes: 34 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
return builder.build();
}

private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
long id = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
return ContextVariable.create("");
}

MappingNode mapNode = (MappingNode) node;
String typeName = "";
for (NodeTuple nodeTuple : mapNode.getValue()) {
Node keyNode = nodeTuple.getKeyNode();
long keyId = ctx.collectMetadata(keyNode);
Node valueNode = nodeTuple.getValueNode();
String keyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case "type_name":
typeName = newString(ctx, valueNode);
break;
default:
ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
break;
}
}

if (typeName.isEmpty()) {
ctx.reportError(id, "Missing required attribute(s): type_name");
}

return ContextVariable.create(typeName);
}

private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
long valueId = ctx.collectMetadata(node);
ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
case "limits":
builder.setLimits(parseLimits(ctx, valueNode));
break;
case "context_variable":
builder.setContextVariable(parseContextVariable(ctx, valueNode));
break;
default:
ctx.reportError(id, "Unknown config tag: " + fieldName);
// continue handling the rest of the nodes
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
deps = [
":cel_expression_source",
":default_result_matcher",
":registry_utils",
":result_matcher",
"//:auto_value",
"//bundle:cel",
Expand Down
22 changes: 11 additions & 11 deletions testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
return Optional.empty();
}

/** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
@Memoized
public Optional<TypeRegistry> typeRegistry() {
public Optional<CelDescriptors> mergedDescriptors() {
if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
return Optional.empty();
}
TypeRegistry.Builder builder = TypeRegistry.newBuilder();
if (!fileTypes().isEmpty()) {
builder.add(
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
.messageTypeDescriptors());
}
if (celDescriptors().isPresent()) {
builder.add(celDescriptors().get().messageTypeDescriptors());
}
return Optional.of(builder.build());
ImmutableSet.Builder<FileDescriptor> allFiles =
ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
}

@Memoized
public Optional<TypeRegistry> typeRegistry() {
return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
}

public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down
33 changes: 24 additions & 9 deletions testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
}

private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
if (!celTestContext.fileDescriptorSetPath().isPresent()) {
throw new IllegalArgumentException(
"Proto descriptors are required for unpacking Any messages.");
TypeRegistry typeRegistry =
celTestContext
.typeRegistry()
.orElseThrow(
() ->
new IllegalArgumentException(
"Proto descriptors or type registry are required for unpacking Any"
+ " messages."));

Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
if (descriptor == null) {
throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
}
Descriptor descriptor =
RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
.getDescriptorForTypeUrl(any.getTypeUrl());

ExtensionRegistry extensionRegistry =
celTestContext
.extensionRegistry()
.orElseGet(
() ->
celTestContext
.mergedDescriptors()
.map(RegistryUtils::getExtensionRegistry)
.orElseGet(ExtensionRegistry::getEmptyRegistry));

return DynamicMessage.getDefaultInstance(descriptor)
.getParserForType()
.parseFrom(
any.getValue(),
RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
.parseFrom(any.getValue(), extensionRegistry);
}

private static Message getEvaluatedContextExpr(
Expand Down
2 changes: 1 addition & 1 deletion testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

assertThat(thrown)
.hasMessageThat()
.contains("Proto descriptors are required for unpacking Any messages.");
.contains("Proto descriptors or type registry are required for unpacking Any messages");
}

@Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
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
Implement context_variable support in YAML environment#1046

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

May 5, 2026
 Merged


Implement context_variable support in YAML environment
#1046
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@@ -104,6 +104,7 @@ java_library(
 ":required_fields_checker",
 "//:auto_value",
 "//bundle:cel",
 "//checker:proto_type_mask",
 "//checker:standard_decl",
 "//common:compiler_common",
 "//common:container",
Expand Down

23 changes: 23 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import dev.cel.checker.CelStandardDeclarations;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
import dev.cel.checker.CelStandardDeclarations.StandardOverload;
import dev.cel.checker.ProtoTypeMask;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -134,6 +135,9 @@ public abstract class CelEnvironment {
 /** Limits to set in the environment. */
 public abstract ImmutableSet<Limit> limits();

 /** Context variable to enable in the environment. */
 public abstract Optional<ContextVariable> contextVariable();

 /** Builder for {@link CelEnvironment}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand DownExpand Up@@ -199,6 +203,8 @@ public Builder setLimits(Limit... limits) {

 public abstract Builder setLimits(ImmutableSet<Limit> limits);

 public abstract Builder setContextVariable(ContextVariable contextVariable);

 abstract CelEnvironment autoBuild();

 @CheckReturnValue
Expand DownExpand Up@@ -258,6 +264,12 @@ public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)

 applyStandardLibrarySubset(compilerBuilder);

 contextVariable()
 .ifPresent(
 cv ->
 compilerBuilder.addProtoTypeMasks(
 ProtoTypeMask.ofAllFields(cv.typeName()).withFieldsAsVariableDeclarations()));

 return compilerBuilder.build();
 } catch (RuntimeException e) {
 throw new CelEnvironmentException(e.getMessage(), e);
Expand DownExpand Up@@ -406,6 +418,17 @@ private static CanonicalCelExtension getExtensionOrThrow(String extensionName) {
 return extension;
 }

 /** Represents a context variable declaration. */
 @AutoValue
 public abstract static class ContextVariable {
 /** Fully qualified type name of the context variable. */
 public abstract String typeName();

 public static ContextVariable create(String typeName) {
 return new AutoValue_CelEnvironment_ContextVariable(typeName);
 }
 }

 /** Represents a policy variable declaration. */
 @AutoValue
 public abstract static class VariableDecl {
Expand Down

34 changes: 34 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlParser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.bundle.CelEnvironment.Alias;
import dev.cel.bundle.CelEnvironment.ContextVariable;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.LibrarySubset;
Expand DownExpand Up@@ -320,6 +321,36 @@ private ImmutableSet<String> parseAbbreviations(ParserContext<Node> ctx, Node no
 return builder.build();
 }

 private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node) {
 long id = ctx.collectMetadata(node);
 if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
 return ContextVariable.create("");
 }

 MappingNode mapNode = (MappingNode) node;
 String typeName = "";
 for (NodeTuple nodeTuple : mapNode.getValue()) {
 Node keyNode = nodeTuple.getKeyNode();
 long keyId = ctx.collectMetadata(keyNode);
 Node valueNode = nodeTuple.getValueNode();
 String keyName = ((ScalarNode) keyNode).getValue();
 switch (keyName) {
 case "type_name":
 typeName = newString(ctx, valueNode);
 break;
 default:
 ctx.reportError(keyId, String.format("Unsupported context_variable tag: %s", keyName));
 break;
 }
 }

 if (typeName.isEmpty()) {
 ctx.reportError(id, "Missing required attribute(s): type_name");
 }

 return ContextVariable.create(typeName);
 }

 private ImmutableSet<VariableDecl> parseVariables(ParserContext<Node> ctx, Node node) {
 long valueId = ctx.collectMetadata(node);
 ImmutableSet.Builder<VariableDecl> variableSetBuilder = ImmutableSet.builder();
Expand DownExpand Up@@ -900,6 +931,9 @@ private CelEnvironment.Builder parseConfig(ParserContext<Node> ctx, Node node) {
 case "limits":
 builder.setLimits(parseLimits(ctx, valueNode));
 break;
 case "context_variable":
 builder.setContextVariable(parseContextVariable(ctx, valueNode));
 break;
 default:
 ctx.reportError(id, "Unknown config tag: " + fieldName);
 // continue handling the rest of the nodes
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,7 @@ java_library(
 deps = [
 ":cel_expression_source",
 ":default_result_matcher",
 ":registry_utils",
 ":result_matcher",
 "//:auto_value",
 "//bundle:cel",
Expand Down

22 changes: 11 additions & 11 deletions
testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,21 +140,21 @@ public Optional<CelDescriptors> celDescriptors() {
 return Optional.empty();
 }

 /** Returns a unified set of {@link CelDescriptors} combined from all descriptor sources. */
 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 public Optional<CelDescriptors> mergedDescriptors() {
 if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
 return Optional.empty();
 }
 TypeRegistry.Builder builder = TypeRegistry.newBuilder();
 if (!fileTypes().isEmpty()) {
 builder.add(
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
 .messageTypeDescriptors());
 }
 if (celDescriptors().isPresent()) {
 builder.add(celDescriptors().get().messageTypeDescriptors());
 }
 return Optional.of(builder.build());
 ImmutableSet.Builder<FileDescriptor> allFiles =
 ImmutableSet.<FileDescriptor>builder().addAll(fileTypes());
 celDescriptors().ifPresent(d -> allFiles.addAll(d.fileDescriptors()));
 return Optional.of(CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(allFiles.build()));
 }

 @Memoized
 public Optional<TypeRegistry> typeRegistry() {
 return mergedDescriptors().map(RegistryUtils::getTypeRegistry);
 }

 public abstract Optional<ExtensionRegistry> extensionRegistry();
Expand Down

33 changes: 24 additions & 9 deletions
testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,18 +360,33 @@ private static Object getEvaluationResultWithMessage(
 }

 private static Message unpackAny(Any any, CelTestContext celTestContext) throws IOException {
 if (!celTestContext.fileDescriptorSetPath().isPresent()) {
 throw new IllegalArgumentException(
 "Proto descriptors are required for unpacking Any messages.");
 TypeRegistry typeRegistry =
 celTestContext
 .typeRegistry()
 .orElseThrow(
 () ->
 new IllegalArgumentException(
 "Proto descriptors or type registry are required for unpacking Any"
 + " messages."));

 Descriptor descriptor = typeRegistry.getDescriptorForTypeUrl(any.getTypeUrl());
 if (descriptor == null) {
 throw new IllegalArgumentException("Descriptor not found for type URL: " + any.getTypeUrl());
 }
 Descriptor descriptor =
 RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
 .getDescriptorForTypeUrl(any.getTypeUrl());

 ExtensionRegistry extensionRegistry =
 celTestContext
 .extensionRegistry()
 .orElseGet(
 () ->
 celTestContext
 .mergedDescriptors()
 .map(RegistryUtils::getExtensionRegistry)
 .orElseGet(ExtensionRegistry::getEmptyRegistry));

 return DynamicMessage.getDefaultInstance(descriptor)
 .getParserForType()
 .parseFrom(
 any.getValue(),
 RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
 .parseFrom(any.getValue(), extensionRegistry);
 }

 private static Message getEvaluatedContextExpr(
Expand Down

2 changes: 1 addition & 1 deletion
testing/src/test/java/dev/cel/testing/testrunner/TestRunnerLibraryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,7 +262,7 @@ public void runTest_missingProtoDescriptors_failure() throws Exception {

 assertThat(thrown)
 .hasMessageThat()
 .contains("Proto descriptors are required for unpacking Any messages.");
 .contains("Proto descriptors or type registry are required for unpacking Any messages");
 }

 @Test
Expand Down
Loading