feat: add --types-dir flag for custom types output directory

- Add TypesDir field to GenConfig
- Add --types-dir flag to gen command (default: internal)
- Update types.go to use configured TypesDir instead of hardcoded internal/types
- Update import paths in generated handler and logic files

Closes #406

Author: jaronnie

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

@@ -96,6 +96,7 @@ func GetCommand() *cobra.Command {
 		genCmd.Flags().BoolP("mongo-cache", "", false, " Generate code with cache prefix [optional]")
 		genCmd.Flags().StringP("mongo-cache-prefix", "", "cache", "mongo cache prefix")
 		genCmd.Flags().StringSliceP("mongo-cache-type", "", []string{"*"}, "mongo cache type names to enable caching")
+		genCmd.Flags().StringP("types-dir", "", "internal", "types output directory")
 		genCmd.Flags().BoolP("rpc-client", "", false, "generate rpc client code")
 	}
 

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

@@ -15,6 +15,7 @@ import (
 	"github.com/zeromicro/go-zero/tools/goctl/util"
 	"golang.org/x/tools/go/ast/astutil"
 
+	"github.com/jzero-io/jzero/cmd/jzero/internal/config"
 	"github.com/jzero-io/jzero/cmd/jzero/internal/pkg/templatex"
 )
 
@@ -47,12 +48,12 @@ var (
 				return err
 			}
 
-			_ = os.MkdirAll(filepath.Join("internal", "types", goPackage), 0o755)
+			_ = os.MkdirAll(filepath.Join(config.C.Gen.TypesDir, "types", goPackage), 0o755)
 			process, err := gosimports.Process("", typesGoBytes, nil)
 			if err != nil {
 				return err
 			}
-			if err = os.WriteFile(filepath.Join("internal", "types", goPackage, "types.go"), process, 0o644); err != nil {
+			if err = os.WriteFile(filepath.Join(config.C.Gen.TypesDir, "types", goPackage, "types.go"), process, 0o644); err != nil {
 				return err
 			}
 		} else {
@@ -96,27 +97,33 @@ var (
 	if err != nil {
 		return err
 	}
-	if err = os.WriteFile(filepath.Join("internal", "types", "types.go"), process, 0o644); err != nil {
+	if err = os.WriteFile(filepath.Join(config.C.Gen.TypesDir, "types", "types.go"), process, 0o644); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (ja *JzeroApi) updateHandlerImportedTypesPath(f *ast.File, fset *token.FileSet, file HandlerFile) error {
+	typesImportPath := fmt.Sprintf("%s/%s", ja.Module, config.C.Gen.TypesDir)
 	if astutil.UsesImport(f, fmt.Sprintf("%s/internal/types", ja.Module)) {
 		astutil.DeleteImport(fset, f, fmt.Sprintf("%s/internal/types", ja.Module))
-		astutil.AddNamedImport(fset, f, "types", fmt.Sprintf("%s/internal/types/%s", ja.Module, file.Package))
 	}
+	if astutil.UsesImport(f, typesImportPath) {
+		return nil
+	}
+	astutil.AddNamedImport(fset, f, "types", fmt.Sprintf("%s/%s/%s", ja.Module, config.C.Gen.TypesDir, file.Package))
 
 	return nil
 }
 
 func (ja *JzeroApi) updateLogicImportedTypesPath(f *ast.File, fset *token.FileSet, file LogicFile) error {
-	astutil.DeleteImport(fset, f, fmt.Sprintf("%s/internal/types", ja.Module))
+	typesImportPath := fmt.Sprintf("%s/%s", ja.Module, config.C.Gen.TypesDir)
+	oldImportPath := fmt.Sprintf("%s/internal/types", ja.Module)
+	astutil.DeleteImport(fset, f, oldImportPath)
 	if file.RequestType == nil && file.ResponseType == nil {
 		return nil
 	}
-	astutil.AddNamedImport(fset, f, "types", fmt.Sprintf("%s/internal/types/%s", ja.Module, file.Package))
+	astutil.AddNamedImport(fset, f, "types", fmt.Sprintf("%s/%s/%s", ja.Module, config.C.Gen.TypesDir, file.Package))
 	return nil
 }
 

cmd/jzero/internal/config/config.go

@@ -137,6 +137,7 @@ type GenConfig struct {
 	MongoCache       bool     `mapstructure:"mongo-cache"`
 	MongoCachePrefix string   `mapstructure:"mongo-cache-prefix"`
 	MongoCacheType   []string `mapstructure:"mongo-cache-type"`
+	TypesDir         string   `mapstructure:"types-dir"`
 
 	// Gen Sub Command
 	Swagger GenSwaggerConfig `mapstructure:"swagger"`