Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hz): trim pb gopackage #1111

Merged
merged 1 commit into from
Jun 6, 2024
+18 −8
Merged

feat(hz): trim pb gopackage #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmd/hz/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ func Init() *cli.App {
customLayoutData := cli.StringFlag{Name: "customize_layout_data_path", Usage: "Specify the path for layout template render data.", Destination: &globalArgs.CustomizeLayoutData}
customPackage := cli.StringFlag{Name: "customize_package", Usage: "Specify the path for package template.", Destination: &globalArgs.CustomizePackage}
handlerByMethod := cli.BoolFlag{Name: "handler_by_method", Usage: "Generate a separate handler file for each method.", Destination: &globalArgs.HandlerByMethod}
trimGoPackage := cli.StringFlag{Name: "trim_gopackage", Aliases: []string{"trim_pkg"}, Usage: "Trim the prefix of go_package for protobuf.", Destination: &globalArgs.TrimGoPackage}

// app
app := cli.NewApp()
Expand Down Expand Up @@ -225,6 +226,7 @@ func Init() *cli.App {
&thriftOptionsFlag,
&protoOptionsFlag,
&optPkgFlag,
&trimGoPackage,
&noRecurseFlag,
&forceNewFlag,
&enableExtendsFlag,
Expand Down Expand Up @@ -261,6 +263,7 @@ func Init() *cli.App {
&thriftOptionsFlag,
&protoOptionsFlag,
&optPkgFlag,
&trimGoPackage,
&noRecurseFlag,
&enableExtendsFlag,
&sortRouterFlag,
Expand Down Expand Up @@ -291,6 +294,7 @@ func Init() *cli.App {
&thriftOptionsFlag,
&protoOptionsFlag,
&noRecurseFlag,
&trimGoPackage,

&jsonEnumStrFlag,
&unsetOmitemptyFlag,
Expand Down Expand Up @@ -318,6 +322,7 @@ func Init() *cli.App {
&protoOptionsFlag,
&noRecurseFlag,
&enableExtendsFlag,
&trimGoPackage,

&jsonEnumStrFlag,
&queryEnumIntFlag,
Expand Down
13 changes: 7 additions & 6 deletions cmd/hz/config/argument.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ type Argument struct {
BaseDomain string // request domain
ForceClientDir string // client dir (not use namespace as a subpath)

IdlType string // idl type
IdlPaths []string // master idl path
RawOptPkg []string // user-specified package import path
OptPkgMap map[string]string
Includes []string
PkgPrefix string
IdlType string // idl type
IdlPaths []string // master idl path
RawOptPkg []string // user-specified package import path
OptPkgMap map[string]string
Includes []string
PkgPrefix string
TrimGoPackage string // trim go_package for protobuf, avoid to generate multiple directory

Gopath string // $GOPATH
Gosrc string // $GOPATH/src
Expand Down
8 changes: 6 additions & 2 deletions cmd/hz/protobuf/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func (plugin *Plugin) Response(resp *pluginpb.CodeGeneratorResponse) error {
}

func (plugin *Plugin) Handle(req *pluginpb.CodeGeneratorRequest, args *config.Argument) error {
plugin.fixGoPackage(req, plugin.PkgMap)
plugin.fixGoPackage(req, plugin.PkgMap, args.TrimGoPackage)

// new plugin
opts := protogen.Options{}
Expand Down Expand Up @@ -291,12 +291,16 @@ func (plugin *Plugin) Handle(req *pluginpb.CodeGeneratorRequest, args *config.Ar
}

// fixGoPackage will update go_package to store all the model files in ${model_dir}
func (plugin *Plugin) fixGoPackage(req *pluginpb.CodeGeneratorRequest, pkgMap map[string]string) {
func (plugin *Plugin) fixGoPackage(req *pluginpb.CodeGeneratorRequest, pkgMap map[string]string, trimGoPackage string) {
gopkg := plugin.Package
for _, f := range req.ProtoFile {
if strings.HasPrefix(f.GetPackage(), "google.protobuf") {
continue
}
if len(trimGoPackage) != 0 && strings.HasPrefix(f.GetOptions().GetGoPackage(), trimGoPackage) {
*f.Options.GoPackage = strings.TrimPrefix(*f.Options.GoPackage, trimGoPackage)
}

opt := getGoPackage(f, pkgMap)
if !strings.Contains(opt, gopkg) {
if strings.HasPrefix(opt, "/") {
Expand Down
Loading