Merge pull request #21 from mtt0/master

fix: Support embedded struct

Author: Ompluscator

builder.go

@@ -87,9 +87,11 @@ type (
 	}
 
 	fieldConfigImpl struct {
-		name string
-		typ  interface{}
-		tag  string
+		name      string
+		pkg       string
+		typ       interface{}
+		tag       string
+		anonymous bool
 	}
 
 	dynamicStructImpl struct {
@@ -132,18 +134,23 @@ func MergeStructs(values ...interface{}) Builder {
 		for i := 0; i < valueOf.NumField(); i++ {
 			fval := valueOf.Field(i)
 			ftyp := typeOf.Field(i)
-			builder.AddField(ftyp.Name, fval.Interface(), string(ftyp.Tag))
+			builder.(*builderImpl).addField(ftyp.Name, ftyp.PkgPath, fval.Interface(), string(ftyp.Tag), ftyp.Anonymous)
 		}
 	}
 
 	return builder
 }
 
 func (b *builderImpl) AddField(name string, typ interface{}, tag string) Builder {
+	return b.addField(name, "", typ, tag, false)
+}
+
+func (b *builderImpl) addField(name string, pkg string, typ interface{}, tag string, anonymous bool) Builder {
 	b.fields = append(b.fields, &fieldConfigImpl{
-		name: name,
-		typ:  typ,
-		tag:  tag,
+		name:      name,
+		typ:       typ,
+		tag:       tag,
+		anonymous: anonymous,
 	})
 
 	return b
@@ -182,9 +189,11 @@ func (b *builderImpl) Build() DynamicStruct {
 
 	for _, field := range b.fields {
 		structFields = append(structFields, reflect.StructField{
-			Name: field.name,
-			Type: reflect.TypeOf(field.typ),
-			Tag:  reflect.StructTag(field.tag),
+			Name:      field.name,
+			PkgPath:   field.pkg,
+			Type:      reflect.TypeOf(field.typ),
+			Tag:       reflect.StructTag(field.tag),
+			Anonymous: field.anonymous,
 		})
 	}
 

builder_test.go

@@ -23,10 +23,15 @@ func TestNewStruct(t *testing.T) {
 }
 
 func TestExtendStruct(t *testing.T) {
-	value := ExtendStruct(struct {
+	type B struct {
+		Embedded string `key:"embedded"`
+	}
+	type A struct {
+		B
 		Field int `key:"value"`
-	}{})
+	}
 
+	value := ExtendStruct(A{})
 	builder, ok := value.(*builderImpl)
 	if !ok {
 		t.Errorf(`TestExtendStruct - expected instance of *builder got %#v`, value)
@@ -36,21 +41,34 @@ func TestExtendStruct(t *testing.T) {
 		t.Error(`TestExtendStruct - expected instance of *map[string]*fieldConfig got nil`)
 	}
 
-	if len(builder.fields) != 1 {
-		t.Errorf(`TestExtendStruct - expected length of fields map to be 1 got %d`, len(builder.fields))
+	if len(builder.fields) != 2 {
+		t.Errorf(`TestExtendStruct - expected length of fields to be 2 got %d`, len(builder.fields))
 	}
 
 	field := builder.GetField("Field")
 	if field == nil {
 		t.Error(`TestExtendStruct - expected to have field "Field"`)
 	}
-
 	expected := &fieldConfigImpl{
 		name: "Field",
 		typ:  0,
 		tag:  `key:"value"`,
 	}
+	if !reflect.DeepEqual(field, expected) {
+		t.Errorf(`TestExtendStruct - expected field to be %#v got %#v`, expected, field)
+	}
 
+	field = builder.GetField("B")
+	if field == nil {
+		t.Error(`TestExtendStruct - expected to have field "B"`)
+	}
+	expected = &fieldConfigImpl{
+		name:      "B",
+		pkg:       "",
+		typ:       reflect.Indirect(reflect.ValueOf(A{})).Field(0).Interface(),
+		tag:       "",
+		anonymous: true,
+	}
 	if !reflect.DeepEqual(field, expected) {
 		t.Errorf(`TestExtendStruct - expected field to be %#v got %#v`, expected, field)
 	}