Skip to content

Improve the efficiency of optMap / optFlatMap #1387

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
TristonianJones merged 1 commit into from
Jul 27, 2026
+53 −8
Merged

Improve the efficiency of optMap / optFlatMap #1387

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
12 changes: 12 additions & 0 deletions cel/cel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3106,6 +3106,18 @@ func TestOptionalValuesEval(t *testing.T) {
},
out: types.OptionalOf(types.Int(43)),
},
{
expr: `{0: 10}[?0].optMap(v, v + 1)`,
out: types.OptionalOf(types.Int(11)),
},
{
expr: `{0: 10}[?0].optMap(a, a + 1).optMap(b, b * 2)`,
out: types.OptionalOf(types.Int(22)),
},
{
expr: `{0: 10}[?1].optMap(a, a + 1).optMap(b, b * 2)`,
out: types.OptionalNone,
},
{
expr: `optional.ofNonZeroValue(z).or(optional.of(10)).value() == 42`,
in: map[string]any{
Expand Down
49 changes: 41 additions & 8 deletions cel/library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const (
optionalUnwrapFunc = "optional.unwrap"
valueFunc = "value"
unusedIterVar = "#unused"
targetVar = "@target"
)

// Library provides a collection of EnvOption and ProgramOption values used to configure a CEL
Expand Down Expand Up @@ -609,22 +610,38 @@ func optMap(meh MacroExprFactory, target ast.Expr, args []ast.Expr) (ast.Expr, *
return nil, meh.NewError(varIdent.ID(), "optMap() variable name must be a simple identifier")
}
mapExpr := args[1]
return meh.NewCall(
targetIdent := target
if target.Kind() != ast.IdentKind {
targetIdent = meh.NewIdent(targetVar)
}
res := meh.NewCall(
operators.Conditional,
meh.NewMemberCall(hasValueFunc, target),
meh.NewMemberCall(hasValueFunc, targetIdent),
meh.NewCall(optionalOfFunc,
meh.NewComprehension(
meh.NewList(),
unusedIterVar,
varName,
meh.NewMemberCall(valueFunc, meh.Copy(target)),
meh.NewMemberCall(valueFunc, meh.Copy(targetIdent)),
meh.NewLiteral(types.False),
meh.NewIdent(varName),
mapExpr,
),
),
meh.NewCall(optionalNoneFunc),
), nil
)
if target.Kind() != ast.IdentKind {
return meh.NewComprehension(
meh.NewList(),
unusedIterVar,
targetVar,
target,
meh.NewLiteral(types.False),
meh.NewIdent(targetVar),
res,
), nil
}
return res, nil
}

func optFlatMap(meh MacroExprFactory, target ast.Expr, args []ast.Expr) (ast.Expr, *Error) {
Expand All @@ -637,20 +654,36 @@ func optFlatMap(meh MacroExprFactory, target ast.Expr, args []ast.Expr) (ast.Exp
return nil, meh.NewError(varIdent.ID(), "optFlatMap() variable name must be a simple identifier")
}
mapExpr := args[1]
return meh.NewCall(
targetIdent := target
if target.Kind() != ast.IdentKind {
targetIdent = meh.NewIdent(targetVar)
}
res := meh.NewCall(
operators.Conditional,
meh.NewMemberCall(hasValueFunc, target),
meh.NewMemberCall(hasValueFunc, targetIdent),
meh.NewComprehension(
meh.NewList(),
unusedIterVar,
varName,
meh.NewMemberCall(valueFunc, meh.Copy(target)),
meh.NewMemberCall(valueFunc, meh.Copy(targetIdent)),
meh.NewLiteral(types.False),
meh.NewIdent(varName),
mapExpr,
),
meh.NewCall(optionalNoneFunc),
), nil
)
if target.Kind() != ast.IdentKind {
return meh.NewComprehension(
meh.NewList(),
unusedIterVar,
targetVar,
target,
meh.NewLiteral(types.False),
meh.NewIdent(targetVar),
res,
), nil
}
return res, nil
}

func optUnwrap(value ref.Val) ref.Val {
Expand Down