Merge pull request #204 from vektah/gqlparser-prelude

Use shared prelude
99designs · Jul 19, 2018 · c2f1570 · c2f1570
2 parents 2692d3e + 548aed1
commit c2f1570
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 162 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/codegen/build.go b/codegen/build.go
@@ -20,6 +20,7 @@ type Build struct {
 	MutationRoot     *Object
 	SubscriptionRoot *Object
 	SchemaRaw        string
+	SchemaFilename   string
 }
 
 type ModelBuild struct {
@@ -76,12 +77,13 @@ func (cfg *Config) bind() (*Build, error) {
 	}
 
 	b := &Build{
-		PackageName: cfg.Exec.Package,
-		Objects:     objects,
-		Interfaces:  cfg.buildInterfaces(namedTypes, prog),
-		Inputs:      inputs,
-		Imports:     imports.finalize(),
-		SchemaRaw:   cfg.SchemaStr,
+		PackageName:    cfg.Exec.Package,
+		Objects:        objects,
+		Interfaces:     cfg.buildInterfaces(namedTypes, prog),
+		Inputs:         inputs,
+		Imports:        imports.finalize(),
+		SchemaRaw:      cfg.SchemaStr,
+		SchemaFilename: cfg.SchemaFilename,
 	}
 
 	if cfg.schema.Query != nil {

diff --git a/codegen/codegen.go b/codegen/codegen.go
@@ -11,8 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/vektah/gqlgen/codegen/templates"
-	"github.com/vektah/gqlgen/graphql/introspection"
 	"github.com/vektah/gqlparser"
+	"github.com/vektah/gqlparser/ast"
+	"github.com/vektah/gqlparser/gqlerror"
 	"golang.org/x/tools/imports"
 )
 
@@ -107,9 +108,12 @@ func (cfg *Config) normalize() error {
 		}
 	}
 
-	var err error
-	cfg.schema, err = gqlparser.LoadSchema(introspection.Prelude + cfg.SchemaStr)
-	return err
+	var err *gqlerror.Error
+	cfg.schema, err = gqlparser.LoadSchema(&ast.Source{Name: cfg.SchemaFilename, Input: cfg.SchemaStr})
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 var invalidPackageNameChar = regexp.MustCompile(`[^\w]`)

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/generated.gotpl b/codegen/templates/generated.gotpl
@@ -168,4 +168,6 @@ func (ec *executionContext) introspectType(name string) *introspection.Type {
 	return introspection.WrapTypeFromDef(parsedSchema, parsedSchema.Types[name])
 }
 
-var parsedSchema = gqlparser.MustLoadSchema(introspection.Prelude + {{.SchemaRaw|rawQuote}})
+var parsedSchema = gqlparser.MustLoadSchema(
+	&ast.Source{Name: {{.SchemaFilename|quote}}, Input: {{.SchemaRaw|rawQuote}}},
+)
diff --git a/codegen/type_build.go b/codegen/type_build.go
@@ -81,6 +81,9 @@ func (n NamedTypes) getType(t *ast.Type) *Type {
 			if !t.NonNull {
 				modifiers = append(modifiers, modPtr)
 			}
+			if n[t.NamedType] == nil {
+				panic("missing type " + t.NamedType)
+			}
 			res := &Type{
 				NamedType: n[t.NamedType],
 				Modifiers: modifiers,

diff --git a/example/chat/generated.go b/example/chat/generated.go
diff --git a/example/dataloader/generated.go b/example/dataloader/generated.go
diff --git a/example/scalars/generated.go b/example/scalars/generated.go
diff --git a/example/selection/generated.go b/example/selection/generated.go
diff --git a/example/starwars/generated.go b/example/starwars/generated.go
diff --git a/example/todo/generated.go b/example/todo/generated.go
diff --git a/example/todo/schema.graphql b/example/todo/schema.graphql
@@ -24,3 +24,5 @@ input TodoInput {
 	text: String!
 	done: Boolean
 }
+
+scalar Map
diff --git a/graphql/introspection/inliner/inliner.go b/graphql/introspection/inliner/inliner.go
diff --git a/graphql/introspection/introspection.go b/graphql/introspection/introspection.go
@@ -1,5 +1,3 @@
-//go:generate go run ./inliner/inliner.go
-
 // introspection implements the spec defined in https://github.com/facebook/graphql/blob/master/spec/Section%204%20--%20Introspection.md#schema-introspection
 package introspection
 

diff --git a/graphql/introspection/prelude.go b/graphql/introspection/prelude.go
diff --git a/graphql/introspection/prelude.graphql b/graphql/introspection/prelude.graphql
diff --git a/handler/stub.go b/handler/stub.go
@@ -15,11 +15,11 @@ type executableSchemaStub struct {
 var _ graphql.ExecutableSchema = &executableSchemaStub{}
 
 func (e *executableSchemaStub) Schema() *ast.Schema {
-	return gqlparser.MustLoadSchema(`
+	return gqlparser.MustLoadSchema(&ast.Source{Input: `
 		schema { query: Query }
 		type Query { me: User! }
 		type User { name: String! }
-	`)
+	`})
 }
 
 func (e *executableSchemaStub) Query(ctx context.Context, op *ast.OperationDefinition) *graphql.Response {

diff --git a/test/generated.go b/test/generated.go