fix --indent 0 to preserve newlines

Author: itchyny

cli/cli.go

@@ -398,7 +398,7 @@ func (cli *cli) createMarshaler() marshaler {
 	}
 	indent := 2
 	if cli.outputCompact {
-		indent = 0
+		indent = -1
 	} else if cli.outputTab {
 		indent = 1
 	} else if i := cli.outputIndent; i != nil {
@@ -412,7 +412,7 @@ func (cli *cli) createMarshaler() marshaler {
 }
 
 func (cli *cli) funcDebug(v any, _ []any) any {
-	if err := newEncoder(false, 0).
+	if err := newEncoder(false, -1).
 		marshal([]any{"DEBUG:", v}, cli.errStream); err != nil {
 		return err
 	}
@@ -423,7 +423,7 @@ func (cli *cli) funcDebug(v any, _ []any) any {
 }
 
 func (cli *cli) funcStderr(v any, _ []any) any {
-	if err := (&rawMarshaler{m: newEncoder(false, 0)}).
+	if err := (&rawMarshaler{m: newEncoder(false, -1)}).
 		marshal(v, cli.errStream); err != nil {
 		return err
 	}

cli/encoder.go

@@ -166,15 +166,15 @@ func (e *encoder) encodeArray(vs []any) error {
 		if i > 0 {
 			e.writeByte(',', arrayColor)
 		}
-		if e.indent != 0 {
+		if e.indent >= 0 {
 			e.writeIndent()
 		}
 		if err := e.encode(v); err != nil {
 			return err
 		}
 	}
 	e.depth -= e.indent
-	if len(vs) > 0 && e.indent != 0 {
+	if len(vs) > 0 && e.indent >= 0 {
 		e.writeIndent()
 	}
 	e.writeByte(']', arrayColor)
@@ -201,20 +201,20 @@ func (e *encoder) encodeObject(vs map[string]any) error {
 		if i > 0 {
 			e.writeByte(',', objectColor)
 		}
-		if e.indent != 0 {
+		if e.indent >= 0 {
 			e.writeIndent()
 		}
 		e.encodeString(kv.key, objectKeyColor)
 		e.writeByte(':', objectColor)
-		if e.indent != 0 {
+		if e.indent >= 0 {
 			e.w.WriteByte(' ')
 		}
 		if err := e.encode(kv.val); err != nil {
 			return err
 		}
 	}
 	e.depth -= e.indent
-	if len(vs) > 0 && e.indent != 0 {
+	if len(vs) > 0 && e.indent >= 0 {
 		e.writeIndent()
 	}
 	e.writeByte('}', objectColor)

cli/test.yaml

@@ -6951,7 +6951,12 @@
     - '.'
   input: '{ "foo": ["hello", "world"] }'
   expected: |
-    {"foo":["hello","world"]}
+    {
+    "foo": [
+    "hello",
+    "world"
+    ]
+    }
 
 - name: indent option with deeply nested array
   args: