Ensuring consistent indentation and preserving field order during YAML conversion.

encoding/convert.go

@@ -1,15 +1,42 @@
 package encoding
 
 import (
+	"bytes"
+	"fmt"
+
 	"gopkg.in/yaml.v3"
 )
 
+// ToYaml converts input JSON (or YAML) data into YAML while preserving key order.
+// It unmarshalls data into yaml.Node instead of map[string]interface{} because
+// maps do not preserve field order.
 func ToYaml(data []byte) ([]byte, error) {
-	var out map[string]interface{}
+	var out yaml.Node
 	err := Unmarshal(data, &out)
 	if err != nil {
 		return nil, err
 	}
 
-	return yaml.Marshal(out)
+	if len(out.Content) == 0 {
+		return nil, fmt.Errorf("No content found in the yaml file.")
+	}
+
+	// Recursively set the style of nodes to block style for readable formatting.
+	setBlockStyle(out.Content[0])
+
+	var buf bytes.Buffer
+	enc := yaml.NewEncoder(&buf)
+	enc.SetIndent(2)
+	err = enc.Encode(out.Content[0])
+	return buf.Bytes(), err
+}
+
+// setBlockStyle changes the node and all its children to block style.
+// In simple terms, it makes the output print on multiple indented lines
+// instead of one single inline line that looks like JSON.
+func setBlockStyle(n *yaml.Node) {
+	n.Style = 0 // Reset style to default (block style).
+	for _, child := range n.Content {
+		setBlockStyle(child)
+	}
 }

encoding/encoding.go

@@ -9,6 +9,13 @@ import (
 
 // Unmarshal parses the JSON/YAML data and stores the result in the value pointed to by out
 func Unmarshal(data []byte, out interface{}) error {
+	if node, ok := out.(*yaml.Node); ok {
+		err := unmarshalYAML(data, node)
+		if err != nil {
+			return err
+		}
+	}
+
 	err := unmarshalJSON(data, out)
 	if err != nil {
 		err = unmarshalYAML(data, out)