Skip to content
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

fix(builtin): handle string pointer in fromJSON #751

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

fix(builtin): handle string pointer in fromJSON #751

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86798a6
fix: handle string pointer in fromJSON builtin
thevilledev Jan 25, 2025
846b310
fix: add pointer-string support to fromJSON & preserve interfaces
thevilledev Jan 27, 2025
9827937
revert: deref changes
thevilledev Jan 27, 2025
5a3ae04
fix: go already deref's the string ptr
thevilledev Jan 27, 2025
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
6 changes: 5 additions & 1 deletion builtin/builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,11 @@ var Builtins = []*Function{
Name: "fromJSON",
Func: func(args ...any) (any, error) {
var v any
err := json.Unmarshal([]byte(args[0].(string)), &v)
jsonStr := args[0]
if strPtr, ok := jsonStr.(*string); ok {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Althoug this is a working solution, we need to understand why OpDeref was not added before calling fromJSON.

Compiler adds OpDeref for arguments before calling a function. But only if needed. Aperently the check is not perfect.

jsonStr = *strPtr
}
err := json.Unmarshal([]byte(jsonStr.(string)), &v)
if err != nil {
return nil, err
}
Expand Down
52 changes: 52 additions & 0 deletions builtin/builtin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,3 +638,55 @@ func Test_int_unwraps_underlying_value(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, true, out)
}

func TestBuiltin_json(t *testing.T) {
t.Run("fromJSON/string", func(t *testing.T) {
env := map[string]any{
"json": `{"foo": "bar"}`,
}
program, err := expr.Compile(`fromJSON(json)`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, map[string]any{"foo": "bar"}, out)
})

t.Run("fromJSON/string pointer", func(t *testing.T) {
jsonString := `{"foo": "bar"}`
env := map[string]any{
"json": &jsonString,
}
program, err := expr.Compile(`fromJSON(json)`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, map[string]any{"foo": "bar"}, out)
})

t.Run("toJSON/object", func(t *testing.T) {
env := map[string]any{
"obj": map[string]any{"foo": "bar"},
}
program, err := expr.Compile(`toJSON(obj)`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "{\n \"foo\": \"bar\"\n}", out)
})

t.Run("toJSON/object pointer", func(t *testing.T) {
obj := map[string]any{"foo": "bar"}
env := map[string]any{
"obj": &obj,
}
program, err := expr.Compile(`toJSON(obj)`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, "{\n \"foo\": \"bar\"\n}", out)
})
}
Loading