Fix HCL -> YAML conversion

Author: sclevine

args/args.go

@@ -15,6 +15,20 @@ type Config struct {
 
 type Encoding rune
 
+func (e Encoding) String() string {
+	switch e {
+	case FlagYAML:
+		return "YAML"
+	case FlagTOML:
+		return "TOML"
+	case FlagJSON:
+		return "JSON"
+	case FlagHCL:
+		return "HCL"
+	}
+	return ""
+}
+
 const (
 	YAML Encoding = FlagYAML
 	TOML Encoding = FlagTOML

main.go

@@ -42,7 +42,7 @@ Convert YAML, TOML, JSON, or HCL to YAML, TOML, JSON, or HCL.
           -cj  -c = HCL to JSON
           -cc     = HCL to HCL
 -n     Do not covert Infinity, -Infinity, and NaN to/from strings
--e     Escape HTML (JSON/HCL output only)
+-e     Escape HTML (JSON output only)
 -k     Attempt to parse keys as objects or numbers types (YAML output only)
 -h     Show this help message
 
@@ -97,12 +97,12 @@ func Run(stdin io.Reader, stdout, stderr io.Writer, osArgs []string) (code int)
 	// TODO: if from == to, don't do yaml decode/encode to avoid stringifying the keys
 	rep, err := from(input, config)
 	if err != nil {
-		fmt.Fprintf(stderr, "Error: %s\n", err)
+		fmt.Fprintf(stderr, "Error parsing %s: %s\n", config.From, err)
 		return 1
 	}
 	output, err := to(rep, config)
 	if err != nil {
-		fmt.Fprintf(stderr, "Error: %s\n", err)
+		fmt.Fprintf(stderr, "Error writing %s: %s\n", config.To, err)
 		return 1
 	}
 	fmt.Fprintf(stdout, "%s", output)
@@ -147,7 +147,7 @@ func fromJSON(input []byte, _ *args.Config) (interface{}, error) {
 	return data, json.Unmarshal(input, &data)
 }
 
-func fromHCL(input []byte, config *args.Config) (interface{}, error) {
+func fromHCL(input []byte, _ *args.Config) (interface{}, error) {
 	if len(bytes.TrimSpace(input)) == 0 {
 		return nil, nil
 	}

yaml/encoder.go

@@ -31,7 +31,7 @@ func (e *Encoder) yamlify(in interface{}) interface{} {
 			out[e.yamlifyKey(k)] = e.yamlify(v)
 		}
 		return out
-	case map[interface{}]interface{}: // test!
+	case map[interface{}]interface{}: // TODO: test
 		out := map[interface{}]interface{}{}
 		for k, v := range in {
 			switch k := k.(type) {
@@ -48,6 +48,12 @@ func (e *Encoder) yamlify(in interface{}) interface{} {
 			out[i] = e.yamlify(v)
 		}
 		return out
+	case []map[string]interface{}: // TODO: test
+		out := make([]interface{}, len(in))
+		for i, v := range in {
+			out[i] = e.yamlify(v)
+		}
+		return out
 	default:
 		return e.yamlifyOther(in)
 	}