fix(#14): return usable type name (in Name attr) (#16)

* fix(#14): return short type name (in Name attr)

* feat: add type Name and InternalName

examples/1_validator/main.tmpl

@@ -6,9 +6,9 @@ import (
   "unicode"
 )
 
-func (v {{ .Type }}) Validate() error {
+func (v {{ .Type.InternalName }}) Validate() error {
 {{ range .Attributes }} {{$attribute := .}}
-  {{ if eq .Type "string" }}
+  {{ if eq .Type.InternalName "string" }}
     {{ range .Comments }}
       {{ if eq . "+optional" }}
   if v.{{ $attribute.Name }} == "" {
@@ -22,7 +22,7 @@ func (v {{ .Type }}) Validate() error {
       {{ end }}
     {{ end }}
   {{ end }}
-  {{ if eq .Type "int" "uint" "uint8" "uint32" "float32" "float64" }}
+  {{ if eq .Type.InternalName "int" "uint" "uint8" "uint32" "float32" "float64" }}
     // WORK IN PROGRESS
     {{ range .Comments }}
     {{ $comparators := split "," . }}

examples/2_getters/getters.tmpl

@@ -0,0 +1,9 @@
+package test
+
+{{ range .Attributes }}
+  {{ if has "+getter" .Comments }}{{ $receiverName := substr 0 1 $.Type.InternalName | lower}}
+func ({{ $receiverName }} *{{ $.Type.InternalName }}) Get{{ camelcase .Name }}() {{ .Type.InternalName }} {
+  return {{ $receiverName }}.{{.Name}}
+}
+  {{ end }}
+{{ end }}

examples/2_getters/test/car.go

@@ -0,0 +1,15 @@
+package test
+
+//go:generate genz -type Car -template ../getters.tmpl -output car.gen.go
+type Car struct {
+
+	//+getter
+	model string
+
+	//+getter
+	wheels []Wheel
+
+	motorReference string
+}
+
+type Wheel struct{}

internal/parser/parser.go

@@ -9,7 +9,13 @@ import (
 )
 
 func Parse(pkg *packages.Package, structName string) (Struct, error) {
-	parsedStruct := Struct{Type: Type(structName)}
+	parsedStruct := Struct{
+		Type: Type{
+			Name:         fmt.Sprintf("%s.%s", pkg.Name, structName),
+			InternalName: structName,
+		},
+	}
+
 	found := false
 	for ident := range pkg.TypesInfo.Defs {
 		if ident.Name == structName {
@@ -84,7 +90,7 @@ func structAttributes(typesInfo *types.Info, structType *ast.StructType) []Attri
 
 		attributes[i] = Attribute{
 			Name:     field.Names[0].Name,
-			Type:     Type(typesInfo.TypeOf(field.Type).String()),
+			Type:     parseType(typesInfo.TypeOf(field.Type)),
 			Comments: comments,
 		}
 	}
@@ -106,15 +112,15 @@ func structMethods(namedType *types.Named) ([]Method, error) {
 		if signature.Params() != nil {
 			params = make([]Type, signature.Params().Len())
 			for j := 0; j < signature.Params().Len(); j++ {
-				params[j] = Type(signature.Params().At(j).Type().String())
+				params[j] = parseType(signature.Params().At(j).Type())
 			}
 		}
 
 		returns := []Type{}
 		if signature.Results() != nil {
 			returns = make([]Type, signature.Results().Len())
 			for j := 0; j < signature.Results().Len(); j++ {
-				returns[j] = Type(signature.Results().At(j).Type().String())
+				returns[j] = parseType(signature.Results().At(j).Type())
 			}
 		}
 
@@ -132,3 +138,21 @@ func structMethods(namedType *types.Named) ([]Method, error) {
 
 	return methods, nil
 }
+
+func parseType(t types.Type) Type {
+	// Remove every qualifier before the type name
+	// transforming "github.com/google/uuid.UUID" into "UUID"
+	noPackageQualifier := func(_ *types.Package) string { return "" }
+
+	// Adds the package name qualifier before the type name
+	// transforming "github.com/google/uuid.UUID" into "uuid.UUID"
+	packageNameQualifier := func(pkg *types.Package) string {
+		return pkg.Name()
+	}
+
+	return Type{
+		Name:         types.TypeString(t, packageNameQualifier), // (e.g. "uuid.UUID")
+		InternalName: types.TypeString(t, noPackageQualifier),   // (e.g. "UUID")
+	}
+
+}