Create CelProtoTypes utility class to handle CelExpr in proto format#524

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
Dec 5, 2024
Merged

Create CelProtoTypes utility class to handle CelExpr in proto format #524

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: 1 addition & 1 deletion bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
"//common/resources/testdata/proto3:standalone_global_enum_java_proto",
"//common/testing",
"//common/types",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:message_type_provider",
"//common/types:type_providers",
"//compiler",
Expand Down
71 changes: 37 additions & 34 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
private static final CheckedExpr CHECKED_EXPR =
CheckedExpr.newBuilder()
.setExpr(EXPR)
.putTypeMap(1L, CelTypes.BOOL)
.putTypeMap(2L, CelTypes.BOOL)
.putTypeMap(3L, CelTypes.BOOL)
.putTypeMap(4L, CelTypes.BOOL)
.putTypeMap(1L, CelProtoTypes.BOOL)
.putTypeMap(2L, CelProtoTypes.BOOL)
.putTypeMap(3L, CelProtoTypes.BOOL)
.putTypeMap(4L, CelProtoTypes.BOOL)
.putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
.putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
.build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
.addFile(AttributeContext.getDescriptor().getFile().toProto())
.build())
.setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
.build());
assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
}
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
public void compile(boolean useProtoResultType) throws Exception {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelTypes.BOOL);
celBuilder.setProtoResultType(CelProtoTypes.BOOL);
} else {
celBuilder.setResultType(SimpleType.BOOL);
}
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
CelBuilder celBuilder = standardCelBuilderWithMacros();
if (useProtoResultType) {
celBuilder.setProtoResultType(CelTypes.STRING);
celBuilder.setProtoResultType(CelProtoTypes.STRING);
} else {
celBuilder.setResultType(SimpleType.STRING);
}
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
.addProtoTypeMasks(
ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
.addVar("condition", StructTypeReference.create("google.type.Expr"))
.setProtoResultType(CelTypes.BOOL)
.setProtoResultType(CelProtoTypes.BOOL)
.build();
CelValidationResult result =
cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
// However, the first type resolution from the alias to the qualified type name won't be
// sufficient as future checks will expect the resolved alias to also be a type.
TypeProvider customTypeProvider =
aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
aliasingProvider(
ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

// The registration of the aliasing TypeProvider and the google.type.Expr descriptor
// ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
aliasingProvider(
ImmutableMap.of(
"Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
"google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

// The registration of the aliasing TypeProvider and the google.type.Expr descriptor
// ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
.setIdent(
IdentDecl.newBuilder()
.setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
.build())
.setResultType(SimpleType.BOOL)
.build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
ImmutableList.of(
Decl.newBuilder()
.setName("one")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
.build(),
Decl.newBuilder()
.setName("two")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
.build(),
Decl.newBuilder()
.setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
.addOverloads(
Overload.newBuilder()
.setOverloadId("any_bool")
.addParams(CelTypes.BOOL)
.setResultType(CelTypes.BOOL))
.addParams(CelProtoTypes.BOOL)
.setResultType(CelProtoTypes.BOOL))
.addOverloads(
Overload.newBuilder()
.setOverloadId("any_bool_bool")
.addParams(CelTypes.BOOL)
.addParams(CelTypes.BOOL)
.setResultType(CelTypes.BOOL))
.addParams(CelProtoTypes.BOOL)
.addParams(CelProtoTypes.BOOL)
.setResultType(CelProtoTypes.BOOL))
.addOverloads(
Overload.newBuilder()
.setOverloadId("any_bool_bool_bool")
.addParams(CelTypes.BOOL)
.addParams(CelTypes.BOOL)
.addParams(CelTypes.BOOL)
.setResultType(CelTypes.BOOL)))
.addParams(CelProtoTypes.BOOL)
.addParams(CelProtoTypes.BOOL)
.addParams(CelProtoTypes.BOOL)
.setResultType(CelProtoTypes.BOOL)))
.build()))
.addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
.addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
.addOverloads(
Overload.newBuilder()
.setOverloadId("throws")
.setResultType(CelTypes.BOOL)))
.setResultType(CelProtoTypes.BOOL)))
.build())
.addFunctionBindings(
CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
.addOverloads(
Overload.newBuilder()
.setOverloadId("throws")
.setResultType(CelTypes.BOOL)))
.setResultType(CelProtoTypes.BOOL)))
.build())
.addFunctionBindings(
CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
.setIdent(
IdentDecl.newBuilder()
.setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
"google.rpc.context.AttributeContext.Resource")))
.build())
.setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
.addDeclarations(
Decl.newBuilder()
.setName("variable")
.setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
.build())
.setResultType(SimpleType.BOOL)
.build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
Cel cel =
standardCelBuilderWithMacros()
.addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
.addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
.build();
CelValidationException exception =
assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
public @Nullable Type lookupType(String typeName) {
Type alias = typeAliases.get(typeName);
if (alias != null) {
return CelTypes.create(alias);
return CelProtoTypes.create(alias);
}
return null;
}
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
@Override
public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
if (typeAliases.containsKey(type.getMessageType())) {
return TypeProvider.FieldType.of(CelTypes.STRING);
return TypeProvider.FieldType.of(CelProtoTypes.STRING);
}
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
"//common/internal:env_visitor",
"//common/internal:errors",
"//common/types",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:message_type_provider",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down
6 changes: 3 additions & 3 deletions checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
CelIdentDecl.Builder identBuilder =
CelIdentDecl.newBuilder()
.setName(decl.getName())
.setType(CelTypes.typeToCelType(decl.getIdent().getType()))
.setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
// Note: Setting doc and constant value exists for compatibility reason. This
// should not be set by the users.
.setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
@Override
public CelCheckerBuilder setProtoResultType(Type resultType) {
checkNotNull(resultType);
return setResultType(CelTypes.typeToCelType(resultType));
return setResultType(CelProtoTypes.typeToCelType(resultType));
}

@Override
Expand Down
1 change: 1 addition & 0 deletions checker/src/test/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
"//common/internal:errors",
"//common/resources/testdata/proto3:standalone_global_enum_java_proto",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:json",
"//common/types:message_type_provider",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading

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

Skip to content
Create CelProtoTypes utility class to handle CelExpr in proto format#524

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

Dec 5, 2024
 Merged


Create CelProtoTypes utility class to handle CelExpr in proto format
#524
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: 1 addition & 1 deletion
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/testing",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "//compiler",
Expand Down

71 changes: 37 additions & 34 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
Expand DownExpand Up@@ -157,10 +157,10 @@ public final class CelImplTest {
 private static final CheckedExpr CHECKED_EXPR =
 CheckedExpr.newBuilder()
 .setExpr(EXPR)
 .putTypeMap(1L, CelTypes.BOOL)
 .putTypeMap(2L, CelTypes.BOOL)
 .putTypeMap(3L, CelTypes.BOOL)
 .putTypeMap(4L, CelTypes.BOOL)
 .putTypeMap(1L, CelProtoTypes.BOOL)
 .putTypeMap(2L, CelProtoTypes.BOOL)
 .putTypeMap(3L, CelProtoTypes.BOOL)
 .putTypeMap(4L, CelProtoTypes.BOOL)
 .putReferenceMap(2L, Reference.newBuilder().addOverloadId("logical_and").build())
 .putReferenceMap(3L, Reference.newBuilder().addOverloadId("logical_not").build())
 .build();
Expand DownExpand Up@@ -194,7 +194,7 @@ public void build_badFileDescriptorSet() {
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
CelTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand All@@ -220,7 +220,7 @@ public void check() throws Exception {
 public void compile(boolean useProtoResultType) throws Exception {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.BOOL);
 celBuilder.setProtoResultType(CelProtoTypes.BOOL);
 } else {
 celBuilder.setResultType(SimpleType.BOOL);
 }
Expand All@@ -234,7 +234,7 @@ public void compile(boolean useProtoResultType) throws Exception {
 public void compile_resultTypeCheckFailure(boolean useProtoResultType) {
 CelBuilder celBuilder = standardCelBuilderWithMacros();
 if (useProtoResultType) {
 celBuilder.setProtoResultType(CelTypes.STRING);
 celBuilder.setProtoResultType(CelProtoTypes.STRING);
 } else {
 celBuilder.setResultType(SimpleType.STRING);
 }
Expand All@@ -258,7 +258,7 @@ public void compile_combinedTypeProvider() {
 .addProtoTypeMasks(
 ImmutableList.of(ProtoTypeMask.ofAllFields("google.rpc.context.AttributeContext")))
 .addVar("condition", StructTypeReference.create("google.type.Expr"))
 .setProtoResultType(CelTypes.BOOL)
 .setProtoResultType(CelProtoTypes.BOOL)
 .build();
 CelValidationResult result =
 cel.compile("type.Expr{expression: \"'hello'\"}.expression == condition.expression");
Expand DownExpand Up@@ -290,7 +290,8 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 // However, the first type resolution from the alias to the qualified type name won't be
 // sufficient as future checks will expect the resolved alias to also be a type.
 TypeProvider customTypeProvider =
 aliasingProvider(ImmutableMap.of("Condition", CelTypes.createMessage("google.type.Expr")));
 aliasingProvider(
 ImmutableMap.of("Condition", CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -322,9 +323,9 @@ public void compile_customTypesWithAliasingSelfContainedProvider() throws Except
 aliasingProvider(
 ImmutableMap.of(
 "Condition",
CelTypes.createMessage("google.type.Expr"),
CelProtoTypes.createMessage("google.type.Expr"),
 "google.type.Expr",
CelTypes.createMessage("google.type.Expr")));
CelProtoTypes.createMessage("google.type.Expr")));

 // The registration of the aliasing TypeProvider and the google.type.Expr descriptor
 // ensures that once the alias is resolved, the additional details about the Expr type
Expand DownExpand Up@@ -500,12 +501,14 @@ public void compile_overlappingVarsFailure() {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.createList(CelTypes.STRING)))
 .setIdent(
 IdentDecl.newBuilder()
 .setType(CelProtoTypes.createList(CelProtoTypes.STRING)))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -529,7 +532,7 @@ public void program_withVars() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand All@@ -545,7 +548,7 @@ public void program_withCelValue() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -655,11 +658,11 @@ public void program_withFunctions() throws Exception {
 ImmutableList.of(
 Decl.newBuilder()
 .setName("one")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("two")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.BOOL))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.BOOL))
 .build(),
 Decl.newBuilder()
 .setName("any")
Expand All@@ -668,21 +671,21 @@ public void program_withFunctions() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool")
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL))
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("any_bool_bool_bool")
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .addParams(CelTypes.BOOL)
 .setResultType(CelTypes.BOOL)))
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .addParams(CelProtoTypes.BOOL)
 .setResultType(CelProtoTypes.BOOL)))
 .build()))
 .addFunctionBindings(CelFunctionBinding.from("any_bool", Boolean.class, (arg) -> arg))
 .addFunctionBindings(
Expand DownExpand Up@@ -716,7 +719,7 @@ public void program_withThrowingFunction() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -744,7 +747,7 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 .addOverloads(
 Overload.newBuilder()
 .setOverloadId("throws")
 .setResultType(CelTypes.BOOL)))
 .setResultType(CelProtoTypes.BOOL)))
 .build())
 .addFunctionBindings(
 CelFunctionBinding.from(
Expand DownExpand Up@@ -960,7 +963,7 @@ public void program_protoActivation() throws Exception {
 .setIdent(
 IdentDecl.newBuilder()
 .setType(
CelTypes.createMessage(
CelProtoTypes.createMessage(
 "google.rpc.context.AttributeContext.Resource")))
 .build())
 .setResultType(SimpleType.STRING)
Expand DownExpand Up@@ -1107,7 +1110,7 @@ public void program_customVarResolver() throws Exception {
 .addDeclarations(
 Decl.newBuilder()
 .setName("variable")
 .setIdent(IdentDecl.newBuilder().setType(CelTypes.STRING))
 .setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
 .build())
 .setResultType(SimpleType.BOOL)
 .build();
Expand DownExpand Up@@ -1150,7 +1153,7 @@ public void program_messageTypeAddedAsVarWithoutDescriptor_throwsHumanReadableEr
 String packageName = CheckedExpr.getDescriptor().getFile().getPackage();
 Cel cel =
 standardCelBuilderWithMacros()
 .addVar("parsedExprVar", CelTypes.createMessage(ParsedExpr.getDescriptor()))
 .addVar("parsedExprVar", CelProtoTypes.createMessage(ParsedExpr.getDescriptor()))
 .build();
 CelValidationException exception =
 assertThrows(
Expand DownExpand Up@@ -2056,7 +2059,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 public @Nullable Type lookupType(String typeName) {
 Type alias = typeAliases.get(typeName);
 if (alias != null) {
 return CelTypes.create(alias);
 return CelProtoTypes.create(alias);
 }
 return null;
 }
Expand All@@ -2069,7 +2072,7 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
 @Override
 public TypeProvider.@Nullable FieldType lookupFieldType(Type type, String fieldName) {
 if (typeAliases.containsKey(type.getMessageType())) {
 return TypeProvider.FieldType.of(CelTypes.STRING);
 return TypeProvider.FieldType.of(CelProtoTypes.STRING);
 }
 return null;
 }
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ java_library(
 "//common/internal:env_visitor",
 "//common/internal:errors",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
Expand Down

6 changes: 3 additions & 3 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,9 +45,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ProtoMessageTypeProvider;
import java.util.ArrayList;
import java.util.Arrays;
Expand DownExpand Up@@ -199,7 +199,7 @@ public CelCheckerBuilder addDeclarations(Iterable<Decl> declarations) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This
 // should not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -278,7 +278,7 @@ public CelCheckerBuilder setResultType(CelType resultType) {
 @Override
 public CelCheckerBuilder setProtoResultType(Type resultType) {
 checkNotNull(resultType);
 return setResultType(CelTypes.typeToCelType(resultType));
 return setResultType(CelProtoTypes.typeToCelType(resultType));
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ java_library(
 "//common/internal:errors",
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
Expand Down
Loading