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

fix(core): catch rejected promises in convertNxExecutor #12627

Merged
merged 1 commit into from Oct 14, 2022
Merged

fix(core): catch rejected promises in convertNxExecutor #12627

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 32 additions & 28 deletions packages/devkit/src/utils/convert-nx-executor.ts
View file
Open in desktop
Expand Up @@ -48,39 +48,43 @@ function toObservable<T extends { success: boolean }>(
): Observable<T> {
return new (require('rxjs') as typeof import('rxjs')).Observable(
(subscriber) => {
promiseOrAsyncIterator.then((value) => {
if (!(value as any).next) {
subscriber.next(value as T);
subscriber.complete();
} else {
let asyncIterator = value as AsyncIterableIterator<T>;
promiseOrAsyncIterator
.then((value) => {
if (!(value as any).next) {
subscriber.next(value as T);
subscriber.complete();
} else {
let asyncIterator = value as AsyncIterableIterator<T>;

function recurse(iterator: AsyncIterableIterator<T>) {
iterator
.next()
.then((result) => {
if (!result.done) {
subscriber.next(result.value);
recurse(iterator);
} else {
if (result.value) {
function recurse(iterator: AsyncIterableIterator<T>) {
iterator
.next()
.then((result) => {
if (!result.done) {
subscriber.next(result.value);
recurse(iterator);
} else {
if (result.value) {
subscriber.next(result.value);
}
subscriber.complete();
}
subscriber.complete();
}
})
.catch((e) => {
subscriber.error(e);
});
}
})
.catch((e) => {
subscriber.error(e);
});
}

recurse(asyncIterator);
recurse(asyncIterator);

return () => {
asyncIterator.return();
};
}
});
return () => {
asyncIterator.return();
};
}
})
.catch((err) => {
subscriber.error(err);
});
}
);
}
60 changes: 32 additions & 28 deletions packages/nx/src/executors/utils/convert-nx-executor.ts
View file
Open in desktop
Expand Up @@ -51,39 +51,43 @@ function toObservable<T extends { success: boolean }>(
): Observable<T> {
return new (require('rxjs') as typeof import('rxjs')).Observable(
(subscriber) => {
promiseOrAsyncIterator.then((value) => {
if (!(value as any).next) {
subscriber.next(value as T);
subscriber.complete();
} else {
let asyncIterator = value as AsyncIterableIterator<T>;
promiseOrAsyncIterator
.then((value) => {
if (!(value as any).next) {
subscriber.next(value as T);
subscriber.complete();
} else {
let asyncIterator = value as AsyncIterableIterator<T>;

function recurse(iterator: AsyncIterableIterator<T>) {
iterator
.next()
.then((result) => {
if (!result.done) {
subscriber.next(result.value);
recurse(iterator);
} else {
if (result.value) {
function recurse(iterator: AsyncIterableIterator<T>) {
iterator
.next()
.then((result) => {
if (!result.done) {
subscriber.next(result.value);
recurse(iterator);
} else {
if (result.value) {
subscriber.next(result.value);
}
subscriber.complete();
}
subscriber.complete();
}
})
.catch((e) => {
subscriber.error(e);
});
}
})
.catch((e) => {
subscriber.error(e);
});
}

recurse(asyncIterator);
recurse(asyncIterator);

return () => {
asyncIterator.return();
};
}
});
return () => {
asyncIterator.return();
};
}
})
.catch((err) => {
subscriber.error(err);
});
Comment on lines +88 to +90
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR got hard to read because of formatting, this block is the important bit.

}
);
}