Merge branch 'introspection-directive-args' into HEAD

graphql/introspection/schema.go

@@ -35,16 +35,34 @@ func (s *Schema) SubscriptionType() *Type {
 
 func (s *Schema) Directives() []Directive {
 	var res []Directive
+
 	for _, d := range s.schema.Directives {
-		var locs []string
-		for _, loc := range d.Locations {
-			locs = append(locs, string(loc))
-		}
-		res = append(res, Directive{
-			Name:        d.Name,
-			Description: d.Description,
-			Locations:   locs,
-		})
+		res = append(res, s.directiveFromDef(d))
 	}
+
 	return res
 }
+
+func (s *Schema) directiveFromDef(d *ast.DirectiveDefinition) Directive {
+	var locs []string
+	for _, loc := range d.Locations {
+		locs = append(locs, string(loc))
+	}
+
+	var args []InputValue
+	for _, arg := range d.Arguments {
+		args = append(args, InputValue{
+			Name:         arg.Name,
+			Description:  arg.Description,
+			DefaultValue: defaultValue(arg.DefaultValue),
+			Type:         WrapTypeFromType(s.schema, arg.Type),
+		})
+	}
+
+	return Directive{
+		Name:        d.Name,
+		Description: d.Description,
+		Locations:   locs,
+		Args:        args,
+	}
+}

integration/integration-test.js

@@ -4,12 +4,10 @@ import {ApolloClient} from "apollo-client";
 import fetch from "node-fetch";
 import gql from 'graphql-tag';
 
-if (!process.env.SERVER_URL) {
-    throw "SERVER_URL must be set"
-}
+var uri = process.env.SERVER_URL || 'http://localhost:8080/query';
 
 const client = new ApolloClient({
-    link: new HttpLink({uri: process.env.SERVER_URL, fetch: fetch}),
+    link: new HttpLink({uri, fetch}),
     cache: new InMemoryCache(),
     defaultOptions: {
         watchQuery: {

integration/schema-expected.graphql

@@ -1,5 +1,8 @@
 # source: http://localhost:8080/query
-# timestamp: Fri Aug 10 2018 11:50:28 GMT+1000 (AEST)
+# timestamp: Thu Aug 23 2018 10:30:37 GMT+1000 (AEST)
+
+"""This directive does magical things"""
+directive @magic(kind: Int) on FIELD_DEFINITION
 
 enum DATE_FILTER_OP {
   EQ

integration/schema.graphql

@@ -1,3 +1,6 @@
+"This directive does magical things"
+directive @magic(kind: Int) on FIELD_DEFINITION
+
 type Element {
     child: Element!
     error: Boolean!