Skip to content

Commit a06dbd2

Browse files
authored
add changeset for previous PR 5973 (#6111)
1 parent 9d79ba2 commit a06dbd2

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.changeset/weak-bears-move.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-tools/merge": patch
3+
---
4+
5+
Fix directive merging when directive name is inherited from object prototype (i.e. toString)

packages/merge/src/typedefs-mergers/merge-nodes.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,17 @@ export function mergeGraphQLNodes(
106106
break;
107107
case Kind.DIRECTIVE_DEFINITION:
108108
if (mergedResultMap[name]) {
109-
const isInheritedFromPrototype = name in {};
109+
const isInheritedFromPrototype = name in {}; // i.e. toString
110110
if (isInheritedFromPrototype) {
111111
if (!isNode(mergedResultMap[name])) {
112112
mergedResultMap[name] = undefined as any;
113113
}
114114
}
115115
}
116-
mergedResultMap[name] = mergeDirective(nodeDefinition, mergedResultMap[name] as any);
116+
mergedResultMap[name] = mergeDirective(
117+
nodeDefinition,
118+
mergedResultMap[name] as DirectiveDefinitionNode,
119+
);
117120
break;
118121
}
119122
}

0 commit comments

Comments
 (0)