@@ -3,7 +3,7 @@ import { isSameSet } from '../jsutils/isSameSet.js';
33
44import type {
55 DeferUsage ,
6- FieldGroup ,
6+ FieldDetailsList ,
77 GroupedFieldSet ,
88} from './collectFields.js' ;
99
@@ -18,13 +18,16 @@ export function buildExecutionPlan(
1818 originalGroupedFieldSet : GroupedFieldSet ,
1919 parentDeferUsages : DeferUsageSet = new Set < DeferUsage > ( ) ,
2020) : ExecutionPlan {
21- const groupedFieldSet = new Map < string , FieldGroup > ( ) ;
22- const newGroupedFieldSets = new Map < DeferUsageSet , Map < string , FieldGroup > > ( ) ;
23- for ( const [ responseKey , fieldGroup ] of originalGroupedFieldSet ) {
24- const filteredDeferUsageSet = getFilteredDeferUsageSet ( fieldGroup ) ;
21+ const groupedFieldSet = new Map < string , FieldDetailsList > ( ) ;
22+ const newGroupedFieldSets = new Map <
23+ DeferUsageSet ,
24+ Map < string , FieldDetailsList >
25+ > ( ) ;
26+ for ( const [ responseKey , fieldDetailsList ] of originalGroupedFieldSet ) {
27+ const filteredDeferUsageSet = getFilteredDeferUsageSet ( fieldDetailsList ) ;
2528
2629 if ( isSameSet ( filteredDeferUsageSet , parentDeferUsages ) ) {
27- groupedFieldSet . set ( responseKey , fieldGroup ) ;
30+ groupedFieldSet . set ( responseKey , fieldDetailsList ) ;
2831 continue ;
2932 }
3033
@@ -36,7 +39,7 @@ export function buildExecutionPlan(
3639 newGroupedFieldSet = new Map ( ) ;
3740 newGroupedFieldSets . set ( filteredDeferUsageSet , newGroupedFieldSet ) ;
3841 }
39- newGroupedFieldSet . set ( responseKey , fieldGroup ) ;
42+ newGroupedFieldSet . set ( responseKey , fieldDetailsList ) ;
4043 }
4144
4245 return {
@@ -46,10 +49,10 @@ export function buildExecutionPlan(
4649}
4750
4851function getFilteredDeferUsageSet (
49- fieldGroup : FieldGroup ,
52+ fieldDetailsList : FieldDetailsList ,
5053) : ReadonlySet < DeferUsage > {
5154 const filteredDeferUsageSet = new Set < DeferUsage > ( ) ;
52- for ( const fieldDetails of fieldGroup ) {
55+ for ( const fieldDetails of fieldDetailsList ) {
5356 const deferUsage = fieldDetails . deferUsage ;
5457 if ( deferUsage === undefined ) {
5558 filteredDeferUsageSet . clear ( ) ;
0 commit comments