Skip to content

Commit 98bbeb2

Browse files
authored
Merge pull request #101 from cli/jq-empty-array
Fix printing empty arrays as result of jq expressions
2 parents 11fe5ed + 60896a3 commit 98bbeb2

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

pkg/jq/jq.go

+6-9
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ func Evaluate(input io.Reader, output io.Writer, expr string) error {
3939
return err
4040
}
4141

42+
enc := json.NewEncoder(output)
43+
4244
iter := code.Run(responseData)
4345
for {
4446
v, ok := iter.Next()
@@ -53,18 +55,13 @@ func Evaluate(input io.Reader, output io.Writer, expr string) error {
5355
if err != nil {
5456
return err
5557
}
56-
} else {
57-
var jsonFragment []byte
58-
jsonFragment, err = json.Marshal(v)
58+
} else if tt, ok := v.([]interface{}); ok && tt == nil {
59+
_, err = fmt.Fprint(output, "[]\n")
5960
if err != nil {
6061
return err
6162
}
62-
_, err = output.Write(jsonFragment)
63-
if err != nil {
64-
return err
65-
}
66-
_, err = fmt.Fprint(output, "\n")
67-
if err != nil {
63+
} else {
64+
if err = enc.Encode(v); err != nil {
6865
return err
6966
}
7067
}

pkg/jq/jq_test.go

+16
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ func TestEvaluate(t *testing.T) {
4646
},
4747
wantW: "{\"login\":\"monalisa\"}\n",
4848
},
49+
{
50+
name: "empty array",
51+
args: args{
52+
json: strings.NewReader(`[]`),
53+
expr: `.`,
54+
},
55+
wantW: "[]\n",
56+
},
57+
{
58+
name: "empty array 2",
59+
args: args{
60+
json: strings.NewReader(`[]`),
61+
expr: `[]`,
62+
},
63+
wantW: "[]\n",
64+
},
4965
{
5066
name: "complex",
5167
args: args{

0 commit comments

Comments
 (0)