Track directive definition directives across extensions

Author: yaacovCR

src/validation/__tests__/UniqueDirectivesPerLocationRule-test.ts

@@ -1,3 +1,4 @@
+import { expectJSON } from '../../__testUtils__/expectJSON';
 import { describe, it } from 'mocha';
 
 import { parse } from '../../language/parser';
@@ -6,6 +7,7 @@ import type { GraphQLSchema } from '../../type/schema';
 
 import { extendSchema } from '../../utilities/extendSchema';
 
+import { validateSDL } from '../validate';
 import { UniqueDirectivesPerLocationRule } from '../rules/UniqueDirectivesPerLocationRule';
 
 import {
@@ -42,6 +44,14 @@ function expectSDLErrors(sdlStr: string, schema?: GraphQLSchema) {
   );
 }
 
+function expectExperimentalSDLErrors(sdlStr: string, schema?: GraphQLSchema) {
+  const doc = parse(sdlStr, {
+    experimentalDirectivesOnDirectiveDefinitions: true,
+  });
+  const errors = validateSDL(doc, schema, [UniqueDirectivesPerLocationRule]);
+  return expectJSON(errors);
+}
+
 describe('Validate: Directives Are Unique Per Location', () => {
   it('no directives', () => {
     expectValid(`
@@ -391,4 +401,39 @@ describe('Validate: Directives Are Unique Per Location', () => {
       },
     ]);
   });
+
+  it('duplicate directives on directive definitions', () => {
+    expectExperimentalSDLErrors(`
+      directive @nonRepeatable on DIRECTIVE_DEFINITION
+
+      directive @testDirective @nonRepeatable @nonRepeatable on FIELD_DEFINITION
+    `).toDeepEqual([
+      {
+        message:
+          'The directive "@nonRepeatable" can only be used once at this location.',
+        locations: [
+          { line: 4, column: 32 },
+          { line: 4, column: 47 },
+        ],
+      },
+    ]);
+  });
+
+  it('duplicate directives between directive definitions and extensions', () => {
+    expectExperimentalSDLErrors(`
+      directive @nonRepeatable on DIRECTIVE_DEFINITION
+
+      directive @testDirective @nonRepeatable on FIELD_DEFINITION
+      extend directive @testDirective @nonRepeatable
+    `).toDeepEqual([
+      {
+        message:
+          'The directive "@nonRepeatable" can only be used once at this location.',
+        locations: [
+          { line: 4, column: 32 },
+          { line: 5, column: 39 },
+        ],
+      },
+    ]);
+  });
 });

src/validation/rules/UniqueDirectivesPerLocationRule.ts

@@ -44,6 +44,7 @@ export function UniqueDirectivesPerLocationRule(
 
   const schemaDirectives = Object.create(null);
   const typeDirectivesMap = Object.create(null);
+  const directiveDirectivesMap = Object.create(null);
 
   return {
     // Many different AST nodes may contain directives. Rather than listing
@@ -66,6 +67,16 @@ export function UniqueDirectivesPerLocationRule(
         if (seenDirectives === undefined) {
           typeDirectivesMap[typeName] = seenDirectives = Object.create(null);
         }
+      } else if (
+        node.kind === Kind.DIRECTIVE_DEFINITION ||
+        node.kind === Kind.DIRECTIVE_EXTENSION
+      ) {
+        const directiveName = node.name.value;
+        seenDirectives = directiveDirectivesMap[directiveName];
+        if (seenDirectives === undefined) {
+          directiveDirectivesMap[directiveName] = seenDirectives =
+            Object.create(null);
+        }
       } else {
         seenDirectives = Object.create(null);
       }