Skip to content

Commit be674ac

Browse files
authored
rename FieldGroup type to FieldDetailsList (#4216)
1 parent ceec0ce commit be674ac

File tree

4 files changed

+136
-123
lines changed

4 files changed

+136
-123
lines changed

src/execution/buildExecutionPlan.ts

+12-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { isSameSet } from '../jsutils/isSameSet.js';
33

44
import 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

4851
function 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();

src/execution/collectFields.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export interface FieldDetails {
3939
fragmentVariableValues?: VariableValues | undefined;
4040
}
4141

42-
export type FieldGroup = ReadonlyArray<FieldDetails>;
42+
export type FieldDetailsList = ReadonlyArray<FieldDetails>;
4343

44-
export type GroupedFieldSet = ReadonlyMap<string, FieldGroup>;
44+
export type GroupedFieldSet = ReadonlyMap<string, FieldDetailsList>;
4545

4646
export interface FragmentDetails {
4747
definition: FragmentDefinitionNode;
@@ -113,7 +113,7 @@ export function collectSubfields(
113113
variableValues: VariableValues,
114114
operation: OperationDefinitionNode,
115115
returnType: GraphQLObjectType,
116-
fieldGroup: FieldGroup,
116+
fieldDetailsList: FieldDetailsList,
117117
): {
118118
groupedFieldSet: GroupedFieldSet;
119119
newDeferUsages: ReadonlyArray<DeferUsage>;
@@ -129,7 +129,7 @@ export function collectSubfields(
129129
const subGroupedFieldSet = new AccumulatorMap<string, FieldDetails>();
130130
const newDeferUsages: Array<DeferUsage> = [];
131131

132-
for (const fieldDetail of fieldGroup) {
132+
for (const fieldDetail of fieldDetailsList) {
133133
const selectionSet = fieldDetail.node.selectionSet;
134134
if (selectionSet) {
135135
const { deferUsage, fragmentVariableValues } = fieldDetail;

0 commit comments

Comments
 (0)