Fix server imports & indentation (#25)

Author: VojtechVitek

client.go.tmpl

@@ -188,5 +188,5 @@ func HTTPRequestHeaders(ctx context.Context) (http.Header, bool) {
 	return h, ok
 }
 
-{{- end}}
-{{- end }}
+{{- end -}}
+{{- end -}}

imports.go.tmpl

@@ -44,7 +44,7 @@ import (
 {{- end -}}
 
 {{- /* Print custom type imports. */ -}}
-{{ $imports := dict }}
+{{- $imports := dict -}}
 
 {{- if eq $opts.json "stdlib" -}}
 	{{- /* Already imported in the stdlib section. */ -}}
@@ -55,28 +55,27 @@ import (
 	{{- exit 1 -}}
 {{- end -}}
 
-{{ if ne $opts.importTypesFrom "" }}
-
-	"{{ $opts.importTypesFrom }}"
-{{- else }}
-	{{ range $_, $type := $types -}}
+{{- if ne $opts.importTypesFrom "" }}
+	{{- set $imports $opts.importTypesFrom "" -}}
+{{- else -}}
+	{{- range $_, $type := $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 }}
-	{{- range $import, $rename := $imports }}
-	{{if ne $rename ""}}{{$rename}} {{end}}"{{$import}}"
 	{{- end -}}
-{{ end }}
+{{- end }}
+{{ range $import, $rename := $imports }}
+	{{if ne $rename ""}}{{$rename}} {{end}}"{{$import}}"
+{{- end }}
 )
 
 {{- if eq $opts.json "jsoniter" }}
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
-{{ end -}}
+{{- end -}}
 
 {{- end -}}

main.go.tmpl

@@ -84,15 +84,17 @@ func WebRPCSchemaHash() string {
 	return "{{.SchemaHash}}"
 }
 
-{{ if eq $opts.importTypesFrom "" -}}
+{{- printf "\n" -}}
+
+{{- if eq $opts.importTypesFrom "" }}
 {{ template "types" dict "Services" .Services "Types" .Types "TypeMap" $typeMap "TypePrefix" $typePrefix}}
-{{- end }}
+{{ end -}}
 
 {{- if $opts.server}}
 {{ template "server" dict "Services" .Services "TypeMap" $typeMap "TypePrefix" $typePrefix }}
 {{ end -}}
 
-{{- if $opts.client }}
+{{ if $opts.client }}
 {{ template "client" dict "Services" .Services "TypeMap" $typeMap "TypePrefix" $typePrefix }}
 {{ end -}}
 

server.go.tmpl

@@ -1,7 +1,7 @@
-{{define "server"}}
+{{- define "server"}}
 {{- $typeMap := .TypeMap -}}
 {{- $typePrefix := .TypePrefix -}}
-{{- if .Services }}
+{{- if .Services -}}
 //
 // Server
 //