Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
liuxingbaoyu committed Dec 1, 2023
1 parent 089ec6f commit a291a24
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Makefile.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile.source.mjs
Expand Up @@ -456,7 +456,7 @@ target["new-version-checklist"] = function () {
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!! !!!!!!
!!!!!! Bump minVersion !!!!!!
!!!!!! Bump minVersion: !!!!!!
!!!!!! - packages/babel-helpers/src/helpers/setFunctionName.ts !!!!!!
!!!!!! - packages/babel-helpers/src/helpers/usingCtx.ts !!!!!!
!!!!!! !!!!!!
Expand Down
4 changes: 2 additions & 2 deletions 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(r,e){return"undefined"!=typeof SuppressedError?dispose_SuppressedError=SuppressedError:(dispose_SuppressedError=function(r,e){this.suppressed=r,this.error=e,this.stack=(new Error).stack},dispose_SuppressedError.prototype=Object.create(Error.prototype,{constructor:{value:dispose_SuppressedError,writable:!0,configurable:!0}})),new dispose_SuppressedError(r,e)}export default function _dispose(r,e,s){function next(){for(;r.length>0;)try{var o=r.pop(),p=o.d.call(o.v);if(o.a)return Promise.resolve(p).then(next,err)}catch(r){return err(r)}if(s)throw e}function err(r){return e=s?new dispose_SuppressedError(r,e):r,s=!0,next()}return next()}',
'function dispose_SuppressedError(r,e){return"undefined"!=typeof SuppressedError?dispose_SuppressedError=SuppressedError:(dispose_SuppressedError=function(r,e){this.suppressed=e,this.error=r,this.stack=(new Error).stack},dispose_SuppressedError.prototype=Object.create(Error.prototype,{constructor:{value:dispose_SuppressedError,writable:!0,configurable:!0}})),new dispose_SuppressedError(r,e)}export default function _dispose(r,e,s){function next(){for(;r.length>0;)try{var o=r.pop(),p=o.d.call(o.v);if(o.a)return Promise.resolve(p).then(next,err)}catch(r){return err(r)}if(s)throw e}function err(r){return e=s?new dispose_SuppressedError(e,r):r,s=!0,next()}return next()}',
),
importDeferProxy: helper(
"7.23.0",
Expand Down Expand Up @@ -115,7 +115,7 @@ export default Object.freeze({
),
usingCtx: helper(
"7.23.0",
'export default function _usingCtx(){var r="function"==typeof SuppressedError?SuppressedError:function(r,n){var e=new Error;return e.name="SuppressedError",e.suppressed=r,e.error=n,e},n={},e=[];function using(r,n){if(null!=n){if("object"!=typeof n)throw new TypeError("using declarations can only be used with objects, null, or undefined.");if(r)var o=n[Symbol.asyncDispose||Symbol.for("Symbol.asyncDispose")];if(null==o&&(o=n[Symbol.dispose||Symbol.for("Symbol.dispose")]),"function"!=typeof o)throw new TypeError("Property [Symbol.dispose] is not a function.");e.push({v:n,d:o,a:r})}return n}return{e:n,u:using.bind(null,!1),a:using.bind(null,!0),d:function(){var o=this.e;function next(){for(;r=e.pop();)try{var r,t=r.d.call(r.v);if(r.a)return Promise.resolve(t).then(next,err)}catch(r){return err(r)}if(o!==n)throw o}function err(e){return o=o!==n?new r(e,o):e,next()}return next()}}}',
'export default function _usingCtx(){var r="function"==typeof SuppressedError?SuppressedError:function(r,n){var e=new Error;return e.name="SuppressedError",e.suppressed=n,e.error=r,e},n={},e=[];function using(r,n){if(null!=n){if("object"!=typeof n)throw new TypeError("using declarations can only be used with objects, null, or undefined.");if(r)var o=n[Symbol.asyncDispose||Symbol.for("Symbol.asyncDispose")];if(null==o&&(o=n[Symbol.dispose||Symbol.for("Symbol.dispose")]),"function"!=typeof o)throw new TypeError("Property [Symbol.dispose] is not a function.");e.push({v:n,d:o,a:r})}return n}return{e:n,u:using.bind(null,!1),a:using.bind(null,!0),d:function(){var o=this.e;function next(){for(;r=e.pop();)try{var r,t=r.d.call(r.v);if(r.a)return Promise.resolve(t).then(next,err)}catch(r){return err(r)}if(o!==n)throw o}function err(e){return o=o!==n?new r(o,e):e,next()}return next()}}}',
),
wrapRegExp: helper(
"7.19.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/babel-helpers/src/helpers/dispose.js
@@ -1,10 +1,10 @@
/* @minVersion 7.22.0 */
function dispose_SuppressedError(suppressed, error) {
function dispose_SuppressedError(error, suppressed) {
if (typeof SuppressedError !== "undefined") {
// eslint-disable-next-line no-undef
dispose_SuppressedError = SuppressedError;
} else {
dispose_SuppressedError = function SuppressedError(suppressed, error) {
dispose_SuppressedError = function SuppressedError(error, suppressed) {
this.suppressed = suppressed;
this.error = error;
this.stack = new Error().stack;
Expand All @@ -17,7 +17,7 @@ function dispose_SuppressedError(suppressed, error) {
},
});
}
return new dispose_SuppressedError(suppressed, error);
return new dispose_SuppressedError(error, suppressed);
}

export default function _dispose(stack, error, hasError) {
Expand All @@ -35,7 +35,7 @@ export default function _dispose(stack, error, hasError) {
}

function err(e) {
error = hasError ? new dispose_SuppressedError(e, error) : e;
error = hasError ? new dispose_SuppressedError(error, e) : e;
hasError = true;

return next();
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-helpers/src/helpers/usingCtx.ts
Expand Up @@ -11,7 +11,7 @@ export default function _usingCtx() {
typeof SuppressedError === "function"
? // eslint-disable-next-line no-undef
SuppressedError
: (function (suppressed: boolean, error: Error) {
: (function (error: Error, suppressed: Error) {
var err = new Error() as SuppressedError;
err.name = "SuppressedError";
err.suppressed = suppressed;
Expand Down Expand Up @@ -70,7 +70,7 @@ export default function _usingCtx() {
}

function err(e: Error) {
error = error !== empty ? new _disposeSuppressedError(e, error) : e;
error = error !== empty ? new _disposeSuppressedError(error, e) : e;

return next();
}
Expand Down
@@ -1,4 +1,4 @@
return async function () {
return (async function () {
let disposed = false;
let beforeReturn;
let inCatch;
Expand All @@ -8,15 +8,19 @@ return async function () {
await using x = {
async [Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")]() {
disposed = true;
}
throw 1;
},
};
beforeReturn = disposed;
throw 0;
} catch {
} catch (e) {
inCatch = disposed;
expect(e.name).toBe("SuppressedError");
expect(e.suppressed).toBe(1);
expect(e.error).toBe(0);
}

expect(beforeReturn).toBe(false);
expect(inCatch).toBe(true);
expect(disposed).toBe(true);
}();
})();
Expand Up @@ -7,12 +7,16 @@ try {
using x = {
[Symbol.dispose || Symbol.for("Symbol.dispose")]() {
disposed = true;
}
throw 1;
},
};
beforeReturn = disposed;
throw 0;
} catch {
} catch (e) {
inCatch = disposed;
expect(e.name).toBe("SuppressedError");
expect(e.suppressed).toBe(1);
expect(e.error).toBe(0);
}

expect(beforeReturn).toBe(false);
Expand Down

0 comments on commit a291a24

Please sign in to comment.