corrected template invocation for queryDirectives and other minor tem…

…plate changes
uber · Nov 26, 2024 · ba9eece · ba9eece
1 parent e5ce419
commit ba9eece
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/codegen/directives.gotpl b/codegen/directives.gotpl
@@ -92,7 +92,7 @@ func _queryMiddleware(ctx context.Context, ec *executionContext, obj *ast.Operat
 {{- else -}}
 func (ec *executionContext) _queryMiddleware(ctx context.Context, obj *ast.OperationDefinition, next func(ctx context.Context) (interface{}, error)) graphql.Marshaler {
 {{- end }}
-	{{ template "queryDirectives" (dict "DirectiveList" .Directives.LocationDirectives "Type" "QUERY" "UseFunctionSyntaxForExecutionContext" $useFunctionSyntaxForExecutionContext) }}
+	{{ template "queryDirectives" (dict "DirectiveList" (.Directives.LocationDirectives "QUERY") "UseFunctionSyntaxForExecutionContext" $useFunctionSyntaxForExecutionContext) }}
 }
 {{ end }}
 
@@ -102,7 +102,7 @@ func _mutationMiddleware(ctx context.Context, ec *executionContext, obj *ast.Ope
 {{- else -}}
 func (ec *executionContext) _mutationMiddleware(ctx context.Context, obj *ast.OperationDefinition, next func(ctx context.Context) (interface{}, error)) graphql.Marshaler {
 {{- end }}
-	{{ template "queryDirectives" (dict "DirectiveList" .Directives.LocationDirectives "Type" "MUTATION" "UseFunctionSyntaxForExecutionContext" $useFunctionSyntaxForExecutionContext) }}
+	{{ template "queryDirectives" (dict "DirectiveList" (.Directives.LocationDirectives "MUTATION") "UseFunctionSyntaxForExecutionContext" $useFunctionSyntaxForExecutionContext) }}
 }
 {{ end }}
 

diff --git a/codegen/type.gotpl b/codegen/type.gotpl
@@ -265,7 +265,7 @@
 						return _{{$type.Definition.Name}}(ctx, ec, sel)
 						{{- else -}}
 						return ec._{{$type.Definition.Name}}(ctx, sel)
-						{{ end }}
+						{{- end }}
 					{{- end }}
 				{{- else }}
 					{{ if $useFunctionSyntaxForExecutionContext -}}

diff --git a/integration/server/generated.go b/integration/server/generated.go