Merge pull request vmkteam#23 from sas1024/master

Add support for optional parameters in go client, add package setting…

README.md

@@ -39,22 +39,23 @@ func main() {
 ### Generate in HTTP handler
 
 ```go
-package main 
+package main
 
 import (
 	"net/http"
-	
+
 	"github.com/vmkteam/rpcgen/v2"
+	"github.com/vmkteam/rpcgen/v2/golang"
 	"github.com/vmkteam/rpcgen/v2/swift"
 	"github.com/vmkteam/zenrpc/v2"
 )
 
-func main () {
+func main() {
 	rpc := zenrpc.NewServer(zenrpc.Options{})
 
 	gen := rpcgen.FromSMD(rpc.SMD())
 
-	http.HandleFunc("/client.go", rpcgen.Handler(gen.GoClient()))
+	http.HandleFunc("/client.go", rpcgen.Handler(gen.GoClient(golang.Settings{})))
 	http.HandleFunc("/client.ts", rpcgen.Handler(gen.TSClient(nil)))
 	http.HandleFunc("/RpcClient.php", rpcgen.Handler(gen.PHPClient("")))
 	http.HandleFunc("/client.swift", rpcgen.Handler(gen.SwiftClient(swift.Settings{})))

generator.go

@@ -22,8 +22,8 @@ type Generator interface {
 	Generate() ([]byte, error)
 }
 
-func (g RPCGen) GoClient() Generator {
-	return golang.NewClient(g.schema)
+func (g RPCGen) GoClient(settings golang.Settings) Generator {
+	return golang.NewClient(g.schema, settings)
 }
 
 func (g RPCGen) PHPClient(phpNamespace string) Generator {

golang/go_client.go

@@ -11,21 +11,30 @@ import (
 	"github.com/vmkteam/zenrpc/v2/smd"
 )
 
+type Settings struct {
+	Package string
+}
+
 // Generator main package structure
 type Generator struct {
-	schema Schema
+	schema   Schema
+	settings Settings
 }
 
 // NewClient create Generator from zenrpc/v2 SMD.
-func NewClient(schema smd.Schema) *Generator {
-	return &Generator{schema: NewSchema(schema)}
+func NewClient(schema smd.Schema, settings Settings) *Generator {
+	if settings.Package == "" {
+		settings.Package = "client"
+	}
+	return &Generator{schema: NewSchema(schema), settings: settings}
 }
 
 // Generate returns generated Go client.
 func (g *Generator) Generate() ([]byte, error) {
 	g.schema.GeneratorData = gen.DefaultGeneratorData()
+	g.schema.Package = g.settings.Package
 
-	tmpl, err := template.New("").Funcs(templateFuncs).Parse(goTpl)
+	tmpl, err := template.New("golang client").Funcs(templateFuncs).Parse(goTpl)
 	if err != nil {
 		return nil, err
 	}

golang/go_template.go

@@ -3,7 +3,7 @@ package golang
 // goTpl contains template for Go client
 const goTpl = `// Code generated from jsonrpc schema by rpcgen v{{ .Version }}; DO NOT EDIT.
 
-package client
+package {{ .Package }}
 
 import (
 	"bytes"
@@ -47,7 +47,7 @@ func NewClient(endpoint string, header http.Header, httpClient *http.Client) *Cl
 {{ range .Models }}
 type {{ .Name }} struct {
 	{{ range .Fields }}{{ if ne .Description "" }}// {{ .Description }}
-	{{ end }}{{ title .Name }} {{ .GoType }} ` + "`json:\"{{ .Name }}{{if .Optional}},omitempty{{end}}\"`" + `
+	{{ end }}{{ title .Name }} {{ if and .Optional (eq .ArrayItemType "")}}*{{ end }}{{ .GoType }} ` + "`json:\"{{ .Name }}{{if .Optional}},omitempty{{end}}\"`" + `
 {{ end }}
 }
 {{ end }} 
@@ -75,9 +75,9 @@ Err{{ title $namespace }}{{ title $method.Name }}{{ .StringCode }} = zenrpc.NewE
 {{ end }}
 
 {{ $method.CommentDescription }}
-func (c *svc{{ title $lTitle}}) {{ title . }}(ctx context.Context, {{ range $method.Params }}{{ .Name }} {{ .GoType }}, {{ end }}) ( {{ if $method.HasResult }} res {{ $method.Returns.GoType }},  {{ else }} {{end}} err error) {
+func (c *svc{{ title $lTitle}}) {{ title . }}(ctx context.Context, {{ range $method.Params }}{{ .Name }} {{ if and .Optional (eq .ArrayItemType "")}}*{{ end }}{{ .GoType }}, {{ end }}) ( {{ if $method.HasResult }} res {{ if and $method.Returns.Optional (eq $method.Returns.ArrayItemType "")}}*{{ end }}{{ $method.Returns.GoType }},  {{ else }} {{end}} err error) {
 	_req := struct {
-		{{ range $method.Params }}{{ title .Name }} {{ .GoType }}
+		{{ range $method.Params }}{{ title .Name }} {{ if and .Optional (eq .ArrayItemType "")}}*{{ end }}{{ .GoType }}
 {{ end }}
 	} {
 		{{ range $method.Params }}{{ title .Name }}: {{ .Name }}, {{ end }}

golang/rpcgen_test.go

@@ -16,7 +16,7 @@ func TestGenerateGoClient(t *testing.T) {
 	rpc.Register("phonebook", testdata.PhoneBook{})
 	rpc.Register("arith", testdata.ArithService{})
 
-	cl := NewClient(rpc.SMD())
+	cl := NewClient(rpc.SMD(), Settings{})
 
 	generated, err := cl.Generate()
 	if err != nil {

golang/schema.go

@@ -30,6 +30,7 @@ func NewSchema(schema smd.Schema) Schema {
 
 type Schema struct {
 	gen.GeneratorData
+	Package    string
 	Namespaces []Namespace
 }
 
@@ -203,10 +204,6 @@ func (v *Value) GoType() string {
 
 		return fmt.Sprintf("[]%s", simpleGoType(v.ArrayItemType))
 	} else if v.Type == smd.Object {
-		if v.Optional {
-			return fmt.Sprintf("*%s", v.LocalModelName())
-		}
-
 		return v.LocalModelName()
 	}