supported pointer embedded struct types

Author: aksentyev

parser.go

@@ -151,19 +151,21 @@ func With(i interface{}) OptionFn {
 }
 
 func (p *parser) findEmbeddedFieldNames(t reflect.Type) map[string]Type {
+	t = dereference(t)
+
 	res := make(map[string]Type)
 	if t.Kind() == reflect.Struct {
 		for i := 0; i < t.NumField(); i++ {
 			f := t.Field(i)
-			if f.Type.Kind() == reflect.Struct && f.Anonymous && f.Type.Name() == f.Name {
-				for name, typ := range p.findEmbeddedFieldNames(f.Type) {
+
+			fType := dereference(f.Type)
+			if fType.Kind() == reflect.Struct && f.Anonymous && fType.Name() == f.Name {
+				for name, typ := range p.findEmbeddedFieldNames(fType) {
 					res[name] = typ
 				}
-
-				return res
 			}
 
-			res[f.Name] = f.Type
+			res[f.Name] = fType
 		}
 	}
 

parser_test.go

@@ -210,6 +210,10 @@ func TestParse_error(t *testing.T) {
 
 func TestParser_findEmbeddedFieldNames(t *testing.T) {
 	type (
+		D struct {
+			F2 int
+		}
+
 		C struct {
 			F int
 		}
@@ -219,12 +223,17 @@ func TestParser_findEmbeddedFieldNames(t *testing.T) {
 		}
 
 		A struct {
+			*D
 			B
 		}
 	)
 
 	res := new(parser).findEmbeddedFieldNames(reflect.TypeOf(A{}))
 	if res["F"] != reflect.TypeOf(1) {
-		t.Error("expected embedded struct field")
+		t.Error("expected embedded struct field 'F'")
+	}
+
+	if res["F2"] != reflect.TypeOf(1) {
+		t.Error("expected embedded struct field 'F2'")
 	}
 }

type.go

@@ -348,15 +348,18 @@ func fieldType(ntype Type, name string) (Type, bool) {
 }
 
 func checkEmbeddedFieldNames(t reflect.Type, name string) (Type, bool) {
+	t = dereference(t)
 	if t.Kind() == reflect.Struct {
 		for i := 0; i < t.NumField(); i++ {
 			f := t.Field(i)
-			if f.Type.Kind() == reflect.Struct {
-				return checkEmbeddedFieldNames(f.Type, name)
+
+			fType := dereference(f.Type)
+			if fType.Kind() == reflect.Struct {
+				return checkEmbeddedFieldNames(fType, name)
 			}
 
 			if f.Anonymous && f.Name == name {
-				return f.Type, true
+				return fType, true
 			}
 		}
 	}

type_test.go

@@ -69,7 +69,8 @@ var typeTests = []typeTest{
 	"Int + Int + Int",
 	"Int % Int > 1",
 	"Int in Int..Int",
-	"FieldStr == 'test'",
+	"FieldStr == ''",
+	"FieldStr2 == ''",
 }
 
 var typeErrorTests = []typeErrorTest{
@@ -279,8 +280,13 @@ type StringStruct struct {
 	FieldStr string
 }
 
+type StringStructPtr struct {
+	FieldStr2 string
+}
+
 type payload struct {
 	StringStruct
+	*StringStructPtr
 	Abc    abc
 	Foo    *foo
 	Arr    []*foo