condense defer payloads

Author: yaacovCR

src/execution/__tests__/defer-test.ts

@@ -367,20 +367,14 @@ describe('Execute: defer directive', () => {
             },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               friends: [{ name: 'Han' }, { name: 'Leia' }, { name: 'C-3PO' }],
             },
             id: '1',
           },
         ],
-        completed: [{ id: '1' }],
+        completed: [{ id: '0' }, { id: '1' }],
         hasNext: false,
       },
     ]);
@@ -732,20 +726,14 @@ describe('Execute: defer directive', () => {
             },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               id: '1',
             },
             id: '1',
           },
         ],
-        completed: [{ id: '1' }],
+        completed: [{ id: '0' }, { id: '1' }],
         hasNext: false,
       },
     ]);
@@ -909,20 +897,14 @@ describe('Execute: defer directive', () => {
             },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               bar: 'bar',
             },
             id: '1',
           },
         ],
-        completed: [{ id: '1' }],
+        completed: [{ id: '0' }, { id: '1' }],
         hasNext: false,
       },
     ]);
@@ -983,37 +965,27 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [{ id: '1', path: ['hero', 'nestedObject'] }],
+        pending: [
+          { id: '1', path: ['hero', 'nestedObject'] },
+          { id: '2', path: ['hero', 'nestedObject', 'deeperObject'] },
+        ],
         incremental: [
           {
             data: { bar: 'bar' },
             id: '0',
             subPath: ['nestedObject', 'deeperObject'],
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        pending: [{ id: '2', path: ['hero', 'nestedObject', 'deeperObject'] }],
-        incremental: [
           {
             data: { baz: 'baz' },
             id: '1',
             subPath: ['deeperObject'],
           },
-        ],
-        completed: [{ id: '1' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: { bak: 'bak' },
             id: '2',
           },
         ],
-        completed: [{ id: '2' }],
+        completed: [{ id: '0' }, { id: '1' }, { id: '2' }],
         hasNext: false,
       },
     ]);
@@ -2080,17 +2052,11 @@ describe('Execute: defer directive', () => {
             data: { name: 'slow', friends: [{}, {}, {}] },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           { data: { name: 'Han' }, id: '1' },
           { data: { name: 'Leia' }, id: '2' },
           { data: { name: 'C-3PO' }, id: '3' },
         ],
-        completed: [{ id: '1' }, { id: '2' }, { id: '3' }],
+        completed: [{ id: '0' }, { id: '1' }, { id: '2' }, { id: '3' }],
         hasNext: false,
       },
     ]);
@@ -2136,17 +2102,11 @@ describe('Execute: defer directive', () => {
             },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           { data: { name: 'Han' }, id: '1' },
           { data: { name: 'Leia' }, id: '2' },
           { data: { name: 'C-3PO' }, id: '3' },
         ],
-        completed: [{ id: '1' }, { id: '2' }, { id: '3' }],
+        completed: [{ id: '0' }, { id: '1' }, { id: '2' }, { id: '3' }],
         hasNext: false,
       },
     ]);

src/execution/__tests__/stream-test.ts

@@ -1444,10 +1444,6 @@ describe('Execute: stream directive', () => {
       },
       {
         incremental: [
-          {
-            items: [{ name: 'Luke' }],
-            id: '1',
-          },
           {
             data: { scalarField: null },
             id: '0',
@@ -1459,6 +1455,10 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
+          {
+            items: [{ name: 'Luke' }],
+            id: '1',
+          },
         ],
         completed: [{ id: '0' }],
         hasNext: true,
@@ -1944,14 +1944,14 @@ describe('Execute: stream directive', () => {
       value: {
         pending: [{ id: '2', path: ['friendList', 1], label: 'DeferName' }],
         incremental: [
-          {
-            items: [{ id: '2' }],
-            id: '1',
-          },
           {
             data: { name: 'Luke' },
             id: '0',
           },
+          {
+            items: [{ id: '2' }],
+            id: '1',
+          },
         ],
         completed: [{ id: '0' }],
         hasNext: true,
@@ -2047,14 +2047,14 @@ describe('Execute: stream directive', () => {
       value: {
         pending: [{ id: '2', path: ['friendList', 1], label: 'DeferName' }],
         incremental: [
-          {
-            items: [{ id: '2' }],
-            id: '1',
-          },
           {
             data: { name: 'Luke' },
             id: '0',
           },
+          {
+            items: [{ id: '2' }],
+            id: '1',
+          },
         ],
         completed: [{ id: '0' }],
         hasNext: true,

src/execution/execute.ts

@@ -2106,13 +2106,22 @@ function executeDeferredGroupedFieldSets(
         deferMap,
       );
 
+    const result = shouldDefer(parentDeferUsages, deferUsageSet)
+      ? Promise.resolve().then(executor)
+      : executor();
+
     const deferredGroupedFieldSetRecord: DeferredGroupedFieldSetRecord = {
       deferredFragmentRecords,
-      result: shouldDefer(parentDeferUsages, deferUsageSet)
-        ? Promise.resolve().then(executor)
-        : executor(),
+      result,
     };
 
+    if (isPromise(result)) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      result.then((resolved) => {
+        deferredGroupedFieldSetRecord.result = resolved;
+      });
+    }
+
     newDeferredGroupedFieldSetRecords.push(deferredGroupedFieldSetRecord);
   }