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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
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
53 changes: 0 additions & 53 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -1991,59 +1991,6 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception
assertThat(result.attributes()).isEmpty();
}

@Test
@TestParameters("{expression: 'string(123)'}")
@TestParameters("{expression: 'string(123u)'}")
@TestParameters("{expression: 'string(1.5)'}")
@TestParameters("{expression: 'string(\"foo\")'}")
@TestParameters("{expression: 'string(b\"foo\")'}")
@TestParameters("{expression: 'string(timestamp(100))'}")
@TestParameters("{expression: 'string(duration(\"1h\"))'}")
public void program_stringConversionDisabled_throws(String expression) throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableStringConversion(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile(expression).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function 'string'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_stringConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableStringConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("'foo' + 'bar'").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_listConcatenationDisabled_throws() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableListConcatenation(false).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("[1] + [2]").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e).hasMessageThat().contains("No matching overload for function '_+_'");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.OVERLOAD_NOT_FOUND);
}

@Test
public void program_comprehensionDisabled_throws() throws Exception {
Cel cel =
Expand Down
27 changes: 0 additions & 27 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,6 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean enableStringConversion();

public abstract boolean enableStringConcatenation();

public abstract boolean enableListConcatenation();

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();
Expand DownExpand Up@@ -169,9 +163,6 @@ public static Builder newBuilder() {
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true)
.maxRegexProgramSize(-1);
}
Expand DownExpand Up@@ -494,24 +485,6 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* Enables string() overloads for the runtime. This option exists to maintain parity with
* cel-cpp interpreter options.
*/
public abstract Builder enableStringConversion(boolean value);

/**
* Enables string concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableStringConcatenation(boolean value);

/**
* Enables list concatenation overload for the runtime. This option exists to maintain parity
* with cel-cpp interpreter options.
*/
public abstract Builder enableListConcatenation(boolean value);

/**
* Enables comprehension (macros) for the runtime. Setting false has the same effect with
* assigning 0 for {@link #comprehensionMaxIterations()}. This option exists to maintain parity
Expand Down
14 changes: 0 additions & 14 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,20 +338,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {

// Disallowed options in favor of subsetting
String subsettingError = "Subset the environment instead using setStandardFunctions method.";
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableStringConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix + "enableStringConversion cannot be disabled. " + subsettingError);
}

if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix + "enableListConcatenation cannot be disabled. " + subsettingError);
}

if (!celOptions.enableTimestampEpoch()) {
throw new IllegalArgumentException(
Expand Down
11 changes: 0 additions & 11 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.standard.AddOperator.AddOverload;
import dev.cel.runtime.standard.IntFunction.IntOverload;
import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
import java.util.Arrays;
Expand DownExpand Up@@ -381,16 +380,6 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
return options.enableTimestampEpoch();
}
break;
case STRING:
return options.enableStringConversion();
case ADD:
if (standardOverload.equals(AddOverload.ADD_STRING)) {
return options.enableStringConcatenation();
}
if (standardOverload.equals(AddOverload.ADD_LIST)) {
return options.enableListConcatenation();
}
break;
default:
if (!options.enableHeterogeneousNumericComparisons()) {
return !CelStandardFunctions.isHeterogeneousComparison(
Expand Down
23 changes: 1 addition & 22 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,24 +132,6 @@ private static void assertAllowedCelOptions(CelOptions celOptions) {
throw new IllegalArgumentException(
prefix + "unwrapWellKnownTypesOnFunctionDispatch cannot be disabled.");
}
if (!celOptions.enableStringConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConcatenation cannot be disabled. Subset the environment instead"
+ " using setStandardFunctions method.");
}
if (!celOptions.enableStringConversion()) {
throw new IllegalArgumentException(
prefix
+ "enableStringConversion cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
if (!celOptions.enableListConcatenation()) {
throw new IllegalArgumentException(
prefix
+ "enableListConcatenation cannot be disabled. Subset the environment instead using"
+ " setStandardFunctions method.");
}
}

@Override
Expand DownExpand Up@@ -201,10 +183,7 @@ public CelLiteRuntime build() {
}

private Builder() {
this.celOptions =
CelOptions.current()
.enableCelValue(true)
.build();
this.celOptions = CelOptions.current().enableCelValue(true).build();
this.celValueProvider = (structType, fields) -> Optional.empty();
this.customFunctionBindings = new HashMap<>();
this.standardFunctionBuilder = ImmutableSet.builder();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -715,9 +715,6 @@ private enum CelOptionsTestCase {
CEL_VALUE_DISABLED(newBaseTestOptions().enableCelValue(false).build()),
UNSIGNED_LONG_DISABLED(newBaseTestOptions().enableUnsignedLongs(false).build()),
UNWRAP_WKT_DISABLED(newBaseTestOptions().unwrapWellKnownTypesOnFunctionDispatch(false).build()),
STRING_CONCAT_DISABLED(newBaseTestOptions().enableStringConcatenation(false).build()),
STRING_CONVERSION_DISABLED(newBaseTestOptions().enableStringConversion(false).build()),
LIST_CONCATENATION_DISABLED(newBaseTestOptions().enableListConcatenation(false).build()),
;

private final CelOptions celOptions;
Expand Down
Loading