Decouple CelTypeResolver from full protobuf implementation#590

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
Feb 14, 2025
Merged

Decouple CelTypeResolver from full protobuf implementation #590

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
6 changes: 6 additions & 0 deletions runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
name = "type_resolver",
visibility = ["//visibility:public"],
exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
name = "unknown_attributes",
exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down
26 changes: 21 additions & 5 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
name = "cel_type_resolver",
srcs = ["CelTypeResolver.java"],
name = "type_resolver",
srcs = ["TypeResolver.java"],
tags = [
],
deps = [
"//common/types",
"//common/types:type_providers",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)

java_library(
name = "descriptor_type_resolver",
srcs = ["DescriptorTypeResolver.java"],
visibility = ["//visibility:private"],
deps = [
":type_resolver",
"//common/types",
"//common/types:type_providers",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
deps = [
":evaluation_exception",
":metadata",
"//:auto_value",
"//common",
"//common:cel_ast",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
exports = [":base"],
deps = [
":base",
":cel_type_resolver",
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener",
":metadata",
":runtime_helpers",
":type_resolver",
":unknown_attributes",
"//:auto_value",
"//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
tags = [
],
deps = [
":descriptor_type_resolver",
":evaluation_exception",
":evaluation_listener",
":interpreter",
Expand Down
6 changes: 5 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
}

return new CelRuntimeLegacyImpl(
new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
new DefaultInterpreter(
DescriptorTypeResolver.create(),
runtimeTypeProvider,
dispatcher.immutableCopy(),
options),
options,
this);
}
Expand Down
20 changes: 14 additions & 6 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

private final TypeResolver typeResolver;
private final RuntimeTypeProvider typeProvider;
private final Dispatcher dispatcher;
private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
* @param celOptions the configurable flags for adjusting evaluation behavior.
*/
public DefaultInterpreter(
RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
TypeResolver typeResolver,
RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
CelOptions celOptions) {
this.typeResolver = checkNotNull(typeResolver);
this.typeProvider = checkNotNull(typeProvider);
this.dispatcher = checkNotNull(dispatcher);
this.celOptions = celOptions;
this.celOptions = checkNotNull(celOptions);
}

@Override
public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
}

@Immutable
private static final class DefaultInterpretable
implements Interpretable, UnknownTrackingInterpretable {
private final TypeResolver typeResolver;
private final RuntimeTypeProvider typeProvider;
private final Dispatcher.ImmutableCopy dispatcher;
private final Metadata metadata;
private final CelAbstractSyntaxTree ast;
private final CelOptions celOptions;

DefaultInterpretable(
TypeResolver typeResolver,
RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
CelAbstractSyntaxTree ast,
CelOptions celOptions) {
this.typeResolver = checkNotNull(typeResolver);
this.typeProvider = checkNotNull(typeProvider);
this.dispatcher = checkNotNull(dispatcher).immutableCopy();
this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
// Check whether the type exists in the type check map as a 'type'.
Optional<CelType> checkedType = ast.getType(expr.id());
if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
TypeType typeValue = typeResolver.adaptType(checkedType.get());
return IntermediateResult.create(typeValue);
}

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
.setMetadata(metadata, typeExprArg.id())
.build());

CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
CelType checkedTypeValue = typeResolver.adaptType(checkedType);
return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
}

private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down
55 changes: 55 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
* {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
* protobuf message types using descriptors.
*/
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

static DescriptorTypeResolver create() {
return new DescriptorTypeResolver();
}

@Override
TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
checkNotNull(obj);

Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
if (wellKnownTypeType.isPresent()) {
return wellKnownTypeType.get();
}

if (obj instanceof MessageOrBuilder) {
MessageOrBuilder msg = (MessageOrBuilder) obj;
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
}

return super.resolveObjectType(obj, typeCheckedType);
}

private DescriptorTypeResolver() {}
}
62 changes: 42 additions & 20 deletions ...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
* {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
* of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
* {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
* a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
*/
@Immutable
final class CelTypeResolver {
class TypeResolver {

static TypeResolver create() {
return new TypeResolver();
}

// Sentinel runtime value representing the special "type" ident. This ensures following to be
// true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
.put(Duration.class, TypeType.create(SimpleType.DURATION))
.put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
.put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
.put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
.put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
.put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
.put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
.buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
.buildOrThrow();

/** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
TypeType adaptType(CelType typeCheckedType) {
checkNotNull(typeCheckedType);

switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
}
}

/** Resolve the CEL type of the {@code obj}. */
static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
checkNotNull(obj);
Optional<TypeType> resolveWellKnownObjectType(Object obj) {
if (obj instanceof TypeType) {
return RUNTIME_TYPE_TYPE;
return Optional.of(RUNTIME_TYPE_TYPE);
}

Class<?> currentClass = obj.getClass();
TypeType runtimeType = COMMON_TYPES.get(currentClass);
if (runtimeType != null) {
return runtimeType;
TypeType commonType = COMMON_TYPES.get(currentClass);
if (commonType != null) {
return Optional.of(commonType);
}

// Guava's Immutable classes use package-private implementations, such that they require an
// explicit check.
if (ImmutableList.class.isAssignableFrom(currentClass)) {
return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
} else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
}

return Optional.empty();
}

/** Resolve the CEL type of the {@code obj}. */
TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
checkNotNull(obj);
Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
if (wellKnownTypeType.isPresent()) {
return wellKnownTypeType.get();
}

if (obj instanceof MessageOrBuilder) {
MessageOrBuilder msg = (MessageOrBuilder) obj;
if (obj instanceof MessageLiteOrBuilder) {
// TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
}

Class<?> currentClass = obj.getClass();
TypeType runtimeType;

// Handle types that the client may have extended.
while (currentClass != null) {
runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
return newTypeOfType;
}

private CelTypeResolver() {}
TypeResolver() {}
}
1 change: 1 addition & 0 deletions runtime/src/test/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
"//runtime:proto_message_runtime_helpers",
"//runtime:runtime_equality",
"//runtime:runtime_helpers",
"//runtime:type_resolver",
"//runtime:unknown_attributes",
"//runtime:unknown_options",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
2 changes: 1 addition & 1 deletion .../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
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
Decouple CelTypeResolver from full protobuf implementation#590

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

Feb 14, 2025
 Merged


Decouple CelTypeResolver from full protobuf implementation
#590
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


6 changes: 6 additions & 0 deletions
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,12 @@ java_library(
 exports = ["//runtime/src/main/java/dev/cel/runtime:proto_message_runtime_equality"],
)

java_library(
 name = "type_resolver",
 visibility = ["//visibility:public"],
 exports = ["//runtime/src/main/java/dev/cel/runtime:type_resolver"],
)

java_library(
 name = "unknown_attributes",
 exports = ["//runtime/src/main/java/dev/cel/runtime:unknown_attributes"],
Expand Down

26 changes: 21 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,25 @@ INTERPRETER_SOURCES = [
]

java_library(
 name = "cel_type_resolver",
 srcs = ["CelTypeResolver.java"],
 name = "type_resolver",
 srcs = ["TypeResolver.java"],
 tags = [
 ],
 deps = [
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "descriptor_type_resolver",
 srcs = ["DescriptorTypeResolver.java"],
 visibility = ["//visibility:private"],
 deps = [
 ":type_resolver",
 "//common/types",
 "//common/types:type_providers",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -56,8 +72,7 @@ java_library(
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:cel_ast",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -75,12 +90,12 @@ java_library(
 exports = [":base"],
 deps = [
 ":base",
 ":cel_type_resolver",
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helpers",
 ":type_resolver",
 ":unknown_attributes",
 "//:auto_value",
 "//common",
Expand DownExpand Up@@ -243,6 +258,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":descriptor_type_resolver",
 ":evaluation_exception",
 ":evaluation_listener",
 ":interpreter",
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -279,7 +279,11 @@ public CelRuntimeLegacyImpl build() {
 }

 return new CelRuntimeLegacyImpl(
 new DefaultInterpreter(runtimeTypeProvider, dispatcher.immutableCopy(), options),
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options,
 this);
 }
Expand Down

20 changes: 14 additions & 6 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@
@Internal
public final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final CelOptions celOptions;
Expand DownExpand Up@@ -98,31 +99,38 @@ static IntermediateResult create(Object value) {
 * @param celOptions the configurable flags for adjusting evaluation behavior.
 */
 public DefaultInterpreter(
 RuntimeTypeProvider typeProvider, Dispatcher dispatcher, CelOptions celOptions) {
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher);
 this.celOptions = celOptions;
 this.celOptions = checkNotNull(celOptions);
 }

 @Override
 public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 return new DefaultInterpretable(typeProvider, dispatcher, ast, celOptions);
 return new DefaultInterpretable(typeResolver, typeProvider, dispatcher, ast, celOptions);
 }

 @Immutable
 private static final class DefaultInterpretable
 implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
 Dispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.ast = checkNotNull(ast);
Expand DownExpand Up@@ -263,7 +271,7 @@ private IntermediateResult resolveIdent(ExecutionFrame frame, CelExpr expr, Stri
 // Check whether the type exists in the type check map as a 'type'.
 Optional<CelType> checkedType = ast.getType(expr.id());
 if (checkedType.isPresent() && checkedType.get().kind() == CelKind.TYPE) {
 TypeType typeValue = CelTypeResolver.adaptType(checkedType.get());
 TypeType typeValue = typeResolver.adaptType(checkedType.get());
 return IntermediateResult.create(typeValue);
 }

Expand DownExpand Up@@ -643,9 +651,9 @@ private IntermediateResult evalType(ExecutionFrame frame, CelCall callExpr)
 .setMetadata(metadata, typeExprArg.id())
 .build());

 CelType checkedTypeValue = CelTypeResolver.adaptType(checkedType);
 CelType checkedTypeValue = typeResolver.adaptType(checkedType);
 return IntermediateResult.create(
CelTypeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
typeResolver.resolveObjectType(argResult.value(), checkedTypeValue));
 }

 private IntermediateResult evalOptionalOr(ExecutionFrame frame, CelCall callExpr)
Expand Down

55 changes: 55 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorTypeResolver.java

View file


Open in desktop

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

package dev.cel.runtime;

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

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageOrBuilder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.types.TypeType;
import java.util.Optional;

/**
 * {@code DescriptorTypeResolver} extends {@link TypeResolver} and additionally resolves incoming
 * protobuf message types using descriptors.
 */
@Immutable
final class DescriptorTypeResolver extends TypeResolver {

 static DescriptorTypeResolver create() {
 return new DescriptorTypeResolver();
 }

 @Override
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);

 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
 }

 return super.resolveObjectType(obj, typeCheckedType);
 }

 private DescriptorTypeResolver() {}
}

62 changes: 42 additions & 20 deletions
...java/dev/cel/runtime/CelTypeResolver.java → ...in/java/dev/cel/runtime/TypeResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -16,13 +16,14 @@

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

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.CelType;
Expand All@@ -40,15 +41,19 @@
import java.util.Optional;

/**
 * {@code CelTypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part
 * of a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 * {@code TypeResolver} resolves incoming {@link CelType} into {@link TypeType}., either as part of
 * a type call (type('foo'), type(1), etc.) or as a type literal (type, int, string, etc.)
 */
@Immutable
final class CelTypeResolver {
class TypeResolver {

 static TypeResolver create() {
 return new TypeResolver();
 }

 // Sentinel runtime value representing the special "type" ident. This ensures following to be
 // true: type == type(string) && type == type(type("foo"))
private static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);
@VisibleForTesting static final TypeType RUNTIME_TYPE_TYPE = TypeType.create(SimpleType.DYN);

 private static final ImmutableMap<Class<?>, TypeType> COMMON_TYPES =
 ImmutableMap.<Class<?>, TypeType>builder()
Expand All@@ -61,9 +66,7 @@ final class CelTypeResolver {
 .put(Duration.class, TypeType.create(SimpleType.DURATION))
 .put(Timestamp.class, TypeType.create(SimpleType.TIMESTAMP))
 .put(ArrayList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(ImmutableList.class, TypeType.create(ListType.create(SimpleType.DYN)))
 .put(HashMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(ImmutableMap.class, TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)))
 .put(Optional.class, TypeType.create(OptionalType.create(SimpleType.DYN)))
 .buildOrThrow();

Expand All@@ -75,7 +78,7 @@ final class CelTypeResolver {
 .buildOrThrow();

 /** Adapt the type-checked {@link CelType} into a runtime type value {@link TypeType}. */
static TypeType adaptType(CelType typeCheckedType) {
 TypeType adaptType(CelType typeCheckedType) {
 checkNotNull(typeCheckedType);

 switch (typeCheckedType.kind()) {
Expand All@@ -94,25 +97,44 @@ static TypeType adaptType(CelType typeCheckedType) {
 }
 }

 /** Resolve the CEL type of the {@code obj}. */
 static TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> resolveWellKnownObjectType(Object obj) {
 if (obj instanceof TypeType) {
 return RUNTIME_TYPE_TYPE;
 return Optional.of(RUNTIME_TYPE_TYPE);
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType = COMMON_TYPES.get(currentClass);
 if (runtimeType != null) {
 return runtimeType;
 TypeType commonType = COMMON_TYPES.get(currentClass);
 if (commonType != null) {
 return Optional.of(commonType);
 }

 // Guava's Immutable classes use package-private implementations, such that they require an
 // explicit check.
 if (ImmutableList.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(ListType.create(SimpleType.DYN)));
 } else if (ImmutableMap.class.isAssignableFrom(currentClass)) {
 return Optional.of(TypeType.create(MapType.create(SimpleType.DYN, SimpleType.DYN)));
 }

 return Optional.empty();
 }

 /** Resolve the CEL type of the {@code obj}. */
 TypeType resolveObjectType(Object obj, CelType typeCheckedType) {
 checkNotNull(obj);
 Optional<TypeType> wellKnownTypeType = resolveWellKnownObjectType(obj);
 if (wellKnownTypeType.isPresent()) {
 return wellKnownTypeType.get();
 }

 if (obj instanceof MessageOrBuilder) {
 MessageOrBuilder msg = (MessageOrBuilder) obj;
 if (obj instanceof MessageLiteOrBuilder) {
 // TODO: Replace with CelLiteDescriptor
return TypeType.create(StructTypeReference.create(msg.getDescriptorForType().getFullName()));
throw new UnsupportedOperationException("Not implemented yet");
 }

 Class<?> currentClass = obj.getClass();
 TypeType runtimeType;

 // Handle types that the client may have extended.
 while (currentClass != null) {
 runtimeType = EXTENDABLE_TYPES.get(currentClass);
Expand DownExpand Up@@ -151,5 +173,5 @@ private static CelType adaptStructType(StructType typeOfType) {
 return newTypeOfType;
 }

private CelTypeResolver() {}
TypeResolver() {}
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ java_library(
 "//runtime:proto_message_runtime_helpers",
 "//runtime:runtime_equality",
 "//runtime:runtime_helpers",
 "//runtime:type_resolver",
 "//runtime:unknown_attributes",
 "//runtime:unknown_options",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

2 changes: 1 addition & 1 deletion
.../dev/cel/runtime/CelTypeResolverTest.java → ...l/runtime/DescriptorTypeResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class CelTypeResolverTest {
public class DescriptorTypeResolverTest {

 private static final ProtoMessageTypeProvider PROTO_MESSAGE_TYPE_PROVIDER =
 new ProtoMessageTypeProvider(ImmutableList.of(TestAllTypes.getDescriptor()));
Expand Down
Loading