mirror of https://github.com/tidwall/gjson.git
The Array method should return back one item for JSON objects.
This commit fixes an issue where the Array method was not returning single value arrays when the reciever Result was a JSON Object. fixes #240
This commit is contained in:
parent
77a57fda87
commit
4fe1916c56
7
gjson.go
7
gjson.go
|
@ -189,14 +189,15 @@ func (t Result) Time() time.Time {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Array returns back an array of values.
|
// Array returns back an array of values.
|
||||||
// If the result represents a non-existent value, then an empty array will be
|
// If the result represents a null value or is non-existent, then an empty
|
||||||
// returned. If the result is not a JSON array, the return value will be an
|
// array will be returned.
|
||||||
|
// If the result is not a JSON array, the return value will be an
|
||||||
// array containing one result.
|
// array containing one result.
|
||||||
func (t Result) Array() []Result {
|
func (t Result) Array() []Result {
|
||||||
if t.Type == Null {
|
if t.Type == Null {
|
||||||
return []Result{}
|
return []Result{}
|
||||||
}
|
}
|
||||||
if t.Type != JSON {
|
if !t.IsArray() {
|
||||||
return []Result{t}
|
return []Result{t}
|
||||||
}
|
}
|
||||||
r := t.arrayOrMap('[', false)
|
r := t.arrayOrMap('[', false)
|
||||||
|
|
|
@ -2189,3 +2189,21 @@ func TestIndexesMatchesRaw(t *testing.T) {
|
||||||
assert(t, Parse(exampleJSON[r.Indexes[0]:]).Get("first").String() == "Dale")
|
assert(t, Parse(exampleJSON[r.Indexes[0]:]).Get("first").String() == "Dale")
|
||||||
assert(t, Parse(exampleJSON[r.Indexes[1]:]).Get("first").String() == "Roger")
|
assert(t, Parse(exampleJSON[r.Indexes[1]:]).Get("first").String() == "Roger")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestIssue240(t *testing.T) {
|
||||||
|
nonArrayData := `{"jsonrpc":"2.0","method":"subscription","params":
|
||||||
|
{"channel":"funny_channel","data":
|
||||||
|
{"name":"Jason","company":"good_company","number":12345}
|
||||||
|
}
|
||||||
|
}`
|
||||||
|
parsed := Parse(nonArrayData)
|
||||||
|
assert(t, len(parsed.Get("params.data").Array()) == 1)
|
||||||
|
|
||||||
|
arrayData := `{"jsonrpc":"2.0","method":"subscription","params":
|
||||||
|
{"channel":"funny_channel","data":[
|
||||||
|
{"name":"Jason","company":"good_company","number":12345}
|
||||||
|
]}
|
||||||
|
}`
|
||||||
|
parsed = Parse(arrayData)
|
||||||
|
assert(t, len(parsed.Get("params.data").Array()) == 1)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue