Skip to content
Merged
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
15 changes: 6 additions & 9 deletions pkg/jq/jq.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func Evaluate(input io.Reader, output io.Writer, expr string) error {
return err
}

enc := json.NewEncoder(output)

iter := code.Run(responseData)
for {
v, ok := iter.Next()
Expand All @@ -53,18 +55,13 @@ func Evaluate(input io.Reader, output io.Writer, expr string) error {
if err != nil {
return err
}
} else {
var jsonFragment []byte
jsonFragment, err = json.Marshal(v)
} else if tt, ok := v.([]interface{}); ok && tt == nil {
_, err = fmt.Fprint(output, "[]\n")
if err != nil {
return err
}
_, err = output.Write(jsonFragment)
if err != nil {
return err
}
_, err = fmt.Fprint(output, "\n")
if err != nil {
} else {
if err = enc.Encode(v); err != nil {
return err
}
}
Expand Down
16 changes: 16 additions & 0 deletions pkg/jq/jq_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@ func TestEvaluate(t *testing.T) {
},
wantW: "{\"login\":\"monalisa\"}\n",
},
{
name: "empty array",
args: args{
json: strings.NewReader(`[]`),
expr: `.`,
},
wantW: "[]\n",
},
{
name: "empty array 2",
args: args{
json: strings.NewReader(`[]`),
expr: `[]`,
},
wantW: "[]\n",
},
{
name: "complex",
args: args{
Expand Down