Set keys when squashing struct (#14)

Author: avorima

nodes.go

@@ -248,7 +248,7 @@ func encodeStruct(in reflect.Value) (ast.Node, []*ast.ObjectKey, error) {
 			}
 		}
 
-		val, childKey, err := encode(rawVal)
+		val, childKeys, err := encode(rawVal)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -270,6 +270,9 @@ func encodeStruct(in reflect.Value) (ast.Node, []*ast.ObjectKey, error) {
 			switch val := val.(type) {
 			case *ast.ObjectType:
 				list.Items = append(list.Items, val.List.Items...)
+				if childKeys != nil {
+					keys = childKeys
+				}
 				continue
 			}
 		}
@@ -292,8 +295,8 @@ func encodeStruct(in reflect.Value) (ast.Node, []*ast.ObjectKey, error) {
 			Keys: []*ast.ObjectKey{itemKey},
 			Val:  val,
 		}
-		if childKey != nil {
-			item.Keys = append(item.Keys, childKey...)
+		if childKeys != nil {
+			item.Keys = append(item.Keys, childKeys...)
 		}
 		list.Add(item)
 	}

nodes_test.go

@@ -405,6 +405,16 @@ func TestEncodeStruct(t *testing.T) {
 				},
 			}}},
 		},
+		{
+			ID:    "squash keyed child struct",
+			Input: reflect.ValueOf(SquashKeyChildStruct{KeyChildStruct: KeyChildStruct{Foo: KeyStruct{Bar: "baz"}}}),
+			Expected: &ast.ObjectType{List: &ast.ObjectList{Items: []*ast.ObjectItem{
+				&ast.ObjectItem{
+					Keys: []*ast.ObjectKey{{Token: token.Token{Type: token.IDENT, Text: "Foo"}}, {Token: token.Token{Type: token.STRING, Text: `"baz"`}}},
+					Val:  &ast.ObjectType{List: &ast.ObjectList{Items: []*ast.ObjectItem{}}},
+				},
+			}}},
+		},
 		{
 			ID:    "nested unkeyed struct slice",
 			Input: reflect.ValueOf(struct{ Foo []TestStruct }{[]TestStruct{{"Test"}}}),
@@ -701,6 +711,10 @@ type SquashStruct struct {
 	TestStruct `hcl:",squash"`
 }
 
+type SquashKeyChildStruct struct {
+	KeyChildStruct `hcl:",squash"`
+}
+
 func strAddr(s string) *string {
 	return &s
 }