diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/generate/main.go | 24 | ||||
| -rw-r--r-- | cmd/generate/templates.go.tmpl | 24 |
2 files changed, 45 insertions, 3 deletions
diff --git a/cmd/generate/main.go b/cmd/generate/main.go index eddd4cb..f846012 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -39,8 +39,10 @@ type Function struct { Name string Pattern string RequestTypeDef string - RequestTypeFields []RequestTypeField DoParseForm bool + RequestTypeFields []RequestTypeField + ResponseHasError bool + ResponseHasMain bool } type RequestTypeField struct { @@ -161,7 +163,7 @@ func run() error { } } if winner == "" { - panic("Counld not find import for " + parsedField.TypeDef) + panic("Could not find import for " + parsedField.TypeDef) } parsedPackage.Imports = append( slices.DeleteFunc(parsedPackage.Imports, func(i string) bool { return i == winner }), @@ -208,6 +210,24 @@ func run() error { parsedFunction.RequestTypeFields = append(parsedFunction.RequestTypeFields, parsedField) } } + if f.Type.Results == nil { + // + } else if len(f.Type.Results.List) == 1 { + switch typ := f.Type.Results.List[0].Type.(type) { + case *ast.Ident: + if typ.Name == "error" { + parsedFunction.ResponseHasError = true + } + } + if !parsedFunction.ResponseHasError { + parsedFunction.ResponseHasMain = true + } + } else if len(f.Type.Results.List) == 2 { + parsedFunction.ResponseHasError = true + parsedFunction.ResponseHasMain = true + } else if len(f.Type.Results.List) > 2 { + return errors.New("Too many return values. Max two allowed") + } parsedPackage.Functions = append(parsedPackage.Functions, parsedFunction) } } diff --git a/cmd/generate/templates.go.tmpl b/cmd/generate/templates.go.tmpl index 3533b2b..9ee259b 100644 --- a/cmd/generate/templates.go.tmpl +++ b/cmd/generate/templates.go.tmpl @@ -66,6 +66,28 @@ func hh_{{ $fn.Name }}(w http.ResponseWriter, r *http.Request) { } } {{ end }} - {{ $fn.Name }}(parsed) + {{ if $fn.ResponseHasMain -}} + res + {{- end -}} + {{- if and $fn.ResponseHasMain $fn.ResponseHasError -}} + , + {{- end -}} + {{- if $fn.ResponseHasError -}} + err + {{- end -}} + {{- if or $fn.ResponseHasMain $fn.ResponseHasError -}} + := + {{- end -}} + {{- $fn.Name }}(parsed) + + {{ if $fn.ResponseHasError }} + if err != nil { + panic("todo: Internal server error in " + {{ $fn.Name | quote }} + ": " + err.Error()) + // return + } + {{ end }} + {{ if $fn.ResponseHasMain -}} + res.Respond(w, r) + {{- end -}} } {{ end }} |