Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

execute: code refactors related to steam/defer #3878

Merged
merged 6 commits into from
Apr 6, 2023
Merged

execute: code refactors related to steam/defer #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e4fde0
introduce FieldGroup type
yaacovCR Apr 4, 2023
2eb67bb
rename fieldNodes variable to fieldGroup
yaacovCR Apr 4, 2023
52ccb18
introduce GroupedFieldSet type
yaacovCR Apr 4, 2023
93989eb
use groupedFieldSet as variable name
yaacovCR Apr 4, 2023
ccca251
refactor handleFieldError
yaacovCR Apr 4, 2023
566c29e
rename executeStreamIterator
yaacovCR Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/execution/collectFields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ import { typeFromAST } from '../utilities/typeFromAST.js';

import { getDirectiveValues } from './values.js';

export type FieldGroup = ReadonlyArray<FieldNode>;

export type GroupedFieldSet = Map<string, FieldGroup>;

export interface PatchFields {
label: string | undefined;
fields: Map<string, ReadonlyArray<FieldNode>>;
groupedFieldSet: GroupedFieldSet;
}

export interface FieldsAndPatches {
fields: Map<string, ReadonlyArray<FieldNode>>;
groupedFieldSet: GroupedFieldSet;
patches: Array<PatchFields>;
}

Expand All @@ -52,7 +56,7 @@ export function collectFields(
runtimeType: GraphQLObjectType,
operation: OperationDefinitionNode,
): FieldsAndPatches {
const fields = new AccumulatorMap<string, FieldNode>();
const groupedFieldSet = new AccumulatorMap<string, FieldNode>();
const patches: Array<PatchFields> = [];
collectFieldsImpl(
schema,
Expand All @@ -61,11 +65,11 @@ export function collectFields(
operation,
runtimeType,
operation.selectionSet,
fields,
groupedFieldSet,
patches,
new Set(),
);
return { fields, patches };
return { groupedFieldSet, patches };
}

/**
Expand All @@ -85,18 +89,18 @@ export function collectSubfields(
variableValues: { [variable: string]: unknown },
operation: OperationDefinitionNode,
returnType: GraphQLObjectType,
fieldNodes: ReadonlyArray<FieldNode>,
fieldGroup: FieldGroup,
): FieldsAndPatches {
const subFieldNodes = new AccumulatorMap<string, FieldNode>();
const subGroupedFieldSet = new AccumulatorMap<string, FieldNode>();
const visitedFragmentNames = new Set<string>();

const subPatches: Array<PatchFields> = [];
const subFieldsAndPatches = {
fields: subFieldNodes,
groupedFieldSet: subGroupedFieldSet,
patches: subPatches,
};

for (const node of fieldNodes) {
for (const node of fieldGroup) {
if (node.selectionSet) {
collectFieldsImpl(
schema,
Expand All @@ -105,7 +109,7 @@ export function collectSubfields(
operation,
returnType,
node.selectionSet,
subFieldNodes,
subGroupedFieldSet,
subPatches,
visitedFragmentNames,
);
Expand All @@ -122,7 +126,7 @@ function collectFieldsImpl(
operation: OperationDefinitionNode,
runtimeType: GraphQLObjectType,
selectionSet: SelectionSetNode,
fields: AccumulatorMap<string, FieldNode>,
groupedFieldSet: AccumulatorMap<string, FieldNode>,
patches: Array<PatchFields>,
visitedFragmentNames: Set<string>,
): void {
Expand All @@ -132,7 +136,7 @@ function collectFieldsImpl(
if (!shouldIncludeNode(variableValues, selection)) {
continue;
}
fields.add(getFieldEntryKey(selection), selection);
groupedFieldSet.add(getFieldEntryKey(selection), selection);
break;
}
case Kind.INLINE_FRAGMENT: {
Expand Down Expand Up @@ -160,7 +164,7 @@ function collectFieldsImpl(
);
patches.push({
label: defer.label,
fields: patchFields,
groupedFieldSet: patchFields,
});
} else {
collectFieldsImpl(
Expand All @@ -170,7 +174,7 @@ function collectFieldsImpl(
operation,
runtimeType,
selection.selectionSet,
fields,
groupedFieldSet,
patches,
visitedFragmentNames,
);
Expand Down Expand Up @@ -216,7 +220,7 @@ function collectFieldsImpl(
);
patches.push({
label: defer.label,
fields: patchFields,
groupedFieldSet: patchFields,
});
} else {
collectFieldsImpl(
Expand All @@ -226,7 +230,7 @@ function collectFieldsImpl(
operation,
runtimeType,
fragment.selectionSet,
fields,
groupedFieldSet,
patches,
visitedFragmentNames,
);
Expand Down
Loading