Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,6 @@ java_library(
],
)

java_library(
name = "cel_experimental_factory",
visibility = ["//:internal"],
exports = [
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
],
)

java_library(
name = "environment",
exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],
Expand Down
19 changes: 0 additions & 19 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ java_library(
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)
Expand All@@ -54,22 +53,6 @@ java_library(
"//compiler:compiler_builder",
"//parser",
"//runtime",
],
)

java_library(
name = "cel_experimental_factory",
srcs = ["CelExperimentalFactory.java"],
tags = [
],
deps = [
":cel",
":cel_impl",
"//checker",
"//common:options",
"//common/annotations",
"//compiler",
"//parser",
"//runtime:runtime_planner_impl",
],
)
Expand DownExpand Up@@ -117,7 +100,6 @@ java_library(
tags = [
],
deps = [
":cel_factory",
":environment_exception",
":required_fields_checker",
"//:auto_value",
Expand DownExpand Up@@ -190,7 +172,6 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//compiler:compiler_builder",
"//extensions",
Expand Down
57 changes: 0 additions & 57 deletions bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

This file was deleted.

25 changes: 25 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.parser.CelParserImpl;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeImpl;
import dev.cel.runtime.CelRuntimeLegacyImpl;

/** Helper class to configure the entire CEL stack in a common interface. */
Expand All@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
* of expressions using the Program Planner.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
* supplying type-checked expressions, this architecture handles both parsed-only and
* type-checked expressions.
* </ul>
*/
public static CelBuilder plannerCelBuilder() {
return CelImpl.newBuilder(
CelCompilerImpl.newBuilder(
CelParserImpl.newBuilder(),
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

/** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
return CelImpl.combine(celCompiler, celRuntime);
Expand Down
1 change: 0 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ java_library(
deps = [
"//:java_truth",
"//bundle:cel",
"//bundle:cel_experimental_factory",
"//common:cel_ast",
"//common:cel_exception",
"//common:compiler_common",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
Expand DownExpand Up@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
switch (testMode) {
case PLANNER_PARSE_ONLY:
case PLANNER_CHECKED:
celBuilder = CelExperimentalFactory.plannerCelBuilder();
celBuilder = CelFactory.plannerCelBuilder();
break;
case LEGACY_CHECKED:
celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 0 additions & 2 deletions publish/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
"//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_factory",
"//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
"//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
Expand DownExpand Up@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
# keep sorted
BUNDLE_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
"//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
"//bundle/src/main/java/dev/cel/bundle:environment",
"//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
]
Expand Down
8 changes: 0 additions & 8 deletions runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,6 @@ java_library(
],
)

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

java_library(
name = "runtime_legacy_impl",
visibility = ["//:internal"],
Expand Down
12 changes: 0 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -916,20 +916,8 @@ java_library(
deps = [
":runtime",
":runtime_legacy_impl",
"//common:options",
],
)

java_library(
name = "runtime_experimental_factory",
srcs = ["CelRuntimeExperimentalFactory.java"],
tags = [
],
deps = [
":runtime",
":runtime_planner_impl",
"//common:options",
"//common/annotations",
],
)

Expand Down

This file was deleted.

19 changes: 19 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
.setStandardEnvironmentEnabled(true);
}

/**
* Create a new builder for constructing a {@code CelRuntime} instance.
*
* <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
* #standardCelRuntimeBuilder()}:
*
* <ul>
* <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
* <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
* #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
* this architecture handles both parsed-only and type-checked expressions.
* </ul>
*/
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeFactory() {}
}
3 changes: 2 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(

@Override
public CelRuntime build() {
assertAllowedCelOptions(options());
CelOptions options = options();
assertAllowedCelOptions(options);
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());

Expand Down
1 change: 0 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,6 @@ java_library(
"//extensions",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_experimental_factory",
"//runtime:unknown_attributes",
"//testing:base_interpreter_test",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {

@Override
protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
return CelRuntimeFactory.plannerRuntimeBuilder()
.addLateBoundFunctions("record")
.setOptions(celOptions)
.addLibraries(CelExtensions.optional())
Expand Down
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:junit_junit",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -113,6 +112,5 @@ java_library(
],
deps = [
"//bundle:cel",
"//bundle:cel_experimental_factory",
],
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
package dev.cel.testing;

import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelExperimentalFactory;
import dev.cel.bundle.CelFactory;

/** Enumeration of supported CEL runtime environments for testing. */
Expand All@@ -29,7 +28,7 @@ public CelBuilder builder() {
PLANNER {
@Override
public CelBuilder builder() {
return CelExperimentalFactory.plannerCelBuilder();
return CelFactory.plannerCelBuilder();
}
};

Expand Down
Loading