Add shorthand type specifier syntax for policy configs#1185

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

Add shorthand type specifier syntax for policy configs #1185

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
2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
name = "environment",
srcs = [
"CelEnvironment.java",
"TypeSpecifierParser.java",
],
tags = [
],
Expand All@@ -111,6 +112,7 @@ java_library(
"//common:container",
"//common:options",
"//common:source",
"//common/formats:parser_context",
"//common/types",
"//common/types:type_providers",
"//compiler:compiler_builder",
Expand Down
13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
return newBuilder().setName(name).build();
}

/**
* Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
* dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
*/
static TypeDecl parse(String typeSpecifier) {
return TypeSpecifierParser.parse(typeSpecifier);
}

/** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
static TypeDecl ofTypeParam(String typeParamName) {
return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
}

public static TypeDecl.Builder newBuilder() {
return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
}
Expand Down
33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
*/
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
}

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
}

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
}

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
}

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
}

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
}
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
}

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down
200 changes: 200 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
* Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
* {@code "int"}) into a {@link TypeDecl}.
*/
final class TypeSpecifierParser {
private static final int MAX_RECURSION_DEPTH = 64;
static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

private final String text;
private final int length;
private int pos;

static TypeDecl parse(String text) {
checkNotNull(text);
TypeSpecifierParser parser = new TypeSpecifierParser(text);
return parser.parse();
}

static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
checkNotNull(ctx);
checkNotNull(text);
try {
return parse(text);
} catch (IllegalArgumentException e) {
ctx.reportError(nodeId, e.getMessage());
return ERROR_TYPE_DECL;
}
}

private TypeDecl parse() {
TypeDecl res = parseTypeElem(0);
skipWhitespace();
if (pos < length) {
throw new IllegalArgumentException(
String.format(
"unexpected character '%c' at position %d in %s",
text.charAt(pos), pos, formatQuoted(text)));
}
return res;
}

private TypeSpecifierParser(String text) {
this.text = text;
this.length = text.length();
this.pos = 0;
}

private TypeDecl parseTypeElem(int depth) {
if (depth > MAX_RECURSION_DEPTH) {
throw new IllegalArgumentException(
String.format("exceeded maximum type specifier recursion depth at position %d", pos));
}
skipWhitespace();
if (pos < length && text.charAt(pos) == '~') {
pos++; // consume '~'
String id = parseTypeParamIdent();
return TypeDecl.ofTypeParam(id);
}
return parseConcreteType(depth);
}

private TypeDecl parseConcreteType(int depth) {
String id = parseNamespaceIdentifier();
skipWhitespace();
if (pos < length && text.charAt(pos) == '<') {
pos++; // consume '<'
ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
while (true) {
TypeDecl param = parseTypeElem(depth + 1);
params.add(param);
skipWhitespace();
if (pos < length && text.charAt(pos) == ',') {
pos++; // consume ','
continue;
}
if (pos < length && text.charAt(pos) == '>') {
pos++; // consume '>'
break;
}
throw new IllegalArgumentException(
String.format("expected ',' or '>' at position %d", pos));
}
return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
}
return TypeDecl.create(id);
}

private String parseNamespaceIdentifier() {
StringBuilder id = new StringBuilder();
while (pos < length && text.charAt(pos) != '<') {
char c = text.charAt(pos);
if (c == '.') {
id.append('.');
pos++; // consume '.'
}
String ident = parseIdentifier();
id.append(ident);
if (pos < length && text.charAt(pos) != '.') {
break;
}
}
String identifier = id.toString();
if (identifier.isEmpty()) {
throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
}
return identifier;
}

private String parseIdentifier() {
if (pos >= length) {
throw new IllegalArgumentException("unexpected end of input");
}
int start = pos;
while (pos < length) {
char c = text.charAt(pos);
boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
if (isValid) {
pos++;
continue;
}
if (pos == start) {
throw new IllegalArgumentException(
String.format("identifier is expected, but '%c' was found at position %d", c, pos));
}
break;
}
return text.substring(start, pos);
}

private String parseTypeParamIdent() {
if (pos >= length) {
throw new IllegalArgumentException("unexpected end of input");
}
char c = text.charAt(pos);
if (c < 'A' || c > 'Z') {
throw new IllegalArgumentException(
String.format(
"invalid type parameter identifier '%c' at position %d, must be a single character"
+ " from A-Z",
c, pos));
}
pos++;
if (pos < length) {
char next = text.charAt(pos);
if (isAlphaNumeric(next) || next == '_') {
throw new IllegalArgumentException(
String.format(
"invalid type parameter identifier '%c' at position %d, must be a single character"
+ " from A-Z",
next, pos));
}
}
return String.valueOf(c);
}

private void skipWhitespace() {
while (pos < length) {
char c = text.charAt(pos);
if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
pos++;
} else {
break;
}
}
}

private static boolean isAlpha(char c) {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

private static boolean isAlphaNumeric(char c) {
return isAlpha(c) || (c >= '0' && c <= '9');
}

private static String formatQuoted(String s) {
return "\"" + s + "\"";
}
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
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 shorthand type specifier syntax for policy configs#1185

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 14, 2026
 Merged


Add shorthand type specifier syntax for policy configs
#1185
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


2 changes: 2 additions & 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@@ -97,6 +97,7 @@ java_library(
 name = "environment",
 srcs = [
 "CelEnvironment.java",
 "TypeSpecifierParser.java",
 ],
 tags = [
 ],
Expand All@@ -111,6 +112,7 @@ java_library(
 "//common:container",
 "//common:options",
 "//common:source",
 "//common/formats:parser_context",
 "//common/types",
 "//common/types:type_providers",
 "//compiler:compiler_builder",
Expand Down

13 changes: 13 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@@ -692,6 +692,19 @@ public static TypeDecl create(String name) {
 return newBuilder().setName(name).build();
 }

 /**
 * Parses a type specifier shorthand string (e.g. {@code "list<int>"}, {@code "map<string,
 * dyn>"}, {@code "list<~T>"}) into a {@link TypeDecl}.
 */
 static TypeDecl parse(String typeSpecifier) {
 return TypeSpecifierParser.parse(typeSpecifier);
 }

 /** Creates a new {@link TypeDecl} representing a type parameter with the provided name. */
 static TypeDecl ofTypeParam(String typeParamName) {
 return newBuilder().setName(typeParamName).setIsTypeParam(true).build();
 }

 public static TypeDecl.Builder newBuilder() {
 return new AutoValue_CelEnvironment_TypeDecl.Builder().setIsTypeParam(false);
 }
Expand Down

33 changes: 18 additions & 15 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@@ -22,7 +22,6 @@
importstaticdev.cel.common.formats.YamlHelper.newString;
importstaticdev.cel.common.formats.YamlHelper.parseYamlSource;
importstaticdev.cel.common.formats.YamlHelper.validateYamlType;
importstaticjava.util.Collections.singletonList;

importcom.google.common.collect.ImmutableList;
importcom.google.common.collect.ImmutableSet;
Expand DownExpand Up@@ -60,7 +59,7 @@
 */
publicfinalclassCelEnvironmentYamlParser {
// Sentinel values to be returned for various declarations when parsing failure is encountered.
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeDecl.create(ERROR);
privatestaticfinalTypeDeclERROR_TYPE_DECL = TypeSpecifierParser.ERROR_TYPE_DECL;
privatestaticfinalVariableDeclERROR_VARIABLE_DECL =
VariableDecl.create(ERROR, ERROR_TYPE_DECL);
privatestaticfinalFunctionDeclERROR_FUNCTION_DECL =
Expand DownExpand Up@@ -335,6 +334,7 @@ private ContextVariable parseContextVariable(ParserContext<Node> ctx, Node node)
NodevalueNode = nodeTuple.getValueNode();
StringkeyName = ((ScalarNode) keyNode).getValue();
switch (keyName) {
case"type":
case"type_name":
typeName = newString(ctx, valueNode);
break;
Expand DownExpand Up@@ -478,7 +478,7 @@ private FunctionDecl parseFunction(ParserContext<Node> ctx, Node node) {
returnbuilder.build();
 }

privatestaticImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
privateImmutableSet<OverloadDecl> parseOverloads(ParserContext<Node> ctx, Nodenode) {
longlistId = ctx.collectMetadata(node);
ImmutableSet.Builder<OverloadDecl> overloadSetBuilder = ImmutableSet.builder();
if (!assertYamlType(ctx, listId, node, YamlNodeType.LIST)) {
Expand DownExpand Up@@ -553,8 +553,7 @@ private static ImmutableList<String> parseOverloadExamples(ParserContext<Node> c
returnbuilder.build();
 }

privatestaticImmutableList<TypeDecl> parseOverloadArguments(
ParserContext<Node> ctx, Nodenode) {
privateImmutableList<TypeDecl> parseOverloadArguments(ParserContext<Node> ctx, Nodenode) {
longlistValueId = ctx.collectMetadata(node);
if (!assertYamlType(ctx, listValueId, node, YamlNodeType.LIST)) {
returnImmutableList.of();
Expand DownExpand Up@@ -791,7 +790,7 @@ private static ImmutableSet<OverloadSelector> parseFunctionOverloadsSelector(
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseInlinedTypeDecl(
privateTypeDecl.BuilderparseInlinedTypeDecl(
ParserContext<Node> ctx, longkeyId, NodekeyNode, NodevalueNode, TypeDecl.Builderbuilder) {
if (!assertYamlType(ctx, keyId, keyNode, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnbuilder;
Expand All@@ -800,24 +799,28 @@ private static TypeDecl.Builder parseInlinedTypeDecl(
// Create a synthetic node to make this behave as if a `type: ` parent node actually exists.
MappingNodemapNode =
newMappingNode(
Tag.MAP, /* value= */singletonList(newNodeTuple(keyNode, valueNode)), FlowStyle.AUTO);
Tag.MAP,
/* value= */ImmutableList.of(newNodeTuple(keyNode, valueNode)),
FlowStyle.AUTO);

returnparseTypeDeclFields(ctx, mapNode, builder);
 }

privatestaticTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
privateTypeDeclparseTypeDecl(ParserContext<Node> ctx, Nodenode) {
longid = ctx.collectMetadata(node);
if (!assertYamlType(ctx, id, node, YamlNodeType.MAP)) {
returnERROR_TYPE_DECL;
if (validateYamlType(node, YamlNodeType.STRING, YamlNodeType.TEXT)) {
returnTypeSpecifierParser.parse(ctx, id, newString(ctx, node));
 }

MappingNodemapNode = (MappingNode) node;
returnparseTypeDeclFields(ctx, mapNode, builder).build();
if (validateYamlType(node, YamlNodeType.MAP)) {
TypeDecl.Builderbuilder = TypeDecl.newBuilder();
returnparseTypeDeclFields(ctx, (MappingNode) node, builder).build();
 }
assertYamlType(ctx, id, node, YamlNodeType.STRING, YamlNodeType.TEXT, YamlNodeType.MAP);
returnERROR_TYPE_DECL;
 }

@CanIgnoreReturnValue
privatestaticTypeDecl.BuilderparseTypeDeclFields(
privateTypeDecl.BuilderparseTypeDeclFields(
ParserContext<Node> ctx, MappingNodemapNode, TypeDecl.Builderbuilder) {
for (NodeTuplenodeTuple : mapNode.getValue()) {
NodekeyNode = nodeTuple.getKeyNode();
Expand Down

200 changes: 200 additions & 0 deletions
bundle/src/main/java/dev/cel/bundle/TypeSpecifierParser.java

View file


Open in desktop

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

package dev.cel.bundle;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.common.formats.ParserContext;

/**
 * Parses a type specifier shorthand string (e.g. {@code "map<string, int>"}, {@code "list<~T>"},
 * {@code "int"}) into a {@link TypeDecl}.
 */
final class TypeSpecifierParser {
 private static final int MAX_RECURSION_DEPTH = 64;
 static final TypeDecl ERROR_TYPE_DECL = TypeDecl.create("*error*");

 private final String text;
 private final int length;
 private int pos;

 static TypeDecl parse(String text) {
 checkNotNull(text);
 TypeSpecifierParser parser = new TypeSpecifierParser(text);
 return parser.parse();
 }

 static TypeDecl parse(ParserContext<?> ctx, long nodeId, String text) {
 checkNotNull(ctx);
 checkNotNull(text);
 try {
 return parse(text);
 } catch (IllegalArgumentException e) {
 ctx.reportError(nodeId, e.getMessage());
 return ERROR_TYPE_DECL;
 }
 }

 private TypeDecl parse() {
 TypeDecl res = parseTypeElem(0);
 skipWhitespace();
 if (pos < length) {
 throw new IllegalArgumentException(
 String.format(
 "unexpected character '%c' at position %d in %s",
 text.charAt(pos), pos, formatQuoted(text)));
 }
 return res;
 }

 private TypeSpecifierParser(String text) {
 this.text = text;
 this.length = text.length();
 this.pos = 0;
 }

 private TypeDecl parseTypeElem(int depth) {
 if (depth > MAX_RECURSION_DEPTH) {
 throw new IllegalArgumentException(
 String.format("exceeded maximum type specifier recursion depth at position %d", pos));
 }
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '~') {
 pos++; // consume '~'
 String id = parseTypeParamIdent();
 return TypeDecl.ofTypeParam(id);
 }
 return parseConcreteType(depth);
 }

 private TypeDecl parseConcreteType(int depth) {
 String id = parseNamespaceIdentifier();
 skipWhitespace();
 if (pos < length && text.charAt(pos) == '<') {
 pos++; // consume '<'
 ImmutableList.Builder<TypeDecl> params = ImmutableList.builder();
 while (true) {
 TypeDecl param = parseTypeElem(depth + 1);
 params.add(param);
 skipWhitespace();
 if (pos < length && text.charAt(pos) == ',') {
 pos++; // consume ','
 continue;
 }
 if (pos < length && text.charAt(pos) == '>') {
 pos++; // consume '>'
 break;
 }
 throw new IllegalArgumentException(
 String.format("expected ',' or '>' at position %d", pos));
 }
 return TypeDecl.newBuilder().setName(id).addParams(params.build()).build();
 }
 return TypeDecl.create(id);
 }

 private String parseNamespaceIdentifier() {
 StringBuilder id = new StringBuilder();
 while (pos < length && text.charAt(pos) != '<') {
 char c = text.charAt(pos);
 if (c == '.') {
 id.append('.');
 pos++; // consume '.'
 }
 String ident = parseIdentifier();
 id.append(ident);
 if (pos < length && text.charAt(pos) != '.') {
 break;
 }
 }
 String identifier = id.toString();
 if (identifier.isEmpty()) {
 throw new IllegalArgumentException(String.format("missing identifier at position %d", pos));
 }
 return identifier;
 }

 private String parseIdentifier() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 int start = pos;
 while (pos < length) {
 char c = text.charAt(pos);
 boolean isValid = (pos == start) ? (isAlpha(c) || c == '_') : (isAlphaNumeric(c) || c == '_');
 if (isValid) {
 pos++;
 continue;
 }
 if (pos == start) {
 throw new IllegalArgumentException(
 String.format("identifier is expected, but '%c' was found at position %d", c, pos));
 }
 break;
 }
 return text.substring(start, pos);
 }

 private String parseTypeParamIdent() {
 if (pos >= length) {
 throw new IllegalArgumentException("unexpected end of input");
 }
 char c = text.charAt(pos);
 if (c < 'A' || c > 'Z') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 c, pos));
 }
 pos++;
 if (pos < length) {
 char next = text.charAt(pos);
 if (isAlphaNumeric(next) || next == '_') {
 throw new IllegalArgumentException(
 String.format(
 "invalid type parameter identifier '%c' at position %d, must be a single character"
 + " from A-Z",
 next, pos));
 }
 }
 return String.valueOf(c);
 }

 private void skipWhitespace() {
 while (pos < length) {
 char c = text.charAt(pos);
 if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
 pos++;
 } else {
 break;
 }
 }
 }

 private static boolean isAlpha(char c) {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

 private static boolean isAlphaNumeric(char c) {
 return isAlpha(c) || (c >= '0' && c <= '9');
 }

 private static String formatQuoted(String s) {
 return "\"" + s + "\"";
 }
}
Loading
Loading