Merge pull request #218 from vektah/remove-old-resolvers

Remove old resolvers
99designs · Jul 24, 2018 · f67f839 · f67f839
2 parents 1a3e4e9 + 1ba61fc
commit f67f839
Show file tree

Hide file tree

Showing 27 changed files with 278 additions and 503 deletions.
diff --git a/codegen/object.go b/codegen/object.go
@@ -67,21 +67,16 @@ func (f *Field) IsResolver() bool {
 func (f *Field) IsConcurrent() bool {
 	return f.IsResolver() && !f.Object.DisableConcurrency
 }
+
 func (f *Field) ShortInvocation() string {
 	if !f.IsResolver() {
 		return ""
 	}
 	shortName := strings.ToUpper(f.GQLName[:1]) + f.GQLName[1:]
-	res := fmt.Sprintf("%s().%s(ctx", f.Object.GQLType, shortName)
-	if !f.Object.Root {
-		res += fmt.Sprintf(", obj")
-	}
-	for _, arg := range f.Args {
-		res += fmt.Sprintf(", %s", arg.GoVarName)
-	}
-	res += ")"
-	return res
+
+	return fmt.Sprintf("%s().%s(%s)", f.Object.GQLType, shortName, f.CallArgs())
 }
+
 func (f *Field) ShortResolverDeclaration() string {
 	if !f.IsResolver() {
 		return ""

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -5,7 +5,7 @@
 	func (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField) func() graphql.Marshaler {
 		{{- template "args.gotpl" $field.Args }}
 		ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
-		results, err := ec.resolvers.{{ $object.GQLType }}_{{ $field.GQLName }}({{ $field.CallArgs }})
+		results, err := ec.resolvers.{{ $field.ShortInvocation }}
 		if err != nil {
 			ec.Error(ctx, err)
 			return nil
@@ -49,7 +49,7 @@
 
 			{{- if $field.IsResolver }}
 				resTmp, err := ec.ResolverMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-					return ec.resolvers.{{ $object.GQLType }}_{{ $field.GQLName }}({{ $field.CallArgs }})
+					return ec.resolvers.{{ $field.ShortInvocation }}
 				})
 				if err != nil {
 					ec.Error(ctx, err)

diff --git a/codegen/templates/generated.gotpl b/codegen/templates/generated.gotpl
@@ -8,22 +8,9 @@ import (
 {{ end }}
 )
 
-// MakeExecutableSchema creates an ExecutableSchema from the Resolvers interface.
-func MakeExecutableSchema(resolvers Resolvers) graphql.ExecutableSchema {
-	return &executableSchema{resolvers: resolvers}
-}
-
 // NewExecutableSchema creates an ExecutableSchema from the ResolverRoot interface.
 func NewExecutableSchema(resolvers ResolverRoot) graphql.ExecutableSchema {
-	return MakeExecutableSchema(shortMapper{r: resolvers})
-}
-
-type Resolvers interface {
-{{- range $object := .Objects -}}
-	{{ range $field := $object.Fields -}}
-		{{ $field.ResolverDeclaration }}
-	{{ end }}
-{{- end }}
+	return &executableSchema{resolvers: resolvers}
 }
 
 type ResolverRoot interface {
@@ -44,22 +31,8 @@ type ResolverRoot interface {
 	{{- end }}
 {{- end }}
 
-type shortMapper struct {
-	r ResolverRoot
-}
-
-{{- range $object := .Objects -}}
-	{{ range $field := $object.Fields -}}
-		{{- if $field.IsResolver }}
-			func (s shortMapper) {{ $field.ResolverDeclaration }} {
-				return s.r.{{$field.ShortInvocation}}
-			}
-		{{- end }}
-	{{ end }}
-{{- end }}
-
 type executableSchema struct {
-	resolvers      Resolvers
+	resolvers      ResolverRoot
 }
 
 func (e *executableSchema) Schema() *ast.Schema {
@@ -141,7 +114,7 @@ func (e *executableSchema) Subscription(ctx context.Context, op *ast.OperationDe
 type executionContext struct {
 	*graphql.RequestContext
 
-	resolvers Resolvers
+	resolvers ResolverRoot
 }
 
 {{- range $object := .Objects }}

diff --git a/example/chat/chat_test.go b/example/chat/chat_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestChat(t *testing.T) {
-	srv := httptest.NewServer(handler.GraphQL(MakeExecutableSchema(New())))
+	srv := httptest.NewServer(handler.GraphQL(NewExecutableSchema(New())))
 	c := client.New(srv.URL)
 
 	t.Run("subscribe to chat events", func(t *testing.T) {

diff --git a/example/chat/generated.go b/example/chat/generated.go
diff --git a/example/chat/resolvers.go b/example/chat/resolvers.go
@@ -9,13 +9,25 @@ import (
 	"time"
 )
 
-type resolvers struct {
+type resolver struct {
 	Rooms map[string]*Chatroom
-	mu    sync.Mutex
+	mu    sync.Mutex // nolint: structcheck
 }
 
-func New() *resolvers {
-	return &resolvers{
+func (r *resolver) Mutation() MutationResolver {
+	return &mutationResolver{r}
+}
+
+func (r *resolver) Query() QueryResolver {
+	return &queryResolver{r}
+}
+
+func (r *resolver) Subscription() SubscriptionResolver {
+	return &subscriptionResolver{r}
+}
+
+func New() *resolver {
+	return &resolver{
 		Rooms: map[string]*Chatroom{},
 	}
 }
@@ -26,7 +38,9 @@ type Chatroom struct {
 	Observers map[string]chan Message
 }
 
-func (r *resolvers) Mutation_post(ctx context.Context, text string, userName string, roomName string) (Message, error) {
+type mutationResolver struct{ *resolver }
+
+func (r *mutationResolver) Post(ctx context.Context, text string, username string, roomName string) (Message, error) {
 	r.mu.Lock()
 	room := r.Rooms[roomName]
 	if room == nil {
@@ -39,7 +53,7 @@ func (r *resolvers) Mutation_post(ctx context.Context, text string, userName str
 		ID:        randString(8),
 		CreatedAt: time.Now(),
 		Text:      text,
-		CreatedBy: userName,
+		CreatedBy: username,
 	}
 
 	room.Messages = append(room.Messages, message)
@@ -51,7 +65,9 @@ func (r *resolvers) Mutation_post(ctx context.Context, text string, userName str
 	return message, nil
 }
 
-func (r *resolvers) Query_room(ctx context.Context, name string) (*Chatroom, error) {
+type queryResolver struct{ *resolver }
+
+func (r *queryResolver) Room(ctx context.Context, name string) (*Chatroom, error) {
 	r.mu.Lock()
 	room := r.Rooms[name]
 	if room == nil {
@@ -63,7 +79,9 @@ func (r *resolvers) Query_room(ctx context.Context, name string) (*Chatroom, err
 	return room, nil
 }
 
-func (r *resolvers) Subscription_messageAdded(ctx context.Context, roomName string) (<-chan Message, error) {
+type subscriptionResolver struct{ *resolver }
+
+func (r *subscriptionResolver) MessageAdded(ctx context.Context, roomName string) (<-chan Message, error) {
 	r.mu.Lock()
 	room := r.Rooms[roomName]
 	if room == nil {

diff --git a/example/chat/server/server.go b/example/chat/server/server.go
@@ -20,7 +20,7 @@ func main() {
 	startAppdashServer()
 
 	http.Handle("/", handler.Playground("Todo", "/query"))
-	http.Handle("/query", handler.GraphQL(chat.MakeExecutableSchema(chat.New()),
+	http.Handle("/query", handler.GraphQL(chat.NewExecutableSchema(chat.New()),
 		handler.ResolverMiddleware(gqlopentracing.ResolverMiddleware()),
 		handler.RequestMiddleware(gqlopentracing.RequestMiddleware()),
 		handler.WebsocketUpgrader(websocket.Upgrader{

diff --git a/example/dataloader/dataloader_test.go b/example/dataloader/dataloader_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestTodo(t *testing.T) {
-	srv := httptest.NewServer(LoaderMiddleware(handler.GraphQL(MakeExecutableSchema(&Resolver{}))))
+	srv := httptest.NewServer(LoaderMiddleware(handler.GraphQL(NewExecutableSchema(&Resolver{}))))
 	c := client.New(srv.URL)
 
 	t.Run("create a new todo", func(t *testing.T) {

diff --git a/example/dataloader/generated.go b/example/dataloader/generated.go