Fix support for query interfaces defined in model packages (#17)

Author: uptutu

README.md

@@ -202,8 +202,8 @@ type Query[T any] interface {
 
   // SELECT * FROM @@table
   // {{where}}
-  //   {{if @user.Name }} [email protected] {{end}}
-  //   {{if @user.Age > 0}} AND [email protected] {{end}}
+  //   {{if user.Name }} [email protected] {{end}}
+  //   {{if user.Age > 0}} AND [email protected] {{end}}
   // {{end}}
   SearchUsers(user User) ([]T, error)
 

examples/models/query.go

@@ -0,0 +1,11 @@
+package models
+
+type Query[T any] interface {
+	// GetByID query data by id and return it as struct
+	//
+	// SELECT * FROM @@table WHERE id=@id
+	GetByID(id int) (T, error)
+
+	// SELECT * FROM @@table WHERE @@column=@value
+	FilterWithColumn(column string, value string) (T, error)
+}

examples/models/user_query.go

@@ -0,0 +1,18 @@
+package models
+
+type UserQuery interface {
+	// SELECT * FROM @@table
+	// {{where}}
+	//   {{if user.ID > 0}} [email protected]  {{end}}
+	//   {{if user.Name != ""}} [email protected] {{end}}
+	// {{end}}
+	QueryWith(user User) (User, error)
+
+	// UPDATE @@table
+	//{{set}}
+	//  {{if user.Name != ""}} [email protected], {{end}}
+	//  {{if user.Age > 0}} [email protected] {{end}}
+	//{{end}}
+	//WHERE [email protected]
+	UpdateWith(user User) error
+}

examples/output/models/query.go

@@ -104,7 +104,7 @@ func (g *Generator) Gen() error {
 	tmpl, _ := template.New("").Parse(pkgTmpl)
 
 	// files contains config
-	filesWithCfg := []string{}
+	var filesWithCfg []string
 	for pth, file := range g.Files {
 		if file.Config != nil {
 			filesWithCfg = append(filesWithCfg, pth)
@@ -683,6 +683,16 @@ func (p *File) parseFieldType(expr ast.Expr, pkgName string, fullMode bool) stri
 			return pkgName + "." + t.Name
 		}
 
+		if !unicode.IsLower(rune(t.Name[0])) && !strings.Contains(t.Name, ".") { // exported type and not another package type
+			if fullMode && p.PackagePath != "" {
+				return p.PackagePath + "." + t.Name
+			}
+
+			if p.Package != "" {
+				return p.Package + "." + t.Name
+			}
+		}
+
 		return t.Name
 	case *ast.SelectorExpr:
 		if pkgIdent, ok := t.X.(*ast.Ident); ok {

examples/output/models/user_query.go

@@ -141,6 +141,6 @@ func TestProcessStructType(t *testing.T) {
 		trimmed.Fields = append(trimmed.Fields, Field{Name: f.Name, DBName: f.DBName, GoType: f.GoType, NamedGoType: f.NamedGoType})
 	}
 	if !reflect.DeepEqual(trimmed, expected) {
-		t.Errorf("Expected %+v, got %+v", expected, trimmed)
+		t.Errorf("Expected %+v, \n got %+v", expected, trimmed)
 	}
 }