fix template error on generated defaults (#146)

* fix template error on generated defaults * go fmt * add test for default fix * . * add key sort for default values
99designs · Jun 26, 2018 · e8c30ac · e8c30ac
1 parent a39c63a
commit e8c30ac
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/codegen/model.go b/codegen/model.go
@@ -8,7 +8,7 @@ type Model struct {
 
 type ModelField struct {
 	*Type
-	GQLName string
+	GQLName   string
 	GoVarName string
 	GoFKName  string
 	GoFKType  string

diff --git a/codegen/templates/templates.go b/codegen/templates/templates.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"text/template"
 	"unicode"
+	"sort"
 )
 
 func Run(name string, tpldata interface{}) (*bytes.Buffer, error) {
@@ -111,10 +112,19 @@ func dump(val interface{}) string {
 	case map[string]interface{}:
 		buf := bytes.Buffer{}
 		buf.WriteString("map[string]interface{}{")
-		for key, data := range val {
+		var keys []string
+		for key := range val {
+			keys = append(keys, key)
+		}
+		sort.Strings(keys)
+
+		for _, key := range keys {
+			data := val[key]
+
 			buf.WriteString(strconv.Quote(key))
 			buf.WriteString(":")
 			buf.WriteString(dump(data))
+			buf.WriteString(",")
 		}
 		buf.WriteString("}")
 		return buf.String()

diff --git a/example/scalars/generated.go b/example/scalars/generated.go
diff --git a/example/scalars/schema.graphql b/example/scalars/schema.graphql
@@ -1,6 +1,6 @@
 type Query {
     user(id: ID!): User
-    search(input: SearchArgs = {location: "37,144"}): [User!]!
+    search(input: SearchArgs = {location: "37,144", isBanned: false}): [User!]!
 }
 
 type User {