add embed property to field

support embedded interfaces

cli/models/field.go

@@ -47,6 +47,9 @@ type Field struct {
 
 	// The custom options of a field.
 	Options FieldOptions
+
+	// Embedded represents whether the field is an embedded field.
+	Embedded bool
 }
 
 // FieldOptions represent options for a Field.
@@ -86,6 +89,7 @@ func (f *Field) Deepcopy(cyclic map[*Field]bool) *Field {
 			Automatch: f.Options.Automatch,
 			Deepcopy:  f.Options.Deepcopy,
 		},
+		Embedded: f.Embedded,
 	}
 
 	copied.Tags = make(map[string]map[string][]string, len(f.Tags))
@@ -114,6 +118,7 @@ func (f *Field) Deepcopy(cyclic map[*Field]bool) *Field {
 		copied.Fields[i] = sf.Deepcopy(cyclic)
 		copied.Fields[i].Parent = copied
 	}
+
 	return copied
 }
 

cli/parser/field.go

@@ -114,9 +114,15 @@ func parseField(typ types.Type) *models.Field {
 		} else {
 			var definition strings.Builder
 			definition.WriteString(models.CollectionInterface + "{")
+
 			for i := 0; i < x.NumMethods(); i++ {
 				definition.WriteString(collectedDefinition(parseField(x.Method(i).Type())) + "; ")
 			}
+
+			for i := 0; i < x.NumEmbeddeds(); i++ {
+				definition.WriteString(collectedDefinition(parseField(x.EmbeddedType(i))) + "; ")
+			}
+
 			definition.WriteString("}")
 			field.Definition = definition.String()
 		}
@@ -127,22 +133,28 @@ func parseField(typ types.Type) *models.Field {
 		var definition strings.Builder
 		definition.WriteString("struct{")
 		for i := 0; i < x.NumFields(); i++ {
-			// a deepcopy of subfield is returned and modified.
+			// a deepcopy of subfield is returned, then modified.
 			subfield := parseField(x.Field(i).Type()).Deepcopy(nil)
 			subfield.VariableName = "." + x.Field(i).Name()
 			subfield.Name = x.Field(i).Name()
 			setTags(subfield, x.Tag(i))
 			subfield.Parent = field
 			field.Fields = append(field.Fields, subfield)
+
+			if x.Field(i).Embedded() {
+				subfield.Embedded = true
+			}
+
 			definition.WriteString(subfield.Name + " " + subfield.FullDefinition() + "; ")
 
-			// all subfields are deepcopied with Fields[0].
+			// Due to the possibility of cyclic structs,
+			// all subfields are deepcopied with len([]Fields) == (0:?).
 			//
-			// in order to correctly represent a deepcopied struct field,
-			// we must point its fields back to the cached field.Fields,
-			// which will eventually be filled.
+			// In order to correctly represent a deepcopied subfield,
+			// point its fields back to the cached field []Fields,
+			// which are eventually filled.
 			//
-			// cachedsubfield.Fields are never modified.
+			// cachedsubfield.Fields pointer is never modified.
 			if cachedsubfield, ok := fieldcache[x.Field(i).String()]; ok {
 				subfield.Fields = cachedsubfield.Fields
 			}

cli/parser/type.go

@@ -37,9 +37,11 @@ func parseTypeField(vars *types.Tuple) []models.Type {
 	for i := 0; i < vars.Len(); i++ {
 		field := parseField(vars.At(i).Type()).Deepcopy(nil)
 		field.Name = vars.At(i).Name()
+
 		if !field.IsPointer() {
 			field.VariableName = "." + alphastring(field.Definition)
 		}
+
 		types[i] = models.Type{Field: field}
 	}