From 87b9b9fe4b1db8d1e981c7af9eb71b2e265da313 Mon Sep 17 00:00:00 2001
From: jaron <jaron@jaronnie.com>
Date: Thu, 21 Nov 2024 11:29:42 +0800
Subject: [PATCH] feat(gen): update jzero gen model

---
 internal/gen/genmodel/gen.go     | 57 +++++++++++++++++++-------------
 internal/gen/genmodel/plugins.go |  3 ++
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/internal/gen/genmodel/gen.go b/internal/gen/genmodel/gen.go
index 602e0f05..fc07c2e2 100644
--- a/internal/gen/genmodel/gen.go
+++ b/internal/gen/genmodel/gen.go
@@ -24,6 +24,7 @@ import (
 	"github.com/zeromicro/go-zero/tools/goctl/util/console"
 	"github.com/zeromicro/go-zero/tools/goctl/util/format"
 	"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/jzero-io/jzero/config"
 	"github.com/jzero-io/jzero/embeded"
@@ -124,47 +125,38 @@ func (jm *JzeroModel) Gen() error {
 		}
 
 		var (
-			allFiles     []string
-			genCodeFiles []string
+			allFiles        []string
+			genCodeSqlFiles []string
 		)
+		genCodeSqlSpecMap := make(map[string][]*parser.Table)
 
 		allFiles, err = jzerodesc.FindSqlFiles(sqlDir)
 		if err != nil {
 			return err
 		}
 
-		for _, f := range allFiles {
-			tableParsers, err := parser.Parse(filepath.Join(jm.Wd, f), "", jm.ModelMysqlStrict)
-			if err != nil {
-				return err
-			}
-			for _, tp := range tableParsers {
-				allTables = append(allTables, tp.Name.Source())
-			}
-		}
-
 		switch {
 		case jm.GitChange && len(jm.Desc) == 0:
 			m, _, err := gitstatus.ChangedFiles(jm.ModelGitChangePath, ".sql")
 			if err == nil {
-				genCodeFiles = append(genCodeFiles, m...)
+				genCodeSqlFiles = append(genCodeSqlFiles, m...)
 			}
 		case len(jm.Desc) > 0:
 			for _, v := range jm.Desc {
 				if !osx.IsDir(v) {
 					if filepath.Ext(v) == ".sql" {
-						genCodeFiles = append(genCodeFiles, v)
+						genCodeSqlFiles = append(genCodeSqlFiles, v)
 					}
 				} else {
 					specifiedSqlFiles, err := jzerodesc.FindSqlFiles(v)
 					if err != nil {
 						return err
 					}
-					genCodeFiles = append(genCodeFiles, specifiedSqlFiles...)
+					genCodeSqlFiles = append(genCodeSqlFiles, specifiedSqlFiles...)
 				}
 			}
 		default:
-			genCodeFiles, err = jzerodesc.FindSqlFiles(sqlDir)
+			genCodeSqlFiles, err = jzerodesc.FindSqlFiles(sqlDir)
 			if err != nil {
 				return err
 			}
@@ -174,7 +166,7 @@ func (jm *JzeroModel) Gen() error {
 		for _, v := range jm.DescIgnore {
 			if !osx.IsDir(v) {
 				if filepath.Ext(v) == ".sql" {
-					genCodeFiles = lo.Reject(genCodeFiles, func(item string, _ int) bool {
+					genCodeSqlFiles = lo.Reject(genCodeSqlFiles, func(item string, _ int) bool {
 						return item == v
 					})
 				}
@@ -184,20 +176,39 @@ func (jm *JzeroModel) Gen() error {
 					return err
 				}
 				for _, saf := range specifiedSqlFiles {
-					genCodeFiles = lo.Reject(genCodeFiles, func(item string, _ int) bool {
+					genCodeSqlFiles = lo.Reject(genCodeSqlFiles, func(item string, _ int) bool {
 						return item == saf
 					})
 				}
 			}
 		}
 
-		fmt.Printf("%s to generate model code from sql files.\n", color.WithColor("Start", color.FgGreen))
-		for _, f := range genCodeFiles {
-			fmt.Printf("%s sql file %s\n", color.WithColor("Using", color.FgGreen), f)
-			tableParsers, err := parser.Parse(filepath.Join(jm.Wd, f), jm.ModelMysqlDDLDatabase, jm.ModelMysqlStrict)
-			if err != nil {
+		if len(genCodeSqlFiles) != 0 {
+			var eg errgroup.Group
+			for _, f := range allFiles {
+				eg.Go(func() error {
+					tableParsers, err := parser.Parse(filepath.Join(jm.Wd, f), "", jm.ModelMysqlStrict)
+					if err != nil {
+						return err
+					}
+					genCodeSqlSpecMap[f] = tableParsers
+					for _, tp := range tableParsers {
+						allTables = append(allTables, tp.Name.Source())
+					}
+					return nil
+				})
+			}
+			if err = eg.Wait(); err != nil {
 				return err
 			}
+		} else {
+			return nil
+		}
+
+		fmt.Printf("%s to generate model code from sql files.\n", color.WithColor("Start", color.FgGreen))
+		for _, f := range genCodeSqlFiles {
+			fmt.Printf("%s sql file %s\n", color.WithColor("Using", color.FgGreen), f)
+			tableParsers := genCodeSqlSpecMap[f]
 
 			for _, tp := range tableParsers {
 				genCodeTables = append(genCodeTables, tp.Name.Source())
diff --git a/internal/gen/genmodel/plugins.go b/internal/gen/genmodel/plugins.go
index 7355e2da..71d89461 100644
--- a/internal/gen/genmodel/plugins.go
+++ b/internal/gen/genmodel/plugins.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 	"sync"
 
@@ -18,6 +19,8 @@ import (
 )
 
 func (jm *JzeroModel) GenRegister(tables []string) error {
+	slices.Sort(tables)
+
 	var imports []string
 	var tablePackages []string