add changeset for previous PR 5973

ardatan · Apr 29, 2024 · 5ee4947 · 5ee4947
1 parent 9d79ba2
commit 5ee4947
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/weak-bears-move.md b/.changeset/weak-bears-move.md
@@ -0,0 +1,5 @@
+---
+"@graphql-tools/merge": patch
+---
+
+Fix directive merging when directive name is inherited from object prototype (i.e. toString)
diff --git a/packages/merge/src/typedefs-mergers/merge-nodes.ts b/packages/merge/src/typedefs-mergers/merge-nodes.ts
@@ -106,14 +106,17 @@ export function mergeGraphQLNodes(
             break;
           case Kind.DIRECTIVE_DEFINITION:
             if (mergedResultMap[name]) {
-              const isInheritedFromPrototype = name in {};
+              const isInheritedFromPrototype = name in {}; // i.e. toString
               if (isInheritedFromPrototype) {
                 if (!isNode(mergedResultMap[name])) {
                   mergedResultMap[name] = undefined as any;
                 }
               }
             }
-            mergedResultMap[name] = mergeDirective(nodeDefinition, mergedResultMap[name] as any);
+            mergedResultMap[name] = mergeDirective(
+              nodeDefinition,
+              mergedResultMap[name] as DirectiveDefinitionNode,
+            );
             break;
         }
       }