[RFC] Added support for repeatable directives

src/language/__tests__/schema-kitchen-sink.graphql

@@ -124,6 +124,10 @@ directive @include2(if: Boolean!) on
   | FRAGMENT_SPREAD
   | INLINE_FRAGMENT
 
+directive @myRepeatableDir(name: String!) repeatable on
+  | OBJECT
+  | INTERFACE
+
 extend schema @onSchema
 
 extend schema @onSchema {

src/language/__tests__/schema-parser-test.js

@@ -804,6 +804,108 @@ input Hello {
     );
   });
 
+  it('Directive definition', () => {
+    const body = 'directive @foo on OBJECT | INTERFACE';
+    const doc = parse(body);
+
+    expect(toJSONDeep(doc)).to.deep.equal({
+      kind: 'Document',
+      definitions: [
+        {
+          kind: 'DirectiveDefinition',
+          description: undefined,
+          name: {
+            kind: 'Name',
+            value: 'foo',
+            loc: {
+              start: 11,
+              end: 14,
+            },
+          },
+          arguments: [],
+          repeatable: false,
+          locations: [
+            {
+              kind: 'Name',
+              value: 'OBJECT',
+              loc: {
+                start: 18,
+                end: 24,
+              },
+            },
+            {
+              kind: 'Name',
+              value: 'INTERFACE',
+              loc: {
+                start: 27,
+                end: 36,
+              },
+            },
+          ],
+          loc: {
+            start: 0,
+            end: 36,
+          },
+        },
+      ],
+      loc: {
+        start: 0,
+        end: 36,
+      },
+    });
+  });
+
+  it('Repeatable directive definition', () => {
+    const body = 'directive @foo repeatable on OBJECT | INTERFACE';
+    const doc = parse(body);
+
+    expect(toJSONDeep(doc)).to.deep.equal({
+      kind: 'Document',
+      definitions: [
+        {
+          kind: 'DirectiveDefinition',
+          description: undefined,
+          name: {
+            kind: 'Name',
+            value: 'foo',
+            loc: {
+              start: 11,
+              end: 14,
+            },
+          },
+          arguments: [],
+          repeatable: true,
+          locations: [
+            {
+              kind: 'Name',
+              value: 'OBJECT',
+              loc: {
+                start: 29,
+                end: 35,
+              },
+            },
+            {
+              kind: 'Name',
+              value: 'INTERFACE',
+              loc: {
+                start: 38,
+                end: 47,
+              },
+            },
+          ],
+          loc: {
+            start: 0,
+            end: 47,
+          },
+        },
+      ],
+      loc: {
+        start: 0,
+        end: 47,
+      },
+    });
+  });
+
   it('Directive with incorrect locations', () => {
     expectSyntaxError(
       `

src/language/__tests__/schema-printer-test.js

@@ -164,6 +164,8 @@ describe('Printer: SDL document', () => {
 
       directive @include2(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
+      directive @myRepeatableDir(name: String!) repeatable on OBJECT | INTERFACE
+
       extend schema @onSchema
 
       extend schema @onSchema {

src/language/ast.js

@@ -508,6 +508,7 @@ export type DirectiveDefinitionNode = {
   +description?: StringValueNode,
   +name: NameNode,
   +arguments?: $ReadOnlyArray<InputValueDefinitionNode>,
+  +repeatable: boolean,
   +locations: $ReadOnlyArray<NameNode>,
 };
 

src/language/parser.js

@@ -1378,7 +1378,7 @@ function parseInputObjectTypeExtension(
 
 /**
  * DirectiveDefinition :
- *   - Description? directive @ Name ArgumentsDefinition? on DirectiveLocations
+ *   - Description? directive @ Name ArgumentsDefinition? `repeatable`? on DirectiveLocations
  */
 function parseDirectiveDefinition(lexer: Lexer<*>): DirectiveDefinitionNode {
   const start = lexer.token;
@@ -1387,13 +1387,15 @@ function parseDirectiveDefinition(lexer: Lexer<*>): DirectiveDefinitionNode {
   expect(lexer, TokenKind.AT);
   const name = parseName(lexer);
   const args = parseArgumentDefs(lexer);
+  const repeatable = expectOptionalKeyword(lexer, 'repeatable');
   expectKeyword(lexer, 'on');
   const locations = parseDirectiveLocations(lexer);
   return {
     kind: Kind.DIRECTIVE_DEFINITION,
     description,
     name,
     arguments: args,
+    repeatable,
     locations,
     loc: loc(lexer, start),
   };
@@ -1529,6 +1531,21 @@ function expectKeyword(lexer: Lexer<*>, value: string): Token {
   );
 }
 
+/**
+ * If the next token is a keyword with the given value, return true after advancing
+ * the lexer. Otherwise, do not change the parser state and return false.
+ */
+function expectOptionalKeyword(lexer: Lexer<*>, value: string): boolean {
+  const token = lexer.token;
+  const match = token.kind === TokenKind.NAME && token.value === value;
+
+  if (match) {
+    lexer.advance();
+  }
+
+  return match;
+}
+
 /**
  * Helper function for creating an error when an unexpected lexed token
  * is encountered.

src/language/printer.js

@@ -181,12 +181,13 @@ const printDocASTReducer = {
   ),
 
   DirectiveDefinition: addDescription(
-    ({ name, arguments: args, locations }) =>
+    ({ name, arguments: args, locations, repeatable }) =>
       'directive @' +
       name +
       (args.every(arg => arg.indexOf('\n') === -1)
         ? wrap('(', join(args, ', '), ')')
         : wrap('(\n', indent(join(args, '\n')), '\n)')) +
+      (repeatable ? ' repeatable' : '') +
       ' on ' +
       join(locations, ' | '),
   ),

src/type/__tests__/introspection-test.js

@@ -700,6 +700,21 @@ describe('Introspection', () => {
                   isDeprecated: false,
                   deprecationReason: null,
                 },
+                {
+                  args: [],
+                  deprecationReason: null,
+                  isDeprecated: false,
+                  name: 'repeatable',
+                  type: {
+                    kind: 'NON_NULL',
+                    name: null,
+                    ofType: {
+                      kind: 'SCALAR',
+                      name: 'Boolean',
+                      ofType: null,
+                    },
+                  },
+                },
               ],
               inputFields: null,
               interfaces: [],
@@ -815,6 +830,7 @@ describe('Introspection', () => {
           directives: [
             {
               name: 'include',
+              repeatable: false,
               locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
               args: [
                 {
@@ -834,6 +850,7 @@ describe('Introspection', () => {
             },
             {
               name: 'skip',
+              repeatable: false,
               locations: ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
               args: [
                 {
@@ -853,6 +870,7 @@ describe('Introspection', () => {
             },
             {
               name: 'deprecated',
+              repeatable: false,
               locations: ['FIELD_DEFINITION', 'ENUM_VALUE'],
               args: [
                 {

src/type/directives.js

@@ -44,12 +44,17 @@ export class GraphQLDirective {
   locations: Array<DirectiveLocationEnum>;
   args: Array<GraphQLArgument>;
   astNode: ?DirectiveDefinitionNode;
+  repeatable: boolean;
 
   constructor(config: GraphQLDirectiveConfig): void {
     this.name = config.name;
     this.description = config.description;
     this.locations = config.locations;
     this.astNode = config.astNode;
+    this.repeatable =
+      config.repeatable === undefined || config.repeatable === null
+        ? false
+        : config.repeatable;
     invariant(config.name, 'Directive must be named.');
     invariant(
       Array.isArray(config.locations),
@@ -92,6 +97,7 @@ export type GraphQLDirectiveConfig = {|
   locations: Array<DirectiveLocationEnum>,
   args?: ?GraphQLFieldConfigArgumentMap,
   astNode?: ?DirectiveDefinitionNode,
+  repeatable?: ?boolean,
 |};
 
 /**

src/type/introspection.js

@@ -98,6 +98,12 @@ export const __Directive = new GraphQLObjectType({
       type: GraphQLNonNull(GraphQLList(GraphQLNonNull(__InputValue))),
       resolve: directive => directive.args || [],
     },
+    repeatable: {
+      type: GraphQLNonNull(GraphQLBoolean),
+      description:
+        'Permits using the directive multiple times at the same location.',
+      resolve: directive => directive.repeatable,
+    },
   }),
 });
 

src/utilities/__tests__/buildASTSchema-test.js

@@ -91,6 +91,22 @@ describe('Schema Builder', () => {
     expect(output).to.equal(body);
   });
 
+  it('With repeatable directives', () => {
+    const body = dedent`
+      directive @foo(arg: Int) repeatable on FIELD
+
+      type Query {
+        str: String
+      }
+    `;
+
+    const output = cycleOutput(body);
+    expect(output).to.equal(body);
+
+    const schema = buildASTSchema(parse(body));
+    expect(schema.getDirective('foo').repeatable).to.equal(true);
+  });
+
   it('Supports descriptions', () => {
     const body = dedent`
       """This is a directive"""

src/utilities/__tests__/buildClientSchema-test.js

@@ -583,6 +583,12 @@ describe('Type System: build schema from introspection', () => {
           description: 'This is a custom directive',
           locations: ['FIELD'],
         }),
+        new GraphQLDirective({
+          name: 'customRepeatableDirective',
+          description: 'This is a custom repeatable directive',
+          repeatable: true,
+          locations: ['FIELD'],
+        }),
       ],
     });
 

src/utilities/__tests__/schemaPrinter-test.js

@@ -650,6 +650,9 @@ describe('Type System Printer', () => {
         description: String
         locations: [__DirectiveLocation!]!
         args: [__InputValue!]!
+
+        """Permits using the directive multiple times at the same location."""
+        repeatable: Boolean!
       }
 
       """
@@ -883,6 +886,9 @@ describe('Type System Printer', () => {
         description: String
         locations: [__DirectiveLocation!]!
         args: [__InputValue!]!
+
+        # Permits using the directive multiple times at the same location.
+        repeatable: Boolean!
       }
 
       # A Directive can be adjacent to many parts of the GraphQL language, a

src/utilities/buildASTSchema.js

@@ -282,6 +282,7 @@ export class ASTDefinitionBuilder {
       args:
         directiveNode.arguments &&
         this._makeInputValues(directiveNode.arguments),
+      repeatable: directiveNode.repeatable,
       astNode: directiveNode,
     });
   }

src/utilities/buildClientSchema.js

@@ -355,6 +355,7 @@ export function buildClientSchema(
       description: directiveIntrospection.description,
       locations: directiveIntrospection.locations.slice(),
       args: buildInputValueDefMap(directiveIntrospection.args),
+      repeatable: directiveIntrospection.repeatable,
     });
   }
 

src/utilities/introspectionQuery.js

@@ -33,6 +33,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
           args {
             ...InputValue
           }
+          repeatable
         }
       }
     }
@@ -273,4 +274,5 @@ export type IntrospectionDirective = {|
   +description?: ?string,
   +locations: $ReadOnlyArray<DirectiveLocationEnum>,
   +args: $ReadOnlyArray<IntrospectionInputValue>,
+  +repeatable: boolean,
 |};

src/utilities/schemaPrinter.js

@@ -309,6 +309,7 @@ function printDirective(directive, options) {
     'directive @' +
     directive.name +
     printArgs(options, directive.args) +
+    (directive.repeatable ? ' repeatable' : '') +
     ' on ' +
     directive.locations.join(' | ')
   );