Add ParseOption.experimentalDirectivesOnDirectiveDefinition

Author: martinbonnin

src/__testUtils__/kitchenSinkSDL.ts

@@ -161,8 +161,4 @@ extend schema @onSchema
 extend schema @onSchema {
   subscription: SubscriptionType
 }
-
-directive @myDirective @onDirective on OBJECT | FIELD_DEFINITION
-
-extend directive @myDirective @onDirective2
 `;

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

@@ -178,10 +178,6 @@ describe('Printer: SDL document', () => {
       extend schema @onSchema {
         subscription: SubscriptionType
       }
-
-      directive @myDirective @onDirective on OBJECT | FIELD_DEFINITION
-      
-      extend directive @myDirective @onDirective2
     `);
   });
 });

src/language/parser.ts

@@ -113,6 +113,18 @@ export interface ParseOptions {
    */
   allowLegacyFragmentVariables?: boolean;
 
+  /**
+   * EXPERIMENTAL:
+   *
+   * If enabled, the parser will parse directives on directive definitions.
+   * This syntax is not part of the GraphQL specification and may change.
+   *
+   * ```graphql
+   * directive @foo @bar on FIELD
+   * ```
+   */
+  experimentalDirectivesOnDirectiveDefinitions?: boolean;
+
   /**
    * You may override the Lexer class used to lex the source; this is used by
    * schema coordinates to introduce a lexer with a restricted syntax.
@@ -1207,7 +1219,12 @@ export class Parser {
         case 'input':
           return this.parseInputObjectTypeExtension();
         case 'directive':
-          return this.parseDirectiveDefinitionExtension();
+          if (
+            this._options.experimentalDirectivesOnDirectiveDefinitions === true
+          ) {
+            return this.parseDirectiveDefinitionExtension();
+          }
+          break;
       }
     }
 
@@ -1420,7 +1437,10 @@ export class Parser {
     this.expectToken(TokenKind.AT);
     const name = this.parseName();
     const args = this.parseArgumentDefs();
-    const directives = this.parseConstDirectives();
+    const directives =
+      this._options.experimentalDirectivesOnDirectiveDefinitions === true
+        ? this.parseConstDirectives()
+        : [];
     const repeatable = this.expectOptionalKeyword('repeatable');
     this.expectKeyword('on');
     const locations = this.parseDirectiveLocations();

src/type/__tests__/introspection-test.ts

@@ -3,12 +3,13 @@ import { describe, it } from 'mocha';
 
 import { expectJSON } from '../../__testUtils__/expectJSON';
 
-import { buildSchema } from '../../utilities/buildASTSchema';
+import { buildASTSchema, buildSchema } from '../../utilities/buildASTSchema';
 import { getIntrospectionQuery } from '../../utilities/getIntrospectionQuery';
 
 import { graphqlSync } from '../../graphql';
 
 import type { GraphQLResolveInfo } from '../definition';
+import { parse } from '../..';
 
 describe('Introspection', () => {
   it('executes an introspection query', () => {
@@ -1798,13 +1799,13 @@ describe('Introspection', () => {
   });
 
   it('identifies deprecated directives', () => {
-    const schema = buildSchema(`
+    const schema = buildASTSchema(parse(`
       type Query {
         someField: String
       }
       directive @isNotDeprecated on FIELD_DEFINITION
       directive @isDeprecated @deprecated(reason: "No longer supported") on FIELD_DEFINITION
-    `);
+    `, { experimentalDirectivesOnDirectiveDefinitions: true }));
 
     const source = `
       {

src/utilities/__tests__/extendSchema-test.ts

@@ -1323,7 +1323,7 @@ describe('extendSchema', () => {
       const schema = buildSchema('directive @isDeprecated on FIELD_DEFINITION');
       const extendAST = parse(`
         extend directive @isDeprecated @deprecated(reason: "use another directive")
-      `);
+      `, { experimentalDirectivesOnDirectiveDefinitions: true });
       const extendedSchema = extendSchema(schema, extendAST);
 
       const someDirective = assertDirective(

src/validation/__tests__/KnownDirectivesRule-test.ts

@@ -352,8 +352,6 @@ describe('Validate: Known directives', () => {
           extend schema @onSchema
           
           directive @myDirective on OBJECT
-          
-          extend directive @myDirective @onDirective
         `,
         schemaWithSDLDirectives,
       );