Ben KraftandGitHub
5995653583
## Summary: In this commit I refactor the argument-generation logic to move most of the code out of the template and into the type-generator. This logic predates #51, and I didn't think to update it there, but I think it benefits from similar treatment, for similar reasons. Specifically, the main change is to treat variables as another struct type we can generate, rather than handling them inline as a `map[string]interface{}`. Users still pass them the same way, but instead of putting them into a `map[string]interface{}` and JSONifying that, we generate a struct and put them there. This turns out to simplify things quite a lot, because we already have a lot of code to generate types. Notably, the omitempty code goes from a dozen lines to basically two, and fixes a bug (#43) in the process, because now that we have a struct, `json.Marshal` will do our work for us! (And, once we have syntax for it (#14), we'll be able to handle field-level omitempty basically for free.) More importantly, it will simplify custom marshalers (#38, forthcoming) significantly, since we do all that logic at the containing-struct level, but will need to apply it to arguments. It does require two breaking changes: 1. For folks implementing the `graphql.Client` API (rather than just calling `NewClient`): we now pass them variables as an `interface{}` rather than a `map[string]interface{}`. For most callers, including Khan/webapp, this is basically a one-line change to the signature of their `MakeRequest`, and it should be a lot more future-proof. 2. genqlient's handling of the `omitempty` option has changed to match that of `encoding/json`, in particular it now never considers structs "empty". The difference was never intentional (I just didn't realize that behavior of `encoding/json`); arguably our behavior was more useful but I think that's outweighed by the value of consistency with `encoding/json` as well as the simpler and more correct implementation (fixing #43 is actually quite nontrivial otherwise). Once we have custom unmarshaler support (#38), users will be able to map a zero value to JSON null if they wish, which is mostly if not entirely equivalent for GraphQL's purposes. Issue: https://github.com/Khan/genqlient/issues/38 Issue: https://github.com/Khan/genqlient/issues/43 ## Test plan: make check Author: benjaminjkraft Reviewers: StevenACoffman, dnerdy, aberkan, jvoll, mahtabsabet, MiguelCastillo Required Reviewers: Approved By: StevenACoffman, dnerdy Checks: ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint, ✅ Lint, ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14) Pull Request URL: https://github.com/Khan/genqlient/pull/103
108 lines
2.2 KiB
Go
108 lines
2.2 KiB
Go
package server
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http/httptest"
|
|
|
|
"github.com/99designs/gqlgen/graphql/handler"
|
|
"github.com/99designs/gqlgen/graphql/handler/transport"
|
|
)
|
|
|
|
func strptr(v string) *string { return &v }
|
|
func intptr(v int) *int { return &v }
|
|
|
|
var users = []*User{
|
|
{
|
|
ID: "1", Name: "Yours Truly", LuckyNumber: intptr(17),
|
|
Hair: &Hair{Color: strptr("Black")},
|
|
},
|
|
{ID: "2", Name: "Raven", LuckyNumber: intptr(-1), Hair: nil},
|
|
}
|
|
|
|
var animals = []*Animal{
|
|
{
|
|
ID: "3", Name: "Fido", Species: SpeciesDog, Owner: userByID("1"),
|
|
Hair: &BeingsHair{HasHair: true},
|
|
},
|
|
{
|
|
ID: "4", Name: "Old One", Species: SpeciesCoelacanth, Owner: nil,
|
|
Hair: &BeingsHair{HasHair: false},
|
|
},
|
|
}
|
|
|
|
func userByID(id string) *User {
|
|
for _, user := range users {
|
|
if id == user.ID {
|
|
return user
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func beingByID(id string) Being {
|
|
for _, user := range users {
|
|
if id == user.ID {
|
|
return user
|
|
}
|
|
}
|
|
for _, animal := range animals {
|
|
if id == animal.ID {
|
|
return animal
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (r *queryResolver) Me(ctx context.Context) (*User, error) {
|
|
return userByID("1"), nil
|
|
}
|
|
|
|
func (r *queryResolver) User(ctx context.Context, id *string) (*User, error) {
|
|
if id == nil {
|
|
return userByID("1"), nil
|
|
}
|
|
return userByID(*id), nil
|
|
}
|
|
|
|
func (r *queryResolver) Being(ctx context.Context, id string) (Being, error) {
|
|
return beingByID(id), nil
|
|
}
|
|
|
|
func (r *queryResolver) Beings(ctx context.Context, ids []string) ([]Being, error) {
|
|
ret := make([]Being, len(ids))
|
|
for i, id := range ids {
|
|
ret[i] = beingByID(id)
|
|
}
|
|
return ret, nil
|
|
}
|
|
|
|
func (r *queryResolver) LotteryWinner(ctx context.Context, number int) (Lucky, error) {
|
|
for _, user := range users {
|
|
if user.LuckyNumber != nil && *user.LuckyNumber == number {
|
|
return user, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (r *queryResolver) Fail(ctx context.Context) (*bool, error) {
|
|
f := true
|
|
return &f, fmt.Errorf("oh no")
|
|
}
|
|
|
|
func RunServer() *httptest.Server {
|
|
gqlgenServer := handler.New(NewExecutableSchema(Config{Resolvers: &resolver{}}))
|
|
gqlgenServer.AddTransport(transport.POST{})
|
|
return httptest.NewServer(gqlgenServer)
|
|
}
|
|
|
|
type (
|
|
resolver struct{}
|
|
queryResolver struct{}
|
|
)
|
|
|
|
func (r *resolver) Query() QueryResolver { return &queryResolver{} }
|
|
|
|
//go:generate go run github.com/99designs/gqlgen
|