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

fix templates

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-02-02 09:29:56 +03:00
parent c74ea2bc7b
commit 31e99273ca
5 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/vfsdata.go
View File

File diff suppressed because one or more lines are too long

3
encoder.go
View File

@ -21,7 +21,6 @@ import (
type GenericTemplateBasedEncoder struct { type GenericTemplateBasedEncoder struct {
templateDir string templateDir string
assetsDir string
service *descriptor.ServiceDescriptorProto service *descriptor.ServiceDescriptorProto
file *descriptor.FileDescriptorProto file *descriptor.FileDescriptorProto
enum []*descriptor.EnumDescriptorProto enum []*descriptor.EnumDescriptorProto
@ -239,6 +238,8 @@ func (e *GenericTemplateBasedEncoder) buildContent(templateFilename string) (str
} }
if err != nil { if err != nil {
return "", "", err return "", "", err
} else if tmpl == nil {
return "", "", fmt.Errorf("template for %s is nil", templateFilename)
} }
ast, err := e.genAst(templateFilename) ast, err := e.genAst(templateFilename)

BIN
protoc-gen-micro Executable file
View File

Binary file not shown.

6
templates/e3t0cmltU3VmZml4ICIucHJvdG8iIC5GaWxlLk5hbWV9fV9taWNyb19ncnBjLnBiLmdvLnRtcGw=
View File

@ -169,11 +169,13 @@ func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) SendMsg(m interface{}) er
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) RecvMsg(m interface{}) error { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) RecvMsg(m interface{}) error {
return x.stream.Recv(m) return x.stream.Recv(m)
} }
{{- if .ServerStreaming}} {{- if .ServerStreaming}}
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Send(m *{{$rspMethod}}) error { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Send(m *{{$rspMethod}}) error {
return x.stream.Send(m) return x.stream.Send(m)
} }
{{- end}} {{end}}
{{if .ClientStreaming}} {{if .ClientStreaming}}
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}}, error) { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}}, error) {
m := &{{$reqMethod}}{} m := &{{$reqMethod}}{}
@ -182,7 +184,7 @@ func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}},
} }
return m, nil return m, nil
} }
{{- end}} {{end}}
{{- end}} {{- end}}
{{- end}} {{- end}}

36
templates/e3t0cmltU3VmZml4ICIucHJvdG8iIC5GaWxlLk5hbWV9fV9taWNyb19odHRwLnBiLmdvLnRtcGw=
View File

@ -34,11 +34,11 @@ func New{{$ServiceName}}Service(name string, c micro_client.Client) {{$ServiceNa
{{range .Service.Method}} {{range .Service.Method}}
{{- $reqMethod := .InputType | splitArray "." | last}} {{- $reqMethod := .InputType | splitArray "." | last}}
{{- $rspMethod := .OutputType | splitArray "." | last}} {{- $rspMethod := .OutputType | splitArray "." | last}}
{{- if and (not .ClientStreaming) (.ServerStreaming) -}} {{ if and (not .ClientStreaming) (.ServerStreaming) }}
func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, req *{{$reqMethod}}, opts ...micro_client.CallOption) ({{$ServiceName}}_{{.Name}}Service, error) { func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, req *{{$reqMethod}}, opts ...micro_client.CallOption) ({{$ServiceName}}_{{.Name}}Service, error) {
{{- else if .ClientStreaming -}} {{ else if .ClientStreaming }}
func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, opts ...micro_client.CallOption) ({{$ServiceName}}_{{.Name}}Service, error) { func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, opts ...micro_client.CallOption) ({{$ServiceName}}_{{.Name}}Service, error) {
{{- else -}} {{ else }}
func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, req *{{$reqMethod}}, opts ...micro_client.CallOption) (*{{$rspMethod}}, error) { func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, req *{{$reqMethod}}, opts ...micro_client.CallOption) (*{{$rspMethod}}, error) {
{{- end }} {{- end }}
{{- if not (contains (json (openapiOption .)) "null") }} {{- if not (contains (json (openapiOption .)) "null") }}
@ -48,7 +48,7 @@ func (c *{{$ServiceName | lowerFirst}}Service) {{.Name}}(ctx context.Context, re
errmap["{{$k}}"] = &{{- (getMessageType $File $v.Schema.JsonSchema.Ref).Name }}{} errmap["{{$k}}"] = &{{- (getMessageType $File $v.Schema.JsonSchema.Ref).Name }}{}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{ end }}
nopts := append(opts, nopts := append(opts,
micro_client_http.Method("{{httpVerb .}}"), micro_client_http.Method("{{httpVerb .}}"),
micro_client_http.Path("{{httpPath .}}"), micro_client_http.Path("{{httpPath .}}"),
@ -162,23 +162,8 @@ func (h *{{$ServiceName | lowerFirst}}Handler) {{.Name}}(ctx context.Context, re
return h.{{$ServiceName}}Handler.{{.Name}}(ctx, req, rsp) return h.{{$ServiceName}}Handler.{{.Name}}(ctx, req, rsp)
} }
{{- end}} {{- end}}
{{if or (.ServerStreaming) (.ClientStreaming)}}
type {{$ServiceName}}_{{.Name}}Stream interface {
Context() context.Context
SendMsg(interface{}) error
RecvMsg(interface{}) error
{{- if and (.ClientStreaming) (not .ServerStreaming)}}
SendAndClose(*{{$rspMethod}}) error
{{- end}}
Close() error
{{- if .ServerStreaming}}
Send(*{{$rspMethod}}) error
{{- end}}
{{- if .ClientStreaming}}
Recv() (*{{$reqMethod}}, error)
{{- end}}
}
{{if or (.ServerStreaming) (.ClientStreaming)}}
type {{$ServiceName | lowerFirst}}{{.Name}}Stream struct { type {{$ServiceName | lowerFirst}}{{.Name}}Stream struct {
stream micro_server.Stream stream micro_server.Stream
} }
@ -207,11 +192,12 @@ func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) SendMsg(m interface{}) er
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) RecvMsg(m interface{}) error { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) RecvMsg(m interface{}) error {
return x.stream.Recv(m) return x.stream.Recv(m)
} }
{{- if .ServerStreaming}} {{if .ServerStreaming}}
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Send(m *{{$rspMethod}}) error { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Send(m *{{$rspMethod}}) error {
return x.stream.Send(m) return x.stream.Send(m)
} }
{{- end}} {{end}}
{{if .ClientStreaming}} {{if .ClientStreaming}}
func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}}, error) { func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}}, error) {
m := &{{$reqMethod}}{} m := &{{$reqMethod}}{}
@ -220,10 +206,10 @@ func (x *{{$ServiceName | lowerFirst}}{{.Name}}Stream) Recv() (*{{$reqMethod}},
} }
return m, nil return m, nil
} }
{{- end}} {{end}}
{{- end}} {{end}}
{{- end}} {{end}}
{{- $errmsg := list }} {{- $errmsg := list }}
{{range .Service.Method}} {{range .Service.Method}}