Generate complexity for all fields. Fix bugs. Re-generate examples.

99designs · Aug 28, 2018 · 8da5d61 · 8da5d61
1 parent e5265ac
commit 8da5d61
Show file tree

Hide file tree

Showing 14 changed files with 4,649 additions and 44 deletions.
diff --git a/codegen/config.go b/codegen/config.go
@@ -84,7 +84,6 @@ type TypeMapEntry struct {
 
 type TypeMapField struct {
 	Resolver   bool   `yaml:"resolver"`
-	Complexity bool   `yaml:"complexity"`
 	FieldName  string `yaml:"fieldName"`
 }
 

diff --git a/codegen/object.go b/codegen/object.go
@@ -33,16 +33,15 @@ type Object struct {
 type Field struct {
 	*Type
 
-	GQLName          string          // The name of the field in graphql
-	GoFieldType      GoFieldType     // The field type in go, if any
-	GoReceiverName   string          // The name of method & var receiver in go, if any
-	GoFieldName      string          // The name of the method or var in go, if any
-	Args             []FieldArgument // A list of arguments to be passed to this field
-	ForceResolver    bool            // Should be emit Resolver method
-	CustomComplexity bool            // Uses a custom complexity calculation
-	NoErr            bool            // If this is bound to a go method, does that method have an error as the second argument
-	Object           *Object         // A link back to the parent object
-	Default          interface{}     // The default value
+	GQLName        string          // The name of the field in graphql
+	GoFieldType    GoFieldType     // The field type in go, if any
+	GoReceiverName string          // The name of method & var receiver in go, if any
+	GoFieldName    string          // The name of the method or var in go, if any
+	Args           []FieldArgument // A list of arguments to be passed to this field
+	ForceResolver  bool            // Should be emit Resolver method
+	NoErr          bool            // If this is bound to a go method, does that method have an error as the second argument
+	Object         *Object         // A link back to the parent object
+	Default        interface{}     // The default value
 }
 
 type FieldArgument struct {
@@ -82,19 +81,14 @@ func (o *Object) IsConcurrent() bool {
 	return false
 }
 
-func (o *Object) HasComplexity() bool {
-	for _, f := range o.Fields {
-		if f.CustomComplexity {
-			return true
-		}
-	}
-	return false
-}
-
 func (f *Field) IsResolver() bool {
 	return f.GoFieldName == ""
 }
 
+func (f *Field) IsSystem() bool {
+	return strings.HasPrefix(f.GQLName, "__")
+}
+
 func (f *Field) IsMethod() bool {
 	return f.GoFieldType == GoFieldMethod
 }
@@ -226,7 +220,7 @@ func (f *Field) doWriteJson(val string, remainingMods []string, astType *ast.Typ
 						ec.Errorf(ctx, "must not be null")
 					}
 				{{- end }}
-				return graphql.Null 
+				return graphql.Null
 			}
 			{{.next }}`, map[string]interface{}{
 			"val":     val,

diff --git a/codegen/object_build.go b/codegen/object_build.go
@@ -135,13 +135,11 @@ func (cfg *Config) buildObject(types NamedTypes, typ *ast.Definition, imports *I
 		}
 
 		var forceResolver bool
-		var customComplexity bool
 		var goName string
 		if entryExists {
 			if typeField, ok := typeEntry.Fields[field.Name]; ok {
 				goName = typeField.FieldName
 				forceResolver = typeField.Resolver
-				customComplexity = typeField.Complexity
 			}
 		}
 
@@ -170,13 +168,12 @@ func (cfg *Config) buildObject(types NamedTypes, typ *ast.Definition, imports *I
 		}
 
 		obj.Fields = append(obj.Fields, Field{
-			GQLName:          field.Name,
-			Type:             types.getType(field.Type),
-			Args:             args,
-			Object:           obj,
-			GoFieldName:      goName,
-			ForceResolver:    forceResolver,
-			CustomComplexity: customComplexity,
+			GQLName:       field.Name,
+			Type:          types.getType(field.Type),
+			Args:          args,
+			Object:        obj,
+			GoFieldName:   goName,
+			ForceResolver: forceResolver,
 		})
 	}
 

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/generated.gotpl b/codegen/templates/generated.gotpl
@@ -39,15 +39,13 @@ type DirectiveRoot struct {
 
 type ComplexityRoot struct {
 {{ range $object := .Objects }}
-	{{ if $object.HasComplexity }}
-		{{ $object.GoType }} struct {
-		{{ range $field := $object.Fields }}
-			{{ if $field.CustomComplexity }}
-				{{ $field.GQLName|toCamel }} {{ $field.ComplexitySignature }}
-			{{ end }}
-		{{ end }}
-		}
-	{{ end }}
+	{{ $object.GQLType|toCamel }} struct {
+	{{ range $field := $object.Fields -}}
+	    {{ if $field.IsSystem }}{{ else -}}
+			{{ $field.GQLName|toCamel }} {{ $field.ComplexitySignature }}
+	    {{ end }}
+	{{- end }}
+	}
 {{ end }}
 }
 
@@ -75,12 +73,12 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 	switch typeName + "." + field {
 	{{ range $object := .Objects }}
 		{{ range $field := $object.Fields }}
-			{{ if $field.CustomComplexity }}
+			{{ if $field.IsSystem }}{{ else }}
 				case "{{$object.GQLType}}.{{$field.GQLName}}":
-				    if e.complexity.{{$object.GoType}}.{{$field.GQLName|toCamel}} == nil {
+					if e.complexity.{{$object.GQLType|toCamel}}.{{$field.GQLName|toCamel}} == nil {
 						break
 					}
-					{{ if . }}args := map[string]interface{}{} {{end}}
+					{{ if $field.Args }}args := map[string]interface{}{} {{end}}
 					{{ range $i, $arg := $field.Args }}
 						var arg{{$i}} {{$arg.Signature }}
 						if tmp, ok := rawArgs[{{$arg.GQLName|quote}}]; ok {
@@ -92,7 +90,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 						}
 						args[{{$arg.GQLName|quote}}] = arg{{$i}}
 					{{ end }}
-					return e.complexity.{{$object.GoType}}.{{$field.GQLName|toCamel}}(childComplexity{{if $field.Args}}, {{$field.ComplexityArgs}} {{end}}), true
+					return e.complexity.{{$object.GQLType|toCamel}}.{{$field.GQLName|toCamel}}(childComplexity{{if $field.Args}}, {{$field.ComplexityArgs}} {{end}}), true
 			{{ end }}
 		{{ end }}
 	{{ end }}