parse type in query

99designs · Oct 23, 2016 · bec4536 · bec4536
1 parent be87a8f
commit bec4536
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/internal/query/query.go b/internal/query/query.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/neelance/graphql-go/errors"
 	"github.com/neelance/graphql-go/internal/lexer"
+	"github.com/neelance/graphql-go/internal/schema"
 )
 
 type Document struct {
@@ -30,7 +31,7 @@ const (
 
 type VariableDef struct {
 	Name string
-	Type string
+	Type schema.Type
 }
 
 type NamedFragment struct {
@@ -169,10 +170,7 @@ func parseVariableDef(l *lexer.Lexer) *VariableDef {
 	l.ConsumeToken('$')
 	v.Name = l.ConsumeIdent()
 	l.ConsumeToken(':')
-	v.Type = l.ConsumeIdent()
-	if l.Peek() == '!' {
-		l.ConsumeToken('!') // TODO
-	}
+	v.Type = schema.ParseType(l)
 	return v
 }
 

diff --git a/internal/schema/schema.go b/internal/schema/schema.go
@@ -349,7 +349,7 @@ func parseFields(l *lexer.Lexer) (map[string]*Field, []string) {
 			l.ConsumeToken(')')
 		}
 		l.ConsumeToken(':')
-		f.Type = parseType(l)
+		f.Type = ParseType(l)
 		fields[f.Name] = f
 		fieldOrder = append(fieldOrder, f.Name)
 	}
@@ -360,15 +360,15 @@ func parseInputValue(l *lexer.Lexer) *InputValue {
 	p := &InputValue{}
 	p.Name = l.ConsumeIdent()
 	l.ConsumeToken(':')
-	p.Type = parseType(l)
+	p.Type = ParseType(l)
 	if l.Peek() == '=' {
 		l.ConsumeToken('=')
 		p.Default = parseValue(l)
 	}
 	return p
 }
 
-func parseType(l *lexer.Lexer) Type {
+func ParseType(l *lexer.Lexer) Type {
 	t := parseNullType(l)
 	if l.Peek() == '!' {
 		l.ConsumeToken('!')
@@ -380,7 +380,7 @@ func parseType(l *lexer.Lexer) Type {
 func parseNullType(l *lexer.Lexer) Type {
 	if l.Peek() == '[' {
 		l.ConsumeToken('[')
-		ofType := parseType(l)
+		ofType := ParseType(l)
 		l.ConsumeToken(']')
 		return &List{OfType: ofType}
 	}