Add support for directives on directive definitions

src/__testUtils__/kitchenSinkSDL.ts

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

src/index.ts

@@ -312,6 +312,7 @@ export type {
   UnionTypeExtensionNode,
   EnumTypeExtensionNode,
   InputObjectTypeExtensionNode,
+  DirectiveExtensionNode,
   // Schema Coordinates
   SchemaCoordinateNode,
   TypeCoordinateNode,

src/language/__tests__/predicates-test.ts

@@ -39,6 +39,7 @@ describe('AST node predicates', () => {
       'InputObjectTypeDefinition',
       'DirectiveDefinition',
       'SchemaExtension',
+      'DirectiveExtension',
       'ScalarTypeExtension',
       'ObjectTypeExtension',
       'InterfaceTypeExtension',
@@ -123,6 +124,7 @@ describe('AST node predicates', () => {
   it('isTypeSystemExtensionNode', () => {
     expect(filterNodes(isTypeSystemExtensionNode)).to.deep.equal([
       'SchemaExtension',
+      'DirectiveExtension',
       'ScalarTypeExtension',
       'ObjectTypeExtension',
       'InterfaceTypeExtension',

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

@@ -1029,6 +1029,7 @@ input Hello {
         {
           kind: 'DirectiveDefinition',
           description: undefined,
+          directives: [],
           name: {
             kind: 'Name',
             value: 'foo',
@@ -1065,6 +1066,7 @@ input Hello {
         {
           kind: 'DirectiveDefinition',
           description: undefined,
+          directives: [],
           name: {
             kind: 'Name',
             value: 'foo',

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

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

src/language/ast.ts

@@ -180,6 +180,7 @@ export type ASTNode =
   | UnionTypeExtensionNode
   | EnumTypeExtensionNode
   | InputObjectTypeExtensionNode
+  | DirectiveExtensionNode
   | TypeCoordinateNode
   | MemberCoordinateNode
   | ArgumentCoordinateNode
@@ -280,10 +281,18 @@ export const QueryDocumentKeys: {
   EnumValueDefinition: ['description', 'name', 'directives'],
   InputObjectTypeDefinition: ['description', 'name', 'directives', 'fields'],
 
-  DirectiveDefinition: ['description', 'name', 'arguments', 'locations'],
+  DirectiveDefinition: [
+    'description',
+    'name',
+    'arguments',
+    'directives',
+    'locations',
+  ],
 
   SchemaExtension: ['directives', 'operationTypes'],
 
+  DirectiveExtension: ['name', 'directives'],
+
   ScalarTypeExtension: ['name', 'directives'],
   ObjectTypeExtension: ['name', 'interfaces', 'directives', 'fields'],
   InterfaceTypeExtension: ['name', 'interfaces', 'directives', 'fields'],
@@ -686,13 +695,17 @@ export interface DirectiveDefinitionNode {
   readonly description?: StringValueNode;
   readonly name: NameNode;
   readonly arguments?: ReadonlyArray<InputValueDefinitionNode>;
+  readonly directives?: ReadonlyArray<ConstDirectiveNode>;
   readonly repeatable: boolean;
   readonly locations: ReadonlyArray<NameNode>;
 }
 
 /** Type System Extensions */
 
-export type TypeSystemExtensionNode = SchemaExtensionNode | TypeExtensionNode;
+export type TypeSystemExtensionNode =
+  | SchemaExtensionNode
+  | TypeExtensionNode
+  | DirectiveExtensionNode;
 
 export interface SchemaExtensionNode {
   readonly kind: Kind.SCHEMA_EXTENSION;
@@ -760,6 +773,13 @@ export interface InputObjectTypeExtensionNode {
   readonly fields?: ReadonlyArray<InputValueDefinitionNode>;
 }
 
+export interface DirectiveExtensionNode {
+  readonly kind: Kind.DIRECTIVE_EXTENSION;
+  readonly loc?: Location;
+  readonly name: NameNode;
+  readonly directives?: ReadonlyArray<ConstDirectiveNode>;
+}
+
 /** Schema Coordinates */
 
 export type SchemaCoordinateNode =

src/language/directiveLocation.ts

@@ -23,6 +23,7 @@ enum DirectiveLocation {
   ENUM_VALUE = 'ENUM_VALUE',
   INPUT_OBJECT = 'INPUT_OBJECT',
   INPUT_FIELD_DEFINITION = 'INPUT_FIELD_DEFINITION',
+  DIRECTIVE_DEFINITION = 'DIRECTIVE_DEFINITION',
 }
 export { DirectiveLocation };
 

src/language/index.ts

@@ -96,6 +96,7 @@ export type {
   UnionTypeExtensionNode,
   EnumTypeExtensionNode,
   InputObjectTypeExtensionNode,
+  DirectiveExtensionNode,
   // Schema Coordinates
   SchemaCoordinateNode,
   TypeCoordinateNode,

src/language/kinds.ts

@@ -58,6 +58,7 @@ enum Kind {
 
   /** Type System Extensions */
   SCHEMA_EXTENSION = 'SchemaExtension',
+  DIRECTIVE_EXTENSION = 'DirectiveExtension',
 
   /** Type Extensions */
   SCALAR_TYPE_EXTENSION = 'ScalarTypeExtension',

src/language/parser.ts

@@ -17,6 +17,7 @@ import type {
   DirectiveArgumentCoordinateNode,
   DirectiveCoordinateNode,
   DirectiveDefinitionNode,
+  DirectiveExtensionNode,
   DirectiveNode,
   DocumentNode,
   EnumTypeDefinitionNode,
@@ -1184,6 +1185,7 @@ export class Parser {
    *   - UnionTypeExtension
    *   - EnumTypeExtension
    *   - InputObjectTypeDefinition
+   *   - DirectiveDefinitionExtension
    */
   parseTypeSystemExtension(): TypeSystemExtensionNode {
     const keywordToken = this._lexer.lookahead();
@@ -1204,6 +1206,8 @@ export class Parser {
           return this.parseEnumTypeExtension();
         case 'input':
           return this.parseInputObjectTypeExtension();
+        case 'directive':
+          return this.parseDirectiveDefinitionExtension();
       }
     }
 
@@ -1386,6 +1390,23 @@ export class Parser {
     });
   }
 
+  parseDirectiveDefinitionExtension(): DirectiveExtensionNode {
+    const start = this._lexer.token;
+    this.expectKeyword('extend');
+    this.expectKeyword('directive');
+    this.expectToken(TokenKind.AT);
+    const name = this.parseName();
+    const directives = this.parseConstDirectives();
+    if (directives.length === 0) {
+      throw this.unexpected();
+    }
+    return this.node<DirectiveExtensionNode>(start, {
+      kind: Kind.DIRECTIVE_EXTENSION,
+      name,
+      directives,
+    });
+  }
+
   /**
    * ```
    * DirectiveDefinition :
@@ -1399,6 +1420,7 @@ export class Parser {
     this.expectToken(TokenKind.AT);
     const name = this.parseName();
     const args = this.parseArgumentDefs();
+    const directives = this.parseConstDirectives();
     const repeatable = this.expectOptionalKeyword('repeatable');
     this.expectKeyword('on');
     const locations = this.parseDirectiveLocations();
@@ -1407,6 +1429,7 @@ export class Parser {
       description,
       name,
       arguments: args,
+      directives,
       repeatable,
       locations,
     });
@@ -1447,6 +1470,7 @@ export class Parser {
    *   `ENUM_VALUE`
    *   `INPUT_OBJECT`
    *   `INPUT_FIELD_DEFINITION`
+   *   `DIRECTIVE_DEFINITION`
    */
   parseDirectiveLocation(): NameNode {
     const start = this._lexer.token;

src/language/predicates.ts

@@ -98,7 +98,11 @@ export function isTypeDefinitionNode(
 export function isTypeSystemExtensionNode(
   node: ASTNode,
 ): node is TypeSystemExtensionNode {
-  return node.kind === Kind.SCHEMA_EXTENSION || isTypeExtensionNode(node);
+  return (
+    node.kind === Kind.SCHEMA_EXTENSION ||
+    node.kind === Kind.DIRECTIVE_EXTENSION ||
+    isTypeExtensionNode(node)
+  );
 }
 
 export function isTypeExtensionNode(node: ASTNode): node is TypeExtensionNode {

src/language/printer.ts

@@ -235,13 +235,21 @@ const printDocASTReducer: ASTReducer<string> = {
   },
 
   DirectiveDefinition: {
-    leave: ({ description, name, arguments: args, repeatable, locations }) =>
+    leave: ({
+      description,
+      name,
+      arguments: args,
+      directives,
+      repeatable,
+      locations,
+    }) =>
       wrap('', description, '\n') +
       'directive @' +
       name +
       (hasMultilineItems(args)
         ? wrap('(\n', indent(join(args, '\n')), '\n)')
         : wrap('(', join(args, ', '), ')')) +
+      wrap(' ', join(directives, ' ')) +
       (repeatable ? ' repeatable' : '') +
       ' on ' +
       join(locations, ' | '),
@@ -311,6 +319,11 @@ const printDocASTReducer: ASTReducer<string> = {
       join(['extend input', name, join(directives, ' '), block(fields)], ' '),
   },
 
+  DirectiveExtension: {
+    leave: ({ name, directives }) =>
+      join(['extend directive @' + name, join(directives, ' ')], ' '),
+  },
+
   // Schema Coordinates
 
   TypeCoordinate: { leave: ({ name }) => name },

src/type/__tests__/directive-test.ts

@@ -73,6 +73,22 @@ describe('Type System: Directive', () => {
     });
   });
 
+  it('defines a deprecated directive', () => {
+    const directive = new GraphQLDirective({
+      name: 'Foo',
+      locations: [DirectiveLocation.QUERY],
+      deprecationReason: 'Some reason',
+    });
+
+    expect(directive).to.deep.include({
+      name: 'Foo',
+      args: [],
+      isRepeatable: false,
+      locations: ['QUERY'],
+      deprecationReason: 'Some reason',
+    });
+  });
+
   it('can be stringified, JSON.stringified and Object.toStringified', () => {
     const directive = new GraphQLDirective({
       name: 'Foo',