add the new command modify-proto-package

api/serverNameExample/v1/userExample.proto

@@ -208,7 +208,7 @@ message GetUserExampleByIDReply {
 }
 
 message ListUserExampleRequest {
-  types.Params params = 1 [(validate.rules).message.required = true];
+  api.types.Params params = 1 [(validate.rules).message.required = true];
 }
 
 message ListUserExampleReply {

api/types/types.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package types;
+package api.types;
 
 option go_package = "github.com/zhufuyi/sponge/api/types;types";
 

cmd/sponge/commands/patch.go

@@ -26,6 +26,7 @@ func PatchCommand() *cobra.Command {
 		patch.ModifyDuplicateErrCodeCommand(),
 		patch.AdaptMonoRepoCommand(),
 		patch.AddSpecialTypesCommand(),
+		patch.ModifyProtoPackageCommand(),
 	)
 
 	return cmd

cmd/sponge/commands/patch/modify-proto-package.go

@@ -0,0 +1,172 @@
+package patch
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/zhufuyi/sponge/pkg/gofile"
+)
+
+// ModifyProtoPackageCommand modifies the package and go_package names of proto files.
+func ModifyProtoPackageCommand() *cobra.Command {
+	var (
+		dir        string
+		moduleName string
+		serverDir  string
+	)
+
+	cmd := &cobra.Command{
+		Use:   "modify-proto-package",
+		Short: "Modifies the package and go_package names of proto files",
+		Long: `modifies the package and go_package names of proto files.
+
+Examples:
+  # modify the package and go_package names of all proto files in the api directory.
+  sponge patch modify-proto-package --dir=api --module-name=foo
+
+  # modify the package and go_package names of all proto files in the api directory, get module name from docs/gen.
+  sponge patch modify-proto-package --dir=api --server-dir=server
+
+`,
+		SilenceErrors: true,
+		SilenceUsage:  true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if serverDir != "" {
+				mdName, _, _ := getNamesFromOutDir(".")
+				if mdName != "" {
+					moduleName = mdName
+				}
+			}
+
+			if moduleName == "" {
+				return errors.New("'module-name' is required.")
+			}
+
+			protoFiles, err := gofile.ListFiles(dir, gofile.WithSuffix(".proto"), gofile.WithNoAbsolutePath())
+			if err != nil {
+				return err
+			}
+			if len(protoFiles) == 0 {
+				fmt.Printf("no proto files found in the directory '%s'.\n", dir)
+				return nil
+			}
+
+			var successFiles []string
+			for _, file := range protoFiles {
+				ss := splitProtoFilePath(gofile.GetDir(file))
+				packageName, goPackageName := getPackageName(ss, moduleName)
+				err = replaceProtoPackages(file, packageName, goPackageName)
+				if err != nil {
+					return err
+				}
+				successFiles = append(successFiles, file)
+			}
+
+			if len(successFiles) > 0 {
+				fmt.Printf(`modified the package and go_package names of files:
+    %s`, strings.Join(successFiles, "\n    "))
+			}
+
+			return nil
+		},
+	}
+
+	cmd.Flags().StringVarP(&dir, "dir", "d", "", "input specified directory")
+	_ = cmd.MarkFlagRequired("dir")
+	cmd.Flags().StringVarP(&serverDir, "server-dir", "s", "", "server directory, get module name and server name from docs/gen.info")
+	cmd.Flags().StringVarP(&moduleName, "module-name", "m", "", "go module name")
+
+	return cmd
+}
+
+func getPackageName(ss []string, moduleName string) (string, string) {
+	var packageName, goPackageName string
+	l := len(ss)
+	switch l {
+	case 0:
+		packageName = "v1"
+		goPackageName = `"v1"`
+		return packageName, goPackageName
+	case 1:
+		if ss[0] == "." {
+			ss[0] = "v1"
+		}
+		packageName = ss[0]
+		goPackageName = fmt.Sprintf(`"%s/%s;%s"`, moduleName, ss[0], ss[0])
+		return packageName, goPackageName
+	case 2:
+		packageName = strings.Join(ss, ".")
+		goPackageName = fmt.Sprintf(`"%s/%s;%s"`, moduleName, strings.Join(ss, "/"), ss[1])
+		return packageName, goPackageName
+	}
+	packageName = strings.Join(ss[l-3:], ".")
+	goPackageName = fmt.Sprintf(`"%s/%s;%s"`, moduleName, strings.Join(ss, "/"), ss[l-1])
+	return packageName, goPackageName
+}
+
+func splitProtoFilePath(protoFilePath string) []string {
+	ss := strings.Split(protoFilePath, gofile.GetPathDelimiter())
+	if len(ss) > 0 {
+		if ss[0] == ".." || ss[0] == "." {
+			return ss[1:]
+		}
+	}
+	return ss
+}
+
+func replaceProtoPackages(protoFilePath, packageName, goPackage string) error {
+	data, err := os.ReadFile(protoFilePath)
+	if err != nil {
+		return err
+	}
+
+	if bytes.Contains(data, []byte("\r\n")) {
+		data = bytes.ReplaceAll(data, []byte("\r\n"), []byte("\n"))
+	}
+
+	regStr := `\npackage [\w\W]*?;`
+	reg := regexp.MustCompile(regStr)
+	srcPackageName := reg.Find(data)
+
+	regStr2 := `go_package [\w\W]*?;\n`
+	reg2 := regexp.MustCompile(regStr2)
+	srcGoPackageName := reg2.Find(data)
+
+	if len(srcPackageName) > 0 {
+		newPackage := fmt.Sprintf("\npackage %s;", packageName)
+		data = bytes.Replace(data, srcPackageName, []byte(newPackage), 1)
+	}
+
+	if len(srcGoPackageName) > 0 {
+		newGoPackage := fmt.Sprintf("go_package = %s;\n", goPackage)
+		data = bytes.Replace(data, srcGoPackageName, []byte(newGoPackage), 1)
+	}
+
+	return os.WriteFile(protoFilePath, data, 0666)
+}
+
+// AddSpecialTypesCommand add common special types that proto files depend on
+// Deprecated: This command has been discarded
+func AddSpecialTypesCommand() *cobra.Command {
+	var dir string
+	cmd := &cobra.Command{
+		Use:   "add-special-types",
+		Short: "Add common special types that proto files depend on, [Deprecated]",
+		Long: `add common special types that proto files depend on, this command has been deprecated.
+
+`,
+		SilenceErrors: true,
+		SilenceUsage:  true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return nil
+		},
+	}
+	cmd.Flags().StringVarP(&dir, "dir", "d", "", "input specified directory")
+	return cmd
+}

pkg/sql2code/parser/template.go

@@ -157,7 +157,7 @@ message Get{{.TableName}}ByIDReply {
 }
 
 message List{{.TableName}}Request {
-  types.Params params = 1;
+  api.types.Params params = 1;
 }
 
 message List{{.TableName}}Reply {
@@ -261,7 +261,7 @@ message Get{{.TableName}}ByIDReply {
 }
 
 message List{{.TableName}}Request {
-  types.Params params = 1;
+  api.types.Params params = 1;
 }
 
 message List{{.TableName}}Reply {
@@ -518,7 +518,7 @@ message Get{{.TableName}}ByIDReply {
 }
 
 message List{{.TableName}}Request {
-  types.Params params = 1;
+  api.types.Params params = 1;
 }
 
 message List{{.TableName}}Reply {
@@ -738,7 +738,7 @@ message Get{{.TableName}}ByIDReply {
 }
 
 message List{{.TableName}}Request {
-  types.Params params = 1;
+  api.types.Params params = 1;
 }
 
 message List{{.TableName}}Reply {

scripts/protoc.sh

@@ -200,9 +200,6 @@ generateByAllProto
 # generate pb.go by specified proto files
 generateBySpecifiedProto
 
-# check and add the special_types.go file
-sponge patch add-special-types
-
 # delete unused packages in pb.go
 handlePbGoFiles $protoBasePath