Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions builtin/builtin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,90 @@ func TestBuiltin_override_and_still_accessible(t *testing.T) {
assert.Equal(t, true, out)
}

func TestBuiltin_override(t *testing.T) {
env := map[string]any{
"upper": func(a string) string { return strings.ToLower(a) },
}
fn := expr.Function(
"upper",
func(params ...any) (any, error) {
s := params[0].(string)
return strings.ToUpper(s[:1]) + strings.ToLower(s[1:]), nil
})

t.Run("with compiled env", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "str", out)
})

t.Run("with uncompiled env", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`)
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "STR", out)
})

t.Run("with uncompiled env and disabled builtin", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, expr.DisableBuiltin("upper"))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "str", out)
})

t.Run("with function", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, fn)
require.NoError(t, err)

out, err := expr.Run(program, nil)
require.NoError(t, err)
assert.Equal(t, "Str", out)
})

t.Run("with function and compiled env", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, fn, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "Str", out)
})

t.Run("with function and compiled env and disabled builtin", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, fn, expr.Env(env), expr.DisableBuiltin("upper"))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "Str", out)
})

t.Run("with function and uncompiled env", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, fn)
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "Str", out)
})

t.Run("with function and uncompiled env and disabled builtin", func(t *testing.T) {
program, err := expr.Compile(`upper("str")`, fn, expr.DisableBuiltin("upper"))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "Str", out)
})
}

func TestBuiltin_DisableBuiltin(t *testing.T) {
t.Run("via env", func(t *testing.T) {
for _, b := range builtin.Builtins {
Expand Down
37 changes: 37 additions & 0 deletions expr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,43 @@ func TestExpr_call_float_arg_func_with_int(t *testing.T) {
}
}

func TestExpr_unknown_call_compiled_without_env(t *testing.T) {
t.Run("some function", func(t *testing.T) {
program, err := expr.Compile(`fn(1)`)
require.NoError(t, err)

env := map[string]any{
"fn": func(a int) int { return a },
}

_, err = expr.Run(program, nil)
require.Error(t, err)
require.Contains(t, err.Error(), "cannot fetch fn from")

out, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, 1, out)
})

t.Run("disabled built-in function", func(t *testing.T) {
program, err := expr.Compile(`upper(1)`, expr.DisableBuiltin("upper"))
require.NoError(t, err)

env := map[string]any{
"upper": func(a int) int { return a },
}

_, err = expr.Run(program, nil)
require.Error(t, err)
require.Contains(t, err.Error(), "cannot fetch upper from")

out, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, 1, out)
})

}

func TestConstExpr_error_panic(t *testing.T) {
env := map[string]any{
"divide": func(a, b int) int { return a / b },
Expand Down
8 changes: 1 addition & 7 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -575,10 +575,7 @@ func (p *Parser) parseCall(token Token, arguments []Node, checkOverrides bool) N
}
isOverridden = isOverridden && checkOverrides

if _, ok := predicates[token.Value]; ok && p.config != nil && p.config.Disabled[token.Value] && !isOverridden {
// Disabled predicate without replacement - fail immediately
p.error("unknown name %s", token.Value)
} else if b, ok := predicates[token.Value]; ok && !isOverridden {
if b, ok := predicates[token.Value]; ok && !isOverridden {
p.expect(Bracket, "(")

// In case of the pipe operator, the first argument is the left-hand side
Expand Down Expand Up @@ -622,9 +619,6 @@ func (p *Parser) parseCall(token Token, arguments []Node, checkOverrides bool) N
if node == nil {
return nil
}
} else if _, ok := builtin.Index[token.Value]; ok && p.config != nil && p.config.Disabled[token.Value] && !isOverridden {
// Disabled builtin without replacement - fail immediately
p.error("unknown name %s", token.Value)
} else if _, ok := builtin.Index[token.Value]; ok && (p.config == nil || !p.config.Disabled[token.Value]) && !isOverridden {
node = p.createNode(&BuiltinNode{
Name: token.Value,
Expand Down