fix: provider generation issues

This commit is contained in:
Rogee
2025-01-09 11:05:03 +08:00
parent 1c5b908269
commit bd6d6bc6e8
4 changed files with 37 additions and 13 deletions

6
.vscode/launch.json vendored
View File

@@ -13,7 +13,7 @@
"args": [ "args": [
"gen", "gen",
"provider", "provider",
"/projects/learn/demo01", "/projects/learn/qq",
] ]
}, },
{ {
@@ -25,7 +25,7 @@
"args": [ "args": [
"swag", "swag",
"init", "init",
"/projects/tt", "/projects/learn/qq",
] ]
}, },
{ {
@@ -37,7 +37,7 @@
"args": [ "args": [
"gen", "gen",
"route", "route",
"/projects/learn/go-demo", "/projects/learn/qq",
] ]
} }
] ]

View File

@@ -51,6 +51,7 @@ type Provider struct {
ReturnType string ReturnType string
Mode string Mode string
ProviderGroup string ProviderGroup string
GrpcRegisterFunc string
NeedPrepareFunc bool NeedPrepareFunc bool
InjectParams map[string]InjectParam InjectParams map[string]InjectParam
Imports map[string]string Imports map[string]string
@@ -255,10 +256,12 @@ func Parse(source string) []Provider {
modePkg := gomod.GetModuleName() + "/providers/grpc" modePkg := gomod.GetModuleName() + "/providers/grpc"
provider.Imports["git.ipao.vip/rogeecn/atom"] = ""
provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = ""
provider.Imports[modePkg] = "" provider.Imports[modePkg] = ""
provider.ProviderGroup = "atom.GroupInitial" provider.ProviderGroup = "atom.GroupInitial"
provider.GrpcRegisterFunc = provider.ReturnType
provider.ReturnType = "contracts.Initial" provider.ReturnType = "contracts.Initial"
provider.InjectParams["__grpc"] = InjectParam{ provider.InjectParams["__grpc"] = InjectParam{
@@ -274,6 +277,7 @@ func Parse(source string) []Provider {
modePkg := gomod.GetModuleName() + "/providers/events" modePkg := gomod.GetModuleName() + "/providers/events"
provider.Imports["git.ipao.vip/rogeecn/atom"] = ""
provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = ""
provider.Imports[modePkg] = "" provider.Imports[modePkg] = ""
@@ -293,6 +297,7 @@ func Parse(source string) []Provider {
modePkg := gomod.GetModuleName() + "/providers/job" modePkg := gomod.GetModuleName() + "/providers/job"
provider.Imports["git.ipao.vip/rogeecn/atom"] = ""
provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = ""
provider.Imports["github.com/riverqueue/river"] = "" provider.Imports["github.com/riverqueue/river"] = ""
provider.Imports[modePkg] = "" provider.Imports[modePkg] = ""

View File

@@ -31,7 +31,7 @@ func Provide(opts ...opt.Option) error {
{{- end }} {{- end }}
{{- if eq .Mode "grpc"}} {{- if eq .Mode "grpc"}}
userv1.RegisterUserServiceServer(__grpc.Server, obj) {{ .GrpcRegisterFunc }}(__grpc.Server, obj)
{{- end }} {{- end }}
{{- if eq .Mode "event"}} {{- if eq .Mode "event"}}

View File

@@ -0,0 +1,19 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
[*.{yaml,yml}]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab