condense stream payloads

Author: yaacovCR

src/execution/__tests__/stream-test.ts

@@ -369,20 +369,10 @@ describe('Execute: stream directive', () => {
             items: [{ name: 'Luke', id: '1' }],
             id: '0',
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ name: 'Han', id: '2' }],
             id: '0',
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ name: 'Leia', id: '3' }],
             id: '0',
@@ -527,11 +517,6 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ name: 'Leia', id: '3' }],
             id: '0',
@@ -591,9 +576,6 @@ describe('Execute: stream directive', () => {
             id: '0',
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -633,9 +615,6 @@ describe('Execute: stream directive', () => {
             id: '0',
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -676,7 +655,7 @@ describe('Execute: stream directive', () => {
         }
       }
     `);
-    const result = await completeAsync(document, 3, {
+    const result = await completeAsync(document, 2, {
       async *friendList() {
         yield await Promise.resolve(friends[0]);
         yield await Promise.resolve(friends[1]);
@@ -706,12 +685,6 @@ describe('Execute: stream directive', () => {
               id: '0',
             },
           ],
-          hasNext: true,
-        },
-      },
-      {
-        done: false,
-        value: {
           completed: [{ id: '0' }],
           hasNext: false,
         },
@@ -946,11 +919,6 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ nonNullName: 'Han' }],
             id: '0',
@@ -997,11 +965,6 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ nonNullName: 'Han' }],
             id: '0',
@@ -1132,19 +1095,11 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ nonNullName: 'Han' }],
             id: '0',
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -1444,6 +1399,10 @@ describe('Execute: stream directive', () => {
       },
       {
         incremental: [
+          {
+            items: [{ name: 'Luke' }],
+            id: '1',
+          },
           {
             data: { scalarField: null },
             id: '0',
@@ -1455,16 +1414,8 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-          {
-            items: [{ name: 'Luke' }],
-            id: '1',
-          },
         ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      {
-        completed: [{ id: '1' }],
+        completed: [{ id: '0' }, { id: '1' }],
         hasNext: false,
       },
     ]);
@@ -1570,9 +1521,6 @@ describe('Execute: stream directive', () => {
             ],
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -1724,9 +1672,6 @@ describe('Execute: stream directive', () => {
             id: '0',
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -1774,19 +1719,11 @@ describe('Execute: stream directive', () => {
             items: [{ id: '1', name: 'Luke' }],
             id: '0',
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ id: '2', name: 'Han' }],
             id: '0',
           },
         ],
-        hasNext: true,
-      },
-      {
         completed: [{ id: '0' }],
         hasNext: false,
       },
@@ -1844,48 +1781,22 @@ describe('Execute: stream directive', () => {
             data: { scalarField: 'slow', nestedFriendList: [] },
             id: '0',
           },
-        ],
-        completed: [{ id: '0' }],
-        hasNext: true,
-      },
-      done: false,
-    });
-    const result3 = await iterator.next();
-    expectJSON(result3).toDeepEqual({
-      value: {
-        incremental: [
           {
             items: [{ name: 'Luke' }],
             id: '1',
           },
-        ],
-        hasNext: true,
-      },
-      done: false,
-    });
-    const result4 = await iterator.next();
-    expectJSON(result4).toDeepEqual({
-      value: {
-        incremental: [
           {
             items: [{ name: 'Han' }],
             id: '1',
           },
         ],
-        hasNext: true,
-      },
-      done: false,
-    });
-    const result5 = await iterator.next();
-    expectJSON(result5).toDeepEqual({
-      value: {
-        completed: [{ id: '1' }],
+        completed: [{ id: '0' }, { id: '1' }],
         hasNext: false,
       },
       done: false,
     });
-    const result6 = await iterator.next();
-    expectJSON(result6).toDeepEqual({
+    const result3 = await iterator.next();
+    expectJSON(result3).toDeepEqual({
       value: undefined,
       done: true,
     });
@@ -1944,14 +1855,14 @@ describe('Execute: stream directive', () => {
       value: {
         pending: [{ id: '2', path: ['friendList', 1], label: 'DeferName' }],
         incremental: [
-          {
-            data: { name: 'Luke' },
-            id: '0',
-          },
           {
             items: [{ id: '2' }],
             id: '1',
           },
+          {
+            data: { name: 'Luke' },
+            id: '0',
+          },
         ],
         completed: [{ id: '0' }],
         hasNext: true,
@@ -2047,14 +1958,14 @@ describe('Execute: stream directive', () => {
       value: {
         pending: [{ id: '2', path: ['friendList', 1], label: 'DeferName' }],
         incremental: [
-          {
-            data: { name: 'Luke' },
-            id: '0',
-          },
           {
             items: [{ id: '2' }],
             id: '1',
           },
+          {
+            data: { name: 'Luke' },
+            id: '0',
+          },
         ],
         completed: [{ id: '0' }],
         hasNext: true,