Remove deprecated ExprFeatures#557

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
Jan 22, 2025
Merged

Remove deprecated ExprFeatures #557

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
"//:auto_value",
"//common",
"//common:compiler_common",
"//common:features",
"//common:options",
"//common:proto_ast",
"//common/annotations",
Expand Down
110 changes: 30 additions & 80 deletions checker/src/main/java/dev/cel/checker/Env.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
/** CEL Feature flags. */
private final CelOptions celOptions;

private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
CelOptions.newBuilder()
.disableCelStandardEquality(false)
.enableNamespacedDeclarations(false)
.build();

private Env(
Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
}

/**
* Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
* operators with a reference to the feature flags enabled in the environment.
*
* @deprecated use {@code unconfigured} with {@code CelOptions} instead.
*/
@Deprecated
public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
}

/**
* Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
* operators using a custom {@code typeProvider}.
*
* @deprecated use {@code unconfigured} with {@code CelOptions} instead.
*/
@Deprecated
public static Env unconfigured(
Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
}

/**
* Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
* operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
* provided.
*
* @deprecated use {@code unconfigured} with {@code CelOptions} instead.
* @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
* See {@code CelCompilerFactory}.
*/
@Deprecated
public static Env unconfigured(
Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
public static Env unconfigured(Errors errors) {
return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
}

/**
* Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
* operators with a reference to the configured {@code celOptions}.
*/
public static Env unconfigured(Errors errors, CelOptions celOptions) {
@VisibleForTesting
static Env unconfigured(Errors errors, CelOptions celOptions) {
return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
}

/**
* Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
* operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
*/
public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
return new Env(errors, typeProvider, new DeclGroup(), celOptions);
}

/**
* Creates an {@code Env} value configured with the standard types, functions, and operators with
* a reference to the set of {@code exprFeatures} enabled in the environment.
*
* <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
* subsequent declarations.
* operators using a custom {@code typeProvider}.
*
* @deprecated use {@code standard} with {@code CelOptions} instead.
* @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
* See {@code CelCompilerFactory}.
*/
@Deprecated
public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
return standard(errors, new DescriptorTypeProvider(), exprFeatures);
public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
return new Env(errors, typeProvider, new DeclGroup(), celOptions);
}

/**
* Creates an {@code Env} value configured with the standard types, functions, and operators,
* configured with a custom {@code typeProvider}.
*
* <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
* subsequent declarations with the same signature.
*
* @deprecated use {@code standard} with {@code CelOptions} instead.
* @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
* See {@code CelCompilerFactory}.
*/
@Deprecated
public static Env standard(
Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
public static Env standard(Errors errors) {
return standard(errors, new DescriptorTypeProvider());
}

/**
* Creates an {@code Env} value configured with the standard types, functions, and operators,
* configured with a custom {@code typeProvider} and a reference to the set of {@code
* exprFeatures} enabled in the environment.
*
* <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
* subsequent declarations with the same signature.
*
* @deprecated use {@code standard} with {@code CelOptions} instead.
* @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
* See {@code CelCompilerFactory}.
*/
@Deprecated
public static Env standard(
Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
}

/**
* Creates an {@code Env} value configured with the standard types, functions, and operators and a
* reference to the configured {@code celOptions}.
*
* <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
* subsequent declarations with the same signature.
*/
public static Env standard(Errors errors, CelOptions celOptions) {
return standard(errors, new DescriptorTypeProvider(), celOptions);
public static Env standard(Errors errors, TypeProvider typeProvider) {
return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
}

/**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
*
* <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
* subsequent declarations with the same signature.
*
* @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
* See {@code CelCompilerFactory}.
*/
@Deprecated
public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
CelStandardDeclarations celStandardDeclaration =
CelStandardDeclarations.newBuilder()
Expand Down
5 changes: 0 additions & 5 deletions common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
name = "features",
exports = ["//common/src/main/java/dev/cel/common:features"],
)

java_library(
name = "proto_ast",
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
Expand Down
11 changes: 0 additions & 11 deletions common/src/main/java/dev/cel/common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
tags = [
],
deps = [
":features",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "features",
srcs = ["ExprFeatures.java"],
tags = [
],
deps = [
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "proto_ast",
srcs = PROTO_AST_SOURCE,
Expand Down
82 changes: 0 additions & 82 deletions common/src/main/java/dev/cel/common/CelOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
if (enableCompileTimeOverloadResolution()) {
features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
}
if (disableCelStandardEquality()) {
features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
}
if (enableHomogeneousLiterals()) {
features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
}
if (enableRegexPartialMatch()) {
features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
}
if (enableReservedIds()) {
features.add(ExprFeatures.RESERVED_IDS);
}
if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
}
if (retainRepeatedUnaryOperators()) {
features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
}
if (retainUnbalancedLogicalExpressions()) {
features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
}
if (errorOnIntWrap()) {
features.add(ExprFeatures.ERROR_ON_WRAP);
}
if (errorOnDuplicateMapKeys()) {
features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
}
if (populateMacroCalls()) {
features.add(ExprFeatures.POPULATE_MACRO_CALLS);
}
if (enableTimestampEpoch()) {
features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
}
if (enableHeterogeneousNumericComparisons()) {
features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
}
if (enableNamespacedDeclarations()) {
features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
}
if (enableUnsignedLongs()) {
features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
}
if (enableProtoDifferencerEquality()) {
features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
}

return features.build();
}

/**
* Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
* both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
.disableCelStandardEquality(false);
}

public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
return newBuilder()
.enableCompileTimeOverloadResolution(
features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
.disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
.enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
.enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
.enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
.enableUnsignedComparisonAndArithmeticIsUnsigned(
features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
.retainRepeatedUnaryOperators(
features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
.retainUnbalancedLogicalExpressions(
features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
.errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
.errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
.populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
.enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
.enableHeterogeneousNumericComparisons(
features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
.enableNamespacedDeclarations(
features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
.enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
.enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
.build();
}

/** Builder for configuring the {@code CelOptions}. */
@AutoValue.Builder
public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
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
Remove deprecated ExprFeatures#557

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

Jan 22, 2025
 Merged


Remove deprecated ExprFeatures
#557
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ java_library(
 "//:auto_value",
 "//common",
 "//common:compiler_common",
 "//common:features",
 "//common:options",
 "//common:proto_ast",
 "//common/annotations",
Expand Down

110 changes: 30 additions & 80 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import dev.cel.expr.Expr;
import dev.cel.expr.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All@@ -32,7 +33,6 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ExprFeatures;
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
Expand DownExpand Up@@ -97,6 +97,12 @@ public class Env {
 /** CEL Feature flags. */
 private final CelOptions celOptions;

 private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
 CelOptions.newBuilder()
 .disableCelStandardEquality(false)
 .enableNamespacedDeclarations(false)
 .build();

 private Env(
 Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
 this.celOptions = celOptions;
Expand All@@ -106,111 +112,51 @@ private Env(
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the feature flags enabled in the environment.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
 return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
 * provided.
 *
 * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env unconfigured(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 public static Env unconfigured(Errors errors) {
 return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators with a reference to the configured {@code celOptions}.
 */
 public static Env unconfigured(Errors errors, CelOptions celOptions) {
 @VisibleForTesting
 static Env unconfigured(Errors errors, CelOptions celOptions) {
 return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
 }

 /**
 * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
 * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
 */
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators with
 * a reference to the set of {@code exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations.
 * operators using a custom {@code typeProvider}.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
 return standard(errors, new DescriptorTypeProvider(), exprFeatures);
 public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 return new Env(errors, typeProvider, new DeclGroup(), celOptions);
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
 return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
 public static Env standard(Errors errors) {
 return standard(errors, new DescriptorTypeProvider());
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators,
 * configured with a custom {@code typeProvider} and a reference to the set of {@code
 * exprFeatures} enabled in the environment.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated use {@code standard} with {@code CelOptions} instead.
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(
 Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
 return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
 }

 /**
 * Creates an {@code Env} value configured with the standard types, functions, and operators and a
 * reference to the configured {@code celOptions}.
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 */
 public static Env standard(Errors errors, CelOptions celOptions) {
 return standard(errors, new DescriptorTypeProvider(), celOptions);
 public static Env standard(Errors errors, TypeProvider typeProvider) {
 return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
 }

 /**
Expand All@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
 *
 * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
 * subsequent declarations with the same signature.
 *
 * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
 * See {@code CelCompilerFactory}.
 */
 @Deprecated
 public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
 CelStandardDeclarations celStandardDeclaration =
 CelStandardDeclarations.newBuilder()
Expand Down

5 changes: 0 additions & 5 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,11 +25,6 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common:options"],
)

java_library(
 name = "features",
 exports = ["//common/src/main/java/dev/cel/common:features"],
)

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

11 changes: 0 additions & 11 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,23 +95,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":features",
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "features",
 srcs = ["ExprFeatures.java"],
 tags = [
 ],
 deps = [
 "@maven//:com_google_guava_guava",
 ],
)

java_library(
 name = "proto_ast",
 srcs = PROTO_AST_SOURCE,
Expand Down

82 changes: 0 additions & 82 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.common;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;

Expand DownExpand Up@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
 ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
 if (enableCompileTimeOverloadResolution()) {
 features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
 }
 if (disableCelStandardEquality()) {
 features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
 }
 if (enableHomogeneousLiterals()) {
 features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
 }
 if (enableRegexPartialMatch()) {
 features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
 }
 if (enableReservedIds()) {
 features.add(ExprFeatures.RESERVED_IDS);
 }
 if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
 features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
 }
 if (retainRepeatedUnaryOperators()) {
 features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
 }
 if (retainUnbalancedLogicalExpressions()) {
 features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
 }
 if (errorOnIntWrap()) {
 features.add(ExprFeatures.ERROR_ON_WRAP);
 }
 if (errorOnDuplicateMapKeys()) {
 features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
 }
 if (populateMacroCalls()) {
 features.add(ExprFeatures.POPULATE_MACRO_CALLS);
 }
 if (enableTimestampEpoch()) {
 features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
 }
 if (enableHeterogeneousNumericComparisons()) {
 features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
 }
 if (enableNamespacedDeclarations()) {
 features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
 }
 if (enableUnsignedLongs()) {
 features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
 }
 if (enableProtoDifferencerEquality()) {
 features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
 }

 return features.build();
 }

 /**
 * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
 * both good and bad, of the original CEL implementation.
Expand DownExpand Up@@ -240,33 +185,6 @@ public static Builder current() {
 .disableCelStandardEquality(false);
 }

 public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
 return newBuilder()
 .enableCompileTimeOverloadResolution(
 features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
 .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
 .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
 .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
 .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
 .enableUnsignedComparisonAndArithmeticIsUnsigned(
 features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
 .retainRepeatedUnaryOperators(
 features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
 .retainUnbalancedLogicalExpressions(
 features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
 .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
 .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
 .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
 .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
 .enableHeterogeneousNumericComparisons(
 features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
 .enableNamespacedDeclarations(
 features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
 .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
 .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
 .build();
 }

 /** Builder for configuring the {@code CelOptions}. */
 @AutoValue.Builder
 public abstract static class Builder {
Expand Down
Loading