feat: detection type args that local or other package

_example/group.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/go-sql-driver/mysql"
+	"github.com/mackee/go-sqlla/_example/id"
 )
 
 //go:generate go run ../cmd/sqlla/main.go
@@ -14,10 +15,11 @@ type GroupID uint64
 //sqlla:table group
 //genddl:table group
 type Group struct {
-	ID              GroupID          `db:"id,primarykey,autoincrement"`
-	Name            string           `db:"name"`
-	LeaderUserID    UserId           `db:"leader_user_id"`
-	SubLeaderUserID sql.Null[UserId] `db:"sub_leader_user_id"`
+	ID              GroupID              `db:"id,primarykey,autoincrement"`
+	Name            string               `db:"name"`
+	LeaderUserID    UserId               `db:"leader_user_id"`
+	SubLeaderUserID sql.Null[UserId]     `db:"sub_leader_user_id"`
+	ChildGroupID    sql.Null[id.GroupID] `db:"child_group_id"`
 
 	CreatedAt time.Time      `db:"created_at"`
 	UpdatedAt mysql.NullTime `db:"updated_at"`

_example/id/id.go

@@ -0,0 +1,3 @@
+package id
+
+type GroupID uint64

generator.go

@@ -60,7 +60,7 @@ func WriteCode(w io.Writer, table *Table) error {
 	i := 0
 	for scanner.Scan() {
 		i++
-		fmt.Printf("%05d: %s\n", i, scanner.Text())
+		// fmt.Printf("%05d: %s\n", i, scanner.Text())
 	}
 	bs, err := format.Source(buf.Bytes())
 	if err != nil {

go.mod

@@ -3,6 +3,7 @@ module github.com/mackee/go-sqlla/v2
 go 1.20
 
 require (
+	github.com/Masterminds/goutils v1.1.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/pkg/errors v0.9.1
 	github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e

go.sum

@@ -1,3 +1,5 @@
+github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

main.go

@@ -94,8 +94,10 @@ func toTable(tablePkg *types.Package, annotationComment string, gd *ast.GenDecl,
 	table := new(Table)
 	table.Package = tablePkg
 	table.PackageName = tablePkg.Name()
+	table.additionalPackagesMap = make(map[string]struct{})
 
 	table.TableName = trimAnnotation(annotationComment)
+	qualifier := types.RelativeTo(tablePkg)
 
 	spec := gd.Specs[0]
 	ts, ok := spec.(*ast.TypeSpec)
@@ -140,14 +142,26 @@ func toTable(tablePkg *types.Package, annotationComment string, gd *ast.GenDecl,
 			}
 			baseTypeName = typeName
 			if _, ok := supportedGenericsTypes[typeName]; ok {
-				tps := nt.TypeParams()
-				if tps == nil {
+				tas := nt.TypeArgs()
+				if tas == nil {
 					return nil, fmt.Errorf("toTable: has not type params: table=%s, field=%s", table.TableName, columnName)
 				}
-				tpsStr := make([]string, tps.Len())
-				for i := 0; i < tps.Len(); i++ {
-					tp := tps.At(i)
-					tpsStr[i] = tp.String()
+				tpsStr := make([]string, tas.Len())
+				for i := 0; i < tas.Len(); i++ {
+					ta := tas.At(i)
+					switch ata := ta.(type) {
+					case *types.Named:
+						tn := ata.Obj()
+						tpsStr[i] = tn.Id()
+						if qualifier(tn.Pkg()) != "" {
+							tpsStr[i] = tn.Pkg().Name() + "." + tn.Id()
+							table.additionalPackagesMap[tn.Pkg().Path()] = struct{}{}
+						}
+					case *types.Basic:
+						tpsStr[i] = ata.Name()
+					default:
+						return nil, fmt.Errorf("toTable: unsupported type param: table=%s, field=%s, type=%s", table.TableName, columnName, ta.String())
+					}
 				}
 				typeParameter = strings.Join(tpsStr, ",")
 			} else if _, ok := supportedNonPrimitiveTypes[typeName]; !ok {