Merge pull request #2559 from harm-less/master

fix(graphql): similar directive sdls on multiple fields fail

Author: kamilmysliwiec

packages/graphql/lib/schema-builder/collections/field-directive.collection.ts

@@ -4,16 +4,19 @@ import { MetadataListByNameCollection } from './metadata-list-by-name.collection
 export class FieldDirectiveCollection extends MetadataListByNameCollection<PropertyDirectiveMetadata> {
   sdls = new Set<string>();
   fieldNames = new Set<string>();
+  uniqueCombinations = new Set<string>();
 
   add(value: PropertyDirectiveMetadata) {
-    if (this.sdls.has(value.sdl) && this.fieldNames.has(value.fieldName)) {
+    const combinationKey = `${value.sdl}${value.fieldName}`;
+    if (this.uniqueCombinations.has(combinationKey)) { 
       return;
     }
 
     super.add(value, value.fieldName);
 
     this.sdls.add(value.sdl);
     this.fieldNames.add(value.fieldName);
+    this.uniqueCombinations.add(combinationKey);
     this.globalArray?.push(value);
   }
 }

packages/graphql/tests/schema-builder/storages/field-directive.collection.spec.ts

@@ -63,6 +63,27 @@ describe('FieldDirectiveCollection', () => {
     expect(map.getByName('bar')).toEqual([directive1Alt]);
   });
 
+  it('should add 2 different fields with the same directives', () => {
+    const map = new FieldDirectiveCollection();
+    const directive1Alt: PropertyDirectiveMetadata = {
+      fieldName: 'bar',
+      sdl: '@foo',
+      target: () => {},
+    };
+    const directive2Alt: PropertyDirectiveMetadata = {
+      fieldName: 'foo',
+      sdl: '@bar',
+      target: () => {},
+    };
+    map.add(directive1);
+    map.add(directive2);
+    map.add(directive1Alt);
+    map.add(directive2Alt);
+
+    expect(map.getByName('foo')).toEqual([directive1, directive2Alt]);
+    expect(map.getByName('bar')).toEqual([directive2, directive1Alt]);
+  });
+
   it('should NOT the same directive on the same field twice', () => {
     const map = new FieldDirectiveCollection();
     map.add(directive1);