Skip to content

mapAsyncIterator: move promise resolution into mapResult #3028

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

Merged
merged 1 commit into from
Apr 4, 2021
Merged

mapAsyncIterator: move promise resolution into mapResult #3028

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
18 changes: 10 additions & 8 deletions src/subscription/mapAsyncIterator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ export function mapAsyncIterator<T, U>(
throw error;
}

async function mapResult(result: IteratorResult<T, void>) {
if (result.done) {
return result;
}

async function mapResult(resultPromise: Promise<IteratorResult<T, void>>) {
try {
const result = await resultPromise;

if (result.done) {
return result;
}

return { value: await callback(result.value), done: false };
} catch (callbackError) {
return abruptClose(callbackError);
Expand All @@ -39,16 +41,16 @@ export function mapAsyncIterator<T, U>(
https://github.com/facebook/flow/issues/3258 */
return ({
next(): Promise<IteratorResult<U, void>> {
return iterator.next().then(mapResult, abruptClose);
return mapResult(iterator.next());
},
return() {
return typeof iterator.return === 'function'
? iterator.return().then(mapResult, abruptClose)
? mapResult(iterator.return())
: Promise.resolve({ value: undefined, done: true });
},
throw(error?: mixed): Promise<IteratorResult<U, void>> {
if (typeof iterator.throw === 'function') {
return iterator.throw(error).then(mapResult, abruptClose);
return mapResult(iterator.throw(error));
}
return Promise.reject(error).catch(abruptClose);
},
Expand Down