Integrate DGraph fork changes

formatter/formatter_test.go

@@ -9,11 +9,11 @@ import (
 	"testing"
 	"unicode/utf8"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/formatter"
 	"github.com/vektah/gqlparser/v2/parser"
+	"github.com/stretchr/testify/assert"
 )
 
 var update = flag.Bool("u", false, "update golden files")

gqlerror/error_test.go

@@ -3,8 +3,8 @@ package gqlerror
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2/ast"
+	"github.com/stretchr/testify/require"
 )
 
 func TestErrorFormatting(t *testing.T) {

gqlparser.go

@@ -25,7 +25,7 @@ func LoadQuery(schema *ast.Schema, str string) (*ast.QueryDocument, gqlerror.Lis
 	if err != nil {
 		return nil, gqlerror.List{err}
 	}
-	errs := validator.Validate(schema, query)
+	errs := validator.Validate(schema, query, nil)
 	if errs != nil {
 		return nil, errs
 	}

parser/parser_test.go

@@ -3,9 +3,9 @@ package parser
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/lexer"
+	"github.com/stretchr/testify/require"
 )
 
 func TestParserUtils(t *testing.T) {

readme.md

@@ -1,4 +1,4 @@
-gqlparser [![CircleCI](https://badgen.net/circleci/github/vektah/gqlparser/master)](https://circleci.com/gh/vektah/gqlparser) [![Go Report Card](https://goreportcard.com/badge/github.com/vektah/gqlparser/v2)](https://goreportcard.com/report/github.com/vektah/gqlparser/v2) [![Coverage Status](https://badgen.net/coveralls/c/github/vektah/gqlparser)](https://coveralls.io/github/vektah/gqlparser?branch=master)
+gqlparser [![CircleCI](https://badgen.net/circleci/github/vektah/gqlparser/v2/master)](https://circleci.com/gh/vektah/gqlparser) [![Go Report Card](https://goreportcard.com/badge/github.com/vektah/gqlparser)](https://goreportcard.com/report/github.com/vektah/gqlparser) [![Coverage Status](https://badgen.net/coveralls/c/github/vektah/gqlparser)](https://coveralls.io/github/vektah/gqlparser?branch=master)
 ===
 
 This is a parser for graphql, written to mirror the graphql-js reference implementation as closely while remaining idiomatic and easy to use.

validator/imported_test.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/gqlerror"
+	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 )
 

validator/schema.go

@@ -40,8 +40,8 @@ func ValidateSchemaDocument(ast *SchemaDocument) (*Schema, *gqlerror.Error) {
 		def := schema.Types[ext.Name]
 		if def == nil {
 			schema.Types[ext.Name] = &Definition{
-				Kind:        ext.Kind,
-				Name:        ext.Name,
+				Kind:     ext.Kind,
+				Name:     ext.Name,
 				Position: ext.Position,
 			}
 			def = schema.Types[ext.Name]
@@ -289,6 +289,21 @@ func validateArgs(schema *Schema, args ArgumentDefinitionList, currentDirective
 	return nil
 }
 
+func validateDirectiveArgs(dir *Directive, schema *Schema) *gqlerror.Error {
+	allowedArgs := make(map[string]struct{})
+	for _, arg := range schema.Directives[dir.Name].Arguments {
+		allowedArgs[arg.Name] = struct{}{}
+	}
+
+	for _, arg := range dir.Arguments {
+		if _, ok := allowedArgs[arg.Name]; !ok {
+			return gqlerror.ErrorPosf(dir.Position, "%s is not supported as an argument for %s directive.", arg.Name, dir.Name)
+		}
+	}
+	return nil
+
+}
+
 func validateDirectives(schema *Schema, dirs DirectiveList, location DirectiveLocation, currentDirective *DirectiveDefinition) *gqlerror.Error {
 	for _, dir := range dirs {
 		if err := validateName(dir.Position, dir.Name); err != nil {
@@ -301,6 +316,9 @@ func validateDirectives(schema *Schema, dirs DirectiveList, location DirectiveLo
 		if schema.Directives[dir.Name] == nil {
 			return gqlerror.ErrorPosf(dir.Position, "Undefined directive %s.", dir.Name)
 		}
+		if err := validateDirectiveArgs(dir, schema); err != nil {
+			return err
+		}
 		validKind := false
 		for _, dirLocation := range schema.Directives[dir.Name].Locations {
 			if dirLocation == location {

validator/schema_test.go

@@ -4,9 +4,9 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/parser/testrunner"
+	"github.com/stretchr/testify/require"
 )
 
 func TestLoadSchema(t *testing.T) {

validator/schema_test.yml

@@ -505,6 +505,16 @@ directives:
 
       directive @A(a: Input, b: Scalar, c: Enum) on FIELD_DEFINITION
 
+  - name: Valid arg for directive
+    input: |
+      type User @include(aggregate: false) {
+        name: String
+      }
+
+    error:
+      message: 'aggregate is not supported as an argument for include directive.'
+      locations: [{line: 1, column: 12}]
+
   - name: Objects not allowed
     input: |
       type Object { id: ID }

validator/testdata/vars.graphql

@@ -1,6 +1,7 @@
 type Query {
     optionalIntArg(i: Int): Boolean!
     intArg(i: Int!): Boolean!
+    int64Arg(i: Int64!): Boolean!
     stringArg(i: String): Boolean!
     boolArg(i: Boolean!): Boolean!
     floatArg(i: Float!): Boolean!
@@ -10,10 +11,14 @@ type Query {
     defaultStructArg(i: InputType! = {name: "foo"}): Boolean!
     arrayArg(i: [InputType!]): Boolean!
     intArrayArg(i: [Int]): Boolean!
+    idArrayArg(i: [ID]): Boolean!
     stringArrayArg(i: [String]): Boolean!
     boolArrayArg(i: [Boolean]): Boolean!
+    typeArrayArg(i: [CustomType]): Boolean!
 }
 
+scalar Int64
+
 input InputType {
     name: String!
     nullName: String
@@ -26,8 +31,12 @@ input Embedded {
     name: String!
 }
 
+input CustomType {
+    and: [Int!]
+}
+
 enum Enum {
     A
 }
 
-scalar Custom
+scalar Custom

validator/validator.go

@@ -1,6 +1,8 @@
 package validator
 
 import (
+	"sort"
+
 	. "github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/gqlerror"
 )
@@ -11,7 +13,9 @@ type ruleFunc func(observers *Events, addError AddErrFunc)
 
 type rule struct {
 	name string
-	rule ruleFunc
+	// rules will be called in the ascending order
+	order int
+	rule  ruleFunc
 }
 
 var rules []rule
@@ -22,7 +26,16 @@ func AddRule(name string, f ruleFunc) {
 	rules = append(rules, rule{name: name, rule: f})
 }
 
-func Validate(schema *Schema, doc *QueryDocument) gqlerror.List {
+// AddRuleWithOrder to rule set with an order.
+// f is called once each time `Validate` is executed.
+func AddRuleWithOrder(name string, order int, f ruleFunc) {
+	rules = append(rules, rule{name: name, order: order, rule: f})
+	sort.Slice(rules, func(i, j int) bool {
+		return rules[i].order < rules[j].order
+	})
+}
+
+func Validate(schema *Schema, doc *QueryDocument, variables map[string]interface{}) gqlerror.List {
 	var errs gqlerror.List
 
 	observers := &Events{}
@@ -39,6 +52,6 @@ func Validate(schema *Schema, doc *QueryDocument) gqlerror.List {
 		})
 	}
 
-	Walk(schema, doc, observers)
+	Walk(schema, doc, observers, variables)
 	return errs
 }

validator/validator_test.go

@@ -3,11 +3,11 @@ package validator_test
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/parser"
 	"github.com/vektah/gqlparser/v2/validator"
+	"github.com/stretchr/testify/require"
 )
 
 func TestExtendingNonExistantTypes(t *testing.T) {
@@ -37,5 +37,5 @@ extend type Query {
 		}
 	}`})
 	require.Nil(t, err)
-	require.Nil(t, validator.Validate(s, q))
+	require.Nil(t, validator.Validate(s, q, nil))
 }