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
11 changes: 11 additions & 0 deletions functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,17 @@ func (e *functionEntry) resolveArgs(arguments []interface{}) ([]interface{}, err
if len(arguments) < len(e.arguments) {
return nil, errors.New("invalid arity")
}
for i, userArg := range arguments {
var spec argSpec
if i < len(e.arguments)-1 {
spec = e.arguments[i]
} else {
spec = e.arguments[len(e.arguments)-1]
}
if err := spec.typeCheck(userArg); err != nil {
return nil, err
}
}
return arguments, nil
}

Expand Down
34 changes: 34 additions & 0 deletions interpreter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,40 @@ func TestCanSupportSliceOfStructsWithFunctions(t *testing.T) {
assert.Equal(result.(float64), 2.0)
}

func TestVariadicFunctionTypeChecking(t *testing.T) {
assert := assert.New(t)

// Issue #72: merge should return error instead of panicking when an argument is not an object.
data := map[string]interface{}{"message": "foo"}
result, err := Search("merge({message: message}, contextMap)", data)
assert.Nil(result)
assert.NotNil(err)

invalidExpressions := []string{
"merge(`\"foo\"`)",
"merge(`123`)",
"merge(`[1, 2]`)",
"merge(`true`)",
"merge(`{\"a\": 1}`, `\"b\"`)",
"merge(`{\"a\": 1}`, `null`)",
}
for _, expr := range invalidExpressions {
res, err := Search(expr, nil)
assert.Nil(res)
assert.NotNil(err)
}

// merge with valid objects should still succeed
res, err := Search("merge(`{\"a\": 1}`, `{\"b\": 2}`)", nil)
assert.Nil(err)
assert.Equal(map[string]interface{}{"a": float64(1), "b": float64(2)}, res)

// not_null with variadic arguments should still succeed
res, err = Search("not_null(foo, bar, `\"default\"`)", map[string]interface{}{})
assert.Nil(err)
assert.Equal("default", res)
}

func BenchmarkInterpretSingleFieldStruct(b *testing.B) {
assert := assert.New(b)
intr := newInterpreter()
Expand Down