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 problem when filtering a root array #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix problem when filtering a root array #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3653274
Fixes a problem when filtering a root array
Sep 3, 2018
daa186f
Support expressions on the right side of equations with array roots.
Sep 3, 2018
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
29 changes: 21 additions & 8 deletions jsonpath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ func tokenize(query string) ([]string, error) {
// token_start := false
// token_end := false
token := ""
open := 0

// fmt.Println("-------------------------------------------------- start")
for idx, x := range query {
Expand Down Expand Up @@ -171,14 +172,22 @@ func tokenize(query string) ([]string, error) {
if strings.Contains(token, "[") {
// fmt.Println(" contains [ ")
if x == ']' && !strings.HasSuffix(token, "\\]") {
if token[0] == '.' {
tokens = append(tokens, token[1:])
} else {
tokens = append(tokens, token[:])
open--

if open == 0 {
if token[0] == '.' {
tokens = append(tokens, token[1:])
} else {
tokens = append(tokens, token[:])
}
token = ""
}
token = ""
continue
}

if x == '[' && !strings.HasSuffix(token, "\\[") {
open++
}
} else {
// fmt.Println(" doesn't contains [ ")
if x == '.' {
Expand Down Expand Up @@ -359,8 +368,12 @@ func get_key(obj interface{}, key string) (interface{}, error) {
res := []interface{}{}
for i := 0; i < reflect.ValueOf(obj).Len(); i++ {
tmp, _ := get_idx(obj, i)
if v, err := get_key(tmp, key); err == nil {
res = append(res, v)
if key == "" {
res = append(res, tmp)
} else {
if v, err := get_key(tmp, key); err == nil {
res = append(res, v)
}
}
}
return res, nil
Expand Down Expand Up @@ -663,7 +676,7 @@ func eval_filter(obj, root interface{}, lp, op, rp string) (res bool, err error)
var rp_v interface{}
if strings.HasPrefix(rp, "@.") {
rp_v, err = filter_get_from_explicit_path(obj, rp)
} else if strings.HasPrefix(rp, "$.") {
} else if strings.HasPrefix(rp, "$.") || strings.HasPrefix(rp, "$[") {
rp_v, err = filter_get_from_explicit_path(root, rp)
} else {
rp_v = rp
Expand Down
83 changes: 77 additions & 6 deletions jsonpath_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func Test_jsonpath_JsonPathLookup_1(t *testing.T) {
if res_v, ok := res.([]interface{}); ok != true || res_v[0].(float64) != 8.95 || res_v[1].(float64) != 12.99 || res_v[2].(float64) != 8.99 || res_v[3].(float64) != 22.99 {
t.Errorf("exp: [8.95, 12.99, 8.99, 22.99], got: %v", res)
}

// range
res, err = JsonPathLookup(json_data, "$.store.book[0:1].price")
t.Log(err, res)
Expand Down Expand Up @@ -453,7 +453,10 @@ func Test_jsonpath_get_key(t *testing.T) {
},
}
res, err = get_key(obj4, "a")
fmt.Println(err, res)
if res_v, ok := res.([]interface{}); ok != true || len(res_v) != 2 || res_v[0] != 1 || res_v[1] != 2 {
fmt.Println(err, res)
t.Errorf("[]map[string]interface{} support failed")
}
}

func Test_jsonpath_get_idx(t *testing.T) {
Expand Down Expand Up @@ -1179,13 +1182,13 @@ func Test_jsonpath_rootnode_is_array_range(t *testing.T) {
t.Logf("idx: %v, v: %v", idx, v)
}
if len(ares) != 2 {
t.Fatal("len is not 2. got: %v", len(ares))
t.Fatalf("len is not 2. got: %v", len(ares))
}
if ares[0].(float64) != 12.34 {
t.Fatal("idx: 0, should be 12.34. got: %v", ares[0])
t.Fatalf("idx: 0, should be 12.34. got: %v", ares[0])
}
if ares[1].(float64) != 13.34 {
t.Fatal("idx: 0, should be 12.34. got: %v", ares[1])
t.Fatalf("idx: 0, should be 12.34. got: %v", ares[1])
}
}

Expand Down Expand Up @@ -1232,7 +1235,7 @@ func Test_jsonpath_rootnode_is_nested_array_range(t *testing.T) {
t.Logf("idx: %v, v: %v", idx, v)
}
if len(ares) != 2 {
t.Fatal("len is not 2. got: %v", len(ares))
t.Fatalf("len is not 2. got: %v", len(ares))
}

//FIXME: `$[:1].[0].test` got wrong result
Expand All @@ -1243,3 +1246,71 @@ func Test_jsonpath_rootnode_is_nested_array_range(t *testing.T) {
// t.Fatal("idx: 0, should be 3.1, got: %v", ares[1])
//}
}

func Test_root_array(t *testing.T) {
var (
err error
books = []map[string]interface{}{
map[string]interface{}{
"category": "reference",
"meta": map[string]interface{}{
"language": "en",
"release_year": 1984,
"available_for_order": false,
},
"author": "Nigel Rees",
"title": "Sayings of the Century",
"price": 8.95,
},
map[string]interface{}{
"category": "fiction",
"meta": map[string]interface{}{
"language": "en",
"release_year": 2012,
"availabe_for_order": true,
},
"author": "Evelyn Waugh",
"title": "Sword of Honour",
"price": 12.99,
},
map[string]interface{}{
"category": "fiction",
"meta": nil,
"author": "Herman Melville",
"title": "Moby Dick",
"isbn": "0-553-21311-3",
"price": 8.99,
},
}
)

res, err := JsonPathLookup(books, "$[?(@.meta.language == 'en')]")
if res_v, ok := res.([]interface{}); err != nil || ok == false || len(res_v) != 2 {
fmt.Println(res, err)
t.Error("root array support is broken")
}

res2, err := JsonPathLookup(books, "$[?(@.meta)]")
if res_v, ok := res2.([]interface{}); err != nil || ok == false || len(res_v) != 2 {
fmt.Println(res2, err)
t.Error("root array support broken")
}

res3, err := JsonPathLookup(books, "$[-1]")
if res_v, ok := res3.(map[string]interface{}); err != nil || ok == false || len(res_v) != 6 || res_v["meta"] != nil {
fmt.Println(res3, err)
t.Error("root array support broken")
}

res4, err := JsonPathLookup(books, "$[*]")
if res_v, ok := res4.([]map[string]interface{}); err != nil || ok == false || len(res_v) != 3 {
fmt.Println(res4, err)
t.Error("root array support broken")
}

res5, err := JsonPathLookup(books, "$[?(@.meta.language == 'en')].meta.release_year")
if res_v, ok := res5.([]interface{}); err != nil || ok == false || len(res_v) != 2 {
fmt.Println(res5, err)
t.Error("root array support is broken")
}
}