Merge pull request #101 from cli/jq-empty-array

Fix printing empty arrays as result of jq expressions
cli · Feb 10, 2023 · 98bbeb2 · 98bbeb2
2 parents 11fe5ed + 60896a3
commit 98bbeb2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/pkg/jq/jq.go b/pkg/jq/jq.go
@@ -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()
@@ -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
 			}
 		}

diff --git a/pkg/jq/jq_test.go b/pkg/jq/jq_test.go
@@ -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{