feat(jzero): support different api file use same go_package and fix model.go.tpl

Author: jaronnie

cmd/jzero/.template/model/model.go.tpl

@@ -44,8 +44,7 @@ type Model struct {
 }
 
 func NewModel(conn sqlx.SqlConn, op ...opts.Opt[modelx.ModelOpts]) Model {
-	{{range $v := .TableInfos}}
-	{{if and $.ModelCache (or $v.HasCacheExpiry $v.HasNotFoundExpiry)}}
+	{{range $v := .TableInfos}}{{if and $.ModelCache (or $v.HasCacheExpiry $v.HasNotFoundExpiry)}}
 	{{$v.Name | ToCamel}}CacheOpts := opts.DefaultApply(op...).CacheOpts
 	{{if $v.HasCacheExpiry}}
 	if expiry, ok := ModelExpiryTable["{{$v.Name}}"]; ok {
@@ -55,12 +54,7 @@ func NewModel(conn sqlx.SqlConn, op ...opts.Opt[modelx.ModelOpts]) Model {
 	{{if $v.HasNotFoundExpiry}}
 	if notFoundExpiry, ok := ModelNotFoundExpiryTable["{{$v.Name}}"]; ok {
 		{{$v.Name | ToCamel}}CacheOpts = append({{$v.Name | ToCamel}}CacheOpts, cache.WithNotFoundExpiry(time.Duration(notFoundExpiry)*time.Millisecond))
-	}
-	{{end}}
-	{{end}}
-	{{end}}
-
-	return Model{
+	}{{end}}{{end}}{{end}}return Model{
          {{range $v := .TableInfos}}{{if and $.ModelCache (or $v.HasCacheExpiry $v.HasNotFoundExpiry)}}{{$v.Name | FirstUpper | ToCamel}}: {{$v.Name}}.New{{ $v.Name | FirstUpper | ToCamel }}Model(conn, append(op, modelx.WithCacheOpts({{$v.Name | ToCamel}}CacheOpts...))...),{{else}}{{$v.Name | FirstUpper | ToCamel}}: {{$v.Name}}.New{{ $v.Name | FirstUpper | ToCamel }}Model(conn, op...),{{end}}
          {{end}}
 	}

cmd/jzero/internal/command/gen/genapi/types.go

@@ -6,6 +6,7 @@ import (
 	"go/token"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"sync"
 
@@ -36,19 +37,19 @@ func (ja *JzeroApi) separateTypesGo(apiFiles []string, apiSpecMap map[string]*sp
 
 // apiFileTypes 表示 API 文件的类型信息
 type apiFileTypes struct {
-	file         string
-	types        []spec.Type
-	goPackage    string
-	typesGoBytes []byte
+	file      string
+	types     []spec.Type
+	goPackage string
 }
 
 // collectAndGenerateTypesByPackage 收集并按包生成 types.go 文件
 func (ja *JzeroApi) collectAndGenerateTypesByPackage(apiFiles []string, apiSpecMap map[string]*spec.ApiSpec) (typesWithPackage []apiFileTypes, typesWithoutPackage []spec.Type, err error) {
 	var eg errgroup.Group
 	var mu sync.Mutex
-	results := make([]apiFileTypes, 0, len(apiFiles))
+	resultsByFile := make([]apiFileTypes, len(apiFiles))
 
-	for _, apiFile := range apiFiles {
+	for i, apiFile := range apiFiles {
+		index := i
 		currentFile := apiFile
 		currentSpec := apiSpecMap[apiFile]
 
@@ -59,11 +60,7 @@ func (ja *JzeroApi) collectAndGenerateTypesByPackage(apiFiles []string, apiSpecM
 			}
 
 			mu.Lock()
-			if fileTypes.goPackage != "" {
-				results = append(results, fileTypes)
-			} else {
-				typesWithoutPackage = append(typesWithoutPackage, fileTypes.types...)
-			}
+			resultsByFile[index] = fileTypes
 			mu.Unlock()
 
 			return nil
@@ -74,12 +71,32 @@ func (ja *JzeroApi) collectAndGenerateTypesByPackage(apiFiles []string, apiSpecM
 		return nil, nil, err
 	}
 
+	results := make([]apiFileTypes, 0, len(apiFiles))
+	typesByPackage := make(map[string][]spec.Type)
+
+	for _, fileTypes := range resultsByFile {
+		if fileTypes.goPackage != "" {
+			results = append(results, fileTypes)
+			typesByPackage[fileTypes.goPackage] = append(typesByPackage[fileTypes.goPackage], fileTypes.types...)
+			continue
+		}
+
+		typesWithoutPackage = append(typesWithoutPackage, fileTypes.types...)
+	}
+
 	// 并发生成有 go_package 的 types.go 文件
 	eg = errgroup.Group{}
-	for _, fileTypes := range results {
-		currentTypes := fileTypes
+	goPackages := make([]string, 0, len(typesByPackage))
+	for goPackage := range typesByPackage {
+		goPackages = append(goPackages, goPackage)
+	}
+	sort.Strings(goPackages)
+
+	for _, goPackage := range goPackages {
+		currentPackage := goPackage
+		currentTypes := typesByPackage[goPackage]
 		eg.Go(func() error {
-			return ja.writeTypesFile(currentTypes.goPackage, currentTypes.typesGoBytes)
+			return ja.writeTypesFile(currentPackage, currentTypes)
 		})
 	}
 
@@ -92,11 +109,6 @@ func (ja *JzeroApi) collectAndGenerateTypesByPackage(apiFiles []string, apiSpecM
 
 // processApiFileTypes 处理单个 API 文件的类型
 func (ja *JzeroApi) processApiFileTypes(apiFile string, apiSpec *spec.ApiSpec) (apiFileTypes, error) {
-	typesGoString, err := gogen.BuildTypes(apiSpec.Types)
-	if err != nil {
-		return apiFileTypes{}, err
-	}
-
 	goPackage, hasGoPackage := apiSpec.Info.Properties["go_package"]
 	if !hasGoPackage || goPackage == "" {
 		return apiFileTypes{
@@ -105,41 +117,25 @@ func (ja *JzeroApi) processApiFileTypes(apiFile string, apiSpec *spec.ApiSpec) (
 		}, nil
 	}
 
-	packageName := strings.ToLower(strings.ReplaceAll(goPackage, "/", ""))
-	typesGoBytes, err := templatex.ParseTemplate("inner_types.go", map[string]any{
-		"Types":   typesGoString,
-		"Package": packageName,
-	}, []byte(`// Code generated by jzero. DO NOT EDIT.
-package {{.Package}}
-
-import (
-    "time"
-)
-
-var (
-    _ = time.Now()
-)
-
-{{.Types}}`))
-	if err != nil {
-		return apiFileTypes{}, err
-	}
-
 	return apiFileTypes{
-		file:         apiFile,
-		types:        apiSpec.Types,
-		goPackage:    goPackage,
-		typesGoBytes: typesGoBytes,
+		file:      apiFile,
+		types:     apiSpec.Types,
+		goPackage: goPackage,
 	}, nil
 }
 
 // writeTypesFile 写入 types.go 文件
-func (ja *JzeroApi) writeTypesFile(goPackage string, typesGoBytes []byte) error {
+func (ja *JzeroApi) writeTypesFile(goPackage string, types []spec.Type) error {
 	typesDir := filepath.Join("internal", "types", goPackage)
 	if err := os.MkdirAll(typesDir, 0o755); err != nil {
 		return err
 	}
 
+	typesGoBytes, err := ja.renderTypesFile(types, strings.ToLower(strings.ReplaceAll(goPackage, "/", "")))
+	if err != nil {
+		return err
+	}
+
 	process, err := gosimports.Process("", typesGoBytes, nil)
 	if err != nil {
 		return err
@@ -153,15 +149,30 @@ func (ja *JzeroApi) generateDefaultTypesFile(allTypes []spec.Type) error {
 	// 去重
 	uniqueTypes := ja.deduplicateTypes(allTypes)
 
-	typesGoString, err := gogen.BuildTypes(uniqueTypes)
+	typesGoBytes, err := ja.renderTypesFile(uniqueTypes, "types")
 	if err != nil {
 		return err
 	}
 
+	process, err := gosimports.Process("", typesGoBytes, nil)
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(filepath.Join("internal", "types", "types.go"), process, 0o644)
+}
+
+func (ja *JzeroApi) renderTypesFile(types []spec.Type, packageName string) ([]byte, error) {
+	typesGoString, err := gogen.BuildTypes(types)
+	if err != nil {
+		return nil, err
+	}
+
 	typesGoBytes, err := templatex.ParseTemplate("inner_types.go", map[string]any{
-		"Types": typesGoString,
+		"Types":   typesGoString,
+		"Package": packageName,
 	}, []byte(`// Code generated by jzero. DO NOT EDIT.
-package types
+package {{.Package}}
 
 import (
     "time"
@@ -173,15 +184,10 @@ var (
 
 {{.Types}}`))
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	process, err := gosimports.Process("", typesGoBytes, nil)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(filepath.Join("internal", "types", "types.go"), process, 0o644)
+	return typesGoBytes, nil
 }
 
 // deduplicateTypes 去重类型列表

cmd/jzero/internal/command/gen/genapi/types_test.go

@@ -77,3 +77,81 @@ type OldType struct{}
 		t.Fatalf("separateTypesGo() should keep default types package, got:\n%s", got)
 	}
 }
+
+func TestSeparateTypesGoMergesTypesForSameGoPackage(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	oldWd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("Getwd() error = %v", err)
+	}
+	t.Cleanup(func() {
+		_ = os.Chdir(oldWd)
+	})
+
+	if err := os.Chdir(tmpDir); err != nil {
+		t.Fatalf("Chdir() error = %v", err)
+	}
+
+	apiSpecMap := map[string]*spec.ApiSpec{
+		"desc/api/user.api": {
+			Info: spec.Info{
+				Properties: map[string]string{
+					"go_package": "shared",
+				},
+			},
+			Types: []spec.Type{
+				spec.DefineStruct{
+					RawName: "UserReq",
+					Members: []spec.Member{
+						{
+							Name: "Name",
+							Type: spec.PrimitiveType{RawName: "string"},
+							Tag:  "`json:\"name\"`",
+						},
+					},
+				},
+			},
+		},
+		"desc/api/order.api": {
+			Info: spec.Info{
+				Properties: map[string]string{
+					"go_package": "shared",
+				},
+			},
+			Types: []spec.Type{
+				spec.DefineStruct{
+					RawName: "OrderReq",
+					Members: []spec.Member{
+						{
+							Name: "Id",
+							Type: spec.PrimitiveType{RawName: "int64"},
+							Tag:  "`json:\"id\"`",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	ja := &JzeroApi{}
+	if err := ja.separateTypesGo([]string{"desc/api/user.api", "desc/api/order.api"}, apiSpecMap); err != nil {
+		t.Fatalf("separateTypesGo() error = %v", err)
+	}
+
+	data, err := os.ReadFile(filepath.Join("internal", "types", "shared", "types.go"))
+	if err != nil {
+		t.Fatalf("ReadFile() error = %v", err)
+	}
+
+	got := string(data)
+	for _, want := range []string{
+		"package shared",
+		"type UserReq struct",
+		"type OrderReq struct",
+	} {
+		if !strings.Contains(got, want) {
+			t.Fatalf("separateTypesGo() missing %q in merged file:\n%s", want, got)
+		}
+	}
+}