update generate field

99designs · Jun 25, 2019 · 526beec · 526beec
1 parent 6e9d7da
commit 526beec
Show file tree

Hide file tree

Showing 19 changed files with 8,255 additions and 2,457 deletions.
diff --git a/codegen/args.go b/codegen/args.go
@@ -38,6 +38,10 @@ func (f *FieldArgument) ImplDirectives() []*Directive {
 	return d
 }
 
+func (f *FieldArgument) DirectiveObjName() string {
+	return "rawArgs"
+}
+
 func (f *FieldArgument) Stream() bool {
 	return f.Object != nil && f.Object.Stream
 }

diff --git a/codegen/args.gotpl b/codegen/args.gotpl
@@ -1,10 +1,10 @@
 {{ range $name, $args := .Args }}
-func (ec *executionContext) {{ $name }}(ctx context.Context, in map[string]interface{}) (map[string]interface{}, error) {
+func (ec *executionContext) {{ $name }}(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
 	var err error
 	args := map[string]interface{}{}
 	{{- range $i, $arg := . }}
 		var arg{{$i}} {{ $arg.TypeReference.GO | ref}}
-		if tmp, ok := in[{{$arg.Name|quote}}]; ok {
+		if tmp, ok := rawArgs[{{$arg.Name|quote}}]; ok {
 			{{- if $arg.ImplDirectives }}
 				directive0 := func(ctx context.Context) (interface{}, error) { return ec.{{ $arg.TypeReference.UnmarshalFunc }}(ctx, tmp) }
 				{{ template "implDirectives" $arg }}

diff --git a/codegen/directives.gotpl b/codegen/directives.gotpl
@@ -1,4 +1,4 @@
-{{ define "implDirectives" }}
+{{ define "implDirectives" }}{{ $in := .DirectiveObjName }}
 	{{- range $i, $directive := .ImplDirectives -}}
 		directive{{add $i 1}} := func(ctx context.Context) (interface{}, error) {
 			{{- range $arg := $directive.Args }}
@@ -14,9 +14,9 @@
 						}
 					{{- end }}
 			{{- end }}
-			return ec.directives.{{$directive.Name|ucFirst}}({{$directive.ResolveArgs "in" $i }})
+			return ec.directives.{{$directive.Name|ucFirst}}({{$directive.ResolveArgs $in $i }})
 		}
-	{{- end }}
+	{{- end -}}
 {{ end }}
 
 {{define "queryDirectives"}}
@@ -102,3 +102,36 @@ func (ec *executionContext) _subscriptionMiddleware(ctx context.Context, obj *as
 	}
 }
 {{ end }}
+
+{{ if .Directives.LocationDirectives "FIELD" }}
+	func (ec *executionContext) _fieldMiddleware(ctx context.Context, obj interface{}, next graphql.Resolver) interface{} {
+		{{- if .Directives.LocationDirectives "FIELD" }}
+		rctx := graphql.GetResolverContext(ctx)
+		for _, d := range rctx.Field.Directives {
+			switch d.Name {
+			{{- range $directive := .Directives.LocationDirectives "FIELD" }}
+			case "{{$directive.Name}}":
+				{{- if $directive.Args }}
+					rawArgs := d.ArgumentMap(ec.Variables)
+					args, err := ec.{{ $directive.ArgsFunc }}(ctx,rawArgs)
+					if err != nil {
+						ec.Error(ctx, err)
+						return nil
+					}
+				{{- end }}
+				n := next
+				next = func(ctx context.Context) (interface{}, error) {
+					return ec.directives.{{$directive.Name|ucFirst}}({{$directive.CallArgs}})
+				}
+			{{- end }}
+			}
+		}
+		{{- end }}
+		res, err := ec.ResolverMiddleware(ctx, next)
+		if err != nil {
+			ec.Error(ctx, err)
+			return nil
+		}
+		return res
+	}
+{{ end }}
diff --git a/codegen/field.go b/codegen/field.go
@@ -287,6 +287,10 @@ func (f *Field) HasDirectives() bool {
 	return len(f.ImplDirectives()) > 0
 }
 
+func (f *Field) DirectiveObjName() string {
+	return f.GoReceiverName
+}
+
 func (f *Field) ImplDirectives() []*Directive {
 	var d []*Directive
 	loc := ast.LocationFieldDefinition

diff --git a/codegen/field.gotpl b/codegen/field.gotpl
@@ -37,9 +37,15 @@
 		}
 	}
 {{ else }}
-	func (ec *executionContext) _{{$object.Name}}_{{$field.Name}}(ctx context.Context, field graphql.CollectedField{{ if not $object.Root }}, obj {{$object.Reference | ref}}{{end}}) graphql.Marshaler {
+	func (ec *executionContext) _{{$object.Name}}_{{$field.Name}}(ctx context.Context, field graphql.CollectedField{{ if not $object.Root }}, obj {{$object.Reference | ref}}{{end}}) (ret graphql.Marshaler) {
 		ctx = ec.Tracer.StartFieldExecution(ctx, field)
-		defer func () { ec.Tracer.EndFieldExecution(ctx) }()
+		defer func () {
+			if r := recover(); r != nil {
+				ec.Error(ctx, ec.Recover(ctx, r))
+				ret = graphql.Null
+			}
+			ec.Tracer.EndFieldExecution(ctx)
+		}()
 		rctx := &graphql.ResolverContext{
 			Object: {{$object.Name|quote}},
 			Field: field,
@@ -57,10 +63,19 @@
 			rctx.Args = args
 		{{- end }}
 		ctx = ec.Tracer.StartFieldResolverExecution(ctx, rctx)
-		resTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {
-			ctx = rctx  // use context from middleware stack in children
-			{{ template "fieldDefinition" $field }}
-		})
+		{{- if  $.Directives.LocationDirectives "FIELD" }}
+			resTmp := ec._fieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {
+				{{ template "field" $field }}
+			})
+		{{ else }}
+			resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
+				{{ template "field" $field }}
+			})
+			if err != nil {
+				ec.Error(ctx, err)
+				return graphql.Null
+			}
+		{{- end }}
 		if resTmp == nil {
 			{{- if $field.TypeReference.GQL.NonNull }}
 				if !ec.HasError(rctx) {
@@ -78,6 +93,27 @@
 
 {{- end }}{{- end}}
 
+{{ define "field" }}
+	{{- if .HasDirectives -}}
+		directive0 := func(rctx context.Context) (interface{}, error) {
+			ctx = rctx  // use context from middleware stack in children
+			{{ template "fieldDefinition" . }}
+		}
+		{{ template "implDirectives" . }}
+		tmp, err := directive{{.ImplDirectives|len}}(rctx)
+		if err != nil {
+			return nil, err
+		}
+		if data, ok := tmp.({{ .TypeReference.GO | ref }}) ; ok {
+			return data, nil
+		}
+		return nil, fmt.Errorf(`unexpected type %T from directive, should be {{ .TypeReference.GO }}`, tmp)
+	{{- else -}}
+		ctx = rctx  // use context from middleware stack in children
+		{{ template "fieldDefinition" . }}
+	{{- end -}}
+{{ end }}
+
 {{ define "fieldDefinition" }}
 	{{- if .IsResolver -}}
 		return ec.resolvers.{{ .ShortInvocation }}

diff --git a/codegen/generated!.gotpl b/codegen/generated!.gotpl
@@ -214,45 +214,6 @@ type executionContext struct {
 	*executableSchema
 }
 
-func (ec *executionContext) FieldMiddleware(ctx context.Context, obj interface{}, next graphql.Resolver) (ret interface{}) {
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = nil
-		}
-	}()
-	{{- if .Directives }}
-	rctx := graphql.GetResolverContext(ctx)
-	for _, d := range rctx.Field.Definition.Directives {
-		switch d.Name {
-		{{- range $directive := .Directives }}
-		case "{{$directive.Name}}":
-			if ec.directives.{{$directive.Name|ucFirst}} != nil {
-				{{- if $directive.Args }}
-					rawArgs := d.ArgumentMap(ec.Variables)
-					args, err := ec.{{ $directive.ArgsFunc }}(ctx,rawArgs)
-					if err != nil {
-						ec.Error(ctx, err)
-						return nil
-					}
-				{{- end }}
-				n := next
-				next = func(ctx context.Context) (interface{}, error) {
-					return ec.directives.{{$directive.Name|ucFirst}}({{$directive.CallArgs}})
-				}
-			}
-		{{- end }}
-		}
-	}
-	{{- end }}
-	res, err := ec.ResolverMiddleware(ctx, next)
-	if err != nil {
-		ec.Error(ctx, err)
-		return nil
-	}
-	return res
-}
-
 func (ec *executionContext) introspectSchema() (*introspection.Schema, error) {
 	if ec.DisableIntrospection {
 		return nil, errors.New("introspection disabled")

diff --git a/codegen/input.gotpl b/codegen/input.gotpl
@@ -1,8 +1,8 @@
 {{- range $input := .Inputs }}
 	{{- if not .HasUnmarshal }}
-	func (ec *executionContext) unmarshalInput{{ .Name }}(ctx context.Context, in interface{}) ({{.Type | ref}}, error) {
+	func (ec *executionContext) unmarshalInput{{ .Name }}(ctx context.Context, obj interface{}) ({{.Type | ref}}, error) {
 		var it {{.Type | ref}}
-		var asMap = in.(map[string]interface{})
+		var asMap = obj.(map[string]interface{})
 		{{ range $field := .Fields}}
 			{{- if $field.Default}}
 				if _, present := asMap[{{$field.Name|quote}}] ; !present {