Skip repeatable flag by default in the introspection.

OlegIlyenko · OlegIlyenko · commit 3b5bf03609b2 · 2018-10-04T17:50:04.000+02:00
diff --git a/src/type/__tests__/introspection-test.js b/src/type/__tests__/introspection-test.js
@@ -830,7 +830,6 @@ describe('Introspection', () => {
           directives: [
             {
               name: 'include',
-              repeatable: false,
               locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
               args: [
                 {
@@ -850,7 +849,6 @@ describe('Introspection', () => {
             },
             {
               name: 'skip',
-              repeatable: false,
               locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
               args: [
                 {
@@ -870,7 +868,6 @@ describe('Introspection', () => {
             },
             {
               name: 'deprecated',
-              repeatable: false,
               locations: ['FIELD_DEFINITION', 'ENUM_VALUE'],
               args: [
                 {
@@ -890,6 +887,81 @@ describe('Introspection', () => {
     });
   });
 
+  it('includes repeatable flag on directives', () => {
+    const EmptySchema = new GraphQLSchema({
+      query: new GraphQLObjectType({
+        name: 'QueryRoot',
+        fields: {
+          onlyField: { type: GraphQLString },
+        },
+      }),
+    });
+    const query = getIntrospectionQuery({
+      descriptions: false,
+      directiveRepeatableFlag: true,
+    });
+    const result = graphqlSync(EmptySchema, query);
+
+    expect((result.data: any).__schema.directives).to.deep.equal([
+      {
+        name: 'include',
+        locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
+        args: [
+          {
+            name: 'if',
+            type: {
+              kind: 'NON_NULL',
+              name: null,
+              ofType: {
+                kind: 'SCALAR',
+                name: 'Boolean',
+                ofType: null,
+              },
+            },
+            defaultValue: null,
+          },
+        ],
+        repeatable: false,
+      },
+      {
+        name: 'skip',
+        locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
+        args: [
+          {
+            name: 'if',
+            type: {
+              kind: 'NON_NULL',
+              name: null,
+              ofType: {
+                kind: 'SCALAR',
+                name: 'Boolean',
+                ofType: null,
+              },
+            },
+            defaultValue: null,
+          },
+        ],
+        repeatable: false,
+      },
+      {
+        name: 'deprecated',
+        locations: ['FIELD_DEFINITION', 'ENUM_VALUE'],
+        args: [
+          {
+            name: 'reason',
+            type: {
+              kind: 'SCALAR',
+              name: 'String',
+              ofType: null,
+            },
+            defaultValue: '"No longer supported"',
+          },
+        ],
+        repeatable: false,
+      },
+    ]);
+  });
+
   it('introspects on input object', () => {
     const TestInputObject = new GraphQLInputObjectType({
       name: 'TestInputObject',
diff --git a/src/utilities/introspectionQuery.js b/src/utilities/introspectionQuery.js
@@ -13,10 +13,15 @@ export type IntrospectionOptions = {|
   // Whether to include descriptions in the introspection result.
   // Default: true
   descriptions: boolean,
+  // Whether to include `repeatable` flag on directives.
+  // Default: false
+  directiveRepeatableFlag?: ?boolean,
 |};
 
 export function getIntrospectionQuery(options?: IntrospectionOptions): string {
   const descriptions = !(options && options.descriptions === false);
+  const directiveRepeatableFlag =
+    options && options.directiveRepeatableFlag === true;
   return `
     query IntrospectionQuery {
       __schema {
@@ -33,7 +38,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
           args {
             ...InputValue
           }
-          repeatable
+          ${directiveRepeatableFlag ? 'repeatable' : ''}
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,15 @@ export type IntrospectionOptions = {\|`
`13`	`13`	`// Whether to include descriptions in the introspection result.`
`14`	`14`	`// Default: true`
`15`	`15`	`descriptions: boolean,`
	`16`	+ // Whether to include `repeatable` flag on directives.
	`17`	`+ // Default: false`
	`18`	`+ directiveRepeatableFlag?: ?boolean,`
`16`	`19`	`\|};`
`17`	`20`
`18`	`21`	`export function getIntrospectionQuery(options?: IntrospectionOptions): string {`
`19`	`22`	`const descriptions = !(options && options.descriptions === false);`
	`23`	`+ const directiveRepeatableFlag =`
	`24`	`+ options && options.directiveRepeatableFlag === true;`
`20`	`25`	return `
`21`	`26`	`query IntrospectionQuery {`
`22`	`27`	`__schema {`
`@@ -33,7 +38,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {`
`33`	`38`	`args {`
`34`	`39`	`...InputValue`
`35`	`40`	`}`
`36`		`- repeatable`
	`41`	`+ ${directiveRepeatableFlag ? 'repeatable' : ''}`
`37`	`42`	`}`
`38`	`43`	`}`
`39`	`44`	`}`