File tree Expand file tree Collapse file tree
packages/merge/src/typedefs-mergers Expand file tree Collapse file tree 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(
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 }
You can’t perform that action at this time.
0 commit comments