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

introduce completeMaybePromisedListItemValue #4264

Closed
wants to merge 1 commit into from
Closed

introduce completeMaybePromisedListItemValue #4264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
138 changes: 67 additions & 71 deletions src/execution/execute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,6 @@ async function completeAsyncIteratorValue(
break;
}

const itemPath = addPath(path, index, undefined);
let iteration;
try {
// eslint-disable-next-line no-await-in-loop
Expand All @@ -1288,44 +1287,19 @@ async function completeAsyncIteratorValue(
break;
}

const item = iteration.value;
// TODO: add tests for stream backed by asyncIterator that returns a promise
/* c8 ignore start */
if (isPromise(item)) {
completedResults.push(
completePromisedListItemValue(
item,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
),
);
containsPromise = true;
} else if (
/* c8 ignore stop */
completeListItemValue(
item,
completedResults,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
)
// TODO: add tests for stream backed by asyncIterator that completes to a promise
/* c8 ignore start */
) {
containsPromise = true;
}
/* c8 ignore stop */
containsPromise = completeMaybePromisedListItemValue(
iteration.value,
completedResults,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
addPath(path, index, undefined),
incrementalContext,
deferMap,
);

index++;
}
} catch (error) {
Expand Down Expand Up @@ -1448,39 +1422,19 @@ function completeIterableValue(

// No need to modify the info object containing the path,
// since from here on it is not ever accessed by resolver functions.
const itemPath = addPath(path, index, undefined);
containsPromise = completeMaybePromisedListItemValue(
item,
completedResults,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
addPath(path, index, undefined),
incrementalContext,
deferMap,
);

if (isPromise(item)) {
completedResults.push(
completePromisedListItemValue(
item,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
),
);
containsPromise = true;
} else if (
completeListItemValue(
item,
completedResults,
graphqlWrappedResult,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
)
) {
containsPromise = true;
}
index++;

iteration = iterator.next();
Expand All @@ -1500,6 +1454,48 @@ function completeIterableValue(
*
* Returns true if the value is a Promise.
*/
function completeMaybePromisedListItemValue(
item: unknown,
completedResults: Array<unknown>,
parent: GraphQLWrappedResult<Array<unknown>>,
exeContext: ExecutionContext,
itemType: GraphQLOutputType,
fieldDetailsList: FieldDetailsList,
info: GraphQLResolveInfo,
itemPath: Path,
incrementalContext: IncrementalContext | undefined,
deferMap: ReadonlyMap<DeferUsage, DeferredFragmentRecord> | undefined,
): boolean {
if (isPromise(item)) {
completedResults.push(
completePromisedListItemValue(
item,
parent,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
),
);
return true;
}
return completeListItemValue(
item,
completedResults,
parent,
exeContext,
itemType,
fieldDetailsList,
info,
itemPath,
incrementalContext,
deferMap,
);
}

function completeListItemValue(
item: unknown,
completedResults: Array<unknown>,
Expand Down
Loading