feat: support --types-dir for proto generation

- Update all hardcoded 'internal' paths in genrpc to use config.C.Gen.TypesDir
- Modified files: genrpc.go, pb.go, logic.go, middleware.go, server.go
- Now proto generation also respects the --types-dir flag

Closes #406

Author: jaronnie

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

@@ -260,15 +260,15 @@ func (jr *JzeroRpc) Gen() (map[string]rpcparser.Proto, error) {
 						if strings.HasPrefix(goPackage, jr.Module) {
 							return goPackage
 						}
-						return filepath.ToSlash(filepath.Join(jr.Module, "internal", goPackage))
+						return filepath.ToSlash(filepath.Join(jr.Module, config.C.Gen.TypesDir, goPackage))
 					}(),
 					jr.Module,
 					rel,
 					func() string {
 						if strings.HasPrefix(goPackage, jr.Module) {
 							return goPackage
 						}
-						return filepath.ToSlash(filepath.Join(jr.Module, "internal", goPackage))
+						return filepath.ToSlash(filepath.Join(jr.Module, config.C.Gen.TypesDir, goPackage))
 					}())
 			}
 

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

@@ -45,7 +45,7 @@ func (jr *JzeroRpc) GetAllLogicFiles(descFilepath string, protoSpec rpcparser.Pr
 				return nil, err
 			}
 
-			fp := filepath.Join(config.C.Wd(), "internal", "logic", strings.ToLower(service.Name), namingFormat+".go")
+			fp := filepath.Join(config.C.Wd(), config.C.Gen.TypesDir, "logic", strings.ToLower(service.Name), namingFormat+".go")
 
 			f := LogicFile{
 				Path:             fp,

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

@@ -163,8 +163,8 @@ func (jr *JzeroRpc) genApiMiddlewares(protoFiles []string) (err error) {
 			return err
 		}
 		namingFormat, _ := format.FileNamingFormat(config.C.Style, v.Name+"Middleware")
-		if !pathx.FileExists(filepath.Join("internal", "middleware", namingFormat+".go")) {
-			err = os.WriteFile(filepath.Join("internal", "middleware", namingFormat+".go"), process, 0o644)
+		if !pathx.FileExists(filepath.Join(config.C.Gen.TypesDir, "middleware", namingFormat+".go")) {
+			err = os.WriteFile(filepath.Join(config.C.Gen.TypesDir, "middleware", namingFormat+".go"), process, 0o644)
 			if err != nil {
 				return err
 			}
@@ -184,8 +184,8 @@ func (jr *JzeroRpc) genApiMiddlewares(protoFiles []string) (err error) {
 			return err
 		}
 		namingFormat, _ := format.FileNamingFormat(config.C.Style, v.Name+"Middleware")
-		if !pathx.FileExists(filepath.Join("internal", "middleware", namingFormat+".go")) {
-			err = os.WriteFile(filepath.Join("internal", "middleware", namingFormat+".go"), process, 0o644)
+		if !pathx.FileExists(filepath.Join(config.C.Gen.TypesDir, "middleware", namingFormat+".go")) {
+			err = os.WriteFile(filepath.Join(config.C.Gen.TypesDir, "middleware", namingFormat+".go"), process, 0o644)
 			if err != nil {
 				return err
 			}
@@ -205,7 +205,7 @@ func (jr *JzeroRpc) genApiMiddlewares(protoFiles []string) (err error) {
 		return err
 	}
 
-	err = os.WriteFile(filepath.Join("internal", "middleware", "middleware_gen.go"), process, 0o644)
+	err = os.WriteFile(filepath.Join(config.C.Gen.TypesDir, "middleware", "middleware_gen.go"), process, 0o644)
 	if err != nil {
 		return err
 	}

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

@@ -56,7 +56,7 @@ func (jr *JzeroRpc) genNoRpcServiceExcludeThirdPartyProto(protoDirPath string) e
 				if strings.HasPrefix(goPackage, jr.Module) {
 					return goPackage
 				}
-				return filepath.ToSlash(filepath.Join(jr.Module, "internal", goPackage))
+				return filepath.ToSlash(filepath.Join(jr.Module, config.C.Gen.TypesDir, goPackage))
 			}(),
 			filepath.Join("."),
 			jr.Module)

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

@@ -40,7 +40,7 @@ func (jr *JzeroRpc) genServer(serverImports, pbImports ImportLines, registerServ
 	if err != nil {
 		return err
 	}
-	err = os.WriteFile(filepath.Join(config.C.Wd(), "internal", "server", "server.go"), serverFile, 0o644)
+	err = os.WriteFile(filepath.Join(config.C.Wd(), config.C.Gen.TypesDir, "server", "server.go"), serverFile, 0o644)
 	if err != nil {
 		return err
 	}
@@ -57,7 +57,7 @@ func (jr *JzeroRpc) GetAllServerFiles(descFilepath string, protoSpec rpcparser.P
 		if err != nil {
 			return nil, err
 		}
-		fp := filepath.Join(config.C.Wd(), "internal", "server", strings.ToLower(service.Name), namingFormat+".go")
+		fp := filepath.Join(config.C.Wd(), config.C.Gen.TypesDir, "server", strings.ToLower(service.Name), namingFormat+".go")
 
 		f := ServerFile{
 			DescFilepath: descFilepath,