fix(merging): use proper collectFields when possible

yaacovCR · Jan 27, 2020 · 5b6b082 · 5b6b082
1 parent 83e38c2
commit 5b6b082
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/stitching/checkResultAndHandleErrors.ts b/src/stitching/checkResultAndHandleErrors.ts
@@ -29,8 +29,8 @@ import {
 } from '../Interfaces';
 import resolveFromParentTypename from './resolveFromParentTypename';
 import { setErrors, setObjectSubschema } from './proxiedResult';
-import { collectFields } from '../utils';
 import { mergeFields } from './mergeFields';
+import { collectFields, ExecutionContext } from 'graphql/execution/execute';
 
 export function checkResultAndHandleErrors(
   result: ExecutionResult,
@@ -165,14 +165,27 @@ export function handleObject(
     return object;
   }
 
+  let subFieldNodes: Record<string, Array<FieldNode>> = Object.create(null);
+  const visitedFragmentNames = Object.create(null);
+  info.fieldNodes.forEach(fieldNode => {
+    subFieldNodes = collectFields(
+      { schema: info.schema, variableValues: info.variableValues, fragments: info.fragments } as ExecutionContext,
+      info.schema.getType(object.__typename) as GraphQLObjectType<any, any>,
+      fieldNode.selectionSet,
+      subFieldNodes,
+      visitedFragmentNames,
+    );
+  });
+
   const typeMap = isSubschemaConfig(subschema) ?
     mergedTypeInfo.typeMaps.get(subschema) : subschema.getTypeMap();
   const fields = (typeMap[typeName] as GraphQLObjectType).getFields();
+
   const selections: Array<FieldNode> = [];
-  info.fieldNodes.forEach(fieldNode => {
-    collectFields(fieldNode.selectionSet, info.fragments).forEach(s => {
-      if (!fields[s.name.value]) {
-        selections.push(s);
+  Object.keys(subFieldNodes).forEach(responseName => {
+    subFieldNodes[responseName].forEach(subFieldNode => {
+      if (!fields[subFieldNode.name.value]) {
+        selections.push(subFieldNode);
       }
     });
   });

diff --git a/src/stitching/mergeSchemas.ts b/src/stitching/mergeSchemas.ts
@@ -329,9 +329,8 @@ function createMergeInfo(
         }
       });
 
-      if (parsedFragments.length) {
-        mergedTypes[typeName].fragment = concatInlineFragments(typeName, parsedFragments);
-      }
+      parsedFragments.push(parseFragmentToInlineFragment(`... on ${typeName} { __typename }`));
+      mergedTypes[typeName].fragment = concatInlineFragments(typeName, parsedFragments);
     }
   });
 

diff --git a/src/utils/fieldNodes.ts b/src/utils/fieldNodes.ts
@@ -75,6 +75,7 @@ export function collectFields(
       case Kind.FRAGMENT_SPREAD:
         const fragmentName = selection.name.value;
         if (!visitedFragmentNames[fragmentName]) {
+          visitedFragmentNames[fragmentName] = true;
           collectFields(
             fragments[fragmentName].selectionSet,
             fragments,