Skip to content

Commit

Permalink
fix(core): catch rejected promises in convertNxExecutor (#12627)
Browse files Browse the repository at this point in the history
  • Loading branch information
@philipjfulcher
philipjfulcher committed Oct 14, 2022
1 parent 628c9c0 commit 62e91f3
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 56 deletions.
60 changes: 32 additions & 28 deletions packages/devkit/src/utils/convert-nx-executor.ts
View file
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
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);
});
}
);
}

1 comment on commit 62e91f3

@vercel
Copy link

@vercel vercel bot commented on 62e91f3 Oct 14, 2022

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

nx-dev – ./

nx-five.vercel.app
nx-dev-nrwl.vercel.app
nx-dev-git-master-nrwl.vercel.app
nx.dev

Please sign in to comment.