refactor collectAndExecuteSubfields

robrichard · Apr 18, 2024 · cf273ff · cf273ff
1 parent 189b502
commit cf273ff
Showing 1 changed file with 15 additions and 52 deletions.
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -1588,65 +1588,28 @@ function collectAndExecuteSubfields(
   // Collect sub-fields to execute to complete this value.
   const { groupedFieldSet: nonPartitionedGroupedFieldSet, newDeferUsages } =
     collectSubfields(exeContext, returnType, fieldGroup);
+  let groupedFieldSet = nonPartitionedGroupedFieldSet;
+  let newGroupedFieldSets;
+  let newDeferMap = deferMap;
 
-  if (newDeferUsages.length === 0) {
-    if (deferMap === undefined) {
-      return executeFields(
-        exeContext,
-        returnType,
-        result,
-        path,
-        nonPartitionedGroupedFieldSet,
-        incrementalContext,
-        undefined,
-      );
-    }
-
-    const { groupedFieldSet, newGroupedFieldSets } = buildSubFieldPlan(
+  if (newDeferUsages.length || newDeferMap !== undefined) {
+    ({ groupedFieldSet, newGroupedFieldSets } = buildSubFieldPlan(
       nonPartitionedGroupedFieldSet,
       incrementalContext?.deferUsageSet,
-    );
+    ));
+  }
 
-    const subFields = executeFields(
-      exeContext,
-      returnType,
-      result,
+  if (
+    newDeferUsages.length ||
+    (newGroupedFieldSets && newGroupedFieldSets.size > 0)
+  ) {
+    newDeferMap = addNewDeferredFragments(
+      newDeferUsages,
+      new Map(deferMap),
       path,
-      groupedFieldSet,
-      incrementalContext,
-      deferMap,
     );
-
-    if (newGroupedFieldSets.size > 0) {
-      const newDeferredGroupedFieldSetRecords = executeDeferredGroupedFieldSets(
-        exeContext,
-        returnType,
-        result,
-        path,
-        incrementalContext?.deferUsageSet,
-        newGroupedFieldSets,
-        deferMap,
-      );
-
-      return withNewDeferredGroupedFieldSets(
-        subFields,
-        newDeferredGroupedFieldSetRecords,
-      );
-    }
-    return subFields;
   }
 
-  const { groupedFieldSet, newGroupedFieldSets } = buildSubFieldPlan(
-    nonPartitionedGroupedFieldSet,
-    incrementalContext?.deferUsageSet,
-  );
-
-  const newDeferMap = addNewDeferredFragments(
-    newDeferUsages,
-    new Map(deferMap),
-    path,
-  );
-
   const subFields = executeFields(
     exeContext,
     returnType,
@@ -1657,7 +1620,7 @@ function collectAndExecuteSubfields(
     newDeferMap,
   );
 
-  if (newGroupedFieldSets.size > 0) {
+  if (newDeferMap && newGroupedFieldSets && newGroupedFieldSets.size > 0) {
     const newDeferredGroupedFieldSetRecords = executeDeferredGroupedFieldSets(
       exeContext,
       returnType,