deduplicate all fields

Author: yaacovCR

src/execution/__tests__/defer-test.ts

@@ -186,7 +186,6 @@ describe('Execute: defer directive', () => {
         }
       }
       fragment NameFragment on Hero {
-        id
         name
       }
     `);
@@ -205,7 +204,6 @@ describe('Execute: defer directive', () => {
         incremental: [
           {
             data: {
-              id: '1',
               name: 'Luke',
             },
             path: ['hero'],
@@ -410,9 +408,7 @@ describe('Execute: defer directive', () => {
       {
         incremental: [
           {
-            data: {
-              name: 'Luke',
-            },
+            data: {},
             path: ['hero'],
           },
         ],
@@ -447,9 +443,7 @@ describe('Execute: defer directive', () => {
       {
         incremental: [
           {
-            data: {
-              name: 'Luke',
-            },
+            data: {},
             path: ['hero'],
           },
         ],
@@ -527,7 +521,7 @@ describe('Execute: defer directive', () => {
     ]);
   });
 
-  it('Does not deduplicate leaf fields present in the initial payload', async () => {
+  it('Can deduplicate leaf fields present in the initial payload', async () => {
     const document = parse(`
       query {
         hero {
@@ -584,11 +578,6 @@ describe('Execute: defer directive', () => {
                   bar: 'bar',
                 },
               },
-              anotherNestedObject: {
-                deeperObject: {
-                  foo: 'foo',
-                },
-              },
             },
             path: ['hero'],
           },
@@ -598,7 +587,7 @@ describe('Execute: defer directive', () => {
     ]);
   });
 
-  it('Does not deduplicate fields with deferred fragments at multiple levels', async () => {
+  it('Can deduplicate fields with deferred fragments at multiple levels', async () => {
     const document = parse(`
       query {
         hero {
@@ -649,32 +638,18 @@ describe('Execute: defer directive', () => {
         incremental: [
           {
             data: {
-              foo: 'foo',
               bar: 'bar',
               baz: 'baz',
               bak: 'bak',
             },
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
           {
-            data: {
-              deeperObject: {
-                foo: 'foo',
-                bar: 'bar',
-                baz: 'baz',
-              },
-            },
+            data: {},
             path: ['hero', 'nestedObject'],
           },
           {
-            data: {
-              nestedObject: {
-                deeperObject: {
-                  foo: 'foo',
-                  bar: 'bar',
-                },
-              },
-            },
+            data: {},
             path: ['hero'],
           },
         ],
@@ -729,11 +704,7 @@ describe('Execute: defer directive', () => {
             path: ['hero', 'nestedObject', 'deeperObject'],
           },
           {
-            data: {
-              nestedObject: {
-                deeperObject: {},
-              },
-            },
+            data: {},
             path: ['hero'],
           },
         ],
@@ -797,13 +768,6 @@ describe('Execute: defer directive', () => {
           },
           {
             data: {
-              a: {
-                b: {
-                  e: {
-                    f: 'f',
-                  },
-                },
-              },
               g: {
                 h: 'h',
               },

src/execution/collectFields.ts

@@ -13,8 +13,11 @@ import type {
 import { OperationTypeNode } from '../language/ast.js';
 import { Kind } from '../language/kinds.js';
 
-import type { GraphQLObjectType } from '../type/definition.js';
-import { isAbstractType } from '../type/definition.js';
+import type {
+  GraphQLObjectType,
+  GraphQLOutputType,
+} from '../type/definition.js';
+import { GraphQLList, isAbstractType, isLeafType } from '../type/definition.js';
 import {
   GraphQLDeferDirective,
   GraphQLIncludeDirective,
@@ -42,13 +45,17 @@ import { getDirectiveValues } from './values.js';
 export interface FieldGroup {
   depth: number;
   fields: Map<number | undefined, ReadonlyArray<FieldNode>>;
+  isLeaf: boolean;
+  listDepth: number;
 }
 
 export type GroupedFieldSet = Map<string, FieldGroup>;
 
 interface MutableFieldGroup {
   depth: number;
   fields: AccumulatorMap<number | undefined, FieldNode>;
+  isLeaf: boolean;
+  listDepth: number;
 }
 
 /**
@@ -166,9 +173,13 @@ function collectFieldsImpl(
         const key = getFieldEntryKey(selection);
         let fieldGroup = groupedFieldSet.get(key);
         if (!fieldGroup) {
+          const fieldDef = schema.getField(runtimeType, selection.name.value);
+          const isLeaf = isLeafType(fieldDef?.type);
           fieldGroup = {
             depth,
             fields: new AccumulatorMap<number | undefined, FieldNode>(),
+            isLeaf,
+            listDepth: getListDepth(fieldDef?.type),
           };
           groupedFieldSet.set(key, fieldGroup);
         }
@@ -327,3 +338,13 @@ function doesFragmentConditionMatch(
 function getFieldEntryKey(node: FieldNode): string {
   return node.alias ? node.alias.value : node.name.value;
 }
+
+function getListDepth(type: GraphQLOutputType | undefined): number {
+  let listDepth = 0;
+  let unwrappedType = type;
+  while (unwrappedType instanceof GraphQLList) {
+    listDepth++;
+    unwrappedType = unwrappedType.ofType;
+  }
+  return listDepth;
+}