fix gen api panic and add import default

Author: xnzone

internal/genapi/gen.go

@@ -19,6 +19,7 @@ func Gen(req *plugin.CodeGeneratorRequest) (*plugin.CodeGeneratorResponse, error
 	}
 	var resp plugin.CodeGeneratorResponse
 	optdata := &OptionData{}
+	var fname string
 	for _, f := range req.GetProtoFile() {
 		if !strContains(req.GetFileToGenerate(), f.GetName()) {
 			continue
@@ -35,6 +36,9 @@ func Gen(req *plugin.CodeGeneratorRequest) (*plugin.CodeGeneratorResponse, error
 			return nil, err
 		}
 		name := fmt.Sprintf("%s.api.go", strings.ReplaceAll(f.GetName(), ".proto", ""))
+		if len(fname) <= 0 {
+			fname = path.Dir(f.GetName())
+		}
 		if len(opts.out) > 0 {
 			name = path.Join(opts.out, name)
 		}
@@ -47,8 +51,11 @@ func Gen(req *plugin.CodeGeneratorRequest) (*plugin.CodeGeneratorResponse, error
 	if err != nil {
 		return nil, err
 	}
+	if len(opts.out) > 0 {
+		fname = path.Join(opts.out, fname, "option.go")
+	}
 	resp.File = append(resp.File, &plugin.CodeGeneratorResponse_File{
-		Name:    proto.String("option.go"),
+		Name:    proto.String(fname),
 		Content: proto.String(bs),
 	})
 	return &resp, nil

internal/genapi/opts_tmpl.go

@@ -2,15 +2,17 @@ package genapi
 
 import (
 	"bytes"
-	"html/template"
 	"log"
+	"text/template"
 )
 
 var optsCode = `package {{ .GoPackage }}
 
 import (
 	"net/http"
 	"errors"
+	"io/ioutil"
+	"encoding/json"
 )
 
 type Option func(*Options)
@@ -48,7 +50,7 @@ func newOptions(opts ...Option) *Options {
 
 func buildOptions(opt *Options, opts ...Option) *Options {
 	res := newOptions(opts...)
-	if len(res.addr) <= 0 {
+	if len(res.addr) == 0 {
 		res.addr = opt.addr
 	}
 	return res
@@ -65,7 +67,7 @@ func doResponse(resp *http.Response, a interface{}) error {
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		return ErrNot200
 	}
-	defer func(){_ = resp.Body.Close()}()
+	defer func(){ _ = resp.Body.Close()}()
 	bs, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return err

internal/genapi/rest.go

@@ -27,6 +27,7 @@ func genRestMethodCode(fd *descriptor.FileDescriptorProto, serv *descriptor.Serv
 	}
 
 	data := &CodeData{}
+	data.Verb = strings.ToUpper(rest.verb)
 
 	tokens := buildRoute(rest)
 	route := rest.route
@@ -118,7 +119,7 @@ func buildRoute(rest *restInfo) []string {
 
 func buildQuery(m *descriptor.MethodDescriptorProto) []string {
 	params := buildParams(m)
-	str := "params.Add(%s, %s)"
+	str := `params.Add("%s", %s)`
 	return formParams(str, params)
 }
 

internal/genapi/tmpl.go

@@ -2,8 +2,8 @@ package genapi
 
 import (
 	"bytes"
-	"html/template"
 	"log"
+	"text/template"
 )
 
 var frame = `// Code generated by protoc-gen-go_api(github.com/dev-openapi/protoc-gen-go_api version={{ .Version }}). DO NOT EDIT.
@@ -13,16 +13,29 @@ package {{ .GoPackage }}
 
 import (
 	context "context"
+	fmt "fmt"
+	io "io"
+	json "encoding/json"
+	bytes "bytes"
+	http "net/http"
+	strings "strings"
 )
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = context.Background
+var _ = http.NewRequest
+var _ = io.Copy
+var _ = bytes.Compare
+var _ = json.Marshal
+var _ = strings.Compare
 
 {{ range .Services }}
 // Client API for {{ .ServName }} service
 
-type {{ .ServName }}Service interace {
+type {{ .ServName }}Service interface {
+{{- range .Methods }}
 	// {{ .MethName }} {{ .Comment }}
-	{{ .MethName }}(ctx context.Context, in *{{ .ReqTyp }}, opts ...CallOption) (*{{ .ResTyp }}, error)
+	{{ .MethName }}(ctx context.Context, in *{{ .ReqTyp }}, opts ...Option) (*{{ .ResTyp }}, error)
+{{- end }}
 }
 
 type {{ unexport .ServName }}Service struct {
@@ -42,7 +55,7 @@ func New{{ .ServName }}Service(opts ...Option) {{ .ServName }}Service {
 
 {{ range .Methods }}
 func (c *{{ unexport .ServName }}Service) {{ .MethName }}(ctx context.Context, in *{{ .ReqTyp }}, opts ...Option) (*{{ .ResTyp }}, error) {
-	var res *{{ .ResTyp }}
+	var res {{ .ResTyp }}
 	{{ .ReqCode | html }}
 }
 {{ end -}}
@@ -58,13 +71,15 @@ var requestCode = `// options
 	// body
 	var body io.Reader
 	{{ .BodyCode | html }}
-	req, err := http.NewRequest({{ .Verb }}, rawURL, body)
+	req, err := http.NewRequest("{{ .Verb }}", rawURL, body)
 	if err != nil {
 		return nil, err
 	}
+	{{ if ne .QueryCode "" }}
 	params := req.URL.Query()
 	{{ .QueryCode | html }}	
 	req.URL.RawQuery = params.Encode()
+	{{ end }}
 	// header
 	for k, v := range headers {
 		req.Header.Set(k, v)
@@ -74,35 +89,35 @@ var requestCode = `// options
 		return nil, err
 	}
 	err = opt.DoResponse(resp, &res)
-	return res, err 
+	return &res, err 
 `
 
 var bodyFormCode = `bodyForms := make(map[string]string)
-{{ .Body | html }}
-var bs []string
-for k, v := range bodyForms {
-	bs = append(bs, fmt.Sprintf("%s=%s", k, v))
-}
-body = strings.NewReader(strings.Join(bs, "&"))
-headers["Content-Type"] = "application/x-www-form-urlencoded"
+	{{ .Body | html }}
+	var bs []string
+	for k, v := range bodyForms {
+		bs = append(bs, fmt.Sprintf("%s=%s", k, v))
+	}
+	body = strings.NewReader(strings.Join(bs, "&"))
+	headers["Content-Type"] = "application/x-www-form-urlencoded"
 `
 
 var bodyMultiCode = `bodyForms := make(map[string]string])
-{{ .Body | html }}
-var bs []string
-for k, v := range bodyForms {
-	bs = append(bs, fmt.Sprintf("%s=%s", k, v))
-}
-body = strings.NewReader(strings.Join(bs, "&"))
-headers["Content-Type"] = "multipart/form-data"
+	{{ .Body | html }}
+	var bs []string
+	for k, v := range bodyForms {
+		bs = append(bs, fmt.Sprintf("%s=%s", k, v))
+	}
+	body = strings.NewReader(strings.Join(bs, "&"))
+	headers["Content-Type"] = "multipart/form-data"
 `
 
 var bodyJsonCode = `bs, err := json.Marshal({{ .Body | html }})
-if err != nil {
-	return nil, err
-}
-body = bytes.NewReader(bs)
-headers["Content-Type"] = "application/json"
+	if err != nil {
+		return nil, err
+	}
+	body = bytes.NewReader(bs)
+	headers["Content-Type"] = "application/json"
 `
 
 func buildFrame(data *FileData) (string, error) {