codegen: fix resolvers execution order (#2267)

* codegen: fix run order of resolver Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com> * fix: update code generate * fix: update stub, root to generate resolver for input * fix: added unit-test for input field order * fix: added test for singlefile Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>
99designs · Jul 3, 2022 · c287a7b · c287a7b
1 parent 8481457
commit c287a7b
Show file tree

Hide file tree

Showing 34 changed files with 1,018 additions and 54 deletions.
diff --git a/_examples/config/generated.go b/_examples/config/generated.go
diff --git a/_examples/fileupload/generated.go b/_examples/fileupload/generated.go
diff --git a/_examples/scalars/generated.go b/_examples/scalars/generated.go
diff --git a/_examples/starwars/generated/exec.go b/_examples/starwars/generated/exec.go
diff --git a/_examples/todo/generated.go b/_examples/todo/generated.go
diff --git a/_examples/type-system-extension/generated.go b/_examples/type-system-extension/generated.go
diff --git a/codegen/input.gotpl b/codegen/input.gotpl
@@ -14,7 +14,12 @@
 			{{- end}}
 		{{- end }}
 
-		for k, v := range asMap {
+		fieldsInOrder := [...]string{ {{ range .Fields }}{{ quote .Name }},{{ end }} }
+		for _, k := range fieldsInOrder {
+			v, ok := asMap[k]
+			if !ok {
+				continue
+			}
 			switch k {
 			{{- range $field := .Fields }}
 			case {{$field.Name|quote}}:

diff --git a/codegen/root_.gotpl b/codegen/root_.gotpl
@@ -35,6 +35,11 @@ type ResolverRoot interface {
 		{{ucFirst $object.Name}}() {{ucFirst $object.Name}}Resolver
 	{{ end }}
 {{- end }}
+{{- range $object := .Inputs -}}
+	{{ if $object.HasResolvers -}}
+		{{ucFirst $object.Name}}() {{ucFirst $object.Name}}Resolver
+	{{ end }}
+{{- end }}
 }
 
 type DirectiveRoot struct {

diff --git a/codegen/testserver/followschema/defaults.generated.go b/codegen/testserver/followschema/defaults.generated.go
diff --git a/codegen/testserver/followschema/directive.generated.go b/codegen/testserver/followschema/directive.generated.go
diff --git a/codegen/testserver/followschema/enum.generated.go b/codegen/testserver/followschema/enum.generated.go