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.

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

Fix handling of sync error in @@asyncDispose #15705

Merged
merged 3 commits into from Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/babel-helpers/src/helpers-generated.ts
Expand Up @@ -63,7 +63,7 @@ export default Object.freeze({
),
dispose: helper(
"7.22.0",
'function dispose_SuppressedError(suppressed,error){return"undefined"!=typeof SuppressedError?dispose_SuppressedError=SuppressedError:(dispose_SuppressedError=function(suppressed,error){this.suppressed=suppressed,this.error=error,this.stack=(new Error).stack},dispose_SuppressedError.prototype=Object.create(Error.prototype,{constructor:{value:dispose_SuppressedError,writable:!0,configurable:!0}})),new dispose_SuppressedError(suppressed,error)}export default function _dispose(stack,error,hasError){function next(){if(0!==stack.length){var r=stack.pop();if(r.a)return Promise.resolve(r.d.call(r.v)).then(next,err);try{r.d.call(r.v)}catch(e){return err(e)}return next()}if(hasError)throw error}function err(e){return error=hasError?new dispose_SuppressedError(e,error):e,hasError=!0,next()}return next()}',
'function dispose_SuppressedError(suppressed,error){return"undefined"!=typeof SuppressedError?dispose_SuppressedError=SuppressedError:(dispose_SuppressedError=function(suppressed,error){this.suppressed=suppressed,this.error=error,this.stack=(new Error).stack},dispose_SuppressedError.prototype=Object.create(Error.prototype,{constructor:{value:dispose_SuppressedError,writable:!0,configurable:!0}})),new dispose_SuppressedError(suppressed,error)}export default function _dispose(stack,error,hasError){function next(){for(;stack.length>0;)try{var r=stack.pop(),p=r.d.call(r.v);if(r.a)return Promise.resolve(p).then(next,err)}catch(e){return err(e)}if(hasError)throw error}function err(e){return error=hasError?new dispose_SuppressedError(e,error):e,hasError=!0,next()}return next()}',
),
iterableToArrayLimit: helper(
"7.0.0-beta.0",
Expand Down
23 changes: 9 additions & 14 deletions packages/babel-helpers/src/helpers/dispose.js
Expand Up @@ -22,21 +22,16 @@ function dispose_SuppressedError(suppressed, error) {

export default function _dispose(stack, error, hasError) {
function next() {
if (stack.length === 0) {
if (hasError) throw error;
return;
while (stack.length > 0) {
try {
var r = stack.pop();
var p = r.d.call(r.v);
if (r.a) return Promise.resolve(p).then(next, err);
} catch (e) {
return err(e);
}
}

var r = stack.pop();
if (r.a) {
return Promise.resolve(r.d.call(r.v)).then(next, err);
}
try {
r.d.call(r.v);
} catch (e) {
return err(e);
}
return next();
if (hasError) throw error;
}

function err(e) {
Expand Down
Expand Up @@ -2,18 +2,21 @@ return async function () {
let disposed = false;
let beforeEnd;

const err = {};
const err1 = {};
const err2 = {};
let thrown;

try {
await using x = {
[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")]() {
throw err;
throw err1;
}
};
throw err2;
} catch (e) {
thrown = e;
}

expect(thrown).toBe(err);
expect(thrown.suppressed).toBe(err1);
expect(thrown.error).toBe(err2);
}();
15 changes: 6 additions & 9 deletions packages/babel-runtime-corejs3/helpers/dispose.js
Expand Up @@ -14,15 +14,12 @@ function dispose_SuppressedError(suppressed, error) {
}
function _dispose(stack, error, hasError) {
function next() {
if (0 !== stack.length) {
var r = stack.pop();
if (r.a) return _Promise.resolve(r.d.call(r.v)).then(next, err);
try {
r.d.call(r.v);
} catch (e) {
return err(e);
}
return next();
for (; stack.length > 0;) try {
var r = stack.pop(),
p = r.d.call(r.v);
if (r.a) return _Promise.resolve(p).then(next, err);
} catch (e) {
return err(e);
}
if (hasError) throw error;
}
Expand Down
15 changes: 6 additions & 9 deletions packages/babel-runtime/helpers/dispose.js
Expand Up @@ -11,15 +11,12 @@ function dispose_SuppressedError(suppressed, error) {
}
function _dispose(stack, error, hasError) {
function next() {
if (0 !== stack.length) {
var r = stack.pop();
if (r.a) return Promise.resolve(r.d.call(r.v)).then(next, err);
try {
r.d.call(r.v);
} catch (e) {
return err(e);
}
return next();
for (; stack.length > 0;) try {
var r = stack.pop(),
p = r.d.call(r.v);
if (r.a) return Promise.resolve(p).then(next, err);
} catch (e) {
return err(e);
}
if (hasError) throw error;
}
Expand Down