Fix JSON output for dyff

With the new version of `dyff`, the Go YAML v3 `Node` based input was
not created properly.

Update JSON marshalling code to properly create JSON output using the
new Go YAML v3 `Node` input.

Author: HeavyWombat

output.go

@@ -28,6 +28,7 @@ import (
 	"github.com/gonvenience/bunt"
 	colorful "github.com/lucasb-eyer/go-colorful"
 	yamlv2 "gopkg.in/yaml.v2"
+	yamlv3 "gopkg.in/yaml.v3"
 )
 
 // DefaultColorSchema is a prepared usable color schema for the neat output
@@ -92,6 +93,23 @@ func (p *OutputProcessor) determineColorByType(obj interface{}) string {
 	color := "scalarDefaultColor"
 
 	switch t := obj.(type) {
+	case *yamlv3.Node:
+		switch t.Tag {
+		case "!!str":
+			if len(strings.Split(strings.TrimSpace(t.Value), "\n")) > 1 {
+				color = "multiLineTextColor"
+			}
+
+		case "!!int":
+			color = "intColor"
+
+		case "!!float":
+			color = "floatColor"
+
+		case "!!bool":
+			color = "boolColor"
+		}
+
 	case bool:
 		color = "boolColor"
 
@@ -111,7 +129,10 @@ func (p *OutputProcessor) determineColorByType(obj interface{}) string {
 }
 
 func (p *OutputProcessor) isScalar(obj interface{}) bool {
-	switch obj.(type) {
+	switch tobj := obj.(type) {
+	case *yamlv3.Node:
+		return tobj.Kind == yamlv3.ScalarNode
+
 	case yamlv2.MapSlice, []interface{}, []yamlv2.MapSlice:
 		return false
 
@@ -136,3 +157,11 @@ func (p *OutputProcessor) prefixAdd() string {
 
 	return p.colorize("  ", "indentLineColor")
 }
+
+func followAlias(node *yamlv3.Node) *yamlv3.Node {
+	if node != nil && node.Alias != nil {
+		return followAlias(node.Alias)
+	}
+
+	return node
+}

output_json.go

@@ -148,30 +148,120 @@ func (p *OutputProcessor) ToCompactJSON(obj interface{}) (string, error) {
 }
 
 func (p *OutputProcessor) neatJSON(prefix string, obj interface{}) (string, error) {
+	var err error
+
 	switch t := obj.(type) {
+	case *yamlv3.Node:
+		err = p.neatJSONofNode(prefix, t)
+
 	case yamlv2.MapSlice:
-		if err := p.neatJSONofYAMLMapSlice(prefix, t); err != nil {
-			return "", err
-		}
+		err = p.neatJSONofYAMLMapSlice(prefix, t)
 
 	case []interface{}:
-		if err := p.neatJSONofSlice(prefix, t); err != nil {
-			return "", err
+		err = p.neatJSONofSlice(prefix, t)
+
+	default:
+		err = p.neatJSONofScalar(prefix, obj)
+	}
+
+	if err != nil {
+		return "", err
+	}
+
+	p.out.Flush()
+	return p.data.String(), nil
+}
+
+func (p *OutputProcessor) neatJSONofNode(prefix string, node *yamlv3.Node) error {
+	switch node.Kind {
+	case yamlv3.DocumentNode:
+		return p.neatJSONofNode(prefix, node.Content[0])
+
+	case yamlv3.MappingNode:
+		if len(node.Content) == 0 {
+			fmt.Fprint(p.out, p.colorize("{}", "emptyStructures"))
+			return nil
 		}
 
-	case []yamlv2.MapSlice:
-		if err := p.neatJSONofSlice(prefix, p.simplify(t)); err != nil {
-			return "", err
+		bunt.Fprint(p.out, "*{*\n")
+		for i := 0; i < len(node.Content); i += 2 {
+			k, v := followAlias(node.Content[i]), followAlias(node.Content[i+1])
+
+			fmt.Fprint(p.out,
+				prefix,
+				p.prefixAdd(),
+				p.colorize(`"`+k.Value+`"`, "keyColor"), ": ",
+			)
+
+			if p.isScalar(v) {
+				p.neatJSON("", v)
+
+			} else {
+				p.neatJSON(prefix+p.prefixAdd(), v)
+			}
+
+			if i < len(node.Content)-2 {
+				fmt.Fprint(p.out, ",")
+			}
+
+			fmt.Fprint(p.out, "\n")
 		}
+		bunt.Fprint(p.out, prefix, "*}*")
 
-	default:
-		if err := p.neatJSONofScalar(prefix, obj); err != nil {
-			return "", nil
+	case yamlv3.SequenceNode:
+		if len(node.Content) == 0 {
+			fmt.Fprint(p.out, p.colorize("[]", "emptyStructures"))
+			return nil
+		}
+
+		bunt.Fprint(p.out, "*[*\n")
+		for i := range node.Content {
+			entry := followAlias(node.Content[i])
+
+			if p.isScalar(entry) {
+				p.neatJSON("", entry)
+
+			} else {
+				fmt.Fprint(p.out, prefix, p.prefixAdd())
+				p.neatJSON(prefix+p.prefixAdd(), entry)
+			}
+
+			if i < len(node.Content)-1 {
+				fmt.Fprint(p.out, ",")
+			}
+
+			fmt.Fprint(p.out, "\n")
+		}
+		bunt.Fprint(p.out, prefix, "*]*")
+
+	case yamlv3.ScalarNode:
+		if node.Tag == "!!null" {
+			fmt.Fprint(p.out, p.colorize("null", "nullColor"))
+			return nil
 		}
+
+		color := p.determineColorByType(node)
+		quotes := func() string {
+			if node.Tag == "!!str" {
+				return p.colorize(`"`, color)
+			}
+
+			return ""
+		}
+
+		fmt.Fprint(p.out, prefix, quotes())
+		parts := strings.Split(node.Value, "\n")
+		for idx, part := range parts {
+			fmt.Fprint(p.out, p.colorize(part, color))
+
+			if idx < len(parts)-1 {
+				fmt.Fprint(p.out, p.colorize("\\n", "emptyStructures"))
+			}
+		}
+		fmt.Fprint(p.out, quotes())
 	}
 
-	p.out.Flush()
-	return p.data.String(), nil
+	return nil
 }
 
 func (p *OutputProcessor) neatJSONofYAMLMapSlice(prefix string, mapslice yamlv2.MapSlice) error {