File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed
packages/merge/src/typedefs-mergers Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ " @graphql-tools/merge " : patch
3
+ ---
4
+
5
+ Fix directive merging when directive name is inherited from object prototype (i.e. toString)
Original file line number Diff line number Diff line change @@ -106,14 +106,17 @@ export function mergeGraphQLNodes(
106
106
break ;
107
107
case Kind . DIRECTIVE_DEFINITION :
108
108
if ( mergedResultMap [ name ] ) {
109
- const isInheritedFromPrototype = name in { } ;
109
+ const isInheritedFromPrototype = name in { } ; // i.e. toString
110
110
if ( isInheritedFromPrototype ) {
111
111
if ( ! isNode ( mergedResultMap [ name ] ) ) {
112
112
mergedResultMap [ name ] = undefined as any ;
113
113
}
114
114
}
115
115
}
116
- mergedResultMap [ name ] = mergeDirective ( nodeDefinition , mergedResultMap [ name ] as any ) ;
116
+ mergedResultMap [ name ] = mergeDirective (
117
+ nodeDefinition ,
118
+ mergedResultMap [ name ] as DirectiveDefinitionNode ,
119
+ ) ;
117
120
break ;
118
121
}
119
122
}
You can’t perform that action at this time.
0 commit comments