consolidate payloads

graphql · May 18, 2023 · 5f98356 · 5f98356
1 parent 165623a
commit 5f98356
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 220 deletions.
diff --git a/src/execution/__tests__/defer-test.ts b/src/execution/__tests__/defer-test.ts
@@ -679,7 +679,6 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [{ path: ['hero'], label: 'DeferID' }],
         incremental: [
           {
             data: {
@@ -689,20 +688,17 @@ describe('Execute: defer directive', () => {
             },
             path: [],
           },
-        ],
-        completed: [{ path: [], label: 'DeferName' }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               id: '1',
             },
             path: ['hero'],
           },
         ],
-        completed: [{ path: ['hero'], label: 'DeferID' }],
+        completed: [
+          { path: [], label: 'DeferName' },
+          { path: ['hero'], label: 'DeferID' },
+        ],
         hasNext: false,
       },
     ]);
@@ -870,7 +866,6 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
         incremental: [
           {
             data: {
@@ -880,20 +875,17 @@ describe('Execute: defer directive', () => {
             },
             path: ['hero'],
           },
-        ],
-        completed: [{ path: ['hero'] }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               bar: 'bar',
             },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
         ],
-        completed: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
+        completed: [
+          { path: ['hero'] },
+          { path: ['hero', 'nestedObject', 'deeperObject'] },
+        ],
         hasNext: false,
       },
     ]);
@@ -948,35 +940,25 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [{ path: ['hero', 'nestedObject'] }],
         incremental: [
           {
             data: { bar: 'bar' },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
-        ],
-        completed: [{ path: ['hero'] }],
-        hasNext: true,
-      },
-      {
-        pending: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
-        incremental: [
           {
             data: { baz: 'baz' },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
-        ],
-        hasNext: true,
-        completed: [{ path: ['hero', 'nestedObject'] }],
-      },
-      {
-        incremental: [
           {
             data: { bak: 'bak' },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
         ],
-        completed: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
+        completed: [
+          { path: ['hero'] },
+          { path: ['hero', 'nestedObject'] },
+          { path: ['hero', 'nestedObject', 'deeperObject'] },
+        ],
         hasNext: false,
       },
     ]);
@@ -1023,31 +1005,25 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
         incremental: [
           {
             data: {
               foo: 'foo',
             },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
-        ],
-        completed: [
-          { path: ['hero', 'nestedObject', 'deeperObject'] },
-          { path: ['hero'] },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             data: {
               bar: 'bar',
             },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
         ],
-        completed: [{ path: ['hero', 'nestedObject', 'deeperObject'] }],
+        completed: [
+          { path: ['hero', 'nestedObject', 'deeperObject'] },
+          { path: ['hero'] },
+          { path: ['hero', 'nestedObject', 'deeperObject'] },
+        ],
         hasNext: false,
       },
     ]);
@@ -1843,27 +1819,17 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [
-          { path: ['hero', 'friends', 0] },
-          { path: ['hero', 'friends', 1] },
-          { path: ['hero', 'friends', 2] },
-        ],
         incremental: [
           {
             data: { name: 'slow', friends: [{}, {}, {}] },
             path: ['hero'],
           },
-        ],
-        completed: [{ path: ['hero'] }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           { data: { name: 'Han' }, path: ['hero', 'friends', 0] },
           { data: { name: 'Leia' }, path: ['hero', 'friends', 1] },
           { data: { name: 'C-3PO' }, path: ['hero', 'friends', 2] },
         ],
         completed: [
+          { path: ['hero'] },
           { path: ['hero', 'friends', 0] },
           { path: ['hero', 'friends', 1] },
           { path: ['hero', 'friends', 2] },
@@ -1900,11 +1866,6 @@ describe('Execute: defer directive', () => {
         hasNext: true,
       },
       {
-        pending: [
-          { path: ['hero', 'friends', 0] },
-          { path: ['hero', 'friends', 1] },
-          { path: ['hero', 'friends', 2] },
-        ],
         incremental: [
           {
             data: {
@@ -1913,17 +1874,12 @@ describe('Execute: defer directive', () => {
             },
             path: ['hero'],
           },
-        ],
-        completed: [{ path: ['hero'] }],
-        hasNext: true,
-      },
-      {
-        incremental: [
           { data: { name: 'Han' }, path: ['hero', 'friends', 0] },
           { data: { name: 'Leia' }, path: ['hero', 'friends', 1] },
           { data: { name: 'C-3PO' }, path: ['hero', 'friends', 2] },
         ],
         completed: [
+          { path: ['hero'] },
           { path: ['hero', 'friends', 0] },
           { path: ['hero', 'friends', 1] },
           { path: ['hero', 'friends', 2] },