Add support for directives on directive definitions

BoD · BoD · commit 6d3b630d66b7 · 2025-12-19T18:34:36.000+01:00
diff --git a/src/__testUtils__/kitchenSinkSDL.ts b/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
 `;
diff --git a/src/index.ts b/src/index.ts
@@ -312,6 +312,7 @@ export type {
   UnionTypeExtensionNode,
   EnumTypeExtensionNode,
   InputObjectTypeExtensionNode,
+  DirectiveExtensionNode,
   // Schema Coordinates
   SchemaCoordinateNode,
   TypeCoordinateNode,
diff --git a/src/language/__tests__/predicates-test.ts b/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',
diff --git a/src/language/__tests__/schema-parser-test.ts b/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',
diff --git a/src/language/__tests__/schema-printer-test.ts b/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
     `);
   });
 });
diff --git a/src/language/ast.ts b/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 =
diff --git a/src/language/directiveLocation.ts b/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 };
 
diff --git a/src/language/index.ts b/src/language/index.ts
@@ -96,6 +96,7 @@ export type {
   UnionTypeExtensionNode,
   EnumTypeExtensionNode,
   InputObjectTypeExtensionNode,
+  DirectiveExtensionNode,
   // Schema Coordinates
   SchemaCoordinateNode,
   TypeCoordinateNode,
diff --git a/src/language/kinds.ts b/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',
diff --git a/src/language/parser.ts b/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;
diff --git a/src/language/predicates.ts b/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 {
diff --git a/src/language/printer.ts b/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 },
diff --git a/src/type/__tests__/introspection-test.ts b/src/type/__tests__/introspection-test.ts
@@ -914,6 +914,11 @@ describe('Introspection', () => {
                   isDeprecated: false,
                   deprecationReason: null,
                 },
+                {
+                  name: 'DIRECTIVE_DEFINITION',
+                  isDeprecated: false,
+                  deprecationReason: null,
+                },
               ],
               possibleTypes: null,
             },
@@ -967,6 +972,7 @@ describe('Introspection', () => {
                 'ARGUMENT_DEFINITION',
                 'INPUT_FIELD_DEFINITION',
                 'ENUM_VALUE',
+                'DIRECTIVE_DEFINITION',
               ],
               args: [
                 {
diff --git a/src/type/directives.ts b/src/type/directives.ts
@@ -59,6 +59,7 @@ export class GraphQLDirective {
   locations: ReadonlyArray<DirectiveLocation>;
   args: ReadonlyArray<GraphQLArgument>;
   isRepeatable: boolean;
+  deprecationReason: Maybe<string>;
   extensions: Readonly<GraphQLDirectiveExtensions>;
   astNode: Maybe<DirectiveDefinitionNode>;
 
@@ -67,6 +68,7 @@ export class GraphQLDirective {
     this.description = config.description;
     this.locations = config.locations;
     this.isRepeatable = config.isRepeatable ?? false;
+    this.deprecationReason = config.deprecationReason;
     this.extensions = toObjMap(config.extensions);
     this.astNode = config.astNode;
 
@@ -95,6 +97,7 @@ export class GraphQLDirective {
       locations: this.locations,
       args: argsToArgsConfig(this.args),
       isRepeatable: this.isRepeatable,
+      deprecationReason: this.deprecationReason,
       extensions: this.extensions,
       astNode: this.astNode,
     };
@@ -115,6 +118,7 @@ export interface GraphQLDirectiveConfig {
   locations: ReadonlyArray<DirectiveLocation>;
   args?: Maybe<GraphQLFieldConfigArgumentMap>;
   isRepeatable?: Maybe<boolean>;
+  deprecationReason?: Maybe<string>;
   extensions?: Maybe<Readonly<GraphQLDirectiveExtensions>>;
   astNode?: Maybe<DirectiveDefinitionNode>;
 }
@@ -182,6 +186,7 @@ export const GraphQLDeprecatedDirective: GraphQLDirective =
       DirectiveLocation.ARGUMENT_DEFINITION,
       DirectiveLocation.INPUT_FIELD_DEFINITION,
       DirectiveLocation.ENUM_VALUE,
+      DirectiveLocation.DIRECTIVE_DEFINITION,
     ],
     args: {
       reason: {
diff --git a/src/type/introspection.ts b/src/type/introspection.ts
@@ -201,6 +201,10 @@ export const __DirectiveLocation: GraphQLEnumType = new GraphQLEnumType({
       value: DirectiveLocation.INPUT_FIELD_DEFINITION,
       description: 'Location adjacent to an input object field definition.',
     },
+    DIRECTIVE_DEFINITION: {
+      value: DirectiveLocation.DIRECTIVE_DEFINITION,
+      description: 'Location adjacent to a directive definition.',
+    },
   },
 });
 
diff --git a/src/utilities/__tests__/printSchema-test.ts b/src/utilities/__tests__/printSchema-test.ts
@@ -681,7 +681,7 @@ describe('Type System Printer', () => {
         Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted using the Markdown syntax, as specified by [CommonMark](https://commonmark.org/).
         """
         reason: String = "No longer supported"
-      ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
+      ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE | DIRECTIVE_DEFINITION
 
       """Exposes a URL that specifies the behavior of this scalar."""
       directive @specifiedBy(
@@ -883,6 +883,9 @@ describe('Type System Printer', () => {
 
         """Location adjacent to an input object field definition."""
         INPUT_FIELD_DEFINITION
+
+        """Location adjacent to a directive definition."""
+        DIRECTIVE_DEFINITION
       }
     `);
   });
diff --git a/src/validation/__tests__/KnownDirectivesRule-test.ts b/src/validation/__tests__/KnownDirectivesRule-test.ts
@@ -58,6 +58,7 @@ const schemaWithSDLDirectives = buildSchema(`
   directive @onEnumValue on ENUM_VALUE
   directive @onInputObject on INPUT_OBJECT
   directive @onInputFieldDefinition on INPUT_FIELD_DEFINITION
+  directive @onDirective on DIRECTIVE_DEFINITION
 `);
 
 describe('Validate: Known directives', () => {
@@ -349,6 +350,10 @@ describe('Validate: Known directives', () => {
           }
 
           extend schema @onSchema
+          
+          directive @myDirective on OBJECT
+          
+          extend directive @myDirective @onDirective
         `,
         schemaWithSDLDirectives,
       );
@@ -382,6 +387,8 @@ describe('Validate: Known directives', () => {
           }
 
           extend schema @onObject
+          
+          extend type MyObj @onDirective
         `,
         schemaWithSDLDirectives,
       ).toDeepEqual([
@@ -446,6 +453,10 @@ describe('Validate: Known directives', () => {
           message: 'Directive "@onObject" may not be used on SCHEMA.',
           locations: [{ line: 26, column: 25 }],
         },
+        {
+          message: 'Directive "@onDirective" may not be used on OBJECT.',
+          locations: [{ line: 28, column: 29 }],
+        },
       ]);
     });
   });
diff --git a/src/validation/rules/KnownDirectivesRule.ts b/src/validation/rules/KnownDirectivesRule.ts

Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,8 @@ extend schema @onSchema`
`161`	`161`	`extend schema @onSchema {`
`162`	`162`	`subscription: SubscriptionType`
`163`	`163`	`}`
	`164`	`+`
	`165`	`+directive @myDirective @onDirective on OBJECT \| FIELD_DEFINITION`
	`166`	`+`
	`167`	`+extend directive @myDirective @onDirective2`
`164`	`168`	`;
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ enum DirectiveLocation {`
`23`	`23`	`ENUM_VALUE = 'ENUM_VALUE',`
`24`	`24`	`INPUT_OBJECT = 'INPUT_OBJECT',`
`25`	`25`	`INPUT_FIELD_DEFINITION = 'INPUT_FIELD_DEFINITION',`
	`26`	`+ DIRECTIVE_DEFINITION = 'DIRECTIVE_DEFINITION',`
`26`	`27`	`}`
`27`	`28`	`export { DirectiveLocation };`
`28`	`29`