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

Jump to bottom

Array and guess #214

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

Array and guess #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
340cc1c
- Adding ability to stop array processing by generating an error
stephane-moreau Oct 7, 2020
ae12a8f
Oups missing error check
stephane-moreau Oct 7, 2020
ef595a1
Make sure we can get the offset where array decoding stopped
stephane-moreau Oct 7, 2020
3a7dadf
offset is automatically found while guessing type
stephane-moreau Oct 8, 2020
a0b6128
Merge remote-tracking branch 'origin/master' into array-and-guess
stephane-moreau Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 20 additions & 5 deletions parser.go
View file
Open in desktop
Expand Up @@ -320,7 +320,7 @@ func searchKeys(data []byte, keys ...string) int {
var valueFound []byte
var valueOffset int
var curI = i
ArrayEach(data[i:], func(value []byte, dataType ValueType, offset int, err error) {
ArrayEach(data[i:], func(value []byte, dataType ValueType, offset int, err error) error {
if curIdx == aIdx {
valueFound = value
valueOffset = offset
Expand All @@ -330,6 +330,7 @@ func searchKeys(data []byte, keys ...string) int {
}
}
curIdx += 1
return nil
})

if valueFound == nil {
Expand Down Expand Up @@ -517,7 +518,7 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
level++

var curIdx int
arrOff, _ := ArrayEach(data[i:], func(value []byte, dataType ValueType, offset int, err error) {
arrOff, _ := ArrayEach(data[i:], func(value []byte, dataType ValueType, offset int, err error) error {
if _, ok = arrIdxFlags[curIdx]; ok {
for pi, p := range paths {
if pIdxFlags[pi] {
Expand All @@ -539,6 +540,7 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
}

curIdx += 1
return nil
})

if pathsMatched == len(paths) {
Expand All @@ -564,6 +566,19 @@ func EachKey(data []byte, cb func(int, []byte, ValueType, error), paths ...[]str
return -1
}

// GuessValueType : returns the type of the next JSON piece in data stream
// Does not ensure that the whole data is a valid JSON
func GuessValueType(data []byte) (ValueType, error) {

offset := nextToken(data)
if offset == -1 {
return NotExist, MalformedJsonError
}

_, dataType, _, err := getType(data, offset)
return dataType, err
}

// Data types available in valid JSON data.
type ValueType int

Expand Down Expand Up @@ -976,7 +991,7 @@ func internalGet(data []byte, keys ...string) (value []byte, dataType ValueType,
}

// ArrayEach is used when iterating arrays, accepts a callback function with the same return arguments as `Get`.
func ArrayEach(data []byte, cb func(value []byte, dataType ValueType, offset int, err error), keys ...string) (offset int, err error) {
func ArrayEach(data []byte, cb func(value []byte, dataType ValueType, offset int, err error) error, keys ...string) (offset int, err error) {
if len(data) == 0 {
return -1, MalformedObjectError
}
Expand Down Expand Up @@ -1031,11 +1046,11 @@ func ArrayEach(data []byte, cb func(value []byte, dataType ValueType, offset int
}

if t != NotExist {
cb(v, t, offset+o-len(v), e)
e = cb(v, t, offset+o-len(v), e)
}

if e != nil {
break
return offset + o - len(v), e
}

offset += o
Expand Down
38 changes: 24 additions & 14 deletions parser_test.go
View file
Open in desktop
Expand Up @@ -12,16 +12,18 @@ import (
var activeTest = ""

func toArray(data []byte) (result [][]byte) {
ArrayEach(data, func(value []byte, dataType ValueType, offset int, err error) {
ArrayEach(data, func(value []byte, dataType ValueType, offset int, err error) error {
result = append(result, value)
return nil
})

return
}

func toStringArray(data []byte) (result []string) {
ArrayEach(data, func(value []byte, dataType ValueType, offset int, err error) {
ArrayEach(data, func(value []byte, dataType ValueType, offset int, err error) error {
result = append(result, string(value))
return nil
})

return
Expand Down Expand Up @@ -989,15 +991,15 @@ var getStringTests = []GetTest{
isErr: true,
},
{
desc: `empty array index`,
json: `[""]`,
path: []string{"[]"},
desc: `empty array index`,
json: `[""]`,
path: []string{"[]"},
isFound: false,
},
{
desc: `malformed array index`,
json: `[""]`,
path: []string{"["},
desc: `malformed array index`,
json: `[""]`,
path: []string{"["},
isFound: false,
},
}
Expand Down Expand Up @@ -1375,7 +1377,7 @@ func TestArrayEach(t *testing.T) {
mock := []byte(`{"a": { "b":[{"x": 1} ,{"x":2},{ "x":3}, {"x":4} ]}}`)
count := 0

ArrayEach(mock, func(value []byte, dataType ValueType, offset int, err error) {
ArrayEach(mock, func(value []byte, dataType ValueType, offset int, err error) error {
count++

switch count {
Expand All @@ -1398,14 +1400,18 @@ func TestArrayEach(t *testing.T) {
default:
t.Errorf("Should process only 4 items")
}
return nil
}, "a", "b")
}

func TestArrayEachWithWhiteSpace(t *testing.T) {
//Issue #159
count := 0
funcError := func([]byte, ValueType, int, error) { t.Errorf("Run func not allow") }
funcSuccess := func(value []byte, dataType ValueType, index int, err error) {
funcError := func([]byte, ValueType, int, error) error {
t.Errorf("Run func not allow")
return nil
}
funcSuccess := func(value []byte, dataType ValueType, index int, err error) error {
count++

switch count {
Expand All @@ -1424,11 +1430,12 @@ func TestArrayEachWithWhiteSpace(t *testing.T) {
default:
t.Errorf("Should process only 3 items")
}
return nil
}

type args struct {
data []byte
cb func(value []byte, dataType ValueType, offset int, err error)
cb func(value []byte, dataType ValueType, offset int, err error) error
keys []string
}
tests := []struct {
Expand All @@ -1452,11 +1459,14 @@ func TestArrayEachWithWhiteSpace(t *testing.T) {
}

func TestArrayEachEmpty(t *testing.T) {
funcError := func([]byte, ValueType, int, error) { t.Errorf("Run func not allow") }
funcError := func([]byte, ValueType, int, error) error {
t.Errorf("Run func not allow")
return nil
}

type args struct {
data []byte
cb func(value []byte, dataType ValueType, offset int, err error)
cb func(value []byte, dataType ValueType, offset int, err error) error
keys []string
}
tests := []struct {
Expand Down