File tree 1 file changed +21
-11
lines changed 1 file changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -1600,19 +1600,29 @@ function collectAndExecuteSubfields(
1600
1600
) ;
1601
1601
let groupedFieldSet = collectedSubfields . groupedFieldSet ;
1602
1602
const newDeferUsages = collectedSubfields . newDeferUsages ;
1603
- let newGroupedFieldSets ;
1604
- let newDeferMap = deferMap ;
1605
- if ( deferMap !== undefined || newDeferUsages . length > 0 ) {
1606
- ( { groupedFieldSet, newGroupedFieldSets } = buildSubFieldPlan (
1607
- groupedFieldSet ,
1608
- incrementalContext ?. deferUsageSet ,
1609
- ) ) ;
1610
- newDeferMap = addNewDeferredFragments (
1611
- newDeferUsages ,
1612
- new Map ( deferMap ) ,
1603
+ if ( deferMap === undefined && newDeferUsages . length === 0 ) {
1604
+ return executeFields (
1605
+ exeContext ,
1606
+ returnType ,
1607
+ result ,
1613
1608
path ,
1609
+ groupedFieldSet ,
1610
+ incrementalContext ,
1611
+ undefined ,
1614
1612
) ;
1615
1613
}
1614
+ const subFieldPlan = buildSubFieldPlan (
1615
+ groupedFieldSet ,
1616
+ incrementalContext ?. deferUsageSet ,
1617
+ ) ;
1618
+
1619
+ groupedFieldSet = subFieldPlan . groupedFieldSet ;
1620
+ const newGroupedFieldSets = subFieldPlan . newGroupedFieldSets ;
1621
+ const newDeferMap = addNewDeferredFragments (
1622
+ newDeferUsages ,
1623
+ new Map ( deferMap ) ,
1624
+ path ,
1625
+ ) ;
1616
1626
1617
1627
const subFields = executeFields (
1618
1628
exeContext ,
@@ -1624,7 +1634,7 @@ function collectAndExecuteSubfields(
1624
1634
newDeferMap ,
1625
1635
) ;
1626
1636
1627
- if ( newGroupedFieldSets && newDeferMap ) {
1637
+ if ( newGroupedFieldSets . size > 0 ) {
1628
1638
const newDeferredGroupedFieldSetRecords = executeDeferredGroupedFieldSets (
1629
1639
exeContext ,
1630
1640
returnType ,
You can’t perform that action at this time.
0 commit comments