Fix imports & formatting

webrpc · Apr 3, 2024 · 09bae60 · 09bae60
1 parent 4ae54d6
commit 09bae60
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/imports.go.tmpl b/imports.go.tmpl
@@ -80,22 +80,28 @@ import (
 	{{- set $imports $opts.importTypesFrom "" -}}
 {{- else -}}
 	{{- range $_, $type := $types -}}
-		{{- range $_, $field := $type.Fields -}}
-			{{- range $meta := $field.Meta -}}
+		{{- /* TODO: We might need to loop through method args too. */ -}}
+		{{- range $meta := $type.Meta -}}
 				{{- if exists $meta "go.type.import" -}}
 					{{- set $imports (get $meta "go.type.import") "" -}}
 				{{- end -}}
 			{{- end -}}
-		{{- end -}}
+		{{- if $opts.types }}
+			{{- range $_, $field := $type.Fields -}}
+				{{- range $meta := $field.Meta -}}
+					{{- if exists $meta "go.type.import" -}}
+						{{- set $imports (get $meta "go.type.import") "" -}}
+					{{- end -}}
+				{{- end -}}
+			{{- end -}}
+		{{- end }}
 	{{- end -}}
 {{- end }}
-{{- if $opts.types }}
 {{ range $import, $rename := $imports }}
 	{{- if not (exists $stdlibImports $import)}}
 	{{if ne $rename ""}}{{$rename}} {{end}}"{{$import}}"
-	{{end}}
+	{{- end }}
 {{- end }}
-{{- end -}}
 )
 
 {{- if eq $opts.json "jsoniter" }}

diff --git a/types.go.tmpl b/types.go.tmpl
@@ -5,18 +5,17 @@
 {{- $services := .Services -}}
 {{- $opts := .Opts -}}
 
-{{- if $types }}
 //
-// Types
+// Common types
 //
 {{ range $_, $type := $types -}}
 
 {{- if eq $type.Kind "enum" }}
 	{{- if eq $type.Type.Expr "string" }}
 {{template "enum_string" dict "Name" $type.Name "Type" $type.Type "TypePrefix" $typePrefix "Fields" $type.Fields "Opts" $opts}}
-	{{ else }}
+	{{- else }}
 {{template "enum" dict "Name" $type.Name "Type" $type.Type "TypePrefix" $typePrefix "Fields" $type.Fields "Opts" $opts}}
-	{{ end -}}
+	{{- end -}}
 {{ end -}}
 
 {{- if and (eq $type.Kind "struct") $opts.types }}
@@ -28,8 +27,7 @@
 {{template "struct" dict "Name" $type.Name "TypeMap" $typeMap "TypePrefix" $typePrefix "Fields" $type.Fields}}
 {{ end -}}
 
-{{ end }}
-{{ end -}}
+{{- end }}
 
 var WebRPCServices = map[string][]string{
 {{- range $_, $service := $services}}
@@ -46,6 +44,7 @@ var WebRPCServices = map[string][]string{
 //
 
 {{ range $_, $service := $services -}}
+{{ if $opts.types -}}
 type {{$service.Name}} interface {
 	{{- range $_, $method := $service.Methods}}
 	{{ if eq $method.StreamOutput true -}}
@@ -56,9 +55,10 @@ type {{$service.Name}} interface {
 
 	{{- end}}
 }
+{{- end }}
 
-{{- range $_, $method := $service.Methods}}
-{{ if eq $method.StreamOutput true -}}
+{{- range $_, $method := $service.Methods -}}
+{{ if eq $method.StreamOutput true }}
 type {{$method.Name}}StreamWriter interface {
 	Write({{range $i, $output := $method.Outputs}}{{if gt $i 0}}, {{end}}{{$output.Name}} {{template "field" dict "Name" $output.Name "Type" $output.Type "Optional" $output.Optional "TypeMap" $typeMap "TypePrefix" $typePrefix "TypeMeta" $output.Meta}}{{end}}) error
 }