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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int
, '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
1 change: 1 addition & 0 deletions bundle/src/main/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ java_library(
name = "environment_yaml_parser",
srcs = [
"CelEnvironmentYamlParser.java",
"CelEnvironmentYamlSerializer.java",
],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/CelEnvironment.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public static Builder newBuilder() {
.setVariables(ImmutableSet.of())
.setFunctions(ImmutableSet.of());
}

/** Extends the provided {@link CelCompiler} environment with this configuration. */
public CelCompiler extend(CelCompiler celCompiler, CelOptions celOptions)
throws CelEnvironmentException {
Expand Down
146 changes: 146 additions & 0 deletions bundle/src/main/java/dev/cel/bundle/CelEnvironmentYamlSerializer.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import com.google.common.collect.ImmutableMap;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.representer.Represent;
import org.yaml.snakeyaml.representer.Representer;

/** Serializes a CelEnvironment into a YAML file. */
public final class CelEnvironmentYamlSerializer extends Representer {

private static DumperOptions initDumperOptions() {
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setPrettyFlow(true);
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
return options;
}

private static final DumperOptions YAML_OPTIONS = initDumperOptions();

private static final CelEnvironmentYamlSerializer INSTANCE = new CelEnvironmentYamlSerializer();

private CelEnvironmentYamlSerializer() {
super(YAML_OPTIONS);
this.multiRepresenters.put(CelEnvironment.class, new RepresentCelEnvironment());
this.multiRepresenters.put(CelEnvironment.VariableDecl.class, new RepresentVariableDecl());
this.multiRepresenters.put(CelEnvironment.FunctionDecl.class, new RepresentFunctionDecl());
this.multiRepresenters.put(CelEnvironment.OverloadDecl.class, new RepresentOverloadDecl());
this.multiRepresenters.put(CelEnvironment.TypeDecl.class, new RepresentTypeDecl());
this.multiRepresenters.put(
CelEnvironment.ExtensionConfig.class, new RepresentExtensionConfig());
}

public static String toYaml(CelEnvironment environment) {
// Yaml is not thread-safe, so we create a new instance for each serialization.
Yaml yaml = new Yaml(INSTANCE, YAML_OPTIONS);
return yaml.dump(environment);
}

private final class RepresentCelEnvironment implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment environment = (CelEnvironment) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", environment.name());
if (!environment.description().isEmpty()) {
configMap.put("description", environment.description());
}
if (!environment.container().isEmpty()) {
configMap.put("container", environment.container());
}
if (!environment.extensions().isEmpty()) {
configMap.put("extensions", environment.extensions().asList());
}
if (!environment.variables().isEmpty()) {
configMap.put("variables", environment.variables().asList());
}
if (!environment.functions().isEmpty()) {
configMap.put("functions", environment.functions().asList());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentExtensionConfig implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.ExtensionConfig extension = (CelEnvironment.ExtensionConfig) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", extension.name());
if (extension.version() > 0 && extension.version() != Integer.MAX_VALUE) {
configMap.put("version", extension.version());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentVariableDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.VariableDecl variable = (CelEnvironment.VariableDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", variable.name()).put("type_name", variable.type().name());
if (!variable.type().params().isEmpty()) {
configMap.put("params", variable.type().params());
}
return represent(configMap.buildOrThrow());
}
}

private final class RepresentFunctionDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.FunctionDecl function = (CelEnvironment.FunctionDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("name", function.name()).put("overloads", function.overloads().asList());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentOverloadDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.OverloadDecl overload = (CelEnvironment.OverloadDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("id", overload.id());
if (overload.target().isPresent()) {
configMap.put("target", overload.target().get());
}
configMap.put("args", overload.arguments()).put("return", overload.returnType());
return represent(configMap.buildOrThrow());
}
}

private final class RepresentTypeDecl implements Represent {
@Override
public Node representData(Object data) {
CelEnvironment.TypeDecl type = (CelEnvironment.TypeDecl) data;
ImmutableMap.Builder<String, Object> configMap = new ImmutableMap.Builder<>();
configMap.put("type_name", type.name());
if (!type.params().isEmpty()) {
configMap.put("params", type.params());
}
if (type.isTypeParam()) {
configMap.put("is_type_param", type.isTypeParam());
}
return represent(configMap.buildOrThrow());
}
}
}
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ java_library(
testonly = True,
srcs = glob(["*Test.java"]),
resources = [
"//testing/environment:dump_env",
"//testing/environment:extended_env",
],
deps = [
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.bundle;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import dev.cel.bundle.CelEnvironment.ExtensionConfig;
import dev.cel.bundle.CelEnvironment.FunctionDecl;
import dev.cel.bundle.CelEnvironment.OverloadDecl;
import dev.cel.bundle.CelEnvironment.TypeDecl;
import dev.cel.bundle.CelEnvironment.VariableDecl;
import java.io.IOException;
import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class CelEnvironmentYamlSerializerTest {

@Test
public void toYaml_success() throws Exception {
CelEnvironment environment =
CelEnvironment.newBuilder()
.setName("dump_env")
.setDescription("dump_env description")
.setContainer("test.container")
.addExtensions(
ImmutableSet.of(
ExtensionConfig.of("bindings"),
ExtensionConfig.of("encoders"),
ExtensionConfig.of("lists"),
ExtensionConfig.of("math"),
ExtensionConfig.of("optional"),
ExtensionConfig.of("protos"),
ExtensionConfig.of("sets"),
ExtensionConfig.of("strings", 1)))
.setVariables(
ImmutableSet.of(
VariableDecl.create(
"request", TypeDecl.create("google.rpc.context.AttributeContext.Request")),
VariableDecl.create(
"map_var",
TypeDecl.newBuilder()
.setName("map")
.addParams(TypeDecl.create("string"))
.addParams(TypeDecl.create("string"))
.build())))
.setFunctions(
ImmutableSet.of(
FunctionDecl.create(
"getOrDefault",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("getOrDefault_key_value")
.setTarget(
TypeDecl.newBuilder()
.setName("map")
.addParams(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build())
.addParams(
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build())
.build())
.setArguments(
ImmutableList.of(
TypeDecl.newBuilder()
.setName("K")
.setIsTypeParam(true)
.build(),
TypeDecl.newBuilder()
.setName("V")
.setIsTypeParam(true)
.build()))
.setReturnType(
TypeDecl.newBuilder().setName("V").setIsTypeParam(true).build())
.build())),
FunctionDecl.create(
"coalesce",
ImmutableSet.of(
OverloadDecl.newBuilder()
.setId("coalesce_null_int")
.setTarget(TypeDecl.create("google.protobuf.Int64Value"))
.setArguments(ImmutableList.of(TypeDecl.create("int")))
.setReturnType(TypeDecl.create("int"))
.build()))))
.build();

String yamlOutput = CelEnvironmentYamlSerializer.toYaml(environment);
try {
String yamlFileContent = readFile("environment/dump_env.yaml");
assertThat(yamlFileContent).endsWith(yamlOutput);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private static String readFile(String path) throws IOException {
URL url = Resources.getResource(Ascii.toLowerCase(path));
return Resources.toString(url, UTF_8);
}
}
5 changes: 5 additions & 0 deletions testing/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,11 @@ package(
default_visibility = ["//:internal"],
)

alias(
name = "dump_env",
actual = "//testing/src/test/resources/environment:dump_env",
)

alias(
name = "extended_env",
actual = "//testing/src/test/resources/environment:extended_env",
Expand Down
5 changes: 5 additions & 0 deletions testing/src/test/resources/environment/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ package(
],
)

filegroup(
name = "dump_env",
srcs = ["dump_env.yaml"],
)

filegroup(
name = "extended_env",
srcs = ["extended_env.yaml"],
Expand Down
63 changes: 63 additions & 0 deletions testing/src/test/resources/environment/dump_env.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: dump_env
description: dump_env description
container: test.container
extensions:
- name: bindings
- name: encoders
- name: lists
- name: math
- name: optional
- name: protos
- name: sets
- name: strings
version: 1
variables:
- name: request
type_name: google.rpc.context.AttributeContext.Request
- name: map_var
type_name: map
params:
- type_name: string
- type_name: string
functions:
- name: getOrDefault
overloads:
- id: getOrDefault_key_value
target:
type_name: map
params:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
args:
- type_name: K
is_type_param: true
- type_name: V
is_type_param: true
return:
type_name: V
is_type_param: true
- name: coalesce
overloads:
- id: coalesce_null_int
target:
type_name: google.protobuf.Int64Value
args:
- type_name: int
return:
type_name: int