Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 29, 2025
Merged

Adding transformMap and transformMapEntry macros #800

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions checker/src/test/resources/standardEnvDump.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
function logical_not (bool) -> bool
}
Expand Down
7 changes: 7 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
name = "comprehensions",
srcs = ["CelComprehensionsExtensions.java"],
deps = [
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/types",
"//compiler:compiler_builder",
"//extensions:extension_library",
"//parser:macro",
"//parser:operator",
"//parser:parser_builder",
"//runtime",
"//runtime:function_binding",
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
],
)
265 changes: 260 additions & 5 deletions extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

private static final String TRANSFORM_LIST = "transformList";
private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

enum Function {
MAP_INSERT(
CelFunctionDecl.newFunctionDeclaration(
MAP_INSERT_FUNCTION,
CelOverloadDecl.newGlobalOverload(
MAP_INSERT_OVERLOAD_MAP_MAP,
"Returns a map that's the result of merging given two maps.",
MAP_KV_TYPE,
MAP_KV_TYPE,
MAP_KV_TYPE),
CelOverloadDecl.newGlobalOverload(
MAP_INSERT_OVERLOAD_KEY_VALUE,
"Adds the given key-value pair to the map.",
MAP_KV_TYPE,
MAP_KV_TYPE,
TYPE_PARAM_K,
TYPE_PARAM_V)));

private final CelFunctionDecl functionDecl;

String getFunction() {
return functionDecl.name();
}

Function(CelFunctionDecl functionDecl) {
this.functionDecl = functionDecl;
}
}

private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
new CelExtensionLibrary<CelComprehensionsExtensions>() {
private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

@Override
public String name() {
return "comprehensions";
}

@Override
public ImmutableSet<CelComprehensionsExtensions> versions() {
return ImmutableSet.of(version0);
}
};

static CelExtensionLibrary<CelComprehensionsExtensions> library() {
return LIBRARY;
}

private final ImmutableSet<Function> functions;

CelComprehensionsExtensions() {
this.functions = ImmutableSet.copyOf(Function.values());
}

@Override
public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
}

@Override
public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
throw new UnsupportedOperationException("Unsupported");
}

@Override
public void setRuntimeOptions(
CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
for (Function function : functions) {
for (CelOverloadDecl overload : function.functionDecl.overloads()) {
switch (overload.overloadId()) {
case MAP_INSERT_OVERLOAD_MAP_MAP:
runtimeBuilder.addFunctionBindings(
CelFunctionBinding.from(
MAP_INSERT_OVERLOAD_MAP_MAP,
Map.class,
Map.class,
(map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
break;
case MAP_INSERT_OVERLOAD_KEY_VALUE:
runtimeBuilder.addFunctionBindings(
CelFunctionBinding.from(
MAP_INSERT_OVERLOAD_KEY_VALUE,
ImmutableList.of(Map.class, Object.class, Object.class),
args -> mapInsertKeyValue(args, runtimeEquality)));
break;
default:
// Nothing to add.
}
}
}
}

@Override
public int version() {
return 0;
}

@Override
public ImmutableSet<CelMacro> macros() {
return ImmutableSet.of(
CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
3,
CelComprehensionsExtensions::expandExistsOneMacro),
CelMacro.newReceiverMacro(
TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
"transformList", 3, CelComprehensionsExtensions::transformListMacro),
CelMacro.newReceiverMacro(
"transformList", 4, CelComprehensionsExtensions::transformListMacro),
CelMacro.newReceiverMacro(
"transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
CelMacro.newReceiverMacro(
"transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
CelMacro.newReceiverMacro(
"transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
}

@Override
public void setParserOptions(CelParserBuilder parserBuilder) {
parserBuilder.addMacros(macros());
}

// TODO: Implement a more efficient map insertion based on mutability once mutable
// maps are supported in Java stack.
private static ImmutableMap<Object, Object> mapInsertMap(
Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
ImmutableMap.Builder<Object, Object> resultBuilder =
ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
throw new IllegalArgumentException(
String.format("insert failed: key '%s' already exists", entry.getKey()));
} else {
resultBuilder.put(entry.getKey(), entry.getValue());
}
}
return resultBuilder.putAll(targetMap).buildOrThrow();
}

private static ImmutableMap<Object, Object> mapInsertKeyValue(
Object[] args, RuntimeEquality equality) {
Map<?, ?> map = (Map<?, ?>) args[0];
Object key = args[1];
Object value = args[2];

if (equality.findInMap(map, key).isPresent()) {
throw new IllegalArgumentException(
String.format("insert failed: key '%s' already exists", key));
}

ImmutableMap.Builder<Object, Object> builder =
ImmutableMap.builderWithExpectedSize(map.size() + 1);
return builder.put(key, value).putAll(map).buildOrThrow();
}

private static Optional<CelExpr> expandAllMacro(
CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
}

private static Optional<CelExpr> transformMapMacro(
CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
checkNotNull(exprFactory);
checkNotNull(target);
checkArgument(arguments.size() == 3 || arguments.size() == 4);
CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(arg0);
}
CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(arg1);
}
CelExpr transform;
CelExpr filter = null;
if (arguments.size() == 4) {
filter = checkNotNull(arguments.get(2));
transform = checkNotNull(arguments.get(3));
} else {
transform = checkNotNull(arguments.get(2));
}
CelExpr accuInit = exprFactory.newMap();
CelExpr condition = exprFactory.newBoolLiteral(true);
CelExpr step =
exprFactory.newGlobalCall(
MAP_INSERT_FUNCTION,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
arg0,
transform);
if (filter != null) {
step =
exprFactory.newGlobalCall(
Operator.CONDITIONAL.getFunction(),
filter,
step,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
}
return Optional.of(
exprFactory.fold(
arg0.ident().name(),
arg1.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
}

private static Optional<CelExpr> transformMapEntryMacro(
CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
checkNotNull(exprFactory);
checkNotNull(target);
checkArgument(arguments.size() == 3 || arguments.size() == 4);
CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(arg0);
}
CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(arg1);
}
CelExpr transform;
CelExpr filter = null;
if (arguments.size() == 4) {
filter = checkNotNull(arguments.get(2));
transform = checkNotNull(arguments.get(3));
} else {
transform = checkNotNull(arguments.get(2));
}
CelExpr accuInit = exprFactory.newMap();
CelExpr condition = exprFactory.newBoolLiteral(true);
CelExpr step =
exprFactory.newGlobalCall(
MAP_INSERT_FUNCTION,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
transform);
if (filter != null) {
step =
exprFactory.newGlobalCall(
Operator.CONDITIONAL.getFunction(),
filter,
step,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
}
return Optional.of(
exprFactory.fold(
arg0.ident().name(),
arg1.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
}

private static CelExpr validatedIterationVariable(
CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down
2 changes: 2 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/CelExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
return CelSetsExtensions.library(options);
case "strings":
return CelStringExtensions.library();
case "comprehensions":
return CelComprehensionsExtensions.library();
// TODO: add support for remaining standard extensions
default:
throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Adding transformMap and transformMapEntry macros#800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 29, 2025
 Merged


Adding transformMap and transformMapEntry macros
#800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
checker/src/test/resources/standardEnvDump.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,10 @@ Source: 'redundant expression so the env is constructed and can be printed'


Standard environment:
declare cel.@mapInsert {
 function cel_@mapInsert_map_map (map(K, V), map(K, V)) -> map(K, V)
 function cel_@mapInsert_map_key_value (map(K, V), K, V) -> map(K, V)
}
declare !_ {
 function logical_not (bool) -> bool
}
Expand Down

7 changes: 7 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -299,12 +299,19 @@ java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//checker:checker_builder",
 "//common:compiler_common",
 "//common:options",
 "//common/ast",
 "//common/types",
 "//compiler:compiler_builder",
 "//extensions:extension_library",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "//runtime",
 "//runtime:function_binding",
 "//runtime:runtime_equality",
 "@maven//:com_google_guava_guava",
 ],
)

265 changes: 260 additions & 5 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,21 +18,137 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import dev.cel.checker.CelCheckerBuilder;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.types.MapType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelInternalRuntimeLibrary;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.RuntimeEquality;
import java.util.Map;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
/** Internal implementation of CEL two variable comprehensions extensions. */
final class CelComprehensionsExtensions
 implements CelCompilerLibrary, CelInternalRuntimeLibrary, CelExtensionLibrary.FeatureSet {

 private static final String TRANSFORM_LIST = "transformList";
 private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
 private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
 private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
 private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
 private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
 private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

 enum Function {
 MAP_INSERT(
 CelFunctionDecl.newFunctionDeclaration(
 MAP_INSERT_FUNCTION,
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 "Returns a map that's the result of merging given two maps.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 MAP_KV_TYPE),
 CelOverloadDecl.newGlobalOverload(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 "Adds the given key-value pair to the map.",
 MAP_KV_TYPE,
 MAP_KV_TYPE,
 TYPE_PARAM_K,
 TYPE_PARAM_V)));

 private final CelFunctionDecl functionDecl;

 String getFunction() {
 return functionDecl.name();
 }

 Function(CelFunctionDecl functionDecl) {
 this.functionDecl = functionDecl;
 }
 }

 private static final CelExtensionLibrary<CelComprehensionsExtensions> LIBRARY =
 new CelExtensionLibrary<CelComprehensionsExtensions>() {
 private final CelComprehensionsExtensions version0 = new CelComprehensionsExtensions();

 @Override
 public String name() {
 return "comprehensions";
 }

 @Override
 public ImmutableSet<CelComprehensionsExtensions> versions() {
 return ImmutableSet.of(version0);
 }
 };

 static CelExtensionLibrary<CelComprehensionsExtensions> library() {
 return LIBRARY;
 }

 private final ImmutableSet<Function> functions;

 CelComprehensionsExtensions() {
 this.functions = ImmutableSet.copyOf(Function.values());
 }

 @Override
 public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
 functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
 }

 @Override
 public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
 throw new UnsupportedOperationException("Unsupported");
 }

 @Override
 public void setRuntimeOptions(
 CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
 for (Function function : functions) {
 for (CelOverloadDecl overload : function.functionDecl.overloads()) {
 switch (overload.overloadId()) {
 case MAP_INSERT_OVERLOAD_MAP_MAP:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_MAP_MAP,
 Map.class,
 Map.class,
 (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
 break;
 case MAP_INSERT_OVERLOAD_KEY_VALUE:
 runtimeBuilder.addFunctionBindings(
 CelFunctionBinding.from(
 MAP_INSERT_OVERLOAD_KEY_VALUE,
 ImmutableList.of(Map.class, Object.class, Object.class),
 args -> mapInsertKeyValue(args, runtimeEquality)));
 break;
 default:
 // Nothing to add.
 }
 }
 }
 }

 @Override
 public int version() {
 return 0;
 }

 @Override
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
Expand All@@ -44,16 +160,58 @@ public ImmutableSet<CelMacro> macros() {
 3,
 CelComprehensionsExtensions::expandExistsOneMacro),
 CelMacro.newReceiverMacro(
 TRANSFORM_LIST, 3, CelComprehensionsExtensions::transformListMacro),
 "transformList", 3, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformList", 4, CelComprehensionsExtensions::transformListMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 3, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMap", 4, CelComprehensionsExtensions::transformMapMacro),
 CelMacro.newReceiverMacro(
 "transformMapEntry", 3, CelComprehensionsExtensions::transformMapEntryMacro),
 CelMacro.newReceiverMacro(
TRANSFORM_LIST, 4, CelComprehensionsExtensions::transformListMacro));
"transformMapEntry", 4, CelComprehensionsExtensions::transformMapEntryMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 // TODO: Implement a more efficient map insertion based on mutability once mutable
 // maps are supported in Java stack.
 private static ImmutableMap<Object, Object> mapInsertMap(
 Map<?, ?> targetMap, Map<?, ?> mapToMerge, RuntimeEquality equality) {
 ImmutableMap.Builder<Object, Object> resultBuilder =
 ImmutableMap.builderWithExpectedSize(targetMap.size() + mapToMerge.size());

 for (Map.Entry<?, ?> entry : mapToMerge.entrySet()) {
 if (equality.findInMap(targetMap, entry.getKey()).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", entry.getKey()));
 } else {
 resultBuilder.put(entry.getKey(), entry.getValue());
 }
 }
 return resultBuilder.putAll(targetMap).buildOrThrow();
 }

 private static ImmutableMap<Object, Object> mapInsertKeyValue(
 Object[] args, RuntimeEquality equality) {
 Map<?, ?> map = (Map<?, ?>) args[0];
 Object key = args[1];
 Object value = args[2];

 if (equality.findInMap(map, key).isPresent()) {
 throw new IllegalArgumentException(
 String.format("insert failed: key '%s' already exists", key));
 }

 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size() + 1);
 return builder.put(key, value).putAll(map).buildOrThrow();
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
Expand DownExpand Up@@ -220,6 +378,103 @@ private static Optional<CelExpr> transformListMacro(
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg0,
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static Optional<CelExpr> transformMapEntryMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3 || arguments.size() == 4);
 CelExpr arg0 = validatedIterationVariable(exprFactory, arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg0);
 }
 CelExpr arg1 = validatedIterationVariable(exprFactory, arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(arg1);
 }
 CelExpr transform;
 CelExpr filter = null;
 if (arguments.size() == 4) {
 filter = checkNotNull(arguments.get(2));
 transform = checkNotNull(arguments.get(3));
 } else {
 transform = checkNotNull(arguments.get(2));
 }
 CelExpr accuInit = exprFactory.newMap();
 CelExpr condition = exprFactory.newBoolLiteral(true);
 CelExpr step =
 exprFactory.newGlobalCall(
 MAP_INSERT_FUNCTION,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 transform);
 if (filter != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 filter,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr validatedIterationVariable(
 CelMacroExprFactory exprFactory, CelExpr argument) {

Expand Down

2 changes: 2 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -363,6 +363,8 @@ public static CelExtensionLibrary<? extends CelExtensionLibrary.FeatureSet> getE
 return CelSetsExtensions.library(options);
 case "strings":
 return CelStringExtensions.library();
 case "comprehensions":
 return CelComprehensionsExtensions.library();
 // TODO: add support for remaining standard extensions
 default:
 throw new IllegalArgumentException("Unknown standard extension '" + name + "'");
Expand Down
Loading
Loading