deduplicate fields present in initial or parent payload

src/execution/__tests__/executor-test.ts

@@ -5,10 +5,12 @@ import { expectJSON } from '../../__testUtils__/expectJSON.js';
 import { resolveOnNextTick } from '../../__testUtils__/resolveOnNextTick.js';
 
 import { inspect } from '../../jsutils/inspect.js';
+import type { Path } from '../../jsutils/Path.js';
 
 import { Kind } from '../../language/kinds.js';
 import { parse } from '../../language/parser.js';
 
+import type { GraphQLResolveInfo } from '../../type/definition.js';
 import {
   GraphQLInterfaceType,
   GraphQLList,
@@ -191,7 +193,7 @@ describe('Execute: Handles basic execution tasks', () => {
   });
 
   it('provides info about current execution state', () => {
-    let resolvedInfo;
+    let resolvedInfo: GraphQLResolveInfo | undefined;
     const testType = new GraphQLObjectType({
       name: 'Test',
       fields: {
@@ -213,7 +215,8 @@ describe('Execute: Handles basic execution tasks', () => {
 
     expect(resolvedInfo).to.have.all.keys(
       'fieldName',
-      'fieldNodes',
+      'fieldGroup',
+      'deferDepth',
       'returnType',
       'parentType',
       'path',
@@ -227,25 +230,35 @@ describe('Execute: Handles basic execution tasks', () => {
     const operation = document.definitions[0];
     assert(operation.kind === Kind.OPERATION_DEFINITION);
 
-    expect(resolvedInfo).to.include({
+    expect(resolvedInfo).to.deep.include({
       fieldName: 'test',
       returnType: GraphQLString,
       parentType: testType,
       schema,
       rootValue,
       operation,
+      deferDepth: undefined,
+      variableValues: { var: 'abc' },
     });
 
-    const field = operation.selectionSet.selections[0];
-    expect(resolvedInfo).to.deep.include({
-      fieldNodes: [field],
-      path: { prev: undefined, key: 'result', typename: 'Test' },
-      variableValues: { var: 'abc' },
+    expect(resolvedInfo?.fieldGroup).to.deep.include({
+      depth: 0,
+    });
+
+    const fieldNode = operation.selectionSet.selections[0];
+    expect(resolvedInfo?.fieldGroup.fields.get(undefined)).to.deep.equal([
+      fieldNode,
+    ]);
+
+    expect(resolvedInfo?.path).to.deep.include({
+      prev: undefined,
+      key: 'result',
+      typename: 'Test',
     });
   });
 
   it('populates path correctly with complex types', () => {
-    let path;
+    let path: Path | undefined;
     const someObject = new GraphQLObjectType({
       name: 'SomeObject',
       fields: {
@@ -288,18 +301,20 @@ describe('Execute: Handles basic execution tasks', () => {
 
     executeSync({ schema, document, rootValue });
 
-    expect(path).to.deep.equal({
+    expect(path).to.deep.include({
       key: 'l2',
       typename: 'SomeObject',
-      prev: {
-        key: 0,
-        typename: undefined,
-        prev: {
-          key: 'l1',
-          typename: 'SomeQuery',
-          prev: undefined,
-        },
-      },
+    });
+
+    expect(path?.prev).to.deep.include({
+      key: 0,
+      typename: undefined,
+    });
+
+    expect(path?.prev?.prev).to.deep.include({
+      key: 'l1',
+      typename: 'SomeQuery',
+      prev: undefined,
     });
   });
 

src/execution/__tests__/mutations-test.ts

@@ -206,7 +206,7 @@ describe('Execute: Handles mutation execution ordering', () => {
     const document = parse(`
       mutation M {
         first: promiseToChangeTheNumber(newNumber: 1) {
-          ...DeferFragment @defer(label: "defer-label")
+          ...DeferFragment @defer
         },
         second: immediatelyChangeTheNumber(newNumber: 2) {
           theNumber
@@ -242,7 +242,6 @@ describe('Execute: Handles mutation execution ordering', () => {
       {
         incremental: [
           {
-            label: 'defer-label',
             path: ['first'],
             data: {
               promiseToGetTheNumber: 2,
@@ -281,7 +280,7 @@ describe('Execute: Handles mutation execution ordering', () => {
   it('Mutation with @defer is not executed serially', async () => {
     const document = parse(`
       mutation M {
-        ...MutationFragment @defer(label: "defer-label")
+        ...MutationFragment @defer
         second: immediatelyChangeTheNumber(newNumber: 2) {
           theNumber
         }
@@ -317,7 +316,6 @@ describe('Execute: Handles mutation execution ordering', () => {
       {
         incremental: [
           {
-            label: 'defer-label',
             path: [],
             data: {
               first: {

src/execution/__tests__/stream-test.ts

@@ -210,9 +210,7 @@ describe('Execute: stream directive', () => {
     });
   });
   it('Returns label from stream directive', async () => {
-    const document = parse(
-      '{ scalarList @stream(initialCount: 1, label: "scalar-stream") }',
-    );
+    const document = parse('{ scalarList @stream(initialCount: 1) }');
     const result = await complete(document, {
       scalarList: () => ['apple', 'banana', 'coconut'],
     });
@@ -228,7 +226,6 @@ describe('Execute: stream directive', () => {
           {
             items: ['banana'],
             path: ['scalarList', 1],
-            label: 'scalar-stream',
           },
         ],
         hasNext: true,
@@ -238,7 +235,6 @@ describe('Execute: stream directive', () => {
           {
             items: ['coconut'],
             path: ['scalarList', 2],
-            label: 'scalar-stream',
           },
         ],
         hasNext: false,
@@ -531,11 +527,6 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ name: 'Leia', id: '3' }],
             path: ['friendList', 2],
@@ -984,11 +975,6 @@ describe('Execute: stream directive', () => {
               },
             ],
           },
-        ],
-        hasNext: true,
-      },
-      {
-        incremental: [
           {
             items: [{ nonNullName: 'Han' }],
             path: ['friendList', 2],
@@ -1661,8 +1647,8 @@ describe('Execute: stream directive', () => {
 
     const document = parse(`
     query { 
-      friendList @stream(initialCount: 1, label:"stream-label") {
-        ...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
+      friendList @stream(initialCount: 1) {
+        ...NameFragment @defer
         id
       }
     }
@@ -1705,12 +1691,10 @@ describe('Execute: stream directive', () => {
           {
             data: { name: 'Luke' },
             path: ['friendList', 0],
-            label: 'DeferName',
           },
           {
             items: [{ id: '2' }],
             path: ['friendList', 1],
-            label: 'stream-label',
           },
         ],
         hasNext: true,
@@ -1727,7 +1711,6 @@ describe('Execute: stream directive', () => {
           {
             data: { name: 'Han' },
             path: ['friendList', 1],
-            label: 'DeferName',
           },
         ],
         hasNext: false,
@@ -1747,8 +1730,8 @@ describe('Execute: stream directive', () => {
 
     const document = parse(`
     query { 
-      friendList @stream(initialCount: 1, label:"stream-label") {
-        ...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
+      friendList @stream(initialCount: 1) {
+        ...NameFragment @defer
         id
       }
     }
@@ -1791,12 +1774,10 @@ describe('Execute: stream directive', () => {
           {
             data: { name: 'Luke' },
             path: ['friendList', 0],
-            label: 'DeferName',
           },
           {
             items: [{ id: '2' }],
             path: ['friendList', 1],
-            label: 'stream-label',
           },
         ],
         hasNext: true,
@@ -1811,7 +1792,6 @@ describe('Execute: stream directive', () => {
           {
             data: { name: 'Han' },
             path: ['friendList', 1],
-            label: 'DeferName',
           },
         ],
         hasNext: true,

src/execution/__tests__/sync-test.ts

@@ -117,7 +117,7 @@ describe('Execute: synchronously when possible', () => {
     it('throws if encountering async iterable execution', () => {
       const doc = `
         query Example {
-          ...deferFrag @defer(label: "deferLabel")
+          ...deferFrag @defer
         }
         fragment deferFrag on Query {
           syncField