unistack-org/protoc-gen-go-micro
4
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases 61 Wiki Activity

error generate in standalone mode

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2023-10-18 01:01:30 +03:00
parent 3806fb9336
commit 6d81896eb1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -90,6 +90,9 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
continue continue
case "micro": case "micro":
err = g.microGenerate(component, plugin, genClient, genServer) err = g.microGenerate(component, plugin, genClient, genServer)
if err == nil {
err = g.writeErrors(plugin)
}
case "http": case "http":
err = g.httpGenerate(component, plugin, genClient, genServer) err = g.httpGenerate(component, plugin, genClient, genServer)
case "grpc", "drpc", "rpc": case "grpc", "drpc", "rpc":
@ -113,11 +116,6 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
} }
if err = g.writeErrors(plugin); err != nil {
plugin.Error(err)
return err
}
if err = g.astGenerate(plugin); err != nil { if err = g.astGenerate(plugin); err != nil {
plugin.Error(err) plugin.Error(err)
return err return err

11
util.go
View File

@ -968,8 +968,10 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error {
} }
var gfile *protogen.GeneratedFile var gfile *protogen.GeneratedFile
var importPath protogen.GoImportPath
if len(errorsMap) > 0 { if len(errorsMap) > 0 {
gfile = plugin.NewGeneratedFile("micro_errors.pb.go", ".")
var packageName string var packageName string
for _, file := range plugin.Files { for _, file := range plugin.Files {
@ -980,9 +982,16 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error {
continue continue
} }
packageName = string(file.GoPackageName) packageName = string(file.GoPackageName)
importPath = file.GoImportPath
break break
} }
if g.standalone {
importPath = "."
}
gfile = plugin.NewGeneratedFile("micro_errors.pb.go", importPath)
gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.") gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
gfile.P("// protoc-gen-go-micro version: " + versionComment) gfile.P("// protoc-gen-go-micro version: " + versionComment)
gfile.P() gfile.P()