From ca9c76b46f26f0aaf6b7f18cb7b4c6fdb7ebd512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 16 Apr 2024 11:20:47 +0900 Subject: [PATCH] build(cargo): Update rustc to `nightly-2024-04-03` (#8821) --- Cargo.lock | 9 +- README.md | 2 +- clippy.toml | 2 +- crates/ast_node/src/ast_node_macro.rs | 1 - crates/ast_node/src/enum_deserialize.rs | 1 - crates/ast_node/src/lib.rs | 2 +- crates/string_enum/src/lib.rs | 2 +- crates/swc/examples/minify.rs | 2 +- crates/swc/examples/transform.rs | 2 +- crates/swc/examples/transform_error.rs | 2 +- crates/swc/src/config/mod.rs | 17 +- crates/swc/src/lib.rs | 2 +- .../fixture/issues-8xxx/8020/output/1.js | 14 +- .../fixture/issues-8xxx/8629/output/1.js | 12 +- .../fixture/issues-8xxx/8629/output/2.js | 12 +- .../fixture/issues-8xxx/8774/output/index.js | 28 +- crates/swc/tests/projects.rs | 2 +- ...gDeclarations.1(target=es2015).1.normal.js | 236 ++-- ...eclarations.1(target=es2015).2.minified.js | 153 ++- ...gDeclarations.1(target=es2017).1.normal.js | 236 ++-- ...eclarations.1(target=es2017).2.minified.js | 143 ++- ...gDeclarations.1(target=es2022).1.normal.js | 236 ++-- ...eclarations.1(target=es2022).2.minified.js | 143 ++- ...singDeclarations.1(target=es5).1.normal.js | 246 ++-- ...ngDeclarations.1(target=es5).2.minified.js | 153 ++- ...gDeclarations.1(target=esnext).1.normal.js | 236 ++-- ...eclarations.1(target=esnext).2.minified.js | 143 ++- .../awaitUsingDeclarations.12.1.normal.js | 12 +- .../awaitUsingDeclarations.12.2.minified.js | 3 +- .../awaitUsingDeclarations.13.1.normal.js | 21 +- .../awaitUsingDeclarations.13.2.minified.js | 11 +- .../awaitUsingDeclarations.15.1.normal.js | 14 +- .../awaitUsingDeclarations.15.2.minified.js | 3 +- ...gDeclarations.2(target=es2015).1.normal.js | 16 +- ...eclarations.2(target=es2015).2.minified.js | 15 +- ...gDeclarations.2(target=es2017).1.normal.js | 16 +- ...eclarations.2(target=es2017).2.minified.js | 15 +- ...gDeclarations.2(target=es2022).1.normal.js | 16 +- ...eclarations.2(target=es2022).2.minified.js | 15 +- ...singDeclarations.2(target=es5).1.normal.js | 16 +- ...ngDeclarations.2(target=es5).2.minified.js | 15 +- ...gDeclarations.2(target=esnext).1.normal.js | 16 +- ...eclarations.2(target=esnext).2.minified.js | 15 +- ...gDeclarations.3(target=es2015).1.normal.js | 16 +- ...eclarations.3(target=es2015).2.minified.js | 15 +- ...gDeclarations.3(target=es2017).1.normal.js | 16 +- ...eclarations.3(target=es2017).2.minified.js | 15 +- ...gDeclarations.3(target=es2022).1.normal.js | 16 +- ...eclarations.3(target=es2022).2.minified.js | 15 +- ...singDeclarations.3(target=es5).1.normal.js | 14 +- ...ngDeclarations.3(target=es5).2.minified.js | 13 +- ...gDeclarations.3(target=esnext).1.normal.js | 16 +- ...eclarations.3(target=esnext).2.minified.js | 15 +- .../awaitUsingDeclarations.9.1.normal.js | 12 +- .../awaitUsingDeclarations.9.2.minified.js | 11 +- ...onsInForAwaitOf(target=es2015).1.normal.js | 9 +- ...sInForAwaitOf(target=es2015).2.minified.js | 2 +- ...onsInForAwaitOf(target=es2017).1.normal.js | 9 +- ...sInForAwaitOf(target=es2017).2.minified.js | 2 +- ...onsInForAwaitOf(target=es2022).1.normal.js | 9 +- ...sInForAwaitOf(target=es2022).2.minified.js | 2 +- ...ationsInForAwaitOf(target=es5).1.normal.js | 11 +- ...ionsInForAwaitOf(target=es5).2.minified.js | 2 +- ...onsInForAwaitOf(target=esnext).1.normal.js | 9 +- ...sInForAwaitOf(target=esnext).2.minified.js | 2 +- ...ationsInForOf.1(target=es2015).1.normal.js | 9 +- ...ionsInForOf.1(target=es2015).2.minified.js | 2 +- ...ationsInForOf.1(target=es2017).1.normal.js | 9 +- ...ionsInForOf.1(target=es2017).2.minified.js | 2 +- ...ationsInForOf.1(target=es2022).1.normal.js | 9 +- ...ionsInForOf.1(target=es2022).2.minified.js | 2 +- ...larationsInForOf.1(target=es5).1.normal.js | 11 +- ...rationsInForOf.1(target=es5).2.minified.js | 2 +- ...ationsInForOf.1(target=esnext).1.normal.js | 9 +- ...ionsInForOf.1(target=esnext).2.minified.js | 2 +- ...TopLevelOfModule.1(module=es6).1.normal.js | 16 +- ...pLevelOfModule.1(module=es6).2.minified.js | 15 +- ...LevelOfModule.1(module=system).1.normal.js | 25 +- ...velOfModule.1(module=system).2.minified.js | 22 +- ...gDeclarationsWithImportHelpers.1.normal.js | 12 +- ...eclarationsWithImportHelpers.2.minified.js | 3 +- ...gDeclarations.1(target=es2015).1.normal.js | 293 +++-- ...eclarations.1(target=es2015).2.minified.js | 131 ++- ...gDeclarations.1(target=es2017).1.normal.js | 293 +++-- ...eclarations.1(target=es2017).2.minified.js | 131 ++- ...gDeclarations.1(target=es2022).1.normal.js | 293 +++-- ...eclarations.1(target=es2022).2.minified.js | 195 ++-- ...singDeclarations.1(target=es5).1.normal.js | 303 +++-- ...ngDeclarations.1(target=es5).2.minified.js | 131 ++- ...gDeclarations.1(target=esnext).1.normal.js | 293 +++-- ...eclarations.1(target=esnext).2.minified.js | 195 ++-- .../usingDeclarations.11.1.normal.js | 48 +- .../usingDeclarations.11.2.minified.js | 3 +- .../usingDeclarations.12.1.normal.js | 12 +- .../usingDeclarations.12.2.minified.js | 3 +- .../usingDeclarations.14.1.normal.js | 12 +- .../usingDeclarations.14.2.minified.js | 11 +- .../usingDeclarations.15.1.normal.js | 12 +- .../usingDeclarations.15.2.minified.js | 11 +- ...gDeclarations.2(target=es2015).1.normal.js | 14 +- ...eclarations.2(target=es2015).2.minified.js | 13 +- ...gDeclarations.2(target=es2017).1.normal.js | 14 +- ...eclarations.2(target=es2017).2.minified.js | 13 +- ...gDeclarations.2(target=es2022).1.normal.js | 14 +- ...eclarations.2(target=es2022).2.minified.js | 13 +- ...singDeclarations.2(target=es5).1.normal.js | 12 +- ...ngDeclarations.2(target=es5).2.minified.js | 11 +- ...gDeclarations.2(target=esnext).1.normal.js | 14 +- ...eclarations.2(target=esnext).2.minified.js | 13 +- ...gDeclarations.3(target=es2015).1.normal.js | 14 +- ...eclarations.3(target=es2015).2.minified.js | 13 +- ...gDeclarations.3(target=es2017).1.normal.js | 14 +- ...eclarations.3(target=es2017).2.minified.js | 13 +- ...gDeclarations.3(target=es2022).1.normal.js | 14 +- ...eclarations.3(target=es2022).2.minified.js | 13 +- ...singDeclarations.3(target=es5).1.normal.js | 12 +- ...ngDeclarations.3(target=es5).2.minified.js | 11 +- ...gDeclarations.3(target=esnext).1.normal.js | 14 +- ...eclarations.3(target=esnext).2.minified.js | 13 +- .../usingDeclarations.9.1.normal.js | 12 +- .../usingDeclarations.9.2.minified.js | 11 +- ...gDeclarationsDeclarationEmit.1.1.normal.js | 16 +- ...eclarationsDeclarationEmit.1.2.minified.js | 13 +- ...gDeclarationsDeclarationEmit.2.1.normal.js | 16 +- ...eclarationsDeclarationEmit.2.2.minified.js | 15 +- ...onsInForAwaitOf(target=es2015).1.normal.js | 9 +- ...sInForAwaitOf(target=es2015).2.minified.js | 2 +- ...onsInForAwaitOf(target=es2017).1.normal.js | 9 +- ...sInForAwaitOf(target=es2017).2.minified.js | 2 +- ...onsInForAwaitOf(target=es2022).1.normal.js | 9 +- ...sInForAwaitOf(target=es2022).2.minified.js | 2 +- ...ationsInForAwaitOf(target=es5).1.normal.js | 11 +- ...ionsInForAwaitOf(target=es5).2.minified.js | 2 +- ...onsInForAwaitOf(target=esnext).1.normal.js | 9 +- ...sInForAwaitOf(target=esnext).2.minified.js | 2 +- ...ationsInForOf.1(target=es2015).1.normal.js | 9 +- ...ionsInForOf.1(target=es2015).2.minified.js | 8 +- ...ationsInForOf.1(target=es2017).1.normal.js | 9 +- ...ionsInForOf.1(target=es2017).2.minified.js | 8 +- ...ationsInForOf.1(target=es2022).1.normal.js | 9 +- ...ionsInForOf.1(target=es2022).2.minified.js | 8 +- ...larationsInForOf.1(target=es5).1.normal.js | 9 +- ...rationsInForOf.1(target=es5).2.minified.js | 8 +- ...ationsInForOf.1(target=esnext).1.normal.js | 9 +- ...ionsInForOf.1(target=esnext).2.minified.js | 8 +- ...TopLevelOfModule.1(module=amd).1.normal.js | 16 +- ...pLevelOfModule.1(module=amd).2.minified.js | 17 +- ...velOfModule.1(module=commonjs).1.normal.js | 14 +- ...lOfModule.1(module=commonjs).2.minified.js | 14 +- ...TopLevelOfModule.1(module=es6).1.normal.js | 14 +- ...pLevelOfModule.1(module=es6).2.minified.js | 15 +- ...LevelOfModule.1(module=system).1.normal.js | 23 +- ...velOfModule.1(module=system).2.minified.js | 20 +- ...TopLevelOfModule.2(module=amd).1.normal.js | 16 +- ...pLevelOfModule.2(module=amd).2.minified.js | 11 +- ...velOfModule.2(module=commonjs).1.normal.js | 14 +- ...lOfModule.2(module=commonjs).2.minified.js | 8 +- ...TopLevelOfModule.3(module=amd).1.normal.js | 14 +- ...pLevelOfModule.3(module=amd).2.minified.js | 13 +- ...velOfModule.3(module=commonjs).1.normal.js | 12 +- ...lOfModule.3(module=commonjs).2.minified.js | 10 +- ...TopLevelOfModule.3(module=es6).1.normal.js | 12 +- ...pLevelOfModule.3(module=es6).2.minified.js | 11 +- ...LevelOfModule.3(module=system).1.normal.js | 21 +- ...velOfModule.3(module=system).2.minified.js | 20 +- ...gDeclarationsWithImportHelpers.1.normal.js | 12 +- ...eclarationsWithImportHelpers.2.minified.js | 11 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....1(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.1(module=es6,target=es2015).1.normal.js | 12 +- ....1(module=es6,target=es2015).2.minified.js | 11 +- ...ators.1(module=es6,target=es5).1.normal.js | 12 +- ...ors.1(module=es6,target=es5).2.minified.js | 11 +- ...rs.1(module=es6,target=esnext).1.normal.js | 12 +- ....1(module=es6,target=esnext).2.minified.js | 11 +- ...1(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.1(module=system,target=es5).1.normal.js | 21 +- ....1(module=system,target=es5).2.minified.js | 20 +- ...1(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ...10(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...s.10(module=es6,target=es2015).1.normal.js | 12 +- ...10(module=es6,target=es2015).2.minified.js | 11 +- ...tors.10(module=es6,target=es5).1.normal.js | 12 +- ...rs.10(module=es6,target=es5).2.minified.js | 11 +- ...s.10(module=es6,target=esnext).1.normal.js | 12 +- ...10(module=es6,target=esnext).2.minified.js | 11 +- ...0(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...s.10(module=system,target=es5).1.normal.js | 21 +- ...10(module=system,target=es5).2.minified.js | 20 +- ...0(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ...11(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...s.11(module=es6,target=es2015).1.normal.js | 12 +- ...11(module=es6,target=es2015).2.minified.js | 11 +- ...tors.11(module=es6,target=es5).1.normal.js | 12 +- ...rs.11(module=es6,target=es5).2.minified.js | 11 +- ...s.11(module=es6,target=esnext).1.normal.js | 12 +- ...11(module=es6,target=esnext).2.minified.js | 11 +- ...1(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...s.11(module=system,target=es5).1.normal.js | 21 +- ...11(module=system,target=es5).2.minified.js | 20 +- ...1(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ...12(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...s.12(module=es6,target=es2015).1.normal.js | 12 +- ...12(module=es6,target=es2015).2.minified.js | 11 +- ...tors.12(module=es6,target=es5).1.normal.js | 12 +- ...rs.12(module=es6,target=es5).2.minified.js | 11 +- ...s.12(module=es6,target=esnext).1.normal.js | 12 +- ...12(module=es6,target=esnext).2.minified.js | 11 +- ...2(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...s.12(module=system,target=es5).1.normal.js | 21 +- ...12(module=system,target=es5).2.minified.js | 20 +- ...2(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....2(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.2(module=es6,target=es2015).1.normal.js | 12 +- ....2(module=es6,target=es2015).2.minified.js | 11 +- ...ators.2(module=es6,target=es5).1.normal.js | 12 +- ...ors.2(module=es6,target=es5).2.minified.js | 11 +- ...rs.2(module=es6,target=esnext).1.normal.js | 12 +- ....2(module=es6,target=esnext).2.minified.js | 11 +- ...2(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.2(module=system,target=es5).1.normal.js | 21 +- ....2(module=system,target=es5).2.minified.js | 20 +- ...2(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....3(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.3(module=es6,target=es2015).1.normal.js | 12 +- ....3(module=es6,target=es2015).2.minified.js | 11 +- ...ators.3(module=es6,target=es5).1.normal.js | 12 +- ...ors.3(module=es6,target=es5).2.minified.js | 11 +- ...rs.3(module=es6,target=esnext).1.normal.js | 12 +- ....3(module=es6,target=esnext).2.minified.js | 11 +- ...3(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.3(module=system,target=es5).1.normal.js | 21 +- ....3(module=system,target=es5).2.minified.js | 20 +- ...3(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....4(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.4(module=es6,target=es2015).1.normal.js | 12 +- ....4(module=es6,target=es2015).2.minified.js | 11 +- ...ators.4(module=es6,target=es5).1.normal.js | 12 +- ...ors.4(module=es6,target=es5).2.minified.js | 11 +- ...rs.4(module=es6,target=esnext).1.normal.js | 12 +- ....4(module=es6,target=esnext).2.minified.js | 11 +- ...4(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.4(module=system,target=es5).1.normal.js | 21 +- ....4(module=system,target=es5).2.minified.js | 20 +- ...4(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....5(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.5(module=es6,target=es2015).1.normal.js | 12 +- ....5(module=es6,target=es2015).2.minified.js | 11 +- ...ators.5(module=es6,target=es5).1.normal.js | 12 +- ...ors.5(module=es6,target=es5).2.minified.js | 11 +- ...rs.5(module=es6,target=esnext).1.normal.js | 12 +- ....5(module=es6,target=esnext).2.minified.js | 11 +- ...5(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.5(module=system,target=es5).1.normal.js | 21 +- ....5(module=system,target=es5).2.minified.js | 20 +- ...5(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....6(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.6(module=es6,target=es2015).1.normal.js | 12 +- ....6(module=es6,target=es2015).2.minified.js | 11 +- ...ators.6(module=es6,target=es5).1.normal.js | 12 +- ...ors.6(module=es6,target=es5).2.minified.js | 11 +- ...rs.6(module=es6,target=esnext).1.normal.js | 12 +- ....6(module=es6,target=esnext).2.minified.js | 11 +- ...6(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.6(module=system,target=es5).1.normal.js | 21 +- ....6(module=system,target=es5).2.minified.js | 20 +- ...6(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....7(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.7(module=es6,target=es2015).1.normal.js | 12 +- ....7(module=es6,target=es2015).2.minified.js | 11 +- ...ators.7(module=es6,target=es5).1.normal.js | 12 +- ...ors.7(module=es6,target=es5).2.minified.js | 11 +- ...rs.7(module=es6,target=esnext).1.normal.js | 12 +- ....7(module=es6,target=esnext).2.minified.js | 11 +- ...7(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.7(module=system,target=es5).1.normal.js | 21 +- ....7(module=system,target=es5).2.minified.js | 20 +- ...7(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....8(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.8(module=es6,target=es2015).1.normal.js | 12 +- ....8(module=es6,target=es2015).2.minified.js | 11 +- ...ators.8(module=es6,target=es5).1.normal.js | 12 +- ...ors.8(module=es6,target=es5).2.minified.js | 11 +- ...rs.8(module=es6,target=esnext).1.normal.js | 12 +- ....8(module=es6,target=esnext).2.minified.js | 11 +- ...8(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.8(module=system,target=es5).1.normal.js | 21 +- ....8(module=system,target=es5).2.minified.js | 20 +- ...8(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- ...module=commonjs,target=es2015).1.normal.js | 12 +- ...dule=commonjs,target=es2015).2.minified.js | 10 +- ....9(module=commonjs,target=es5).1.normal.js | 12 +- ...(module=commonjs,target=es5).2.minified.js | 10 +- ...module=commonjs,target=esnext).1.normal.js | 12 +- ...dule=commonjs,target=esnext).2.minified.js | 10 +- ...rs.9(module=es6,target=es2015).1.normal.js | 12 +- ....9(module=es6,target=es2015).2.minified.js | 11 +- ...ators.9(module=es6,target=es5).1.normal.js | 12 +- ...ors.9(module=es6,target=es5).2.minified.js | 11 +- ...rs.9(module=es6,target=esnext).1.normal.js | 12 +- ....9(module=es6,target=esnext).2.minified.js | 11 +- ...9(module=system,target=es2015).1.normal.js | 21 +- ...module=system,target=es2015).2.minified.js | 20 +- ...rs.9(module=system,target=es5).1.normal.js | 21 +- ....9(module=system,target=es5).2.minified.js | 20 +- ...9(module=system,target=esnext).1.normal.js | 21 +- ...module=system,target=esnext).2.minified.js | 20 +- crates/swc_atoms/Cargo.toml | 2 +- crates/swc_bundler/src/bundler/chunk/cjs.rs | 2 +- crates/swc_bundler/src/bundler/chunk/merge.rs | 85 +- crates/swc_bundler/src/bundler/chunk/mod.rs | 3 - crates/swc_bundler/src/bundler/mod.rs | 9 +- crates/swc_bundler/src/util.rs | 2 +- crates/swc_bundler/tests/fixture.rs | 1 - crates/swc_cli_impl/src/commands/compile.rs | 10 +- crates/swc_common/Cargo.toml | 2 +- crates/swc_common/src/errors/diagnostic.rs | 2 +- crates/swc_common/src/errors/emitter.rs | 5 +- crates/swc_common/src/source_map.rs | 47 - crates/swc_common/src/syntax_pos/hygiene.rs | 4 +- crates/swc_common/tests/attr_interop.rs | 4 +- .../tests/fixture/stub_napi/Cargo.toml | 1 + .../tests/fixture/stub_wasm/Cargo.toml | 1 + crates/swc_css_ast/Cargo.toml | 2 +- crates/swc_css_codegen/src/writer/basic.rs | 18 +- crates/swc_css_compat/src/compiler/nesting.rs | 2 +- crates/swc_css_parser/src/parser/input.rs | 6 +- crates/swc_css_parser/src/parser/mod.rs | 9 +- .../src/parser/values_and_units/mod.rs | 5 +- crates/swc_ecma_ast/Cargo.toml | 2 +- crates/swc_ecma_ast/src/lib.rs | 9 +- crates/swc_ecma_codegen/benches/bench.rs | 2 +- crates/swc_ecma_codegen/benches/with_parse.rs | 2 +- crates/swc_ecma_codegen/src/lib.rs | 16 +- crates/swc_ecma_codegen/src/tests.rs | 21 +- crates/swc_ecma_codegen/tests/sourcemap.rs | 2 +- crates/swc_ecma_codegen/tests/test262.rs | 2 +- crates/swc_ecma_codegen_macros/src/lib.rs | 2 +- .../src/block_scoping/mod.rs | 2 +- .../src/classes/constructor.rs | 40 - .../swc_ecma_compat_es2015/src/generator.rs | 1 + crates/swc_ecma_compat_es2015/src/lib.rs | 1 - crates/swc_ecma_compat_es2015/src/spread.rs | 6 +- .../src/class_properties/mod.rs | 2 +- .../src/private_in_object.rs | 2 +- crates/swc_ecma_lints/src/lib.rs | 1 + .../src/rules/constructor_super.rs | 9 +- crates/swc_ecma_loader/src/lib.rs | 9 +- crates/swc_ecma_loader/src/resolve.rs | 1 + crates/swc_ecma_minifier/src/compress/mod.rs | 11 +- .../src/compress/optimize/inline.rs | 2 +- crates/swc_ecma_minifier/src/js.rs | 9 +- crates/swc_ecma_minifier/src/option/terser.rs | 9 +- .../src/pass/mangle_names/mod.rs | 2 +- crates/swc_ecma_minifier/src/util/mod.rs | 3 +- crates/swc_ecma_minifier/src/util/unit.rs | 2 + crates/swc_ecma_minifier/tests/compress.rs | 1031 +---------------- crates/swc_ecma_parser/examples/lexer.rs | 1 - crates/swc_ecma_parser/examples/perf.rs | 2 +- crates/swc_ecma_parser/examples/typescript.rs | 1 - .../src/parser/class_and_fn.rs | 2 +- .../swc_ecma_parser/src/parser/expr/tests.rs | 3 - .../src/parser/expr/verifier.rs | 4 +- .../swc_ecma_parser/src/parser/jsx/tests.rs | 1 - crates/swc_ecma_parser/src/parser/pat.rs | 1 - crates/swc_ecma_parser/src/parser/tests.rs | 4 +- .../swc_ecma_parser/src/parser/typescript.rs | 2 +- crates/swc_ecma_parser/src/token.rs | 2 - crates/swc_ecma_transforms_base/src/fixer.rs | 11 +- .../src/helpers/mod.rs | 2 +- .../src/hygiene/tests.rs | 2 +- .../src/rename/mod.rs | 2 + .../src/resolver/tests.rs | 3 +- crates/swc_ecma_transforms_base/src/scope.rs | 9 +- .../tests/fixer_test262.rs | 2 +- .../src/const_modules.rs | 4 +- .../src/inline_globals.rs | 1 - .../src/json_parse.rs | 4 - .../src/simplify/inlining/scope.rs | 4 +- .../src/jsx/tests.rs | 2 +- .../src/jsx_src/tests.rs | 2 +- .../src/refresh/tests.rs | 2 +- .../examples/ts_to_js.rs | 1 - .../tests/strip_correctness.rs | 59 +- .../src/analyzer/mod.rs | 2 +- crates/swc_ecma_utils/src/lib.rs | 5 +- crates/swc_estree_ast/src/flavor.rs | 13 +- crates/swc_fast_graph/src/digraph.rs | 2 +- crates/swc_html_ast/Cargo.toml | 2 +- crates/swc_html_codegen/src/writer/basic.rs | 18 +- crates/swc_html_codegen/tests/fixture.rs | 60 +- crates/swc_html_minifier/src/option.rs | 18 +- crates/swc_html_parser/src/parser/mod.rs | 9 +- crates/swc_macros_common/src/binder.rs | 1 - .../swc_macros_common/src/derive/generics.rs | 2 +- crates/swc_node_bundler/src/loaders/json.rs | 2 +- crates/swc_node_bundler/src/v1/mod.rs | 9 +- crates/swc_plugin_proxy/Cargo.toml | 2 +- .../read_returned_result_from_host.rs | 4 +- .../src/imported_fn/source_map.rs | 2 + .../src/transform_executor.rs | 3 +- .../css-plugins/swc_noop_plugin/Cargo.toml | 1 + .../tests/ecma_integration.rs | 86 +- .../tests/fixture/issue_6404/Cargo.toml | 1 + .../tests/fixture/issue_6404/src/lib.rs | 4 +- .../fixture/swc_internal_plugin/Cargo.toml | 7 +- .../fixture/swc_internal_plugin/src/lib.rs | 22 + .../tests/fixture/swc_noop_plugin/Cargo.toml | 1 + crates/swc_plugin_runner/tests/issues.rs | 24 +- crates/swc_xml_codegen/src/writer/basic.rs | 18 +- crates/swc_xml_codegen/tests/fixture.rs | 30 +- crates/swc_xml_parser/src/parser/mod.rs | 8 +- crates/swc_xml_parser/src/parser/node.rs | 2 + crates/testing/src/output.rs | 1 - .../plugin_transform_schema_v1/rust-toolchain | 2 +- .../rust-toolchain | 2 +- rust-toolchain | 2 +- 493 files changed, 4170 insertions(+), 6659 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb46037ac744..05f989e49e00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3110,12 +3110,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "indexmap 1.9.3", "ptr_meta", @@ -3128,9 +3129,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", diff --git a/README.md b/README.md index b432b1058b10..c35c9149d475 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Also, SWC tries to ensure that for rust users. -MSRV of crates is currently nightly, but we will support stable rustc again in the future. +MSRV of crates is currently `1.71`. To update all SWC crates you use, you can run `curl https://raw.githubusercontent.com/swc-project/swc/main/scripts/update-all-swc-crates.sh | bash -s`. This script will update all dependencies to the latest version and run `cargo build` to ensure that everything works. Note that you need diff --git a/clippy.toml b/clippy.toml index 30bf79298597..d3673c818d2f 100644 --- a/clippy.toml +++ b/clippy.toml @@ -22,5 +22,5 @@ ignore-interior-mutability = [ "swc_atoms::JsWord", "swc_ecma_ast::Id", ] -msrv = "1.58" +msrv = "1.71" type-complexity-threshold = 25000 diff --git a/crates/ast_node/src/ast_node_macro.rs b/crates/ast_node/src/ast_node_macro.rs index a6eff03434e5..e67e08926ede 100644 --- a/crates/ast_node/src/ast_node_macro.rs +++ b/crates/ast_node/src/ast_node_macro.rs @@ -1,6 +1,5 @@ use swc_macros_common::prelude::*; use syn::{ - self, parse::{Parse, ParseStream}, *, }; diff --git a/crates/ast_node/src/enum_deserialize.rs b/crates/ast_node/src/enum_deserialize.rs index b6294a50886f..a6ea5e61ba5d 100644 --- a/crates/ast_node/src/enum_deserialize.rs +++ b/crates/ast_node/src/enum_deserialize.rs @@ -1,6 +1,5 @@ use swc_macros_common::prelude::*; use syn::{ - self, parse::{Parse, ParseStream}, *, }; diff --git a/crates/ast_node/src/lib.rs b/crates/ast_node/src/lib.rs index 010cc70f614b..46cf23733c85 100644 --- a/crates/ast_node/src/lib.rs +++ b/crates/ast_node/src/lib.rs @@ -5,7 +5,7 @@ extern crate proc_macro; use quote::quote; use swc_macros_common::prelude::*; -use syn::{self, visit_mut::VisitMut, *}; +use syn::{visit_mut::VisitMut, *}; mod ast_node_macro; mod enum_deserialize; diff --git a/crates/string_enum/src/lib.rs b/crates/string_enum/src/lib.rs index 67dcb46163a8..121f13a52f1f 100644 --- a/crates/string_enum/src/lib.rs +++ b/crates/string_enum/src/lib.rs @@ -4,7 +4,7 @@ extern crate proc_macro; use quote::quote_spanned; use swc_macros_common::prelude::*; -use syn::{self, parse::Parse, *}; +use syn::{parse::Parse, *}; /// Creates `.as_str()` and then implements `Debug` and `Display` using it. /// diff --git a/crates/swc/examples/minify.rs b/crates/swc/examples/minify.rs index 038a930d7180..8596ab43b8dc 100644 --- a/crates/swc/examples/minify.rs +++ b/crates/swc/examples/minify.rs @@ -1,7 +1,7 @@ use std::{path::Path, sync::Arc}; use anyhow::Context; -use swc::{self, config::JsMinifyOptions, try_with_handler, BoolOrDataConfig}; +use swc::{config::JsMinifyOptions, try_with_handler, BoolOrDataConfig}; use swc_common::{SourceMap, GLOBALS}; fn main() { diff --git a/crates/swc/examples/transform.rs b/crates/swc/examples/transform.rs index 70b98044e182..07655dd536b7 100644 --- a/crates/swc/examples/transform.rs +++ b/crates/swc/examples/transform.rs @@ -1,7 +1,7 @@ use std::{path::Path, sync::Arc}; use anyhow::Context; -use swc::{self, try_with_handler}; +use swc::try_with_handler; use swc_common::{SourceMap, GLOBALS}; fn main() { diff --git a/crates/swc/examples/transform_error.rs b/crates/swc/examples/transform_error.rs index aba51622ac6d..d5e1b4217640 100644 --- a/crates/swc/examples/transform_error.rs +++ b/crates/swc/examples/transform_error.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use anyhow::Context; -use swc::{self, try_with_handler}; +use swc::try_with_handler; use swc_common::{errors::ColorConfig, FileName, SourceMap, GLOBALS}; fn main() { diff --git a/crates/swc/src/config/mod.rs b/crates/swc/src/config/mod.rs index 02cc37dee70e..3364eec44459 100644 --- a/crates/swc/src/config/mod.rs +++ b/crates/swc/src/config/mod.rs @@ -783,8 +783,9 @@ impl Options { } } -#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)] pub enum RootMode { + #[default] #[serde(rename = "root")] Root, #[serde(rename = "upward")] @@ -793,11 +794,6 @@ pub enum RootMode { UpwardOptional, } -impl Default for RootMode { - fn default() -> Self { - RootMode::Root - } -} const fn default_swcrc() -> bool { true } @@ -1179,21 +1175,16 @@ pub struct JscOutputConfig { pub preamble: String, } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, Default)] #[serde(deny_unknown_fields, rename_all = "camelCase")] pub enum OutputCharset { + #[default] #[serde(rename = "utf8")] Utf8, #[serde(rename = "ascii")] Ascii, } -impl Default for OutputCharset { - fn default() -> Self { - OutputCharset::Utf8 - } -} - /// `jsc.experimental` in `.swcrc` #[derive(Debug, Default, Clone, Serialize, Deserialize, Merge)] #[serde(deny_unknown_fields, rename_all = "camelCase")] diff --git a/crates/swc/src/lib.rs b/crates/swc/src/lib.rs index c8a108a8b1ca..880b295f8f22 100644 --- a/crates/swc/src/lib.rs +++ b/crates/swc/src/lib.rs @@ -132,7 +132,7 @@ use swc_common::{ pub use swc_compiler_base::{PrintArgs, TransformOutput}; pub use swc_config::config_types::{BoolConfig, BoolOr, BoolOrDataConfig}; use swc_ecma_ast::{EsVersion, Program}; -use swc_ecma_codegen::{self, Node}; +use swc_ecma_codegen::Node; use swc_ecma_loader::resolvers::{ lru::CachingResolver, node::NodeModulesResolver, tsc::TsConfigResolver, }; diff --git a/crates/swc/tests/fixture/issues-8xxx/8020/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8020/output/1.js index acc0c8214eaf..f460cbf43846 100644 --- a/crates/swc/tests/fixture/issues-8xxx/8020/output/1.js +++ b/crates/swc/tests/fixture/issues-8xxx/8020/output/1.js @@ -1,16 +1,14 @@ -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function baz() { return bar; } try { - var _stack = []; - var foo = _using(_stack, null); - var bar = 1; + var _usingCtx = _using_ctx(); + var foo = _usingCtx.u(null); + const bar = 1; console.log(baz()); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/fixture/issues-8xxx/8629/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8629/output/1.js index a7febe103cd6..65041b92b814 100644 --- a/crates/swc/tests/fixture/issues-8xxx/8629/output/1.js +++ b/crates/swc/tests/fixture/issues-8xxx/8629/output/1.js @@ -1,8 +1,7 @@ -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _Disposable; try { - var _stack = []; + var _usingCtx = _using_ctx(); var _computedKey; _computedKey = Symbol.dispose; class Disposable { @@ -11,12 +10,11 @@ try { } } _Disposable = Disposable; - var _disposable = _using(_stack, new Disposable()); + var _disposable = _usingCtx.u(new Disposable()); console.log('ok'); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _Disposable as Disposable }; diff --git a/crates/swc/tests/fixture/issues-8xxx/8629/output/2.js b/crates/swc/tests/fixture/issues-8xxx/8629/output/2.js index 2b4522372a39..3eb77110e5a1 100644 --- a/crates/swc/tests/fixture/issues-8xxx/8629/output/2.js +++ b/crates/swc/tests/fixture/issues-8xxx/8629/output/2.js @@ -1,16 +1,14 @@ -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _Disposable; try { - var _stack = []; + var _usingCtx = _using_ctx(); var Disposable = 1334; _Disposable = Disposable; - var _disposable = _using(_stack, new Disposable()); + var _disposable = _usingCtx.u(new Disposable()); console.log('ok'); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _Disposable as Disposable }; diff --git a/crates/swc/tests/fixture/issues-8xxx/8774/output/index.js b/crates/swc/tests/fixture/issues-8xxx/8774/output/index.js index 15e70fb63153..60bbb7e882b6 100644 --- a/crates/swc/tests/fixture/issues-8xxx/8774/output/index.js +++ b/crates/swc/tests/fixture/issues-8xxx/8774/output/index.js @@ -1,5 +1,4 @@ -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; const logClean = function() { return { [Symbol.dispose] () { @@ -12,21 +11,20 @@ const logClean = function() { }; async function foo() { try { - var _stack = []; - var a = _using(_stack, logClean()); - var b = _using(_stack, logClean(), true); + var _usingCtx = _using_ctx(); + const a = _usingCtx.u(logClean()); + const b = _usingCtx.a(logClean()); for (const a of [ logClean(), logClean() ]){ try { - var _stack1 = []; + var _usingCtx1 = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } for (const a of [ @@ -34,20 +32,18 @@ async function foo() { logClean() ]){ try { - var _stack2 = []; + var _usingCtx2 = _using_ctx(); {} } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } } } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error2, _hasError2); + await _usingCtx.d(); } } foo(); diff --git a/crates/swc/tests/projects.rs b/crates/swc/tests/projects.rs index 10e2da2da6ab..36e9d86cd9c8 100644 --- a/crates/swc/tests/projects.rs +++ b/crates/swc/tests/projects.rs @@ -21,7 +21,7 @@ use swc_common::{ BytePos, FileName, Globals, SourceMap, GLOBALS, }; use swc_compiler_base::PrintArgs; -use swc_ecma_ast::{EsVersion, *}; +use swc_ecma_ast::*; use swc_ecma_minifier::option::MangleOptions; use swc_ecma_parser::{EsConfig, Syntax, TsConfig}; use swc_ecma_transforms::{ diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).1.normal.js index 3dc88224bf72..7ced32f4f868 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).1.normal.js @@ -2,26 +2,24 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _await_async_generator } from "@swc/helpers/_/_await_async_generator"; import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function af() { return _af.apply(this, arguments); } function _af() { _af = _async_to_generator(function*() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); yield null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _dispose(_stack, _error, _hasError); + yield _usingCtx.d(); } }); return _af.apply(this, arguments); @@ -32,44 +30,42 @@ function ag() { function _ag() { _ag = _wrap_async_generator(function*() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); yield; yield _await_async_generator(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _await_async_generator(_dispose(_stack, _error, _hasError)); + yield _await_async_generator(_usingCtx.d()); } }); return _ag.apply(this, arguments); } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); - var a = function() { + }); + const a = function() { var _ref = _async_to_generator(function*() { try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _dispose(_stack, _error, _hasError); + yield _usingCtx.d(); } }); return function a() { @@ -80,276 +76,258 @@ try { am() { return _async_to_generator(function*() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); yield null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _dispose(_stack, _error, _hasError); + yield _usingCtx.d(); } })(); } ag() { return _wrap_async_generator(function*() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); yield; yield _await_async_generator(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _await_async_generator(_dispose(_stack, _error, _hasError)); + yield _await_async_generator(_usingCtx.d()); } })(); } constructor(){ this.a = /*#__PURE__*/ _async_to_generator(function*() { try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - yield _dispose(_stack, _error, _hasError); + yield _usingCtx.d(); } }); } } { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - await _dispose(_stack9, _error8, _hasError8); + await _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).2.minified.js index 45fc960e6ad6..1e23f22187e2 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2015).2.minified.js @@ -2,168 +2,167 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import "@swc/helpers/_/_await_async_generator"; import "@swc/helpers/_/_wrap_async_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0), _async_to_generator(function*() { + }), _async_to_generator(function*() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - yield _dispose(_stack, _error, _hasError); + yield _usingCtx.d(); } }); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).1.normal.js index af414257e5f3..5cb90efe0440 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).1.normal.js @@ -1,289 +1,267 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); - var a = async ()=>{ + }); + const a = async ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; class C1 { async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } constructor(){ this.a = async ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; } } { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - await _dispose(_stack9, _error8, _hasError8); + await _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).2.minified.js index f49688ce6ffd..6d3aad2315e7 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2017).2.minified.js @@ -1,155 +1,154 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).1.normal.js index cd8f6d01da90..5f28d335d27f 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).1.normal.js @@ -1,289 +1,267 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); - var a = async ()=>{ + }); + const a = async ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; class C1 { async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } constructor(){ this.a = async ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; } } { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - await _dispose(_stack9, _error8, _hasError8); + await _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).2.minified.js index 6f8a888b9f65..db8011a13132 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es2022).2.minified.js @@ -1,155 +1,154 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).1.normal.js index 1a5f1f5396b8..d00226235d98 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).1.normal.js @@ -5,14 +5,13 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function af() { return _af.apply(this, arguments); } function _af() { _af = _async_to_generator(function() { - var _stack, d3, _, _error, _hasError; + var _usingCtx, d3, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -22,8 +21,8 @@ function _af() { 3, 5 ]); - _stack = []; - d3 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d3 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -31,7 +30,7 @@ function _af() { ]; }); })(); - }), true); + })); return [ 4, null @@ -44,8 +43,7 @@ function _af() { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 5 @@ -53,7 +51,7 @@ function _af() { case 3: return [ 4, - _dispose(_stack, _error, _hasError) + _usingCtx.d() ]; case 4: _state.sent(); @@ -74,7 +72,7 @@ function ag() { } function _ag() { _ag = _wrap_async_generator(function() { - var _stack, d5, _, _error, _hasError; + var _usingCtx, d5, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -84,8 +82,8 @@ function _ag() { 4, 6 ]); - _stack = []; - d5 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d5 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -93,7 +91,7 @@ function _ag() { ]; }); })(); - }), true); + })); return [ 4 ]; @@ -111,8 +109,7 @@ function _ag() { ]; case 3: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 6 @@ -120,7 +117,7 @@ function _ag() { case 4: return [ 4, - _await_async_generator(_dispose(_stack, _error, _hasError)) + _await_async_generator(_usingCtx.d()) ]; case 5: _state.sent(); @@ -137,8 +134,8 @@ function _ag() { return _ag.apply(this, arguments); } try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -146,10 +143,10 @@ try { ]; }); })(); - }), true); + })); var a = function() { var _ref = _async_to_generator(function() { - var _stack, d6, _, _error, _hasError; + var _usingCtx, d6, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -159,8 +156,8 @@ try { 2, 4 ]); - _stack = []; - d6 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d6 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -168,15 +165,14 @@ try { ]; }); })(); - }), true); + })); return [ 3, 4 ]; case 1: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 @@ -184,7 +180,7 @@ try { case 2: return [ 4, - _dispose(_stack, _error, _hasError) + _usingCtx.d() ]; case 3: _state.sent(); @@ -207,7 +203,7 @@ try { function C1() { _class_call_check(this, C1); this.a = /*#__PURE__*/ _async_to_generator(function() { - var _stack, d7, _, _error, _hasError; + var _usingCtx, d7, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -217,8 +213,8 @@ try { 2, 4 ]); - _stack = []; - d7 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d7 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -226,15 +222,14 @@ try { ]; }); })(); - }), true); + })); return [ 3, 4 ]; case 1: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 @@ -242,7 +237,7 @@ try { case 2: return [ 4, - _dispose(_stack, _error, _hasError) + _usingCtx.d() ]; case 3: _state.sent(); @@ -260,7 +255,7 @@ try { var _proto = C1.prototype; _proto.am = function am() { return _async_to_generator(function() { - var _stack, d13, _, _error, _hasError; + var _usingCtx, d13, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -270,8 +265,8 @@ try { 3, 5 ]); - _stack = []; - d13 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d13 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -279,7 +274,7 @@ try { ]; }); })(); - }), true); + })); return [ 4, null @@ -292,8 +287,7 @@ try { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 5 @@ -301,7 +295,7 @@ try { case 3: return [ 4, - _dispose(_stack, _error, _hasError) + _usingCtx.d() ]; case 4: _state.sent(); @@ -318,7 +312,7 @@ try { }; _proto.ag = function ag() { return _wrap_async_generator(function() { - var _stack, d15, _, _error, _hasError; + var _usingCtx, d15, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -328,8 +322,8 @@ try { 4, 6 ]); - _stack = []; - d15 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + _usingCtx = _using_ctx(); + d15 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -337,7 +331,7 @@ try { ]; }); })(); - }), true); + })); return [ 4 ]; @@ -355,8 +349,7 @@ try { ]; case 3: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 6 @@ -364,7 +357,7 @@ try { case 4: return [ 4, - _await_async_generator(_dispose(_stack, _error, _hasError)) + _await_async_generator(_usingCtx.d()) ]; case 5: _state.sent(); @@ -383,8 +376,8 @@ try { }(); { try { - var _stack1 = []; - var d19 = _using(_stack1, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx1 = _using_ctx(); + var d19 = _usingCtx1.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -392,19 +385,18 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx2 = _using_ctx(); + var d20 = _usingCtx2.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -412,18 +404,17 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx3 = _using_ctx(); + var d21 = _usingCtx3.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -431,20 +422,19 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx4 = _using_ctx(); + var d22 = _usingCtx4.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -452,19 +442,18 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx5 = _using_ctx(); + var d23 = _usingCtx5.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -472,17 +461,16 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx6 = _using_ctx(); + var d24 = _usingCtx6.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -490,17 +478,16 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx7 = _using_ctx(); + var d25 = _usingCtx7.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -508,18 +495,17 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx8 = _using_ctx(); + var d26 = _usingCtx8.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -527,17 +513,16 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx9 = _using_ctx(); + var d27 = _usingCtx9.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -545,18 +530,17 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - await _dispose(_stack9, _error8, _hasError8); + await _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx10 = _using_ctx(); + var d28 = _usingCtx10.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -564,19 +548,18 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx11 = _using_ctx(); + var d29 = _usingCtx11.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -584,19 +567,18 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } }while (true); for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx12 = _using_ctx(); + var d30 = _usingCtx12.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -604,19 +586,18 @@ try { ]; }); })(); - }), true); + })); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } } for(var x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx13 = _using_ctx(); + var d31 = _usingCtx13.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -624,19 +605,18 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } } for(var _i = 0, _iter = []; _i < _iter.length; _i++){ var x1 = _iter[_i]; try { - var _stack14 = []; - var d32 = _using(_stack14, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx14 = _using_ctx(); + var d32 = _usingCtx14.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -644,18 +624,16 @@ try { ]; }); })(); - }), true); + })); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).2.minified.js index a33555a6c280..f7e7ed4ef76b 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=es5).2.minified.js @@ -5,11 +5,10 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -17,8 +16,8 @@ try { ]; }); })(); - }), !0), _async_to_generator(function() { - var _stack, _error, _hasError; + })), _async_to_generator(function() { + var _usingCtx, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -27,7 +26,7 @@ try { 1, 2, 4 - ]), _stack = [], _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + ]), (_usingCtx = _using_ctx()).a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -35,19 +34,19 @@ try { ]; }); })(); - }), !0), [ + })), [ 3, 4 ]; case 1: - return _error = _state.sent(), _hasError = !0, [ + return _ = _state.sent(), _usingCtx.e = _, [ 3, 4 ]; case 2: return [ 4, - _dispose(_stack, _error, _hasError) + _usingCtx.d() ]; case 3: return _state.sent(), [ @@ -61,8 +60,8 @@ try { }); }); try { - var _stack1 = []; - _using(_stack1, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx1 = _using_ctx(); + _usingCtx1.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -70,17 +69,17 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx2 = _using_ctx(); + _usingCtx2.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -88,17 +87,17 @@ try { ]; }); })(); - }), !0); + })); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx3 = _using_ctx(); + _usingCtx3.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -106,16 +105,16 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx4 = _using_ctx(); + _usingCtx4.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -123,16 +122,16 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx5 = _using_ctx(); + _usingCtx5.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -140,16 +139,16 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx6 = _using_ctx(); + _usingCtx6.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -157,16 +156,16 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx7 = _using_ctx(); + _usingCtx7.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -174,16 +173,16 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx8 = _using_ctx(); + _usingCtx8.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -191,15 +190,15 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx10 = _using_ctx(); + _usingCtx10.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -207,16 +206,16 @@ try { ]; }); })(); - }), !0); + })); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx11 = _using_ctx(); + _usingCtx11.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -224,16 +223,16 @@ try { ]; }); })(); - }), !0); + })); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx12 = _using_ctx(); + _usingCtx12.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -241,16 +240,16 @@ try { ]; }); })(); - }), !0); + })); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } for(var x in {})try { - var _stack13 = []; - _using(_stack13, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx13 = _using_ctx(); + _usingCtx13.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -258,17 +257,17 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } for(var _i = 0, _iter = []; _i < _iter.length; _i++){ _iter[_i]; try { - var _stack14 = []; - _using(_stack14, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx14 = _using_ctx(); + _usingCtx14.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -276,15 +275,15 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).1.normal.js index cd8f6d01da90..5f28d335d27f 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).1.normal.js @@ -1,289 +1,267 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); - var a = async ()=>{ + }); + const a = async ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; class C1 { async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } constructor(){ this.a = async ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }; } } { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - await _dispose(_stack9, _error8, _hasError8); + await _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, true); + }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).2.minified.js index 6f8a888b9f65..db8011a13132 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.1(target=esnext).2.minified.js @@ -1,155 +1,154 @@ //// [awaitUsingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - await _dispose(_stack1, _error, _hasError); + await _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - await _dispose(_stack2, _error1, _hasError1); + await _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - await _dispose(_stack3, _error2, _hasError2); + await _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - await _dispose(_stack4, _error3, _hasError3); + await _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - await _dispose(_stack5, _error4, _hasError4); + await _usingCtx5.d(); } } catch { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - await _dispose(_stack6, _error5, _hasError5); + await _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - await _dispose(_stack7, _error6, _hasError6); + await _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - await _dispose(_stack8, _error7, _hasError7); + await _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - await _dispose(_stack10, _error9, _hasError9); + await _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - await _dispose(_stack11, _error10, _hasError10); + await _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - await _dispose(_stack12, _error11, _hasError11); + await _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - await _dispose(_stack13, _error12, _hasError12); + await _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - await _dispose(_stack14, _error13, _hasError13); + await _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error14, _hasError14); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.1.normal.js index 272cb18dc26a..015814bfd05a 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.1.normal.js @@ -1,14 +1,12 @@ //// [awaitUsingDeclarations.12.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function f() { try { - var _stack = []; - var x = _using(_stack, {}, true); + var _usingCtx = _using_ctx(); + const x = _usingCtx.a({}); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.2.minified.js index b698e0821207..aab4b1d8155a 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.12.2.minified.js @@ -1,3 +1,2 @@ //// [awaitUsingDeclarations.12.ts] -import "@swc/helpers/_/_dispose"; -import "@swc/helpers/_/_using"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.1.normal.js index 773c5578135c..8c3319033d6b 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.1.normal.js @@ -1,23 +1,20 @@ //// [awaitUsingDeclarations.13.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var x = _using(_stack, null, true); + var _usingCtx = _using_ctx(); + const x = _usingCtx.a(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } try { - var _stack = []; - var x = _using(_stack, null, true); + var _usingCtx = _using_ctx(); + var x = _usingCtx.a(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.2.minified.js index ba5ef2f091ba..5ae54041146f 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.13.2.minified.js @@ -1,11 +1,10 @@ //// [awaitUsingDeclarations.13.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null, !0); + var _usingCtx = _using_ctx(); + _usingCtx.a(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.1.normal.js index 48032a164b13..9790c4791081 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.1.normal.js @@ -1,16 +1,14 @@ //// [awaitUsingDeclarations.15.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function f() { try { - var _stack = []; - var _ = _using(_stack, { + var _usingCtx = _using_ctx(); + const _ = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.2.minified.js index bed7bbabcb62..9ef0acd65b91 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.15.2.minified.js @@ -1,3 +1,2 @@ //// [awaitUsingDeclarations.15.ts] -import "@swc/helpers/_/_dispose"; -import "@swc/helpers/_/_using"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).1.normal.js index ccb97f23c47e..7990b6670007 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).1.normal.js @@ -1,23 +1,21 @@ //// [awaitUsingDeclarations.2.ts] import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true), d2 = _using(_stack, { + }), d2 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).2.minified.js index 3d891f39d23f..c1b77cca3149 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2015).2.minified.js @@ -1,16 +1,15 @@ //// [awaitUsingDeclarations.2.ts] import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0), _using(_stack, { + }), _usingCtx.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).1.normal.js index 86ec3758f7b0..5e64ce262f0e 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, { + }), d2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).2.minified.js index fa24b4a3680c..b0930ba472dd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2017).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, { + }), _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).1.normal.js index 86ec3758f7b0..5e64ce262f0e 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, { + }), d2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).2.minified.js index fa24b4a3680c..b0930ba472dd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es2022).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, { + }), _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).1.normal.js index 6d39c6117086..0717b41aba09 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).1.normal.js @@ -2,12 +2,11 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -15,7 +14,7 @@ import { _ as _using } from "@swc/helpers/_/_using"; ]; }); })(); - }), true), d2 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + })), d2 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -23,11 +22,10 @@ import { _ as _using } from "@swc/helpers/_/_using"; ]; }); })(); - }), true); + })); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).2.minified.js index a5f78986bb83..589b225128b5 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=es5).2.minified.js @@ -2,11 +2,10 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -14,7 +13,7 @@ try { ]; }); })(); - }), !0), _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + })), _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -22,9 +21,9 @@ try { ]; }); })(); - }), !0); + })); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).1.normal.js index 86ec3758f7b0..5e64ce262f0e 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, { + }), d2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).2.minified.js index fa24b4a3680c..b0930ba472dd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.2(target=esnext).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, { + }), _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).1.normal.js index b5167500ddca..46421b5f06bd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).1.normal.js @@ -1,21 +1,19 @@ //// [awaitUsingDeclarations.3.ts] import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ [Symbol.asyncDispose] () { return _async_to_generator(function*() {})(); } - }, true), d2 = _using(_stack, null, true), d3 = _using(_stack, undefined, true), d4 = _using(_stack, { + }), d2 = _usingCtx.a(null), d3 = _usingCtx.a(undefined), d4 = _usingCtx.a({ [Symbol.dispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).2.minified.js index 54752889b084..5122c7b8bfe5 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2015).2.minified.js @@ -1,16 +1,15 @@ //// [awaitUsingDeclarations.3.ts] import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ [Symbol.asyncDispose]: ()=>_async_to_generator(function*() {})() - }, !0), _using(_stack, null, !0), _using(_stack, void 0, !0), _using(_stack, { + }), _usingCtx.a(null), _usingCtx.a(void 0), _usingCtx.a({ [Symbol.dispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).1.normal.js index 59a2e4d396e4..645f4b1c1805 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, null, true), d3 = _using(_stack, undefined, true), d4 = _using(_stack, { + }), d2 = _usingCtx.a(null), d3 = _usingCtx.a(undefined), d4 = _usingCtx.a({ [Symbol.dispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).2.minified.js index 69929682e705..f2f521bcbbcd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2017).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, null, !0), _using(_stack, void 0, !0), _using(_stack, { + }), _usingCtx.a(null), _usingCtx.a(void 0), _usingCtx.a({ [Symbol.dispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).1.normal.js index 59a2e4d396e4..645f4b1c1805 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, null, true), d3 = _using(_stack, undefined, true), d4 = _using(_stack, { + }), d2 = _usingCtx.a(null), d3 = _usingCtx.a(undefined), d4 = _usingCtx.a({ [Symbol.dispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).2.minified.js index 69929682e705..f2f521bcbbcd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es2022).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, null, !0), _using(_stack, void 0, !0), _using(_stack, { + }), _usingCtx.a(null), _usingCtx.a(void 0), _usingCtx.a({ [Symbol.dispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).1.normal.js index 52cbc23abc63..09db876595f8 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).1.normal.js @@ -2,12 +2,11 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -15,11 +14,10 @@ import { _ as _using } from "@swc/helpers/_/_using"; ]; }); })(); - }), true), d2 = _using(_stack, null, true), d3 = _using(_stack, undefined, true), d4 = _using(_stack, _define_property({}, Symbol.dispose, function() {}), true); + })), d2 = _usingCtx.a(null), d3 = _usingCtx.a(undefined), d4 = _usingCtx.a(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).2.minified.js index e173ffda09ab..550f4e0d8ef7 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=es5).2.minified.js @@ -2,11 +2,10 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.asyncDispose, function() { + var _usingCtx = _using_ctx(); + _usingCtx.a(_define_property({}, Symbol.asyncDispose, function() { return _async_to_generator(function() { return _ts_generator(this, function(_state) { return [ @@ -14,9 +13,9 @@ try { ]; }); })(); - }), !0), _using(_stack, null, !0), _using(_stack, void 0, !0), _using(_stack, _define_property({}, Symbol.dispose, function() {}), !0); + })), _usingCtx.a(null), _usingCtx.a(void 0), _usingCtx.a(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).1.normal.js index 59a2e4d396e4..645f4b1c1805 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).1.normal.js @@ -1,18 +1,16 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true), d2 = _using(_stack, null, true), d3 = _using(_stack, undefined, true), d4 = _using(_stack, { + }), d2 = _usingCtx.a(null), d3 = _usingCtx.a(undefined), d4 = _usingCtx.a({ [Symbol.dispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).2.minified.js index 69929682e705..f2f521bcbbcd 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.3(target=esnext).2.minified.js @@ -1,15 +1,14 @@ //// [awaitUsingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), _using(_stack, null, !0), _using(_stack, void 0, !0), _using(_stack, { + }), _usingCtx.a(null), _usingCtx.a(void 0), _usingCtx.a({ [Symbol.dispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.1.normal.js index 90f21603db42..e3f89b0810d8 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.1.normal.js @@ -1,14 +1,12 @@ //// [awaitUsingDeclarations.9.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var a = _using(_stack, null, true); + var _usingCtx = _using_ctx(); + const a = _usingCtx.a(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.2.minified.js index fdd35d1514b2..10b581c62b46 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarations.9.2.minified.js @@ -1,11 +1,10 @@ //// [awaitUsingDeclarations.9.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null, !0); + var _usingCtx = _using_ctx(); + _usingCtx.a(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).1.normal.js index 1566d75ea6f5..0f7daf3af093 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).1.normal.js @@ -1,7 +1,7 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] import { _ as _async_iterator } from "@swc/helpers/_/_async_iterator"; import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } @@ -25,13 +25,12 @@ function _main() { let _value = _step.value; const d1 = _value; try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } catch (err) { diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).2.minified.js index aecf0b6155f3..7d7e834be922 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2015).2.minified.js @@ -1,4 +1,4 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] import "@swc/helpers/_/_async_iterator"; import "@swc/helpers/_/_async_to_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).1.normal.js index 34268ec9e78b..51c6a9728631 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).2.minified.js index 0c372bedeea7..35eb661ced31 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2017).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).1.normal.js index 34268ec9e78b..51c6a9728631 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).2.minified.js index 0c372bedeea7..35eb661ced31 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es2022).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).1.normal.js index 9f4cd0d7b43a..39d65ce5006c 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).1.normal.js @@ -3,13 +3,13 @@ import { _ as _async_iterator } from "@swc/helpers/_/_async_iterator"; import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } function _main() { _main = _async_to_generator(function() { - var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, d1, _stack, _error, _hasError, err; + var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, d1, _usingCtx, err; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -50,13 +50,12 @@ function _main() { _value = _step.value; d1 = _value; try { - _stack = []; + _usingCtx = _using_ctx(); {} } catch (_) { - _error = _; - _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } _state.label = 4; case 4: diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).2.minified.js index 3bf70bce4f95..19e2c806ac5c 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=es5).2.minified.js @@ -3,4 +3,4 @@ import "@swc/helpers/_/_async_iterator"; import "@swc/helpers/_/_async_to_generator"; import "@swc/helpers/_/_define_property"; import "@swc/helpers/_/_ts_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).1.normal.js index 34268ec9e78b..51c6a9728631 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).2.minified.js index 0c372bedeea7..35eb661ced31 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForAwaitOf(target=esnext).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).1.normal.js index 6f241e475a63..2c971032ffdc 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).1.normal.js @@ -1,6 +1,6 @@ //// [awaitUsingDeclarationsInForOf.1.ts] import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } @@ -19,13 +19,12 @@ function _main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }); diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).2.minified.js index e56fa25f934b..d7eb364e989b 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2015).2.minified.js @@ -1,3 +1,3 @@ //// [awaitUsingDeclarationsInForOf.1.ts] import "@swc/helpers/_/_async_to_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).1.normal.js index a9415bf9b803..b539d27f7acb 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).2.minified.js index 627c0b7e321e..7cfe7407750d 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2017).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).1.normal.js index a9415bf9b803..b539d27f7acb 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).2.minified.js index 627c0b7e321e..7cfe7407750d 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es2022).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).1.normal.js index f23474fd18fd..a38b9bb9ee34 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).1.normal.js @@ -2,13 +2,13 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } function _main() { _main = _async_to_generator(function() { - var _i, _iter, d1, _stack, _error, _hasError; + var _i, _iter, d1, _usingCtx; return _ts_generator(this, function(_state) { for(_i = 0, _iter = [ _define_property({}, Symbol.asyncDispose, function() { @@ -26,13 +26,12 @@ function _main() { ]; _i < _iter.length; _i++){ d1 = _iter[_i]; try { - _stack = []; + _usingCtx = _using_ctx(); {} } catch (_) { - _error = _; - _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } return [ diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).2.minified.js index abedd580b287..8057e88dc703 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=es5).2.minified.js @@ -2,4 +2,4 @@ import "@swc/helpers/_/_async_to_generator"; import "@swc/helpers/_/_define_property"; import "@swc/helpers/_/_ts_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).1.normal.js index a9415bf9b803..b539d27f7acb 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).1.normal.js @@ -1,5 +1,5 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for (const d1 of [ { @@ -12,13 +12,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).2.minified.js index 627c0b7e321e..7cfe7407750d 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsInForOf.1(target=esnext).2.minified.js @@ -1,2 +1,2 @@ //// [awaitUsingDeclarationsInForOf.1.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js index a2c01fb7f763..4bd21fdc4282 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js @@ -1,27 +1,25 @@ //// [awaitUsingDeclarationsTopLevelOfModule.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _x; export { y }; var _w; export { _default as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); const x = 1; _x = x; - var z = _using(_stack, { + var z = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); - var y = 2; + }); + const y = 2; const w = 3; _w = w; var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } export { _x as x }; export { _w as w }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js index 458a880a042d..902428c27f5a 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js @@ -1,18 +1,17 @@ //// [awaitUsingDeclarationsTopLevelOfModule.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _x, _w, _stack = []; + var _x, _w, _usingCtx = _using_ctx(); _x = 1; - var z = _using(_stack, { + var z = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0), y = 2; + }); _w = 3; var _default = 4; - console.log(3, 1, y, z); + console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } export { y, _default as default, _x as x, _w as w }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).1.normal.js index 59cebf112d56..c1d33bdda846 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).1.normal.js @@ -1,41 +1,36 @@ //// [awaitUsingDeclarationsTopLevelOfModule.1.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _dispose, _using, _x, _w; + var _using_ctx, _x, _w; _export({ x: void 0, w: void 0 }); return { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: async function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); const x = 1; _export("x", _x = x); - var z = _using(_stack, { + var z = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); - var y = 2; + }); + const y = 2; const w = 3; _export("w", _w = w); var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).2.minified.js index 4630f1887b8e..288b89f0e665 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsTopLevelOfModule.1(module=system).2.minified.js @@ -1,33 +1,29 @@ //// [awaitUsingDeclarationsTopLevelOfModule.1.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _dispose, _using; + var _using_ctx; return _export({ x: void 0, w: void 0 }), { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: async function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); _export("x", 1); - var z = _using(_stack, { + var z = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); _export("w", 3), console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.1.normal.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.1.normal.js index 0622ebb5b8c5..9c252bc04e02 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.1.normal.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.1.normal.js @@ -1,15 +1,13 @@ //// [awaitUsingDeclarationsWithImportHelpers.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function f() { try { - var _stack = []; - var a = _using(_stack, null, true); + var _usingCtx = _using_ctx(); + const a = _usingCtx.a(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } } export { }; diff --git a/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.2.minified.js b/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.2.minified.js index d244a186e469..371b6dabb67b 100644 --- a/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.2.minified.js +++ b/crates/swc/tests/tsc-references/awaitUsingDeclarationsWithImportHelpers.2.minified.js @@ -1,3 +1,2 @@ //// [awaitUsingDeclarationsWithImportHelpers.ts] -import "@swc/helpers/_/_dispose"; -import "@swc/helpers/_/_using"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).1.normal.js index b56cbe5caee2..e62ebe0f866e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).1.normal.js @@ -2,19 +2,17 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _await_async_generator } from "@swc/helpers/_/_await_async_generator"; import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var d2 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function af() { @@ -23,32 +21,30 @@ function af() { function _af() { _af = _async_to_generator(function*() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.u({ [Symbol.dispose] () {} }); yield null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }); return _af.apply(this, arguments); } function* g() { try { - var _stack = []; - var d4 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d4 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function ag() { @@ -57,404 +53,375 @@ function ag() { function _ag() { _ag = _wrap_async_generator(function*() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; yield _await_async_generator(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }); return _ag.apply(this, arguments); } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var a = ()=>{ + const a = ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; class C1 { m() { try { - var _stack = []; - var d10 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d10 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - var d11 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d11 = _usingCtx.u({ [Symbol.dispose] () {} }); return 0; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - var d12 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d12 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } am() { return _async_to_generator(function*() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.u({ [Symbol.dispose] () {} }); yield null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(); } *g() { try { - var _stack = []; - var d14 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d14 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } ag() { return _wrap_async_generator(function*() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; yield _await_async_generator(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(); } constructor(){ this.a = ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - var d8 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d8 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } (()=>{ try { - var _stack = []; - var d9 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d9 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(); class C2 extends C1 { constructor(){ try { - var _stack = []; - var d16 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d16 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C3 extends C1 { constructor(){ try { - var _stack = []; - var d17 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d17 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } var N; (function(N) { try { - var _stack = []; - var d18 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d18 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(N || (N = {})); { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - _dispose(_stack9, _error8, _hasError8); + _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).2.minified.js index 941ef6b48e01..0935feef1992 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2015).2.minified.js @@ -2,179 +2,178 @@ import "@swc/helpers/_/_async_to_generator"; import "@swc/helpers/_/_await_async_generator"; import "@swc/helpers/_/_wrap_async_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var N, _stack = []; - _using(_stack, { + var N, _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), (()=>{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(), function(N) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(N || (N = {})); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).1.normal.js index 56ce4e65991c..35dcd9bcd498 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).1.normal.js @@ -1,441 +1,408 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var d2 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function* g() { try { - var _stack = []; - var d4 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d4 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var a = ()=>{ + const a = ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; class C1 { m() { try { - var _stack = []; - var d10 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d10 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - var d11 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d11 = _usingCtx.u({ [Symbol.dispose] () {} }); return 0; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - var d12 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d12 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } *g() { try { - var _stack = []; - var d14 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d14 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } constructor(){ this.a = ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - var d8 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d8 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } (()=>{ try { - var _stack = []; - var d9 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d9 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(); class C2 extends C1 { constructor(){ try { - var _stack = []; - var d16 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d16 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C3 extends C1 { constructor(){ try { - var _stack = []; - var d17 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d17 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } var N; (function(N) { try { - var _stack = []; - var d18 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d18 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(N || (N = {})); { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - _dispose(_stack9, _error8, _hasError8); + _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).2.minified.js index cad15ef939ec..1a1a2e70b216 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2017).2.minified.js @@ -1,177 +1,176 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var N, _stack = []; - _using(_stack, { + var N, _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), (()=>{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(), function(N) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(N || (N = {})); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).1.normal.js index 37785332587a..02cff72474a0 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).1.normal.js @@ -1,441 +1,408 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var d2 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function* g() { try { - var _stack = []; - var d4 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d4 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var a = ()=>{ + const a = ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; class C1 { constructor(){ this.a = ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - var d8 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d8 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } static{ try { - var _stack = []; - var d9 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d9 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } m() { try { - var _stack = []; - var d10 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d10 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - var d11 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d11 = _usingCtx.u({ [Symbol.dispose] () {} }); return 0; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - var d12 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d12 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } *g() { try { - var _stack = []; - var d14 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d14 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C2 extends C1 { constructor(){ try { - var _stack = []; - var d16 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d16 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C3 extends C1 { constructor(){ try { - var _stack = []; - var d17 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d17 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } var N; (function(N) { try { - var _stack = []; - var d18 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d18 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(N || (N = {})); { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - _dispose(_stack9, _error8, _hasError8); + _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).2.minified.js index 5d654f5f2e97..c757c3f676a5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es2022).2.minified.js @@ -1,277 +1,276 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var N, _stack = []; - _using(_stack, { + var N, _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); class C1 { constructor(){ this.a = ()=>{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } static{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } m() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - return _using(_stack, { + var _usingCtx = _using_ctx(); + return _usingCtx.u({ [Symbol.dispose] () {} }), 0; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async am() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), await null; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } *g() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), yield; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async *ag() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), yield, await null; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } !function(N) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(N || (N = {})); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).1.normal.js index 1bdbb10ca3b9..bfd9eb040547 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).1.normal.js @@ -9,17 +9,15 @@ import { _ as _possible_constructor_return } from "@swc/helpers/_/_possible_cons import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; import { _ as _create_super } from "@swc/helpers/_/_create_super"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var d2 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d2 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function af() { @@ -27,7 +25,7 @@ function af() { } function _af() { _af = _async_to_generator(function() { - var _stack, d3, _, _error, _hasError; + var _usingCtx, d3, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -37,8 +35,8 @@ function _af() { 3, 4 ]); - _stack = []; - d3 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d3 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4, null @@ -51,14 +49,13 @@ function _af() { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 ]; case 3: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -72,7 +69,7 @@ function _af() { return _af.apply(this, arguments); } function g() { - var _stack, d4, _, _error, _hasError; + var _usingCtx, d4, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -82,8 +79,8 @@ function g() { 3, 4 ]); - _stack = []; - d4 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d4 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4 ]; @@ -95,14 +92,13 @@ function g() { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 ]; case 3: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -118,7 +114,7 @@ function ag() { } function _ag() { _ag = _wrap_async_generator(function() { - var _stack, d5, _, _error, _hasError; + var _usingCtx, d5, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -128,8 +124,8 @@ function _ag() { 4, 5 ]); - _stack = []; - d5 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d5 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4 ]; @@ -147,14 +143,13 @@ function _ag() { ]; case 3: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 5 ]; case 4: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -168,17 +163,16 @@ function _ag() { return _ag.apply(this, arguments); } try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); var a = function() { try { - var _stack = []; - var d6 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d6 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; var C1 = /*#__PURE__*/ function() { @@ -187,40 +181,37 @@ try { _class_call_check(this, C1); this.a = function() { try { - var _stack = []; - var d7 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d7 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - var d8 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d8 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } var _proto = C1.prototype; _proto.m = function m() { try { - var _stack = []; - var d10 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d10 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; _proto.am = function am() { return _async_to_generator(function() { - var _stack, d13, _, _error, _hasError; + var _usingCtx, d13, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -230,8 +221,8 @@ try { 3, 4 ]); - _stack = []; - d13 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d13 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4, null @@ -244,14 +235,13 @@ try { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 ]; case 3: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -264,7 +254,7 @@ try { })(); }; _proto.g = function g() { - var _stack, d14, _, _error, _hasError; + var _usingCtx, d14, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -274,8 +264,8 @@ try { 3, 4 ]); - _stack = []; - d14 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d14 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4 ]; @@ -287,14 +277,13 @@ try { ]; case 2: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 4 ]; case 3: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -307,7 +296,7 @@ try { }; _proto.ag = function ag() { return _wrap_async_generator(function() { - var _stack, d15, _, _error, _hasError; + var _usingCtx, d15, _; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -317,8 +306,8 @@ try { 4, 5 ]); - _stack = []; - d15 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + _usingCtx = _using_ctx(); + d15 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return [ 4 ]; @@ -336,14 +325,13 @@ try { ]; case 3: _ = _state.sent(); - _error = _; - _hasError = true; + _usingCtx.e = _; return [ 3, 5 ]; case 4: - _dispose(_stack, _error, _hasError); + _usingCtx.d(); return [ 7 ]; @@ -360,25 +348,23 @@ try { key: "x", get: function get() { try { - var _stack = []; - var d11 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d11 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); return 0; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }, set: function set(v) { try { - var _stack = []; - var d12 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d12 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } @@ -387,13 +373,12 @@ try { }(); (function() { try { - var _stack = []; - var d9 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d9 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(); var C2 = /*#__PURE__*/ function(C1) { @@ -404,14 +389,13 @@ try { _class_call_check(this, C2); var _this; try { - var _stack = []; - var d16 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d16 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); _this = _super.call(this); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -425,15 +409,14 @@ try { _class_call_check(this, C3); var _this; try { - var _stack = []; - var d17 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d17 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); _this = _super.call(this); _this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -442,178 +425,162 @@ try { var N; (function(N) { try { - var _stack = []; - var d18 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d18 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(N || (N = {})); { try { - var _stack1 = []; - var d19 = _using(_stack1, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx1 = _using_ctx(); + var d19 = _usingCtx1.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx2 = _using_ctx(); + var d20 = _usingCtx2.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx3 = _using_ctx(); + var d21 = _usingCtx3.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx4 = _using_ctx(); + var d22 = _usingCtx4.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx5 = _using_ctx(); + var d23 = _usingCtx5.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - var d24 = _using(_stack6, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx6 = _using_ctx(); + var d24 = _usingCtx6.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx7 = _using_ctx(); + var d25 = _usingCtx7.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx8 = _using_ctx(); + var d26 = _usingCtx8.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx9 = _using_ctx(); + var d27 = _usingCtx9.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - _dispose(_stack9, _error8, _hasError8); + _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx10 = _using_ctx(); + var d28 = _usingCtx10.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx11 = _using_ctx(); + var d29 = _usingCtx11.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } }while (true); for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx12 = _using_ctx(); + var d30 = _usingCtx12.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } } for(var x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx13 = _using_ctx(); + var d31 = _usingCtx13.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } } for(var _i = 0, _iter = []; _i < _iter.length; _i++){ var x1 = _iter[_i]; try { - var _stack14 = []; - var d32 = _using(_stack14, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx14 = _using_ctx(); + var d32 = _usingCtx14.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).2.minified.js index 04a146832079..445a366d3e2c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=es5).2.minified.js @@ -9,150 +9,149 @@ import { _ as _possible_constructor_return } from "@swc/helpers/_/_possible_cons import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator"; import { _ as _create_super } from "@swc/helpers/_/_create_super"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var N, _stack = []; - _using(_stack, _define_property({}, Symbol.dispose, function() {})), function() { + var N, _usingCtx = _using_ctx(); + _usingCtx.u(_define_property({}, Symbol.dispose, function() {})), function() { try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(), function(N) { try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(N || (N = {})); try { - var _stack1 = []; - _using(_stack1, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx1 = _using_ctx(); + _usingCtx1.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx2 = _using_ctx(); + _usingCtx2.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx3 = _using_ctx(); + _usingCtx3.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx4 = _using_ctx(); + _usingCtx4.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx5 = _using_ctx(); + _usingCtx5.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch (e) { try { - var _stack6 = []; - _using(_stack6, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx6 = _using_ctx(); + _usingCtx6.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx7 = _using_ctx(); + _usingCtx7.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx8 = _using_ctx(); + _usingCtx8.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx10 = _using_ctx(); + _usingCtx10.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx11 = _using_ctx(); + _usingCtx11.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx12 = _using_ctx(); + _usingCtx12.u(_define_property({}, Symbol.dispose, function() {})); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } for(var x in {})try { - var _stack13 = []; - _using(_stack13, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx13 = _using_ctx(); + _usingCtx13.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } for(var _i = 0, _iter = []; _i < _iter.length; _i++){ _iter[_i]; try { - var _stack14 = []; - _using(_stack14, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx14 = _using_ctx(); + _usingCtx14.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).1.normal.js index 37785332587a..02cff72474a0 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).1.normal.js @@ -1,441 +1,408 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function f() { try { - var _stack = []; - var d2 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function af() { try { - var _stack = []; - var d3 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d3 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } function* g() { try { - var _stack = []; - var d4 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d4 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async function* ag() { try { - var _stack = []; - var d5 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d5 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var a = ()=>{ + const a = ()=>{ try { - var _stack = []; - var d6 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d6 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; class C1 { constructor(){ this.a = ()=>{ try { - var _stack = []; - var d7 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d7 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - var d8 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d8 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } static{ try { - var _stack = []; - var d9 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d9 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } m() { try { - var _stack = []; - var d10 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d10 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - var d11 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d11 = _usingCtx.u({ [Symbol.dispose] () {} }); return 0; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - var d12 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d12 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async am() { try { - var _stack = []; - var d13 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d13 = _usingCtx.u({ [Symbol.dispose] () {} }); await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } *g() { try { - var _stack = []; - var d14 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d14 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async *ag() { try { - var _stack = []; - var d15 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d15 = _usingCtx.u({ [Symbol.dispose] () {} }); yield; await null; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C2 extends C1 { constructor(){ try { - var _stack = []; - var d16 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d16 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } class C3 extends C1 { constructor(){ try { - var _stack = []; - var d17 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d17 = _usingCtx.u({ [Symbol.dispose] () {} }); super(); this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } var N; (function(N) { try { - var _stack = []; - var d18 = _using(_stack, { + var _usingCtx = _using_ctx(); + var d18 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } })(N || (N = {})); { try { - var _stack1 = []; - var d19 = _using(_stack1, { + var _usingCtx1 = _using_ctx(); + const d19 = _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } } switch(Math.random()){ case 0: try { - var _stack2 = []; - var d20 = _using(_stack2, { + var _usingCtx2 = _using_ctx(); + const d20 = _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _; - var _hasError1 = true; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - var d21 = _using(_stack3, { + var _usingCtx3 = _using_ctx(); + const d21 = _usingCtx3.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error2 = _; - var _hasError2 = true; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } if (true) switch(0){ case 0: try { - var _stack4 = []; - var d22 = _using(_stack4, { + var _usingCtx4 = _using_ctx(); + const d22 = _usingCtx4.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error3 = _; - var _hasError3 = true; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } } try { try { - var _stack5 = []; - var d23 = _using(_stack5, { + var _usingCtx5 = _using_ctx(); + const d23 = _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _; - var _hasError4 = true; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch { try { - var _stack6 = []; - var d24 = _using(_stack6, { + var _usingCtx6 = _using_ctx(); + const d24 = _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _; - var _hasError5 = true; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - var d25 = _using(_stack7, { + var _usingCtx7 = _using_ctx(); + const d25 = _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _; - var _hasError6 = true; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } if (true) { try { - var _stack8 = []; - var d26 = _using(_stack8, { + var _usingCtx8 = _using_ctx(); + const d26 = _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _; - var _hasError7 = true; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } } else { try { - var _stack9 = []; - var d27 = _using(_stack9, { + var _usingCtx9 = _using_ctx(); + const d27 = _usingCtx9.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error8 = _; - var _hasError8 = true; + _usingCtx9.e = _; } finally{ - _dispose(_stack9, _error8, _hasError8); + _usingCtx9.d(); } } while(true){ try { - var _stack10 = []; - var d28 = _using(_stack10, { + var _usingCtx10 = _using_ctx(); + const d28 = _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _; - var _hasError9 = true; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } } do { try { - var _stack11 = []; - var d29 = _using(_stack11, { + var _usingCtx11 = _using_ctx(); + const d29 = _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _; - var _hasError10 = true; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } }while (true) for(;;){ try { - var _stack12 = []; - var d30 = _using(_stack12, { + var _usingCtx12 = _using_ctx(); + const d30 = _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _; - var _hasError11 = true; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } } for(const x in {}){ try { - var _stack13 = []; - var d31 = _using(_stack13, { + var _usingCtx13 = _using_ctx(); + const d31 = _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _; - var _hasError12 = true; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } } for (const x of []){ try { - var _stack14 = []; - var d32 = _using(_stack14, { + var _usingCtx14 = _using_ctx(); + const d32 = _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _; - var _hasError13 = true; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } } catch (_) { - var _error14 = _; - var _hasError14 = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).2.minified.js index 5d654f5f2e97..c757c3f676a5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.1(target=esnext).2.minified.js @@ -1,277 +1,276 @@ //// [usingDeclarations.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var N, _stack = []; - _using(_stack, { + var N, _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); class C1 { constructor(){ this.a = ()=>{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } static{ try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } m() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } get x() { try { - var _stack = []; - return _using(_stack, { + var _usingCtx = _using_ctx(); + return _usingCtx.u({ [Symbol.dispose] () {} }), 0; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } set x(v) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async am() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), await null; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } *g() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), yield; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } async *ag() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }), yield, await null; } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } !function(N) { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }(N || (N = {})); try { - var _stack1 = []; - _using(_stack1, { + var _usingCtx1 = _using_ctx(); + _usingCtx1.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx1.e = _; } finally{ - _dispose(_stack1, _error, _hasError); + _usingCtx1.d(); } switch(Math.random()){ case 0: try { - var _stack2 = []; - _using(_stack2, { + var _usingCtx2 = _using_ctx(); + _usingCtx2.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error1 = _, _hasError1 = !0; + _usingCtx2.e = _; } finally{ - _dispose(_stack2, _error1, _hasError1); + _usingCtx2.d(); } case 1: try { - var _stack3 = []; - _using(_stack3, { + var _usingCtx3 = _using_ctx(); + _usingCtx3.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error2 = _, _hasError2 = !0; + _usingCtx3.e = _; } finally{ - _dispose(_stack3, _error2, _hasError2); + _usingCtx3.d(); } } try { - var _stack4 = []; - _using(_stack4, { + var _usingCtx4 = _using_ctx(); + _usingCtx4.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error3 = _, _hasError3 = !0; + _usingCtx4.e = _; } finally{ - _dispose(_stack4, _error3, _hasError3); + _usingCtx4.d(); } try { try { - var _stack5 = []; - _using(_stack5, { + var _usingCtx5 = _using_ctx(); + _usingCtx5.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error4 = _, _hasError4 = !0; + _usingCtx5.e = _; } finally{ - _dispose(_stack5, _error4, _hasError4); + _usingCtx5.d(); } } catch { try { - var _stack6 = []; - _using(_stack6, { + var _usingCtx6 = _using_ctx(); + _usingCtx6.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error5 = _, _hasError5 = !0; + _usingCtx6.e = _; } finally{ - _dispose(_stack6, _error5, _hasError5); + _usingCtx6.d(); } } finally{ try { - var _stack7 = []; - _using(_stack7, { + var _usingCtx7 = _using_ctx(); + _usingCtx7.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error6 = _, _hasError6 = !0; + _usingCtx7.e = _; } finally{ - _dispose(_stack7, _error6, _hasError6); + _usingCtx7.d(); } } try { - var _stack8 = []; - _using(_stack8, { + var _usingCtx8 = _using_ctx(); + _usingCtx8.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error7 = _, _hasError7 = !0; + _usingCtx8.e = _; } finally{ - _dispose(_stack8, _error7, _hasError7); + _usingCtx8.d(); } for(;;)try { - var _stack10 = []; - _using(_stack10, { + var _usingCtx10 = _using_ctx(); + _usingCtx10.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error9 = _, _hasError9 = !0; + _usingCtx10.e = _; } finally{ - _dispose(_stack10, _error9, _hasError9); + _usingCtx10.d(); } for(;;)try { - var _stack11 = []; - _using(_stack11, { + var _usingCtx11 = _using_ctx(); + _usingCtx11.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error10 = _, _hasError10 = !0; + _usingCtx11.e = _; } finally{ - _dispose(_stack11, _error10, _hasError10); + _usingCtx11.d(); } for(;;)try { - var _stack12 = []; - _using(_stack12, { + var _usingCtx12 = _using_ctx(); + _usingCtx12.u({ [Symbol.dispose] () {} }); break; } catch (_) { - var _error11 = _, _hasError11 = !0; + _usingCtx12.e = _; } finally{ - _dispose(_stack12, _error11, _hasError11); + _usingCtx12.d(); } for(let x in {})try { - var _stack13 = []; - _using(_stack13, { + var _usingCtx13 = _using_ctx(); + _usingCtx13.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error12 = _, _hasError12 = !0; + _usingCtx13.e = _; } finally{ - _dispose(_stack13, _error12, _hasError12); + _usingCtx13.d(); } for (let x of [])try { - var _stack14 = []; - _using(_stack14, { + var _usingCtx14 = _using_ctx(); + _usingCtx14.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error13 = _, _hasError13 = !0; + _usingCtx14.e = _; } finally{ - _dispose(_stack14, _error13, _hasError13); + _usingCtx14.d(); } } catch (_) { - var _error14 = _, _hasError14 = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error14, _hasError14); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.11.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.11.1.normal.js index c6f398ae2026..8dde64a1e4b2 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.11.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.11.1.normal.js @@ -3,8 +3,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _inherits } from "@swc/helpers/_/_inherits"; import { _ as _possible_constructor_return } from "@swc/helpers/_/_possible_constructor_return"; import { _ as _create_super } from "@swc/helpers/_/_create_super"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var A = function A() { "use strict"; _class_call_check(this, A); @@ -17,14 +16,13 @@ var C1 = /*#__PURE__*/ function(A) { _class_call_check(this, C1); var _this; try { - var _stack = []; - var x = _using(_stack, null); + var _usingCtx = _using_ctx(); + var x = _usingCtx.u(null); _this = _super.call(this); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -38,14 +36,13 @@ var C2 = /*#__PURE__*/ function(A) { _class_call_check(this, C2); var _this; try { - var _stack = []; + var _usingCtx = _using_ctx(); _this = _super.call(this); - var x = _using(_stack, null); + var x = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -59,15 +56,14 @@ var C3 = /*#__PURE__*/ function(A) { _class_call_check(this, C3); var _this; try { - var _stack = []; - var x = _using(_stack, null); + var _usingCtx = _using_ctx(); + var x = _usingCtx.u(null); _this = _super.call(this); _this.y = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -81,15 +77,14 @@ var C4 = /*#__PURE__*/ function(A) { _class_call_check(this, C4); var _this; try { - var _stack = []; - var x = _using(_stack, null); + var _usingCtx = _using_ctx(); + var x = _usingCtx.u(null); _this = _super.call(this); _this.y = y; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } @@ -103,16 +98,15 @@ var C5 = /*#__PURE__*/ function(A) { _class_call_check(this, C5); var _this; try { - var _stack = []; - var x = _using(_stack, null); + var _usingCtx = _using_ctx(); + var x = _usingCtx.u(null); _this = _super.call(this); _this.y = y; _this.z = 1; } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } return _possible_constructor_return(_this); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.11.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.11.2.minified.js index c1bf705a749f..09e7774421b8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.11.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.11.2.minified.js @@ -3,5 +3,4 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _inherits } from "@swc/helpers/_/_inherits"; import { _ as _possible_constructor_return } from "@swc/helpers/_/_possible_constructor_return"; import { _ as _create_super } from "@swc/helpers/_/_create_super"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.12.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.12.1.normal.js index 579131f0a6ad..0955629f5b0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.12.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.12.1.normal.js @@ -1,23 +1,21 @@ //// [usingDeclarations.12.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; class C1 { constructor(){} } class C2 extends C1 { constructor(){ try { - var _stack = []; + var _usingCtx = _using_ctx(); super(); this.y = 1; - var d17 = _using(_stack, { + const d17 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.12.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.12.2.minified.js index eafaab673fe0..542f787c77be 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.12.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.12.2.minified.js @@ -1,3 +1,2 @@ //// [usingDeclarations.12.ts] -import "@swc/helpers/_/_dispose"; -import "@swc/helpers/_/_using"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.14.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.14.1.normal.js index e1310bf57adb..cfbfba2ad869 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.14.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.14.1.normal.js @@ -1,12 +1,10 @@ //// [usingDeclarations.14.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var x = _using(_stack, {}); + var _usingCtx = _using_ctx(); + var x = _usingCtx.u({}); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.14.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.14.2.minified.js index 4fa7dc998fcb..e50f2dc1dea4 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.14.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.14.2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarations.14.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, {}); + var _usingCtx = _using_ctx(); + _usingCtx.u({}); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.15.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.15.1.normal.js index 27e0f48f8f79..bea8776ea040 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.15.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.15.1.normal.js @@ -1,15 +1,13 @@ //// [usingDeclarations.15.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var _ = _using(_stack, { + var _usingCtx = _using_ctx(); + var _ = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarations.15.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.15.2.minified.js index a131d9fca3d6..a1f9133d0799 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.15.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.15.2.minified.js @@ -1,13 +1,12 @@ //// [usingDeclarations.15.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).1.normal.js index 72957d777f17..ebd9d72663f3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, { + }), d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).2.minified.js index bea0f731245e..45ef9b4d6f41 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2015).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, { + }), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).1.normal.js index 72957d777f17..ebd9d72663f3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, { + }), d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).2.minified.js index bea0f731245e..45ef9b4d6f41 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2017).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, { + }), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).1.normal.js index 72957d777f17..ebd9d72663f3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, { + }), d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).2.minified.js index bea0f731245e..45ef9b4d6f41 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es2022).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, { + }), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).1.normal.js index 2efd2cf92993..c146a8e5399a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).1.normal.js @@ -1,15 +1,13 @@ //// [usingDeclarations.2.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.dispose, function() {})), d2 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})), d2 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).2.minified.js index 2c49f1134a3a..c33fc5e1fcdb 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=es5).2.minified.js @@ -1,12 +1,11 @@ //// [usingDeclarations.2.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.dispose, function() {})), _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + _usingCtx.u(_define_property({}, Symbol.dispose, function() {})), _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).1.normal.js index 72957d777f17..ebd9d72663f3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, { + }), d2 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).2.minified.js index bea0f731245e..45ef9b4d6f41 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.2(target=esnext).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, { + }), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).1.normal.js index 774e56f6bc0d..6f27d83c73a8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, null), d3 = _using(_stack, undefined), d4 = _using(_stack, { + }), d2 = _usingCtx.u(null), d3 = _usingCtx.u(undefined), d4 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).2.minified.js index 7f1c4a10bf9e..d9daab6fa430 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2015).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, null), _using(_stack, void 0), _using(_stack, { + }), _usingCtx.u(null), _usingCtx.u(void 0), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).1.normal.js index 774e56f6bc0d..6f27d83c73a8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, null), d3 = _using(_stack, undefined), d4 = _using(_stack, { + }), d2 = _usingCtx.u(null), d3 = _usingCtx.u(undefined), d4 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).2.minified.js index 7f1c4a10bf9e..d9daab6fa430 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2017).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, null), _using(_stack, void 0), _using(_stack, { + }), _usingCtx.u(null), _usingCtx.u(void 0), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).1.normal.js index 774e56f6bc0d..6f27d83c73a8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, null), d3 = _using(_stack, undefined), d4 = _using(_stack, { + }), d2 = _usingCtx.u(null), d3 = _usingCtx.u(undefined), d4 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).2.minified.js index 7f1c4a10bf9e..d9daab6fa430 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es2022).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, null), _using(_stack, void 0), _using(_stack, { + }), _usingCtx.u(null), _usingCtx.u(void 0), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).1.normal.js index e1f8c64aa5a6..b6791667ddbc 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).1.normal.js @@ -1,15 +1,13 @@ //// [usingDeclarations.3.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, _define_property({}, Symbol.dispose, function() {})), d2 = _using(_stack, null), d3 = _using(_stack, undefined), d4 = _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + var d1 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})), d2 = _usingCtx.u(null), d3 = _usingCtx.u(undefined), d4 = _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).2.minified.js index c7370d2d3792..1b0448496e75 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=es5).2.minified.js @@ -1,12 +1,11 @@ //// [usingDeclarations.3.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, _define_property({}, Symbol.dispose, function() {})), _using(_stack, null), _using(_stack, void 0), _using(_stack, _define_property({}, Symbol.dispose, function() {})); + var _usingCtx = _using_ctx(); + _usingCtx.u(_define_property({}, Symbol.dispose, function() {})), _usingCtx.u(null), _usingCtx.u(void 0), _usingCtx.u(_define_property({}, Symbol.dispose, function() {})); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).1.normal.js index 774e56f6bc0d..6f27d83c73a8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var d1 = _using(_stack, { + var _usingCtx = _using_ctx(); + const d1 = _usingCtx.u({ [Symbol.dispose] () {} - }), d2 = _using(_stack, null), d3 = _using(_stack, undefined), d4 = _using(_stack, { + }), d2 = _usingCtx.u(null), d3 = _usingCtx.u(undefined), d4 = _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).2.minified.js index 7f1c4a10bf9e..d9daab6fa430 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.3(target=esnext).2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarations.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, null), _using(_stack, void 0), _using(_stack, { + }), _usingCtx.u(null), _usingCtx.u(void 0), _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.9.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarations.9.1.normal.js index 14bbdae302bf..970efa4e9e24 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.9.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.9.1.normal.js @@ -1,14 +1,12 @@ //// [usingDeclarations.9.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var a = _using(_stack, null); + var _usingCtx = _using_ctx(); + const a = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarations.9.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarations.9.2.minified.js index f4aafb6612b2..838a1525bee2 100644 --- a/crates/swc/tests/tsc-references/usingDeclarations.9.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarations.9.2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarations.9.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.1.normal.js index 3265f5c0e8a1..fb0905592aa1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsDeclarationEmit.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { r1 }; export { r2 }; try { - var _stack = []; - var r1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var r1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var r2 = _using(_stack, { + var r2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.2.minified.js index 63c273a1c4c0..4222545f0b31 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.1.2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarationsDeclarationEmit.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], r1 = _using(_stack, { + var _usingCtx = _using_ctx(), r1 = _usingCtx.u({ [Symbol.dispose] () {} - }), r2 = _using(_stack, { + }), r2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } export { r1, r2 }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.1.normal.js index 27561c7e5b8e..5c38eddf239d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarationsDeclarationEmit.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var r1 = _using(_stack, { + var _usingCtx = _using_ctx(); + var r1 = _usingCtx.u({ [Symbol.dispose] () {} }); - var r2 = _using(_stack, { + var r2 = _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, true); + }); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.2.minified.js index 04280bcd0e01..58dec52a1ed4 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsDeclarationEmit.2.2.minified.js @@ -1,15 +1,14 @@ //// [usingDeclarationsDeclarationEmit.2.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} - }), _using(_stack, { + }), _usingCtx.a({ async [Symbol.asyncDispose] () {} - }, !0); + }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - await _dispose(_stack, _error, _hasError); + await _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).1.normal.js index 4aa6df5540c6..048c1a1b02e1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).1.normal.js @@ -1,7 +1,7 @@ //// [usingDeclarationsInForAwaitOf.ts] import { _ as _async_iterator } from "@swc/helpers/_/_async_iterator"; import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } @@ -20,13 +20,12 @@ function _main() { let _value = _step.value; const d1 = _value; try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } catch (err) { diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).2.minified.js index 0c06f8a89017..25676163c058 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2015).2.minified.js @@ -1,4 +1,4 @@ //// [usingDeclarationsInForAwaitOf.ts] import "@swc/helpers/_/_async_iterator"; import "@swc/helpers/_/_async_to_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).1.normal.js index f84db7340602..c7af45306326 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -9,13 +9,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).2.minified.js index ec22de7422b7..d4aece823eb8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2017).2.minified.js @@ -1,2 +1,2 @@ //// [usingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).1.normal.js index f84db7340602..c7af45306326 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -9,13 +9,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).2.minified.js index ec22de7422b7..d4aece823eb8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es2022).2.minified.js @@ -1,2 +1,2 @@ //// [usingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).1.normal.js index 7feacd63924a..4dc1b4513e28 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).1.normal.js @@ -3,13 +3,13 @@ import { _ as _async_iterator } from "@swc/helpers/_/_async_iterator"; import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator"; import { _ as _define_property } from "@swc/helpers/_/_define_property"; import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; function main() { return _main.apply(this, arguments); } function _main() { _main = _async_to_generator(function() { - var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, d1, _stack, _error, _hasError, err; + var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, d1, _usingCtx, err; return _ts_generator(this, function(_state) { switch(_state.label){ case 0: @@ -41,13 +41,12 @@ function _main() { _value = _step.value; d1 = _value; try { - _stack = []; + _usingCtx = _using_ctx(); {} } catch (_) { - _error = _; - _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } _state.label = 4; case 4: diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).2.minified.js index ac42c2049ba8..1f36613b865b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=es5).2.minified.js @@ -3,4 +3,4 @@ import "@swc/helpers/_/_async_iterator"; import "@swc/helpers/_/_async_to_generator"; import "@swc/helpers/_/_define_property"; import "@swc/helpers/_/_ts_generator"; -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).1.normal.js index f84db7340602..c7af45306326 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForAwaitOf.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; async function main() { for await (const d1 of [ { @@ -9,13 +9,12 @@ async function main() { undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).2.minified.js index ec22de7422b7..d4aece823eb8 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForAwaitOf(target=esnext).2.minified.js @@ -1,2 +1,2 @@ //// [usingDeclarationsInForAwaitOf.ts] -import "@swc/helpers/_/_dispose"; +import "@swc/helpers/_/_using_ctx"; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).1.normal.js index 7cf6dff0cf89..800b83760a49 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (const d1 of [ { [Symbol.dispose] () {} @@ -8,12 +8,11 @@ for (const d1 of [ undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).2.minified.js index ba9595c1ab7b..834d99aa8f7b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2015).2.minified.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (let d1 of [ { [Symbol.dispose] () {} @@ -7,9 +7,9 @@ for (let d1 of [ null, void 0 ])try { - var _stack = []; + var _usingCtx = _using_ctx(); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).1.normal.js index 7cf6dff0cf89..800b83760a49 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (const d1 of [ { [Symbol.dispose] () {} @@ -8,12 +8,11 @@ for (const d1 of [ undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).2.minified.js index ba9595c1ab7b..834d99aa8f7b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2017).2.minified.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (let d1 of [ { [Symbol.dispose] () {} @@ -7,9 +7,9 @@ for (let d1 of [ null, void 0 ])try { - var _stack = []; + var _usingCtx = _using_ctx(); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).1.normal.js index 7cf6dff0cf89..800b83760a49 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (const d1 of [ { [Symbol.dispose] () {} @@ -8,12 +8,11 @@ for (const d1 of [ undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).2.minified.js index ba9595c1ab7b..834d99aa8f7b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es2022).2.minified.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (let d1 of [ { [Symbol.dispose] () {} @@ -7,9 +7,9 @@ for (let d1 of [ null, void 0 ])try { - var _stack = []; + var _usingCtx = _using_ctx(); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).1.normal.js index 95a0cfbd6b5b..d2a1121d17b1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).1.normal.js @@ -1,6 +1,6 @@ //// [usingDeclarationsInForOf.1.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for(var _i = 0, _iter = [ _define_property({}, Symbol.dispose, function() {}), null, @@ -8,12 +8,11 @@ for(var _i = 0, _iter = [ ]; _i < _iter.length; _i++){ var d1 = _iter[_i]; try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).2.minified.js index 050b382f9034..ffd46258d0e9 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=es5).2.minified.js @@ -1,6 +1,6 @@ //// [usingDeclarationsInForOf.1.ts] import { _ as _define_property } from "@swc/helpers/_/_define_property"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for(var _i = 0, _iter = [ _define_property({}, Symbol.dispose, function() {}), null, @@ -8,10 +8,10 @@ for(var _i = 0, _iter = [ ]; _i < _iter.length; _i++){ _iter[_i]; try { - var _stack = []; + var _usingCtx = _using_ctx(); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).1.normal.js index 7cf6dff0cf89..800b83760a49 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).1.normal.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (const d1 of [ { [Symbol.dispose] () {} @@ -8,12 +8,11 @@ for (const d1 of [ undefined ]){ try { - var _stack = []; + var _usingCtx = _using_ctx(); {} } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).2.minified.js index ba9595c1ab7b..834d99aa8f7b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsInForOf.1(target=esnext).2.minified.js @@ -1,5 +1,5 @@ //// [usingDeclarationsInForOf.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; for (let d1 of [ { [Symbol.dispose] () {} @@ -7,9 +7,9 @@ for (let d1 of [ null, void 0 ])try { - var _stack = []; + var _usingCtx = _using_ctx(); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).1.normal.js index 5a7694ff8c14..40ce3e5e2018 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).1.normal.js @@ -2,9 +2,8 @@ define([ "require", "exports", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, exports, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, exports, _using_ctx) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true @@ -32,21 +31,20 @@ define([ var _x; var _w; try { - var _stack = []; + var _usingCtx = _using_ctx._(); const x = 1; _x = x; - var z = _using._(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; const w = 3; _w = w; var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).2.minified.js index 235a9ad3569c..0d11f96f11ba 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=amd).2.minified.js @@ -2,9 +2,8 @@ define([ "require", "exports", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, exports, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, exports, _using_ctx) { Object.defineProperty(exports, "__esModule", { value: !0 }), function(target, all) { @@ -27,17 +26,17 @@ define([ } }); try { - var _x, _w, _stack = []; + var _x, _w, _usingCtx = _using_ctx._(); _x = 1; - var z = _using._(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} - }), y = 2; + }); _w = 3; var _default = 4; - console.log(3, 1, y, z); + console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).1.normal.js index c40880af7c2e..148c08be13dc 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).1.normal.js @@ -23,25 +23,23 @@ _export(exports, { return y; } }); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); var _x; var _w; try { - var _stack = []; + var _usingCtx = _using_ctx._(); const x = 1; _x = x; - var z = _using._(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; const w = 3; _w = w; var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).2.minified.js index 0b85b546bbc0..518a0b1c01e1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=commonjs).2.minified.js @@ -20,18 +20,18 @@ Object.defineProperty(exports, "__esModule", { return y; } }); -const _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _x, _w, _stack = []; + var _x, _w, _usingCtx = _using_ctx._(); _x = 1; - var z = _using._(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} - }), y = 2; + }); _w = 3; var _default = 4; - console.log(3, 1, y, z); + console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js index 0604f3baa47c..e97ab951662c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).1.normal.js @@ -1,27 +1,25 @@ //// [usingDeclarationsTopLevelOfModule.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _x; export { y }; var _w; export { _default as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); const x = 1; _x = x; - var z = _using(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; const w = 3; _w = w; var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _x as x }; export { _w as w }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js index fa9e2f05fd83..21e3eb7e7903 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=es6).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsTopLevelOfModule.1.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _x, _w, _stack = []; + var _x, _w, _usingCtx = _using_ctx(); _x = 1; - var z = _using(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} - }), y = 2; + }); _w = 3; var _default = 4; - console.log(3, 1, y, z); + console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { y, _default as default, _x as x, _w as w }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).1.normal.js index a8033a3a4d22..2ef834ca120a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).1.normal.js @@ -1,41 +1,36 @@ //// [usingDeclarationsTopLevelOfModule.1.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _dispose, _using, _x, _w; + var _using_ctx, _x, _w; _export({ x: void 0, w: void 0 }); return { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); const x = 1; _export("x", _x = x); - var z = _using(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; const w = 3; _export("w", _w = w); var _default = 4; console.log(w, x, y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).2.minified.js index 7f6b5dcbdf20..a39976e2ff26 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.1(module=system).2.minified.js @@ -1,33 +1,29 @@ //// [usingDeclarationsTopLevelOfModule.1.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _dispose, _using; + var _using_ctx; return _export({ x: void 0, w: void 0 }), { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); _export("x", 1); - var z = _using(_stack, { + var z = _usingCtx.u({ [Symbol.dispose] () {} }); _export("w", 3), console.log(3, 1, 2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).1.normal.js index 6c5c72321363..c179a99ce919 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).1.normal.js @@ -1,22 +1,20 @@ //// [usingDeclarationsTopLevelOfModule.2.ts] define([ "require", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, _using_ctx) { "use strict"; try { - var _stack = []; - var z = _using._(_stack, { + var _usingCtx = _using_ctx._(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; console.log(y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } return 4; }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).2.minified.js index 8fc0f4c62610..89b5b04b6252 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=amd).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsTopLevelOfModule.2.ts] define([ "require", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, _using_ctx) { try { - var _stack = [], z = _using._(_stack, { + var _usingCtx = _using_ctx._(), z = _usingCtx.u({ [Symbol.dispose] () {} }); console.log(2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } return 4; }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).1.normal.js index ac7d77356c01..ae3cb448f448 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).1.normal.js @@ -1,18 +1,16 @@ //// [usingDeclarationsTopLevelOfModule.2.ts] "use strict"; -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var z = _using._(_stack, { + var _usingCtx = _using_ctx._(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); - var y = 2; + const y = 2; console.log(y, z); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } module.exports = 4; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).2.minified.js index 0d780e751f10..21d7176e8f0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.2(module=commonjs).2.minified.js @@ -1,13 +1,13 @@ //// [usingDeclarationsTopLevelOfModule.2.ts] -const _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], z = _using._(_stack, { + var _usingCtx = _using_ctx._(), z = _usingCtx.u({ [Symbol.dispose] () {} }); console.log(2, z); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } module.exports = 4; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).1.normal.js index bd7fb156189a..29254e094e4b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).1.normal.js @@ -2,9 +2,8 @@ define([ "require", "exports", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, exports, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, exports, _using_ctx) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true @@ -19,17 +18,16 @@ define([ console.log(y, z); } try { - var _stack = []; - var z = _using._(_stack, { + var _usingCtx = _using_ctx._(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); if (false) { var y = 1; } } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).2.minified.js index 4de8524df2b3..773ec14e9b2c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=amd).2.minified.js @@ -2,9 +2,8 @@ define([ "require", "exports", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" -], function(require, exports, _dispose, _using) { + "@swc/helpers/_/_using_ctx" +], function(require, exports, _using_ctx) { Object.defineProperty(exports, "__esModule", { value: !0 }), Object.defineProperty(exports, "y", { @@ -14,13 +13,13 @@ define([ } }); try { - var y, _stack = []; - _using._(_stack, { + var y, _usingCtx = _using_ctx._(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } }); diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).1.normal.js index 2dd8b5782eb3..e0c7677ce190 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).1.normal.js @@ -9,22 +9,20 @@ Object.defineProperty(exports, "y", { return y; } }); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); function f() { console.log(y, z); } try { - var _stack = []; - var z = _using._(_stack, { + var _usingCtx = _using_ctx._(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); if (false) { var y = 1; } } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).2.minified.js index cba65395d88b..8ce33f9e3e3c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=commonjs).2.minified.js @@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", { return y; } }); -const _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var y, _stack = []; - _using._(_stack, { + var y, _usingCtx = _using_ctx._(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).1.normal.js index 97fc475ed13c..f89557661729 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).1.normal.js @@ -1,21 +1,19 @@ //// [usingDeclarationsTopLevelOfModule.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { y }; function f() { console.log(y, z); } try { - var _stack = []; - var z = _using(_stack, { + var _usingCtx = _using_ctx(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); if (false) { var y = 1; } } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).2.minified.js index ae84ccce678e..9589e9d10f9a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=es6).2.minified.js @@ -1,14 +1,13 @@ //// [usingDeclarationsTopLevelOfModule.3.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var y, _stack = []; - _using(_stack, { + var y, _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { y }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).1.normal.js index 6a21991c75c8..e0d29f964924 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).1.normal.js @@ -1,36 +1,31 @@ //// [usingDeclarationsTopLevelOfModule.3.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _dispose, _using; + var _using_ctx; function f() { console.log(y, z); } return { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var z = _using(_stack, { + var _usingCtx = _using_ctx(); + var z = _usingCtx.u({ [Symbol.dispose] () {} }); if (false) { var y = 1; } } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).2.minified.js index 712c9430eab4..5684a13c1acc 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsTopLevelOfModule.3(module=system).2.minified.js @@ -1,28 +1,24 @@ //// [usingDeclarationsTopLevelOfModule.3.ts] System.register([ - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _dispose, _using; + var _using_ctx; return { setters: [ - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, { + var _usingCtx = _using_ctx(); + _usingCtx.u({ [Symbol.dispose] () {} }); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.1.normal.js index 1ff249944171..8263f40ba35b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.1.normal.js @@ -1,14 +1,12 @@ //// [usingDeclarationsWithImportHelpers.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; { try { - var _stack = []; - var a = _using(_stack, null); + var _usingCtx = _using_ctx(); + const a = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } }export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.2.minified.js index 4a018730d716..253ed876295c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithImportHelpers.2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithImportHelpers.ts] -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).1.normal.js index 71858adb8861..b29dc452d1fe 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).1.normal.js @@ -4,19 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).2.minified.js index 5347912f58a5..c4a2f9568a0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es2015).2.minified.js @@ -2,17 +2,17 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).1.normal.js index 3b88e544e4b3..70dc22dd5dda 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).1.normal.js @@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -18,8 +17,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).2.minified.js index f8df351945e0..80fe04afdaae 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).2.minified.js @@ -2,10 +2,10 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = function C() { _class_call_check._(this, C); }; @@ -13,7 +13,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).1.normal.js index 71858adb8861..b29dc452d1fe 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).1.normal.js @@ -4,19 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).2.minified.js index 5347912f58a5..c4a2f9568a0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=esnext).2.minified.js @@ -2,17 +2,17 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).1.normal.js index f50c324a8527..036b36e82eb7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).2.minified.js index 9cbb6cc4f685..89afdaf62485 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es2015).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).1.normal.js index 3772cb89cb1f..1f8c924c6150 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -14,9 +13,8 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).2.minified.js index e60f53b1998a..1df3155cec14 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -13,7 +12,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).1.normal.js index f50c324a8527..036b36e82eb7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).2.minified.js index 9cbb6cc4f685..89afdaf62485 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=es6,target=esnext).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).1.normal.js index 292bace8b988..bf6171222432 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).2.minified.js index 1bf45619cf1c..eb06e75805f5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).1.normal.js index c3d1656b6dba..10ae37db19a1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,17 +14,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -34,10 +30,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).2.minified.js index 09cdc5617de8..425273eedcc5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -32,9 +28,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).1.normal.js index 292bace8b988..bf6171222432 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).2.minified.js index 1bf45619cf1c..eb06e75805f5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.1.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).1.normal.js index 79fc6942532b..abdfcde66ed6 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var _class = class _class { }; _class = _ts_decorate._([ dec ], _class); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).2.minified.js index cf4b69303668..025220975440 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es2015).2.minified.js @@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx._(), _class = class { }; _class = _ts_decorate._([ dec - ], _class), _using._(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).1.normal.js index c57a552fa146..865696319f96 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).1.normal.js @@ -11,10 +11,9 @@ Object.defineProperty(exports, "default", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var _class = function _class() { "use strict"; _class_call_check._(this, _class); @@ -22,10 +21,9 @@ try { _class = _ts_decorate._([ dec ], _class); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).2.minified.js index af534cf7f332..123ab2d2f173 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], _class = function _class() { + var _usingCtx = _using_ctx._(), _class = function _class() { _class_call_check._(this, _class); }; _class = _ts_decorate._([ dec - ], _class), _using._(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).1.normal.js index 79fc6942532b..abdfcde66ed6 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var _class = class _class { }; _class = _ts_decorate._([ dec ], _class); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).2.minified.js index cf4b69303668..025220975440 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=esnext).2.minified.js @@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx._(), _class = class { }; _class = _ts_decorate._([ dec - ], _class), _using._(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).1.normal.js index 6823bf320d59..ffed1694dcb1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = class _class { }; _class = _ts_decorate([ dec ], _class); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).2.minified.js index 1b759cf5937a..8b1e6147911a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es2015).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx(), _class = class { }; _class = _ts_decorate([ dec - ], _class), _using(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).1.normal.js index 28ac007ccf85..9c71428b2c81 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = function _class() { "use strict"; _class_call_check(this, _class); @@ -13,10 +12,9 @@ try { _class = _ts_decorate([ dec ], _class); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).2.minified.js index 266989eeefa2..309d1a77bebb 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=es5).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], _class = function _class() { + var _usingCtx = _using_ctx(), _class = function _class() { _class_call_check(this, _class); }; _class = _ts_decorate([ dec - ], _class), _using(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).1.normal.js index 6823bf320d59..ffed1694dcb1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = class _class { }; _class = _ts_decorate([ dec ], _class); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).2.minified.js index 1b759cf5937a..8b1e6147911a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=es6,target=esnext).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx(), _class = class { }; _class = _ts_decorate([ dec - ], _class), _using(_stack, null); + ], _class), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).1.normal.js index b840ec30cb32..881ecb69908c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = class _class { }; _export("default", _class = _ts_decorate([ dec ], _class)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).2.minified.js index 79281b2bafc5..118dd094ae31 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).2.minified.js @@ -1,33 +1,29 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx(), _class = class { }; _export("default", _class = _ts_decorate([ dec - ], _class)), _using(_stack, null); + ], _class)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).1.normal.js index 0b9efbbe8522..cb38103c539a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,16 +14,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = function _class() { "use strict"; _class_call_check(this, _class); @@ -32,12 +28,11 @@ System.register([ _export("default", _class = _ts_decorate([ dec ], _class)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).2.minified.js index 0c53bfc5da64..1430703415a7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], _class = function _class() { + var _usingCtx = _using_ctx(), _class = function _class() { _class_call_check(this, _class); }; _export("default", _class = _ts_decorate([ dec - ], _class)), _using(_stack, null); + ], _class)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).1.normal.js index b840ec30cb32..881ecb69908c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var _class = class _class { }; _export("default", _class = _ts_decorate([ dec ], _class)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).2.minified.js index 79281b2bafc5..118dd094ae31 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).2.minified.js @@ -1,33 +1,29 @@ //// [usingDeclarationsWithLegacyClassDecorators.10.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], _class = class { + var _usingCtx = _using_ctx(), _class = class { }; _export("default", _class = _ts_decorate([ dec - ], _class)), _using(_stack, null); + ], _class)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).1.normal.js index 2060f3f17abd..5cbd98dbc701 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).2.minified.js index 712eac0bbbc3..892d8ceeb02b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es2015).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C1 { } C1 = _ts_decorate._([ dec - ], C1), _using._(_stack, null); + ], C1), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).1.normal.js index 62f2647d57ea..8b84463d0a1a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).1.normal.js @@ -11,10 +11,9 @@ Object.defineProperty(exports, "C", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -22,10 +21,9 @@ try { C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).2.minified.js index d0d9048335cc..2b7c106f9f2b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx._(), C = function C() { _class_call_check._(this, C); }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).1.normal.js index 2060f3f17abd..5cbd98dbc701 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).2.minified.js index 712eac0bbbc3..892d8ceeb02b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=esnext).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C1 { } C1 = _ts_decorate._([ dec - ], C1), _using._(_stack, null); + ], C1), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).1.normal.js index f2936a1d2007..2daa7fe9636f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).2.minified.js index bfc41e688265..74007d040bac 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es2015).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).1.normal.js index 10b8e7222029..b3e990cd56ad 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -13,10 +12,9 @@ try { C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).2.minified.js index 8ce197772e6b..35f3137e9e11 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=es5).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).1.normal.js index f2936a1d2007..2daa7fe9636f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).2.minified.js index bfc41e688265..74007d040bac 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=es6,target=esnext).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).1.normal.js index 68ed418475fd..7d98f05d9d82 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).2.minified.js index 4846050e419d..1f6e0fa7f09c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).1.normal.js index 4096021ba5a2..1221ef2e9cf0 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,16 +14,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -32,12 +28,11 @@ System.register([ _export("C", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).2.minified.js index 1e7955da9826..ef43f70c7b46 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; _export("C", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).1.normal.js index 68ed418475fd..7d98f05d9d82 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).2.minified.js index 4846050e419d..1f6e0fa7f09c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.11.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).1.normal.js index 977c78ee12bf..eaef720a233d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "D", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).2.minified.js index 7cf79fb251ce..e9dd78c1b36d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es2015).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C1 { } C1 = _ts_decorate._([ dec - ], C1), _using._(_stack, null); + ], C1), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).1.normal.js index 872cf7a4def8..ae267c344a62 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).1.normal.js @@ -11,10 +11,9 @@ Object.defineProperty(exports, "D", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -22,10 +21,9 @@ try { C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).2.minified.js index 17a533f5293c..fd8bd2b2ef3c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx._(), C = function C() { _class_call_check._(this, C); }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).1.normal.js index 977c78ee12bf..eaef720a233d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "D", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).2.minified.js index 7cf79fb251ce..e9dd78c1b36d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=esnext).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C1 { } C1 = _ts_decorate._([ dec - ], C1), _using._(_stack, null); + ], C1), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).1.normal.js index ab3578769112..a21418310128 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).2.minified.js index 025b7687012a..96a12738b3e3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es2015).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).1.normal.js index 53a8569a8754..2d2972eea9ce 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -13,10 +12,9 @@ try { C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).2.minified.js index d77693ddb361..2b67039e2d30 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=es5).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).1.normal.js index ab3578769112..a21418310128 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).2.minified.js index 025b7687012a..96a12738b3e3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=es6,target=esnext).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).1.normal.js index af4f0cb9a19b..8aae998a8767 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("D", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).2.minified.js index dd20b3a8fab6..0d8a2fe98456 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("D", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).1.normal.js index 80d71d06fc81..90deef8402c2 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,16 +14,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -32,12 +28,11 @@ System.register([ _export("D", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).2.minified.js index fa928d32b9b6..67e97e0a65fb 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; _export("D", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).1.normal.js index af4f0cb9a19b..8aae998a8767 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("D", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).2.minified.js index dd20b3a8fab6..0d8a2fe98456 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.12.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("D", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).1.normal.js index bf766002e453..0deba7a50d7f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).1.normal.js @@ -10,12 +10,11 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } _C = C; @@ -23,8 +22,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).2.minified.js index 3d5bf0f8fc73..f3849d640a99 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es2015).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _C, _stack = []; - _using._(_stack, null); + var _C, _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C { } _C = C, C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).1.normal.js index 6dbef6773916..fb8f76404e59 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).1.normal.js @@ -11,12 +11,11 @@ Object.defineProperty(exports, "C", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -26,8 +25,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).2.minified.js index 70226f357f9d..8c0db9b467c1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).2.minified.js @@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -var _C, _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _C, _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = function C() { _class_call_check._(this, C); }; @@ -18,7 +18,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).1.normal.js index bf766002e453..0deba7a50d7f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).1.normal.js @@ -10,12 +10,11 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } _C = C; @@ -23,8 +22,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).2.minified.js index 3d5bf0f8fc73..f3849d640a99 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=esnext).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _C, _stack = []; - _using._(_stack, null); + var _C, _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C { } _C = C, C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).1.normal.js index d21a0d275137..27865d30b109 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _C = C; @@ -13,9 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).2.minified.js index 526153f667c2..7e5c750c71b3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es2015).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = []; - _using(_stack, null); + var _C, _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _C = C, C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).1.normal.js index 3caca2d874f5..0e8568e1559c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).1.normal.js @@ -1,12 +1,11 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -16,9 +15,8 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).2.minified.js index 05b69667369a..28c8b045f567 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = []; - _using(_stack, null); + var _C, _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -13,8 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).1.normal.js index d21a0d275137..27865d30b109 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _C = C; @@ -13,9 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).2.minified.js index 526153f667c2..7e5c750c71b3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=es6,target=esnext).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = []; - _using(_stack, null); + var _C, _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _C = C, C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).1.normal.js index cbbd98cadaa1..98691c8149e1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).1.normal.js @@ -1,28 +1,24 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using, _C; + var _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("C", _C = C); @@ -30,10 +26,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).2.minified.js index b7e46c04b56d..f7a8aae41569 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("C", C), C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).1.normal.js index fad5d2641ce2..d98e2b865441 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using, _C; + var _class_call_check, _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ @@ -16,17 +15,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -36,10 +32,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).2.minified.js index c1deb230f753..6b81ece727b5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -32,9 +28,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).1.normal.js index cbbd98cadaa1..98691c8149e1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).1.normal.js @@ -1,28 +1,24 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using, _C; + var _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("C", _C = C); @@ -30,10 +26,9 @@ System.register([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).2.minified.js index b7e46c04b56d..f7a8aae41569 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.2.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("C", C), C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).1.normal.js index 9735c1f95d4f..cdfae9e0bf96 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = class C { }; C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).2.minified.js index c31f8af43fb9..8a31f307ff05 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es2015).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = class { }; C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).1.normal.js index 7a2aeed22cb0..8f52201b81c1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).1.normal.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "default", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -24,8 +23,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).2.minified.js index ec15ff12606b..fc6a89834b02 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).2.minified.js @@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = function C() { _class_call_check._(this, C); }; @@ -18,7 +18,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).1.normal.js index 9735c1f95d4f..cdfae9e0bf96 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = class C { }; C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).2.minified.js index c31f8af43fb9..8a31f307ff05 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=esnext).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = class { }; C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).1.normal.js index 8bdcb3119add..06cb6c24d36c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = class C { }; C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).2.minified.js index ded12a82e6b9..904b8a4b8e8d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es2015).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = class { }; C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).1.normal.js index 8748ef616d6e..cd4aa2b73926 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).1.normal.js @@ -1,12 +1,11 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -15,8 +14,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).2.minified.js index 3e4ec8bc9d3b..fff9ac887e78 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -13,8 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).1.normal.js index 8bdcb3119add..06cb6c24d36c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = class C { }; C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).2.minified.js index ded12a82e6b9..904b8a4b8e8d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=es6,target=esnext).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = class { }; C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).1.normal.js index b5cc17c4b511..728117336184 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = class C { }; _export("default", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).2.minified.js index 5f2d6e813f72..068fe6225f59 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = class { }; _export("default", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).1.normal.js index bf550321395e..cbeb2031f31f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,17 +14,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -34,10 +30,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).2.minified.js index e8c0a25331be..55f32c104ee5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -32,9 +28,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).1.normal.js index b5cc17c4b511..728117336184 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = class C { }; _export("default", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).2.minified.js index 5f2d6e813f72..068fe6225f59 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.3.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = class { }; _export("default", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).1.normal.js index 95fad7db1859..40ccb45028ff 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var _class = class _class { }; _class = _ts_decorate._([ dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).2.minified.js index f210eadd3063..651b4dbc09d5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es2015).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var _class = class { }; _class = _ts_decorate._([ dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).1.normal.js index cb072e4e481f..b08de63aba0d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).1.normal.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "default", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var _class = function _class() { "use strict"; _class_call_check._(this, _class); @@ -24,8 +23,7 @@ try { dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).2.minified.js index 37757050a372..a3c0f621c3d5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).2.minified.js @@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var _class = function _class() { _class_call_check._(this, _class); }; @@ -18,7 +18,7 @@ try { dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).1.normal.js index 95fad7db1859..40ccb45028ff 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var _class = class _class { }; _class = _ts_decorate._([ dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).2.minified.js index f210eadd3063..651b4dbc09d5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=esnext).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return _class; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var _class = class { }; _class = _ts_decorate._([ dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).1.normal.js index 54bbc3405516..494956940d4a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = class _class { }; _class = _ts_decorate([ dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).2.minified.js index 0c6931f10edc..16fd923fd420 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es2015).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = class { }; _class = _ts_decorate([ dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).1.normal.js index e2bfc69507c2..61c57de6872a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).1.normal.js @@ -1,12 +1,11 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = function _class() { "use strict"; _class_call_check(this, _class); @@ -15,8 +14,7 @@ try { dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).2.minified.js index 5423bad1e46f..e45139543abc 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = function _class() { _class_call_check(this, _class); }; @@ -13,8 +12,8 @@ try { dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).1.normal.js index 54bbc3405516..494956940d4a 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { _class as default }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = class _class { }; _class = _ts_decorate([ dec ], _class); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).2.minified.js index 0c6931f10edc..16fd923fd420 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=es6,target=esnext).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = class { }; _class = _ts_decorate([ dec ], _class); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _class as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).1.normal.js index efb6402b75bc..d19071f6100c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = class _class { }; _export("default", _class = _ts_decorate([ dec ], _class)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).2.minified.js index c7a07b62be46..f2954e1f4b1b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = class { }; _export("default", _class = _ts_decorate([ dec ], _class)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).1.normal.js index 5b8332865f86..beb4a5ec9b05 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,17 +14,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = function _class() { "use strict"; _class_call_check(this, _class); @@ -34,10 +30,9 @@ System.register([ dec ], _class)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).2.minified.js index ea32bb438cd9..4ea3d1a4993d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = function _class() { _class_call_check(this, _class); }; @@ -32,9 +28,9 @@ System.register([ dec ], _class)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).1.normal.js index efb6402b75bc..d19071f6100c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var _class = class _class { }; _export("default", _class = _ts_decorate([ dec ], _class)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).2.minified.js index c7a07b62be46..f2954e1f4b1b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.4.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var _class = class { }; _export("default", _class = _ts_decorate([ dec ], _class)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).1.normal.js index 009466ea54f9..3ec36fd8d880 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).2.minified.js index 152d3812ef55..b6b98e01017c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es2015).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C1 { } C1 = _ts_decorate._([ dec ], C1); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).1.normal.js index 04de7e2d9a97..f23d67fc97d3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).1.normal.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "C", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -24,8 +23,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).2.minified.js index c75d815c186d..0ece95382e4c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).2.minified.js @@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = function C() { _class_call_check._(this, C); }; @@ -18,7 +18,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).1.normal.js index 009466ea54f9..3ec36fd8d880 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).2.minified.js index 152d3812ef55..b6b98e01017c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=esnext).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C1 { } C1 = _ts_decorate._([ dec ], C1); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).1.normal.js index f6c6f5053a9d..5ca6582ea6a7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).2.minified.js index 96d6a1140a68..07486ef3ac46 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es2015).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).1.normal.js index f8d968f5a762..253e725123fa 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).1.normal.js @@ -1,12 +1,11 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -15,8 +14,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).2.minified.js index be5d3e5efab8..b36fc3fe2288 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -13,8 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).1.normal.js index f6c6f5053a9d..5ca6582ea6a7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).2.minified.js index 96d6a1140a68..07486ef3ac46 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=es6,target=esnext).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).1.normal.js index b0eab7c811bd..3c77cb98fa4e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("C", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).2.minified.js index 018faf498774..93eeefd42634 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("C", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).1.normal.js index ecaa7ae8692b..878d18d69ebb 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,17 +14,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -34,10 +30,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).2.minified.js index baf6c809b9ef..3e6cdfcd4378 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -32,9 +28,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).1.normal.js index b0eab7c811bd..3c77cb98fa4e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("C", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).2.minified.js index 018faf498774..93eeefd42634 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.5.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("C", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).1.normal.js index c7cb727c0511..68c7b549b012 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "D", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).2.minified.js index a1ea7d66bbb5..336700d32d3e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es2015).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C1 { } C1 = _ts_decorate._([ dec ], C1); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).1.normal.js index b68217d21735..94273ef9a875 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).1.normal.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "D", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -24,8 +23,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).2.minified.js index 3ce1b3173c26..598796f98807 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).2.minified.js @@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); var C = function C() { _class_call_check._(this, C); }; @@ -18,7 +18,7 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).1.normal.js index c7cb727c0511..68c7b549b012 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "D", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - var before = _using._(_stack, null); + var _usingCtx = _using_ctx._(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate._([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).2.minified.js index a1ea7d66bbb5..336700d32d3e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=esnext).2.minified.js @@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; - _using._(_stack, null); + var _usingCtx = _using_ctx._(); + _usingCtx.u(null); class C1 { } C1 = _ts_decorate._([ dec ], C1); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).1.normal.js index c4fc86a5ce20..34a460c4368c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).2.minified.js index 8ec90864b21d..0bcad536860c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es2015).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).1.normal.js index 5558c33efb3f..8f8b72455193 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).1.normal.js @@ -1,12 +1,11 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -15,8 +14,7 @@ try { dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).2.minified.js index 3a9b8d9ae4b1..f386f567fce9 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=es5).2.minified.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -13,8 +12,8 @@ try { dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).1.normal.js index c4fc86a5ce20..34a460c4368c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as D }; try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).2.minified.js index 8ec90864b21d..0bcad536860c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=es6,target=esnext).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } C = _ts_decorate([ dec ], C); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as D }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).1.normal.js index bb30a21f28ce..ddf501115f38 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("D", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).2.minified.js index 4996610bbc1f..8ed7bef15037 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("D", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).1.normal.js index 5a23e2142659..f21e5cbe8d3c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,17 +14,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); var C = function C() { "use strict"; _class_call_check(this, C); @@ -34,10 +30,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).2.minified.js index f2006a103704..7ab0eb31a202 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,17 +13,14 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); var C = function C() { _class_call_check(this, C); }; @@ -32,9 +28,9 @@ System.register([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).1.normal.js index bb30a21f28ce..ddf501115f38 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - var before = _using(_stack, null); + var _usingCtx = _using_ctx(); + var before = _usingCtx.u(null); class C { } _export("D", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).2.minified.js index 4996610bbc1f..8ed7bef15037 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).2.minified.js @@ -1,35 +1,31 @@ //// [usingDeclarationsWithLegacyClassDecorators.6.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; - _using(_stack, null); + var _usingCtx = _using_ctx(); + _usingCtx.u(null); class C { } _export("D", C = _ts_decorate([ dec ], C)); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).1.normal.js index 9021d5532f74..9c2698aaab74 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).1.normal.js @@ -4,19 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).2.minified.js index bf84a5632b5a..dd66a6ff87ea 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es2015).2.minified.js @@ -2,16 +2,16 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).1.normal.js index 2fc760b0ba15..ea9b2d8c46e7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).1.normal.js @@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -16,10 +15,9 @@ try { C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).2.minified.js index 8a03c8bb2be6..98f1b834405e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).2.minified.js @@ -2,16 +2,16 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx._(), C = function C() { _class_call_check._(this, C); }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).1.normal.js index 9021d5532f74..9c2698aaab74 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).1.normal.js @@ -4,19 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).2.minified.js index bf84a5632b5a..dd66a6ff87ea 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=esnext).2.minified.js @@ -2,16 +2,16 @@ Object.defineProperty(exports, "__esModule", { value: !0 }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).1.normal.js index 72a97e8c0f22..853a3b6b62e6 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).2.minified.js index 5d4519141cf5..86d340d23276 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es2015).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).1.normal.js index f8a00255779c..06de5faa4046 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).1.normal.js @@ -1,10 +1,9 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -12,11 +11,10 @@ try { C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).2.minified.js index 00c5a2c0dea8..0fbdd9b8ee3f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=es5).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).1.normal.js index 72a97e8c0f22..853a3b6b62e6 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).2.minified.js index 5d4519141cf5..86d340d23276 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=es6,target=esnext).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).1.normal.js index bc8c9f021d29..2e8581f536ce 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).2.minified.js index a24f2db11bfe..59a9df2f1e1e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).1.normal.js index 4515dc11866c..02d1f7ea7e7c 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,16 +14,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -32,12 +28,11 @@ System.register([ C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).2.minified.js index bf63b2099e12..1cc637894ae3 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).1.normal.js index bc8c9f021d29..2e8581f536ce 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).2.minified.js index a24f2db11bfe..59a9df2f1e1e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.7.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).1.normal.js index 8548e1c8cf4b..8ae1ece99a0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).1.normal.js @@ -10,21 +10,19 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } _C = C; C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).2.minified.js index 857eb3e81424..6ba8203d51f1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es2015).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _C, _stack = []; + var _C, _usingCtx = _using_ctx._(); class C { } _C = C, C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).1.normal.js index a3c0297321a8..3449d82df4ab 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).1.normal.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "C", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -24,10 +23,9 @@ try { C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).2.minified.js index bc84c9fe84c9..8ac7c0bb5c95 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -var _C, _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _C, _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx._(), C = function C() { _class_call_check._(this, C); }; _C = C, C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).1.normal.js index 8548e1c8cf4b..8ae1ece99a0f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).1.normal.js @@ -10,21 +10,19 @@ Object.defineProperty(exports, "C", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); var _C; try { - var _stack = []; + var _usingCtx = _using_ctx._(); class C { } _C = C; C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).2.minified.js index 857eb3e81424..6ba8203d51f1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=esnext).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return _C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _C, _stack = []; + var _C, _usingCtx = _using_ctx._(); class C { } _C = C, C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).1.normal.js index 612fe5198fcb..aa6a7ceef736 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).1.normal.js @@ -1,21 +1,19 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _C = C; C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).2.minified.js index 0b335d56f288..10cbe3e0e41f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es2015).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = []; + var _C, _usingCtx = _using_ctx(); class C { } _C = C, C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).1.normal.js index 65b869691318..b9ad72b0c0e4 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -14,11 +13,10 @@ try { C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).2.minified.js index 0e2160687553..76f2e248d861 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=es5).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = [], C = function C() { + var _C, _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; _C = C, C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).1.normal.js index 612fe5198fcb..aa6a7ceef736 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).1.normal.js @@ -1,21 +1,19 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; var _C; try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _C = C; C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).2.minified.js index 0b335d56f288..10cbe3e0e41f 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=es6,target=esnext).2.minified.js @@ -1,17 +1,16 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _C, _stack = []; + var _C, _usingCtx = _using_ctx(); class C { } _C = C, C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { _C as C }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).1.normal.js index dd520731f7c3..d1024d13d7db 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).1.normal.js @@ -1,39 +1,34 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using, _C; + var _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", _C = C); C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).2.minified.js index 1b7d491d59c1..b85e72b2b16e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C), C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).1.normal.js index a6801e82cabf..d25512b1fd3e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using, _C; + var _class_call_check, _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ @@ -16,16 +15,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -34,12 +30,11 @@ System.register([ C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).2.minified.js index 3a1e329a924a..b20766568cb1 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; _export("C", C), C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).1.normal.js index dd520731f7c3..d1024d13d7db 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).1.normal.js @@ -1,39 +1,34 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using, _C; + var _ts_decorate, _using_ctx, _C; _export("C", void 0); return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", _C = C); C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).2.minified.js index 1b7d491d59c1..b85e72b2b16e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).2.minified.js @@ -1,34 +1,30 @@ //// [usingDeclarationsWithLegacyClassDecorators.8.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return _export("C", void 0), { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); class C { } _export("C", C), C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).1.normal.js index b23b8ccd8fc3..a4bd4accb1a7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = class C { }; C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).2.minified.js index 4374fcb711a7..6c68fbfb6168 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es2015).2.minified.js @@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = class { + var _usingCtx = _using_ctx._(), C = class { }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).1.normal.js index 83ff7521a6f4..3e2b6a072242 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).1.normal.js @@ -11,10 +11,9 @@ Object.defineProperty(exports, "default", { }); var _class_call_check = require("@swc/helpers/_/_class_call_check"); var _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -var _dispose = require("@swc/helpers/_/_dispose"); -var _using = require("@swc/helpers/_/_using"); +var _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = function C() { "use strict"; _class_call_check._(this, C); @@ -22,10 +21,9 @@ try { C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).2.minified.js index be3020abd9ee..2e8e8391c8db 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).2.minified.js @@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +var _class_call_check = require("@swc/helpers/_/_class_call_check"), _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx._(), C = function C() { _class_call_check._(this, C); }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).1.normal.js index b23b8ccd8fc3..a4bd4accb1a7 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).1.normal.js @@ -10,19 +10,17 @@ Object.defineProperty(exports, "default", { } }); const _ts_decorate = require("@swc/helpers/_/_ts_decorate"); -const _dispose = require("@swc/helpers/_/_dispose"); -const _using = require("@swc/helpers/_/_using"); +const _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = []; + var _usingCtx = _using_ctx._(); var C = class C { }; C = _ts_decorate._([ dec ], C); - var after = _using._(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).2.minified.js index 4374fcb711a7..6c68fbfb6168 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=esnext).2.minified.js @@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", { return C; } }); -const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _dispose = require("@swc/helpers/_/_dispose"), _using = require("@swc/helpers/_/_using"); +const _ts_decorate = require("@swc/helpers/_/_ts_decorate"), _using_ctx = require("@swc/helpers/_/_using_ctx"); try { - var _stack = [], C = class { + var _usingCtx = _using_ctx._(), C = class { }; C = _ts_decorate._([ dec - ], C), _using._(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose._(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).1.normal.js index 65b351dfa8e8..7084d7b2830d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = class C { }; C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).2.minified.js index 3a03f356c560..7110630aa11e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es2015).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = class { + var _usingCtx = _using_ctx(), C = class { }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).1.normal.js index 604476f04612..8e93165a0f35 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).1.normal.js @@ -1,11 +1,10 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -13,10 +12,9 @@ try { C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).2.minified.js index 2fafdf49bc3d..babb12144ca5 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=es5).2.minified.js @@ -1,18 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check"; import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).1.normal.js index 65b351dfa8e8..7084d7b2830d 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).1.normal.js @@ -1,19 +1,17 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; export { C as default }; try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = class C { }; C = _ts_decorate([ dec ], C); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).2.minified.js index 3a03f356c560..7110630aa11e 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=es6,target=esnext).2.minified.js @@ -1,16 +1,15 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate"; -import { _ as _dispose } from "@swc/helpers/_/_dispose"; -import { _ as _using } from "@swc/helpers/_/_using"; +import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx"; try { - var _stack = [], C = class { + var _usingCtx = _using_ctx(), C = class { }; C = _ts_decorate([ dec - ], C), _using(_stack, null); + ], C), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } export { C as default }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).1.normal.js index c1a39246a4af..a9d1eccb0f2b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = class C { }; _export("default", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).2.minified.js index 3832dfd790c9..b6ba6d8a9800 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).2.minified.js @@ -1,33 +1,29 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = class { + var _usingCtx = _using_ctx(), C = class { }; _export("default", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).1.normal.js index a105cb91ebf6..c5eeb1dd3398 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).1.normal.js @@ -2,11 +2,10 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -15,16 +14,13 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = function C() { "use strict"; _class_call_check(this, C); @@ -32,12 +28,11 @@ System.register([ _export("default", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).2.minified.js index b0ee7290e35b..dc0750bb89c2 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).2.minified.js @@ -2,10 +2,9 @@ System.register([ "@swc/helpers/_/_class_call_check", "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _class_call_check, _ts_decorate, _dispose, _using; + var _class_call_check, _ts_decorate, _using_ctx; return { setters: [ function(_class_call_check1) { @@ -14,25 +13,22 @@ System.register([ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = function C() { + var _usingCtx = _using_ctx(), C = function C() { _class_call_check(this, C); }; _export("default", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).1.normal.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).1.normal.js index c1a39246a4af..a9d1eccb0f2b 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).1.normal.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).1.normal.js @@ -1,37 +1,32 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { "use strict"; - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = []; + var _usingCtx = _using_ctx(); var C = class C { }; _export("default", C = _ts_decorate([ dec ], C)); - var after = _using(_stack, null); + var after = _usingCtx.u(null); } catch (_) { - var _error = _; - var _hasError = true; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).2.minified.js b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).2.minified.js index 3832dfd790c9..b6ba6d8a9800 100644 --- a/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).2.minified.js +++ b/crates/swc/tests/tsc-references/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).2.minified.js @@ -1,33 +1,29 @@ //// [usingDeclarationsWithLegacyClassDecorators.9.ts] System.register([ "@swc/helpers/_/_ts_decorate", - "@swc/helpers/_/_dispose", - "@swc/helpers/_/_using" + "@swc/helpers/_/_using_ctx" ], function(_export, _context) { - var _ts_decorate, _dispose, _using; + var _ts_decorate, _using_ctx; return { setters: [ function(_ts_decorate1) { _ts_decorate = _ts_decorate1._; }, - function(_dispose1) { - _dispose = _dispose1._; - }, - function(_using1) { - _using = _using1._; + function(_using_ctx1) { + _using_ctx = _using_ctx1._; } ], execute: function() { try { - var _stack = [], C = class { + var _usingCtx = _using_ctx(), C = class { }; _export("default", C = _ts_decorate([ dec - ], C)), _using(_stack, null); + ], C)), _usingCtx.u(null); } catch (_) { - var _error = _, _hasError = !0; + _usingCtx.e = _; } finally{ - _dispose(_stack, _error, _hasError); + _usingCtx.d(); } } }; diff --git a/crates/swc_atoms/Cargo.toml b/crates/swc_atoms/Cargo.toml index 6d9dd6e6722e..afc6077a2e47 100644 --- a/crates/swc_atoms/Cargo.toml +++ b/crates/swc_atoms/Cargo.toml @@ -20,7 +20,7 @@ rkyv-impl = ["__rkyv", "rkyv", "bytecheck"] bytecheck = { version = "0.6.10", optional = true } hstr = "0.2.8" once_cell = "1" -rkyv = { package = "rkyv", version = "=0.7.42", optional = true, features = [ +rkyv = { package = "rkyv", version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_bundler/src/bundler/chunk/cjs.rs b/crates/swc_bundler/src/bundler/chunk/cjs.rs index 5c8befce6259..3277515f0857 100644 --- a/crates/swc_bundler/src/bundler/chunk/cjs.rs +++ b/crates/swc_bundler/src/bundler/chunk/cjs.rs @@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::atomic::Ordering}; use anyhow::Error; use swc_common::{collections::AHashMap, Span, SyntaxContext, DUMMY_SP}; -use swc_ecma_ast::{ModuleItem, *}; +use swc_ecma_ast::*; use swc_ecma_utils::{quote_ident, undefined, ExprFactory}; use swc_ecma_visit::{noop_visit_mut_type, VisitMut, VisitMutWith}; diff --git a/crates/swc_bundler/src/bundler/chunk/merge.rs b/crates/swc_bundler/src/bundler/chunk/merge.rs index a431776c1db2..dff0b42b369e 100644 --- a/crates/swc_bundler/src/bundler/chunk/merge.rs +++ b/crates/swc_bundler/src/bundler/chunk/merge.rs @@ -10,14 +10,11 @@ use swc_common::{ }; use swc_ecma_ast::*; use swc_ecma_utils::{find_pat_ids, prepend_stmt, private_ident, quote_ident, ExprFactory}; -use swc_ecma_visit::{noop_fold_type, noop_visit_mut_type, Fold, VisitMut, VisitMutWith}; +use swc_ecma_visit::{VisitMut, VisitMutWith}; use EdgeDirection::Outgoing; use crate::{ - bundler::{ - keywords::KeywordRenamer, - load::{Imports, TransformedModule}, - }, + bundler::{keywords::KeywordRenamer, load::TransformedModule}, dep_graph::ModuleGraph, id::{Id, ModuleId}, inline::inline, @@ -1295,84 +1292,6 @@ where } } -pub(super) struct ImportDropper<'a> { - pub imports: &'a Imports, -} - -impl VisitMut for ImportDropper<'_> { - noop_visit_mut_type!(); - - fn visit_mut_module_item(&mut self, i: &mut ModuleItem) { - match i { - ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { src, .. })) - if self - .imports - .specifiers - .iter() - .any(|(s, _)| s.src.value == *src.value) => - { - *i = ModuleItem::Stmt(Stmt::Empty(EmptyStmt { span: DUMMY_SP })) - } - _ => {} - } - } -} - -/// `export var a = 1` => `var a = 1` -pub(super) struct Unexporter; - -impl Fold for Unexporter { - noop_fold_type!(); - - fn fold_module_item(&mut self, item: ModuleItem) -> ModuleItem { - match item { - ModuleItem::ModuleDecl(decl) => match decl { - ModuleDecl::ExportDecl(decl) => ModuleItem::Stmt(Stmt::Decl(decl.decl)), - - ModuleDecl::ExportDefaultDecl(export) => match export.decl { - DefaultDecl::Class(ClassExpr { ident: None, .. }) - | DefaultDecl::Fn(FnExpr { ident: None, .. }) => { - ModuleItem::Stmt(Stmt::Empty(EmptyStmt { span: DUMMY_SP })) - } - DefaultDecl::TsInterfaceDecl(decl) => { - ModuleItem::Stmt(Stmt::Decl(Decl::TsInterface(decl))) - } - - DefaultDecl::Class(ClassExpr { - ident: Some(ident), - class, - }) => ModuleItem::Stmt(Stmt::Decl(Decl::Class(ClassDecl { - declare: false, - ident, - class, - }))), - - DefaultDecl::Fn(FnExpr { - ident: Some(ident), - function, - }) => ModuleItem::Stmt(Stmt::Decl(Decl::Fn(FnDecl { - declare: false, - function, - ident, - }))), - }, - - // Empty statement - ModuleDecl::ExportAll(..) - | ModuleDecl::ExportDefaultExpr(..) - | ModuleDecl::ExportNamed(..) => { - ModuleItem::Stmt(Stmt::Empty(EmptyStmt { span: DUMMY_SP })) - } - ModuleDecl::Import(..) => ModuleItem::ModuleDecl(decl), - - _ => unimplemented!("Unexported: {:?}", decl), - }, - - _ => item, - } - } -} - struct ImportMetaHandler<'a, 'b> { file: &'a FileName, #[allow(clippy::borrowed_box)] diff --git a/crates/swc_bundler/src/bundler/chunk/mod.rs b/crates/swc_bundler/src/bundler/chunk/mod.rs index 8fef06d61d8a..5ca2296c2729 100644 --- a/crates/swc_bundler/src/bundler/chunk/mod.rs +++ b/crates/swc_bundler/src/bundler/chunk/mod.rs @@ -15,9 +15,6 @@ mod computed_key; mod merge; mod plan; -#[derive(Debug)] -struct InternalEntry {} - #[derive(Debug, Default)] struct State {} diff --git a/crates/swc_bundler/src/bundler/mod.rs b/crates/swc_bundler/src/bundler/mod.rs index 4d959c6efaff..c1432870fbf4 100644 --- a/crates/swc_bundler/src/bundler/mod.rs +++ b/crates/swc_bundler/src/bundler/mod.rs @@ -48,18 +48,13 @@ pub struct Config { pub module: ModuleType, } -#[derive(Debug, PartialEq, Eq, Hash)] +#[derive(Debug, PartialEq, Eq, Hash, Default)] pub enum ModuleType { + #[default] Es, Iife, } -impl Default for ModuleType { - fn default() -> Self { - ModuleType::Es - } -} - #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub enum BundleKind { /// User-provided entry diff --git a/crates/swc_bundler/src/util.rs b/crates/swc_bundler/src/util.rs index 9ff36025e309..752835a4c3e5 100644 --- a/crates/swc_bundler/src/util.rs +++ b/crates/swc_bundler/src/util.rs @@ -1,6 +1,6 @@ #![allow(dead_code)] -use std::{clone::Clone, cmp::Eq, hash::Hash}; +use std::hash::Hash; use swc_common::{Span, SyntaxContext, DUMMY_SP}; use swc_ecma_ast::*; diff --git a/crates/swc_bundler/tests/fixture.rs b/crates/swc_bundler/tests/fixture.rs index bd837a3cd060..6869b8d52426 100644 --- a/crates/swc_bundler/tests/fixture.rs +++ b/crates/swc_bundler/tests/fixture.rs @@ -1,5 +1,4 @@ use std::{ - self, collections::HashMap, fs::read_dir, io, diff --git a/crates/swc_cli_impl/src/commands/compile.rs b/crates/swc_cli_impl/src/commands/compile.rs index 96a9dc5cd3fd..3808e4ed4867 100644 --- a/crates/swc_cli_impl/src/commands/compile.rs +++ b/crates/swc_cli_impl/src/commands/compile.rs @@ -308,7 +308,10 @@ impl CompileOptions { }); if let Some(file_path) = *file_path { - options.filename = file_path.to_str().unwrap_or_default().to_owned(); + file_path + .to_str() + .unwrap_or_default() + .clone_into(&mut options.filename); } if let Some(env_name) = &self.env_name { @@ -322,8 +325,9 @@ impl CompileOptions { value => SourceMapsConfig::Str(value.to_string()), }); - options.source_file_name = self.source_file_name.to_owned(); - options.source_root = self.source_root.to_owned(); + self.source_file_name + .clone_into(&mut options.source_file_name); + self.source_root.clone_into(&mut options.source_root); } Ok(options) diff --git a/crates/swc_common/Cargo.toml b/crates/swc_common/Cargo.toml index a20c7b5e2ac7..44e865cbeadc 100644 --- a/crates/swc_common/Cargo.toml +++ b/crates/swc_common/Cargo.toml @@ -49,7 +49,7 @@ new_debug_unreachable = "1.0.4" num-bigint = "0.4" once_cell = "1.19.0" parking_lot = { version = "0.12.1", optional = true } -rkyv = { version = "=0.7.42", optional = true, features = [ +rkyv = { version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_common/src/errors/diagnostic.rs b/crates/swc_common/src/errors/diagnostic.rs index be198a3f2c69..cb33fc6b88fd 100644 --- a/crates/swc_common/src/errors/diagnostic.rs +++ b/crates/swc_common/src/errors/diagnostic.rs @@ -455,7 +455,7 @@ impl Diagnostic { /// message". pub fn copy_details_not_message(&mut self, from: &Diagnostic) { self.span = from.span.clone(); - self.code = from.code.clone(); + self.code.clone_from(&from.code); self.children.extend(from.children.iter().cloned()) } diff --git a/crates/swc_common/src/errors/emitter.rs b/crates/swc_common/src/errors/emitter.rs index 767d8e2267f3..e9d102ce1071 100644 --- a/crates/swc_common/src/errors/emitter.rs +++ b/crates/swc_common/src/errors/emitter.rs @@ -15,11 +15,8 @@ use std::{ io::{self, prelude::*}, }; -#[cfg(feature = "tty-emitter")] -use atty; #[cfg(feature = "tty-emitter")] use termcolor::{Buffer, BufferWriter, Color, ColorChoice, ColorSpec, StandardStream, WriteColor}; -use unicode_width; use self::Destination::*; use super::{ @@ -1112,7 +1109,7 @@ impl EmitterWriter { let mut to_add = HashMap::<_, _>::default(); for (depth, style) in depths { - if multilines.get(&depth).is_some() { + if multilines.contains_key(&depth) { multilines.remove(&depth); } else { to_add.insert(depth, style); diff --git a/crates/swc_common/src/source_map.rs b/crates/swc_common/src/source_map.rs index d1a951dfae9b..5fc8967975ff 100644 --- a/crates/swc_common/src/source_map.rs +++ b/crates/swc_common/src/source_map.rs @@ -1191,7 +1191,6 @@ impl SourceMap { None } - /// #[cfg(feature = "sourcemap")] #[cfg_attr(docsrs, doc(cfg(feature = "sourcemap")))] pub fn build_source_map(&self, mappings: &[(BytePos, LineCol)]) -> sourcemap::SourceMap { @@ -1508,7 +1507,6 @@ pub struct ByteToCharPosState { #[cfg(test)] mod tests { use super::*; - use crate::sync::Lrc; fn init_source_map() -> SourceMap { let sm = SourceMap::new(FilePathMapping::empty()); @@ -1765,49 +1763,4 @@ mod tests { cpos = cpos + CharPos(c.len_utf16()); } } - - /// Returns the span corresponding to the `n`th occurrence of - /// `substring` in `source_text`. - trait SourceMapExtension { - fn span_substr( - &self, - file: &Lrc, - source_text: &str, - substring: &str, - n: usize, - ) -> Span; - } - - impl SourceMapExtension for SourceMap { - fn span_substr( - &self, - file: &Lrc, - source_text: &str, - substring: &str, - n: usize, - ) -> Span { - let mut i = 0; - let mut hi = 0; - loop { - let offset = source_text[hi..].find(substring).unwrap_or_else(|| { - panic!( - "source_text `{}` does not have {} occurrences of `{}`, only {}", - source_text, n, substring, i - ); - }); - let lo = hi + offset; - hi = lo + substring.len(); - if i == n { - let span = Span::new( - BytePos(lo as u32 + file.start_pos.0), - BytePos(hi as u32 + file.start_pos.0), - NO_EXPANSION, - ); - assert_eq!(&self.span_to_snippet(span).unwrap()[..], substring); - return span; - } - i += 1; - } - } - } } diff --git a/crates/swc_common/src/syntax_pos/hygiene.rs b/crates/swc_common/src/syntax_pos/hygiene.rs index 0d43b52ebd95..5ec6d36c71c5 100644 --- a/crates/swc_common/src/syntax_pos/hygiene.rs +++ b/crates/swc_common/src/syntax_pos/hygiene.rs @@ -315,7 +315,7 @@ impl HygieneData { return f(&mut globals.hygiene_data.lock()); #[cfg(not(feature = "parking_lot"))] - return f(&mut *globals.hygiene_data.lock().unwrap()); + return f(&mut globals.hygiene_data.lock().unwrap()); }) } } @@ -328,7 +328,7 @@ pub(crate) fn with_marks) -> T>(f: F) -> T { return f(&mut globals.marks.lock()); #[cfg(not(feature = "parking_lot"))] - return f(&mut *globals.marks.lock().unwrap()); + return f(&mut globals.marks.lock().unwrap()); }) } diff --git a/crates/swc_common/tests/attr_interop.rs b/crates/swc_common/tests/attr_interop.rs index 2db21d74314c..3be53899e45a 100644 --- a/crates/swc_common/tests/attr_interop.rs +++ b/crates/swc_common/tests/attr_interop.rs @@ -1,6 +1,6 @@ //! Test that `#[span]` and `#[fold]` can be used at same time. -use serde::{self, Deserialize, Serialize}; -use swc_common::{self, ast_node, Span, Spanned}; +use serde::{Deserialize, Serialize}; +use swc_common::{ast_node, Span, Spanned}; #[ast_node("Class")] // See https://github.com/rust-lang/rust/issues/44925 diff --git a/crates/swc_core/tests/fixture/stub_napi/Cargo.toml b/crates/swc_core/tests/fixture/stub_napi/Cargo.toml index 044a070f42d9..841394d5ad67 100644 --- a/crates/swc_core/tests/fixture/stub_napi/Cargo.toml +++ b/crates/swc_core/tests/fixture/stub_napi/Cargo.toml @@ -39,6 +39,7 @@ napi-derive = { version = "2", default-features = false, features = [ "type-def", ] } path-clean = "0.1" +proc-macro2 = "=1.0.79" serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["unbounded_depth"] } tracing = { version = "0.1.37", features = ["release_max_level_info"] } diff --git a/crates/swc_core/tests/fixture/stub_wasm/Cargo.toml b/crates/swc_core/tests/fixture/stub_wasm/Cargo.toml index d12d3403e245..e8b40c293bd7 100644 --- a/crates/swc_core/tests/fixture/stub_wasm/Cargo.toml +++ b/crates/swc_core/tests/fixture/stub_wasm/Cargo.toml @@ -17,6 +17,7 @@ swc_v1 = [] [dependencies] anyhow = "1.0.66" browserslist-rs = { version = "0.13.0", features = ["wasm_bindgen"] } +proc-macro2 = "=1.0.79" serde = { version = "1", features = ["derive"] } serde-wasm-bindgen = "0.4.5" swc_core = { path = "../../../../swc_core", features = [ diff --git a/crates/swc_css_ast/Cargo.toml b/crates/swc_css_ast/Cargo.toml index 88df62d23290..9d0b9f494247 100644 --- a/crates/swc_css_ast/Cargo.toml +++ b/crates/swc_css_ast/Cargo.toml @@ -19,7 +19,7 @@ serde-impl = ["serde"] [dependencies] is-macro = "0.3.5" -rkyv = { version = "=0.7.42", optional = true, features = [ +rkyv = { version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_css_codegen/src/writer/basic.rs b/crates/swc_css_codegen/src/writer/basic.rs index 1983d1192949..c9a1a2277691 100644 --- a/crates/swc_css_codegen/src/writer/basic.rs +++ b/crates/swc_css_codegen/src/writer/basic.rs @@ -5,30 +5,20 @@ use swc_common::{BytePos, LineCol, Span}; use super::CssWriter; -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Default, Copy, PartialEq, Eq, Debug)] pub enum IndentType { Tab, + #[default] Space, } -impl Default for IndentType { - fn default() -> Self { - IndentType::Space - } -} - -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Default, Copy, PartialEq, Eq, Debug)] pub enum LineFeed { + #[default] LF, CRLF, } -impl Default for LineFeed { - fn default() -> Self { - LineFeed::LF - } -} - pub struct BasicCssWriterConfig { pub indent_type: IndentType, pub indent_width: i32, diff --git a/crates/swc_css_compat/src/compiler/nesting.rs b/crates/swc_css_compat/src/compiler/nesting.rs index f9661f41ea23..6b3e0153901a 100644 --- a/crates/swc_css_compat/src/compiler/nesting.rs +++ b/crates/swc_css_compat/src/compiler/nesting.rs @@ -117,7 +117,7 @@ impl Compiler { &mut children { if c.type_selector.is_some() { - compound.type_selector = c.type_selector.clone(); + compound.type_selector.clone_from(&c.type_selector); } let mut subclass = c.subclass_selectors.clone(); diff --git a/crates/swc_css_parser/src/parser/input.rs b/crates/swc_css_parser/src/parser/input.rs index 0c5fbd52b394..eef9c7958111 100644 --- a/crates/swc_css_parser/src/parser/input.rs +++ b/crates/swc_css_parser/src/parser/input.rs @@ -176,7 +176,7 @@ where } pub(super) fn reset(&mut self, state: &WrappedState) { - self.cur = state.cur.clone(); + self.cur.clone_from(&state.cur); self.input.reset(&state.inner); } } @@ -465,8 +465,8 @@ impl<'a> ParserInput for Input<'a> { } fn reset(&mut self, state: &Self::State) { - self.idx = state.idx.clone(); - self.balance_stack = state.balance_stack.clone(); + self.idx.clone_from(&state.idx); + self.balance_stack.clone_from(&state.balance_stack); } fn take_errors(&mut self) -> Vec { diff --git a/crates/swc_css_parser/src/parser/mod.rs b/crates/swc_css_parser/src/parser/mod.rs index 5a49c79ce28e..f9d06439cecc 100644 --- a/crates/swc_css_parser/src/parser/mod.rs +++ b/crates/swc_css_parser/src/parser/mod.rs @@ -53,20 +53,15 @@ pub struct ParserConfig { pub legacy_ie: bool, } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)] pub enum BlockContentsGrammar { StyleBlock, DeclarationList, RuleList, + #[default] Stylesheet, } -impl Default for BlockContentsGrammar { - fn default() -> Self { - BlockContentsGrammar::Stylesheet - } -} - #[derive(Debug, Clone, Copy)] struct Ctx { is_top_level: bool, diff --git a/crates/swc_css_parser/src/parser/values_and_units/mod.rs b/crates/swc_css_parser/src/parser/values_and_units/mod.rs index f29a8197c246..75dd8c6970b2 100644 --- a/crates/swc_css_parser/src/parser/values_and_units/mod.rs +++ b/crates/swc_css_parser/src/parser/values_and_units/mod.rs @@ -146,10 +146,7 @@ where } }; - let balance_close_type = match balance_stack.pop() { - Some(v) => v, - None => None, - }; + let balance_close_type = balance_stack.pop().unwrap_or_default(); if Some(value) != balance_close_type { break; diff --git a/crates/swc_ecma_ast/Cargo.toml b/crates/swc_ecma_ast/Cargo.toml index b797db447bfc..5a6c27ffe574 100644 --- a/crates/swc_ecma_ast/Cargo.toml +++ b/crates/swc_ecma_ast/Cargo.toml @@ -36,7 +36,7 @@ bytecheck = { version = "0.6.10", optional = true } is-macro = "0.3.5" num-bigint = { version = "0.4", features = ["serde"] } phf = { version = "0.11.2", features = ["macros"] } -rkyv = { package = "rkyv", version = "=0.7.42", optional = true, features = [ +rkyv = { package = "rkyv", version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs index 75128632909d..933ce6dc343a 100644 --- a/crates/swc_ecma_ast/src/lib.rs +++ b/crates/swc_ecma_ast/src/lib.rs @@ -105,12 +105,13 @@ impl Take for Invalid { /// Note: This type implements `Serailize` and `Deserialize` if `serde` is /// enabled, instead of requiring `serde-impl` feature. -#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)] +#[derive(Debug, Default, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum EsVersion { #[cfg_attr(feature = "serde", serde(rename = "es3", alias = "ES3"))] Es3, #[cfg_attr(feature = "serde", serde(rename = "es5", alias = "ES5"))] + #[default] Es5, #[cfg_attr( feature = "serde", @@ -141,12 +142,6 @@ impl EsVersion { } } -impl Default for EsVersion { - fn default() -> Self { - EsVersion::Es5 - } -} - /// Warning: The particular implementation of serialization and deserialization /// of the ast nodes may change in the future, and so these types would be /// removed. It's safe to say they will be serializable in some form or another, diff --git a/crates/swc_ecma_codegen/benches/bench.rs b/crates/swc_ecma_codegen/benches/bench.rs index b1501a580ecb..792777fab247 100644 --- a/crates/swc_ecma_codegen/benches/bench.rs +++ b/crates/swc_ecma_codegen/benches/bench.rs @@ -2,7 +2,7 @@ extern crate swc_malloc; use criterion::{black_box, criterion_group, criterion_main, Bencher, Criterion}; use swc_common::FileName; -use swc_ecma_codegen::{self, Emitter}; +use swc_ecma_codegen::Emitter; use swc_ecma_parser::{Parser, StringInput, Syntax}; const COLORS_JS: &str = r#" diff --git a/crates/swc_ecma_codegen/benches/with_parse.rs b/crates/swc_ecma_codegen/benches/with_parse.rs index deab9f740137..30b0b8791e99 100644 --- a/crates/swc_ecma_codegen/benches/with_parse.rs +++ b/crates/swc_ecma_codegen/benches/with_parse.rs @@ -2,7 +2,7 @@ extern crate swc_malloc; use criterion::{black_box, criterion_group, criterion_main, Bencher, Criterion}; use swc_common::FileName; -use swc_ecma_codegen::{self, Emitter}; +use swc_ecma_codegen::Emitter; use swc_ecma_parser::{Parser, StringInput, Syntax}; const COLORS_JS: &str = r#" diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs index 24b162c32223..f2260dc2d73f 100644 --- a/crates/swc_ecma_codegen/src/lib.rs +++ b/crates/swc_ecma_codegen/src/lib.rs @@ -38,27 +38,27 @@ pub mod util; pub type Result = io::Result<()>; pub trait Node: Spanned { - fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result + fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result where W: WriteJs, - S: SourceMapperExt; + S: SourceMapper + SourceMapperExt; } impl Node for Box { #[inline] - fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result + fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result where W: WriteJs, - S: SourceMapperExt, + S: SourceMapper + SourceMapperExt, { (**self).emit_with(e) } } impl<'a, N: Node> Node for &'a N { #[inline] - fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result + fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result where W: WriteJs, - S: SourceMapperExt, + S: SourceMapper + SourceMapperExt, { (**self).emit_with(e) } @@ -3675,10 +3675,10 @@ impl Node for Option where N: Node, { - fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result + fn emit_with(&self, e: &mut Emitter<'_, W, S>) -> Result where W: WriteJs, - S: SourceMapperExt, + S: SourceMapper + SourceMapperExt, { match *self { Some(ref n) => n.emit_with(e), diff --git a/crates/swc_ecma_codegen/src/tests.rs b/crates/swc_ecma_codegen/src/tests.rs index 0903d5df541e..1a66d887080c 100644 --- a/crates/swc_ecma_codegen/src/tests.rs +++ b/crates/swc_ecma_codegen/src/tests.rs @@ -1,9 +1,4 @@ -use std::{ - fmt::Debug, - io::Write, - path::PathBuf, - sync::{Arc, RwLock}, -}; +use std::path::PathBuf; use swc_common::{comments::SingleThreadedComments, FileName, SourceMap}; use swc_ecma_parser; @@ -12,7 +7,7 @@ use testing::DebugUsingDisplay; use self::swc_ecma_parser::{EsConfig, Parser, StringInput, Syntax}; use super::*; -use crate::{config::Config, text_writer::omit_trailing_semi}; +use crate::text_writer::omit_trailing_semi; struct Builder { cfg: Config, @@ -706,18 +701,6 @@ fn test_escape_with_source_str() { ); } -#[derive(Debug, Clone)] -struct Buf(Arc>>); -impl Write for Buf { - fn write(&mut self, data: &[u8]) -> io::Result { - self.0.write().unwrap().write(data) - } - - fn flush(&mut self) -> io::Result<()> { - self.0.write().unwrap().flush() - } -} - #[test] fn issue_2213() { assert_min("a - -b * c", "a- -b*c") diff --git a/crates/swc_ecma_codegen/tests/sourcemap.rs b/crates/swc_ecma_codegen/tests/sourcemap.rs index c55ede261912..fbbe43edb688 100644 --- a/crates/swc_ecma_codegen/tests/sourcemap.rs +++ b/crates/swc_ecma_codegen/tests/sourcemap.rs @@ -5,7 +5,7 @@ use rustc_hash::FxHashSet; use sourcemap::SourceMap; use swc_common::{comments::SingleThreadedComments, source_map::SourceMapGenConfig}; use swc_ecma_ast::EsVersion; -use swc_ecma_codegen::{self, text_writer::WriteJs, Emitter}; +use swc_ecma_codegen::{text_writer::WriteJs, Emitter}; use swc_ecma_parser::{lexer::Lexer, Parser, Syntax}; use swc_ecma_testing::{exec_node_js, JsExecOptions}; diff --git a/crates/swc_ecma_codegen/tests/test262.rs b/crates/swc_ecma_codegen/tests/test262.rs index f6437d69ce50..f12b0ce8ebcb 100644 --- a/crates/swc_ecma_codegen/tests/test262.rs +++ b/crates/swc_ecma_codegen/tests/test262.rs @@ -8,7 +8,7 @@ use std::{ use swc_common::comments::SingleThreadedComments; use swc_ecma_ast::EsVersion; -use swc_ecma_codegen::{self, text_writer::WriteJs, Emitter}; +use swc_ecma_codegen::{text_writer::WriteJs, Emitter}; use swc_ecma_parser::{lexer::Lexer, Parser, Syntax}; use testing::NormalizedOutput; diff --git a/crates/swc_ecma_codegen_macros/src/lib.rs b/crates/swc_ecma_codegen_macros/src/lib.rs index 93aa49c0fc6c..e592c5073e3b 100644 --- a/crates/swc_ecma_codegen_macros/src/lib.rs +++ b/crates/swc_ecma_codegen_macros/src/lib.rs @@ -2,7 +2,7 @@ extern crate proc_macro; use proc_macro::TokenStream; use swc_macros_common::prelude::*; -use syn::{self, fold::Fold, *}; +use syn::{fold::Fold, *}; mod fold; diff --git a/crates/swc_ecma_compat_es2015/src/block_scoping/mod.rs b/crates/swc_ecma_compat_es2015/src/block_scoping/mod.rs index 81cada815c31..3903abda4ce6 100644 --- a/crates/swc_ecma_compat_es2015/src/block_scoping/mod.rs +++ b/crates/swc_ecma_compat_es2015/src/block_scoping/mod.rs @@ -675,7 +675,7 @@ impl<'a> FlowHelper<'a> { fn has_outer_label(&self, label: &Option) -> bool { match label { - Some(l) => self.inner_label.get(&l.sym).is_none(), + Some(l) => !self.inner_label.contains(&l.sym), None => false, } } diff --git a/crates/swc_ecma_compat_es2015/src/classes/constructor.rs b/crates/swc_ecma_compat_es2015/src/classes/constructor.rs index 5b091143e5c1..354f6e6769d9 100644 --- a/crates/swc_ecma_compat_es2015/src/classes/constructor.rs +++ b/crates/swc_ecma_compat_es2015/src/classes/constructor.rs @@ -1,6 +1,5 @@ use std::iter; -use swc_atoms::JsWord; use swc_common::{util::take::Take, Mark, DUMMY_SP}; use swc_ecma_ast::*; use swc_ecma_transforms_base::helper; @@ -511,42 +510,3 @@ pub(super) fn replace_this_in_constructor(mark: Mark, c: &mut Constructor) -> bo v.found } - -/// # In -/// -/// ```js -/// -/// class Example { -/// constructor() { -/// var Example; -/// } -/// } -/// ``` -/// -/// # Out -/// -/// ```js -/// var Example = function Example() { -/// _class_call_check(this, Example); -/// var Example1; -/// }; -/// ``` -pub(super) struct VarRenamer<'a> { - pub mark: Mark, - pub class_name: &'a JsWord, -} - -impl<'a> VisitMut for VarRenamer<'a> { - noop_visit_mut_type!(); - - fn visit_mut_pat(&mut self, pat: &mut Pat) { - match pat { - Pat::Ident(ident) => { - if *self.class_name == ident.id.sym { - ident.id.span = ident.id.span.apply_mark(self.mark); - } - } - _ => pat.visit_mut_children_with(self), - } - } -} diff --git a/crates/swc_ecma_compat_es2015/src/generator.rs b/crates/swc_ecma_compat_es2015/src/generator.rs index 2f14ca583de5..1dc473a60096 100644 --- a/crates/swc_ecma_compat_es2015/src/generator.rs +++ b/crates/swc_ecma_compat_es2015/src/generator.rs @@ -2915,6 +2915,7 @@ impl Generator { self.clauses = Some(Default::default()); } + #[allow(clippy::manual_unwrap_or_default)] let stmts = if let Some(mut stmts) = self.stmts.take() { if self.with_block_stack.is_some() { // The previous label was nested inside one or more `with` diff --git a/crates/swc_ecma_compat_es2015/src/lib.rs b/crates/swc_ecma_compat_es2015/src/lib.rs index e536e0704b4a..7be2ba0b2440 100644 --- a/crates/swc_ecma_compat_es2015/src/lib.rs +++ b/crates/swc_ecma_compat_es2015/src/lib.rs @@ -124,7 +124,6 @@ pub struct Config { #[cfg(test)] mod tests { - use swc_common::Mark; use swc_ecma_transforms_base::resolver; use swc_ecma_transforms_testing::{test, test_exec}; diff --git a/crates/swc_ecma_compat_es2015/src/spread.rs b/crates/swc_ecma_compat_es2015/src/spread.rs index a4ab5b32ec82..7b49968ca1ff 100644 --- a/crates/swc_ecma_compat_es2015/src/spread.rs +++ b/crates/swc_ecma_compat_es2015/src/spread.rs @@ -222,7 +222,7 @@ impl Spread { fn concat_args( &self, span: Span, - args: impl ExactSizeIterator + Iterator>, + args: impl ExactSizeIterator>, need_array: bool, ) -> Expr { // @@ -447,11 +447,11 @@ impl Spread { #[tracing::instrument(level = "info", skip_all)] fn expand_literal_args( - args: impl ExactSizeIterator + Iterator>, + args: impl ExactSizeIterator>, ) -> Vec> { fn expand( buf: &mut Vec>, - args: impl ExactSizeIterator + Iterator>, + args: impl ExactSizeIterator>, ) { for mut arg in args { if let Some(ExprOrSpread { diff --git a/crates/swc_ecma_compat_es2022/src/class_properties/mod.rs b/crates/swc_ecma_compat_es2022/src/class_properties/mod.rs index 7a506aae3cf7..054745604a15 100644 --- a/crates/swc_ecma_compat_es2022/src/class_properties/mod.rs +++ b/crates/swc_ecma_compat_es2022/src/class_properties/mod.rs @@ -485,7 +485,7 @@ impl ClassProperties { } ClassMember::PrivateProp(prop) => { - if private_map.get(&prop.key.id.sym).is_some() { + if private_map.contains_key(&prop.key.id.sym) { let error = format!("duplicate private name #{}.", prop.key.id.sym); HANDLER.with(|handler| { handler.struct_span_err(prop.key.id.span, &error).emit() diff --git a/crates/swc_ecma_compat_es2022/src/private_in_object.rs b/crates/swc_ecma_compat_es2022/src/private_in_object.rs index 0b245bce12eb..4dcd8c744f28 100644 --- a/crates/swc_ecma_compat_es2022/src/private_in_object.rs +++ b/crates/swc_ecma_compat_es2022/src/private_in_object.rs @@ -216,7 +216,7 @@ impl VisitMut for PrivateInObject { let old_cls = take(&mut self.cls); self.cls.mark = Mark::fresh(Mark::root()); - self.cls.ident = n.ident.clone(); + self.cls.ident.clone_from(&n.ident); self.cls.vars = Mode::ClassExpr { vars: Default::default(), init_exprs: Default::default(), diff --git a/crates/swc_ecma_lints/src/lib.rs b/crates/swc_ecma_lints/src/lib.rs index 86f4713cf2c5..cf3b8b32497c 100644 --- a/crates/swc_ecma_lints/src/lib.rs +++ b/crates/swc_ecma_lints/src/lib.rs @@ -1,6 +1,7 @@ #![cfg_attr(feature = "non_critical_lints", deny(unused))] #![cfg_attr(feature = "non_critical_lints", deny(clippy::all))] #![allow(rustc::untranslatable_diagnostic_trivial)] +#![allow(dead_code)] pub mod config; pub mod rule; diff --git a/crates/swc_ecma_lints/src/rules/constructor_super.rs b/crates/swc_ecma_lints/src/rules/constructor_super.rs index 19b37c521b6b..16e44cdd3ec5 100644 --- a/crates/swc_ecma_lints/src/rules/constructor_super.rs +++ b/crates/swc_ecma_lints/src/rules/constructor_super.rs @@ -25,19 +25,14 @@ pub fn constructor_super(config: &RuleConfig<()>) -> Option> { } } -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Clone, Copy, Default)] enum SuperClass { Valid, Invalid, + #[default] NotSetted, } -impl Default for SuperClass { - fn default() -> Self { - SuperClass::NotSetted - } -} - #[derive(Debug, Default)] struct ClassMeta { super_class: SuperClass, diff --git a/crates/swc_ecma_loader/src/lib.rs b/crates/swc_ecma_loader/src/lib.rs index 97b51f3fdc62..710e719d50fb 100644 --- a/crates/swc_ecma_loader/src/lib.rs +++ b/crates/swc_ecma_loader/src/lib.rs @@ -78,16 +78,11 @@ pub const NODE_BUILTINS: &[&str] = &[ ]; /// Target runtime environment. -#[derive(Debug, Copy, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)] +#[derive(Debug, Copy, Clone, Serialize, Deserialize, Eq, PartialEq, Hash, Default)] pub enum TargetEnv { #[serde(rename = "browser")] + #[default] Browser, #[serde(rename = "node")] Node, } - -impl Default for TargetEnv { - fn default() -> Self { - TargetEnv::Browser - } -} diff --git a/crates/swc_ecma_loader/src/resolve.rs b/crates/swc_ecma_loader/src/resolve.rs index 049baf2f1687..9baa5dce4a02 100644 --- a/crates/swc_ecma_loader/src/resolve.rs +++ b/crates/swc_ecma_loader/src/resolve.rs @@ -2,6 +2,7 @@ use std::sync::Arc; use anyhow::Error; use swc_atoms::Atom; +#[allow(unused_imports)] use swc_common::{ sync::{Send, Sync}, FileName, diff --git a/crates/swc_ecma_minifier/src/compress/mod.rs b/crates/swc_ecma_minifier/src/compress/mod.rs index 01eda3c681f9..834f8d51f067 100644 --- a/crates/swc_ecma_minifier/src/compress/mod.rs +++ b/crates/swc_ecma_minifier/src/compress/mod.rs @@ -1,11 +1,8 @@ #[cfg(feature = "debug")] +use std::fmt::{self, Debug, Display, Formatter}; +#[cfg(feature = "debug")] use std::thread; -use std::{ - borrow::Cow, - fmt, - fmt::{Debug, Display, Formatter, Write}, - time::Instant, -}; +use std::{borrow::Cow, fmt::Write, time::Instant}; #[cfg(feature = "pretty_assertions")] use pretty_assertions::assert_eq; @@ -357,9 +354,11 @@ impl VisitMut for Compressor<'_> { } } +#[cfg(feature = "debug")] #[derive(PartialEq, Eq)] struct DebugUsingDisplay<'a>(pub &'a str); +#[cfg(feature = "debug")] impl<'a> Debug for DebugUsingDisplay<'a> { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { Display::fmt(self.0, f) diff --git a/crates/swc_ecma_minifier/src/compress/optimize/inline.rs b/crates/swc_ecma_minifier/src/compress/optimize/inline.rs index 38a1657e51c2..d2aa38e509a0 100644 --- a/crates/swc_ecma_minifier/src/compress/optimize/inline.rs +++ b/crates/swc_ecma_minifier/src/compress/optimize/inline.rs @@ -797,7 +797,7 @@ impl Optimizer<'_> { report_change!("inline: Inlined array access"); self.changed = true; - me.obj = new.clone(); + me.obj.clone_from(new); // TODO(kdy1): Optimize performance by skipping visiting of children // nodes. e.visit_mut_with(&mut expr_simplifier( diff --git a/crates/swc_ecma_minifier/src/js.rs b/crates/swc_ecma_minifier/src/js.rs index cb49c72fb174..99dabbb1457c 100644 --- a/crates/swc_ecma_minifier/src/js.rs +++ b/crates/swc_ecma_minifier/src/js.rs @@ -202,16 +202,11 @@ fn default_comments() -> BoolOrDataConfig { BoolOrDataConfig::from_obj(JsMinifyCommentOption::PreserveSomeComments) } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, Default)] pub enum JsMinifyCommentOption { #[serde(rename = "some")] + #[default] PreserveSomeComments, #[serde(rename = "all")] PreserveAllComments, } - -impl Default for JsMinifyCommentOption { - fn default() -> Self { - JsMinifyCommentOption::PreserveSomeComments - } -} diff --git a/crates/swc_ecma_minifier/src/option/terser.rs b/crates/swc_ecma_minifier/src/option/terser.rs index c82fdeb7c2e9..6f9dc513d759 100644 --- a/crates/swc_ecma_minifier/src/option/terser.rs +++ b/crates/swc_ecma_minifier/src/option/terser.rs @@ -25,22 +25,17 @@ impl Default for TerserEcmaVersion { } } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, Default)] #[serde(deny_unknown_fields)] #[serde(untagged)] pub enum TerserPureGetterOption { Bool(bool), #[serde(rename = "strict")] + #[default] Strict, Str(String), } -impl Default for TerserPureGetterOption { - fn default() -> Self { - TerserPureGetterOption::Strict - } -} - #[derive(Debug, Clone, Copy, Serialize, Deserialize)] #[serde(deny_unknown_fields)] #[serde(untagged)] diff --git a/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs b/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs index 3ff75820f86a..3d9057e7aa65 100644 --- a/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs +++ b/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs @@ -1,7 +1,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; use swc_atoms::JsWord; use swc_common::{chain, Mark}; -use swc_ecma_ast::{Module, *}; +use swc_ecma_ast::*; use swc_ecma_transforms_base::rename::{renamer, Renamer}; use swc_ecma_visit::{noop_visit_mut_type, VisitMut, VisitMutWith}; diff --git a/crates/swc_ecma_minifier/src/util/mod.rs b/crates/swc_ecma_minifier/src/util/mod.rs index 97bde2117bbb..96702000c4b8 100644 --- a/crates/swc_ecma_minifier/src/util/mod.rs +++ b/crates/swc_ecma_minifier/src/util/mod.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + use std::time::Instant; use rustc_hash::FxHashSet; @@ -11,7 +13,6 @@ pub(crate) mod size; pub(crate) mod sort; pub(crate) mod unit; -/// pub(crate) fn make_number(span: Span, value: f64) -> Expr { trace_op!("Creating a numeric literal"); Expr::Lit(Lit::Num(Number { diff --git a/crates/swc_ecma_minifier/src/util/unit.rs b/crates/swc_ecma_minifier/src/util/unit.rs index 107b01ac1f56..5cef338f77a5 100644 --- a/crates/swc_ecma_minifier/src/util/unit.rs +++ b/crates/swc_ecma_minifier/src/util/unit.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + use std::fmt::Debug; use swc_common::Mark; diff --git a/crates/swc_ecma_minifier/tests/compress.rs b/crates/swc_ecma_minifier/tests/compress.rs index 1ddc0cdcf8fe..950dd5933fd8 100644 --- a/crates/swc_ecma_minifier/tests/compress.rs +++ b/crates/swc_ecma_minifier/tests/compress.rs @@ -4,7 +4,7 @@ extern crate swc_malloc; use std::{ env, - fmt::{self, Debug}, + fmt::Debug, fs::read_to_string, panic::catch_unwind, path::{Path, PathBuf}, @@ -20,7 +20,7 @@ use swc_common::{ errors::{Handler, HANDLER}, sync::Lrc, util::take::Take, - EqIgnoreSpan, FileName, Mark, SourceMap, Spanned, + EqIgnoreSpan, FileName, Mark, SourceMap, }; use swc_ecma_ast::*; use swc_ecma_codegen::{ @@ -45,7 +45,7 @@ use swc_ecma_transforms_base::{ resolver, }; use swc_ecma_utils::drop_span; -use swc_ecma_visit::{FoldWith, Visit, VisitMut, VisitMutWith, VisitWith}; +use swc_ecma_visit::{FoldWith, VisitMut, VisitMutWith}; use testing::{assert_eq, unignore_fixture, DebugUsingDisplay, NormalizedOutput}; fn load_txt(filename: &str) -> Vec { @@ -669,1031 +669,6 @@ fn print( String::from_utf8(buf).unwrap() } -struct Shower<'a> { - cm: Lrc, - handler: &'a Handler, -} - -impl Shower<'_> { - fn show(&self, name: &str, node: &N) - where - N: Spanned + fmt::Debug + swc_ecma_codegen::Node, - { - let span = node.span(); - - if span.is_dummy() { - let src = print(self.cm.clone(), &[node], false, false); - self.handler - .struct_span_warn(span, &format!("{}: {}", name, src)) - .emit(); - } else { - self.handler.struct_span_warn(span, name).emit(); - } - } - - fn show_name(&self, name: &str, node: &N) - where - N: Spanned + fmt::Debug, - { - let span = node.span(); - - if span.is_dummy() { - self.handler - .struct_span_warn(span, &format!("{:?}", node)) - .emit(); - } else { - self.handler.struct_span_warn(span, name).emit(); - } - } -} - -impl Visit for Shower<'_> { - fn visit_array_lit(&mut self, n: &ArrayLit) { - self.show("ArrayLit", n); - n.visit_children_with(self) - } - - fn visit_array_pat(&mut self, n: &ArrayPat) { - self.show("ArrayPat", n); - n.visit_children_with(self) - } - - fn visit_arrow_expr(&mut self, n: &ArrowExpr) { - self.show("ArrowExpr", n); - n.visit_children_with(self) - } - - fn visit_assign_expr(&mut self, n: &AssignExpr) { - self.show("AssignExpr", n); - n.visit_children_with(self) - } - - fn visit_assign_pat(&mut self, n: &AssignPat) { - self.show("AssignPat", n); - n.visit_children_with(self) - } - - fn visit_assign_pat_prop(&mut self, n: &AssignPatProp) { - self.show("AssignPatProp", n); - n.visit_children_with(self) - } - - fn visit_assign_prop(&mut self, n: &AssignProp) { - self.show("AssignProp", n); - n.visit_children_with(self) - } - - fn visit_await_expr(&mut self, n: &AwaitExpr) { - self.show("AwaitExpr", n); - n.visit_children_with(self) - } - - fn visit_bin_expr(&mut self, n: &BinExpr) { - self.show("BinExpr", n); - n.visit_children_with(self) - } - - fn visit_block_stmt(&mut self, n: &BlockStmt) { - self.show("BlockStmt", n); - n.visit_children_with(self) - } - - fn visit_block_stmt_or_expr(&mut self, n: &BlockStmtOrExpr) { - self.show("BlockStmtOrExpr", n); - n.visit_children_with(self) - } - - fn visit_bool(&mut self, n: &Bool) { - self.show("Bool", n); - n.visit_children_with(self) - } - - fn visit_break_stmt(&mut self, n: &BreakStmt) { - self.show("BreakStmt", n); - n.visit_children_with(self) - } - - fn visit_call_expr(&mut self, n: &CallExpr) { - self.show("CallExpr", n); - n.visit_children_with(self) - } - - fn visit_catch_clause(&mut self, n: &CatchClause) { - self.show("CatchClause", n); - n.visit_children_with(self) - } - - fn visit_class(&mut self, n: &Class) { - self.show("Class", n); - n.visit_children_with(self) - } - - fn visit_class_decl(&mut self, n: &ClassDecl) { - self.show("ClassDecl", n); - n.visit_children_with(self) - } - - fn visit_class_expr(&mut self, n: &ClassExpr) { - self.show("ClassExpr", n); - n.visit_children_with(self) - } - - fn visit_class_member(&mut self, n: &ClassMember) { - self.show("ClassMember", n); - n.visit_children_with(self) - } - - fn visit_class_method(&mut self, n: &ClassMethod) { - self.show("ClassMethod", n); - n.visit_children_with(self) - } - - fn visit_class_prop(&mut self, n: &ClassProp) { - self.show("ClassProp", n); - n.visit_children_with(self) - } - - fn visit_computed_prop_name(&mut self, n: &ComputedPropName) { - self.show("ComputedPropName", n); - n.visit_children_with(self) - } - - fn visit_cond_expr(&mut self, n: &CondExpr) { - self.show("CondExpr", n); - n.visit_children_with(self) - } - - fn visit_constructor(&mut self, n: &Constructor) { - self.show("Constructor", n); - n.visit_children_with(self) - } - - fn visit_continue_stmt(&mut self, n: &ContinueStmt) { - self.show("ContinueStmt", n); - n.visit_children_with(self) - } - - fn visit_debugger_stmt(&mut self, n: &DebuggerStmt) { - self.show("DebuggerStmt", n); - n.visit_children_with(self) - } - - fn visit_decl(&mut self, n: &Decl) { - self.show("Decl", n); - n.visit_children_with(self) - } - - fn visit_decorator(&mut self, n: &Decorator) { - self.show("Decorator", n); - n.visit_children_with(self) - } - - fn visit_default_decl(&mut self, n: &DefaultDecl) { - self.show_name("DefaultDecl", n); - n.visit_children_with(self) - } - - fn visit_do_while_stmt(&mut self, n: &DoWhileStmt) { - self.show("DoWhileStmt", n); - n.visit_children_with(self) - } - - fn visit_empty_stmt(&mut self, n: &EmptyStmt) { - self.show("EmptyStmt", n); - n.visit_children_with(self) - } - - fn visit_export_all(&mut self, n: &ExportAll) { - self.show("ExportAll", n); - n.visit_children_with(self) - } - - fn visit_export_decl(&mut self, n: &ExportDecl) { - self.show("ExportDecl", n); - n.visit_children_with(self) - } - - fn visit_export_default_decl(&mut self, n: &ExportDefaultDecl) { - self.show("ExportDefaultDecl", n); - n.visit_children_with(self) - } - - fn visit_export_default_expr(&mut self, n: &ExportDefaultExpr) { - self.show("ExportDefaultExpr", n); - n.visit_children_with(self) - } - - fn visit_export_default_specifier(&mut self, n: &ExportDefaultSpecifier) { - self.show_name("ExportDefaultSpecifier", n); - n.visit_children_with(self) - } - - fn visit_export_named_specifier(&mut self, n: &ExportNamedSpecifier) { - self.show("ExportNamedSpecifier", n); - n.visit_children_with(self) - } - - fn visit_export_namespace_specifier(&mut self, n: &ExportNamespaceSpecifier) { - self.show("ExportNamespaceSpecifier", n); - n.visit_children_with(self) - } - - fn visit_export_specifier(&mut self, n: &ExportSpecifier) { - self.show("ExportSpecifier", n); - n.visit_children_with(self) - } - - fn visit_expr(&mut self, n: &Expr) { - self.show("Expr", n); - n.visit_children_with(self) - } - - fn visit_expr_or_spread(&mut self, n: &ExprOrSpread) { - self.show("ExprOrSpread", n); - n.visit_children_with(self) - } - - fn visit_callee(&mut self, n: &Callee) { - self.show("Callee", n); - n.visit_children_with(self) - } - - fn visit_fn_decl(&mut self, n: &FnDecl) { - self.show("FnDecl", n); - n.visit_children_with(self) - } - - fn visit_fn_expr(&mut self, n: &FnExpr) { - self.show("FnExpr", n); - n.visit_children_with(self) - } - - fn visit_for_in_stmt(&mut self, n: &ForInStmt) { - self.show("ForInStmt", n); - n.visit_children_with(self) - } - - fn visit_for_of_stmt(&mut self, n: &ForOfStmt) { - self.show("ForOfStmt", n); - n.visit_children_with(self) - } - - fn visit_for_stmt(&mut self, n: &ForStmt) { - self.show("ForStmt", n); - n.visit_children_with(self) - } - - fn visit_function(&mut self, n: &Function) { - self.show("Function", n); - n.visit_children_with(self) - } - - fn visit_getter_prop(&mut self, n: &GetterProp) { - self.show("GetterProp", n); - n.visit_children_with(self) - } - - fn visit_ident(&mut self, n: &Ident) { - self.show("Ident", n); - n.visit_children_with(self) - } - - fn visit_if_stmt(&mut self, n: &IfStmt) { - self.show("IfStmt", n); - n.visit_children_with(self) - } - - fn visit_import_decl(&mut self, n: &ImportDecl) { - self.show("ImportDecl", n); - n.visit_children_with(self) - } - - fn visit_import_default_specifier(&mut self, n: &ImportDefaultSpecifier) { - self.show_name("ImportDefaultSpecifier", n); - n.visit_children_with(self) - } - - fn visit_import_named_specifier(&mut self, n: &ImportNamedSpecifier) { - self.show("ImportNamedSpecifier", n); - n.visit_children_with(self) - } - - fn visit_import_specifier(&mut self, n: &ImportSpecifier) { - self.show_name("ImportSpecifier", n); - n.visit_children_with(self) - } - - fn visit_import_star_as_specifier(&mut self, n: &ImportStarAsSpecifier) { - self.show_name("ImportStarAsSpecifier", n); - n.visit_children_with(self) - } - - fn visit_invalid(&mut self, n: &Invalid) { - self.show("Invalid", n); - n.visit_children_with(self) - } - - fn visit_jsx_attr(&mut self, n: &JSXAttr) { - self.show("JSXAttr", n); - n.visit_children_with(self) - } - - fn visit_jsx_attr_name(&mut self, n: &JSXAttrName) { - self.show("JSXAttrName", n); - n.visit_children_with(self) - } - - fn visit_jsx_attr_or_spread(&mut self, n: &JSXAttrOrSpread) { - self.show("JSXAttrOrSpread", n); - n.visit_children_with(self) - } - - fn visit_jsx_attr_value(&mut self, n: &JSXAttrValue) { - self.show("JSXAttrValue", n); - n.visit_children_with(self) - } - - fn visit_jsx_closing_element(&mut self, n: &JSXClosingElement) { - self.show("JSXClosingElement", n); - n.visit_children_with(self) - } - - fn visit_jsx_closing_fragment(&mut self, n: &JSXClosingFragment) { - self.show("JSXClosingFragment", n); - n.visit_children_with(self) - } - - fn visit_jsx_element(&mut self, n: &JSXElement) { - self.show("JSXElement", n); - n.visit_children_with(self) - } - - fn visit_jsx_element_child(&mut self, n: &JSXElementChild) { - self.show("JSXElementChild", n); - n.visit_children_with(self) - } - - fn visit_jsx_element_name(&mut self, n: &JSXElementName) { - self.show("JSXElementName", n); - n.visit_children_with(self) - } - - fn visit_jsx_empty_expr(&mut self, n: &JSXEmptyExpr) { - self.show("JSXEmptyExpr", n); - n.visit_children_with(self) - } - - fn visit_jsx_expr(&mut self, n: &JSXExpr) { - self.show("JSXExpr", n); - n.visit_children_with(self) - } - - fn visit_jsx_expr_container(&mut self, n: &JSXExprContainer) { - self.show("JSXExprContainer", n); - n.visit_children_with(self) - } - - fn visit_jsx_fragment(&mut self, n: &JSXFragment) { - self.show("JSXFragment", n); - n.visit_children_with(self) - } - - fn visit_jsx_member_expr(&mut self, n: &JSXMemberExpr) { - self.show("JSXMemberExpr", n); - n.visit_children_with(self) - } - - fn visit_jsx_namespaced_name(&mut self, n: &JSXNamespacedName) { - self.show("JSXNamespacedName", n); - n.visit_children_with(self) - } - - fn visit_jsx_object(&mut self, n: &JSXObject) { - self.show("JSXObject", n); - n.visit_children_with(self) - } - - fn visit_jsx_opening_element(&mut self, n: &JSXOpeningElement) { - self.show("JSXOpeningElement", n); - n.visit_children_with(self) - } - - fn visit_jsx_opening_fragment(&mut self, n: &JSXOpeningFragment) { - self.show("JSXOpeningFragment", n); - n.visit_children_with(self) - } - - fn visit_jsx_spread_child(&mut self, n: &JSXSpreadChild) { - self.show("JSXSpreadChild", n); - n.visit_children_with(self) - } - - fn visit_jsx_text(&mut self, n: &JSXText) { - self.show("JSXText", n); - n.visit_children_with(self) - } - - fn visit_key_value_pat_prop(&mut self, n: &KeyValuePatProp) { - self.show("KeyValuePatProp", n); - n.visit_children_with(self) - } - - fn visit_key_value_prop(&mut self, n: &KeyValueProp) { - self.show("KeyValueProp", n); - n.visit_children_with(self) - } - - fn visit_labeled_stmt(&mut self, n: &LabeledStmt) { - self.show("LabeledStmt", n); - n.visit_children_with(self) - } - - fn visit_lit(&mut self, n: &Lit) { - self.show("Lit", n); - n.visit_children_with(self) - } - - fn visit_member_expr(&mut self, n: &MemberExpr) { - self.show("MemberExpr", n); - n.visit_children_with(self) - } - - fn visit_super_prop_expr(&mut self, n: &SuperPropExpr) { - self.show("SuperPropExpr", n); - n.visit_children_with(self) - } - - fn visit_meta_prop_expr(&mut self, n: &MetaPropExpr) { - self.show("MetaPropExpr", n); - n.visit_children_with(self) - } - - fn visit_method_prop(&mut self, n: &MethodProp) { - self.show("MethodProp", n); - n.visit_children_with(self) - } - - fn visit_module(&mut self, n: &Module) { - self.show("Module", n); - n.visit_children_with(self) - } - - fn visit_module_decl(&mut self, n: &ModuleDecl) { - self.show("ModuleDecl", n); - n.visit_children_with(self) - } - - fn visit_named_export(&mut self, n: &NamedExport) { - self.show("NamedExport", n); - n.visit_children_with(self) - } - - fn visit_new_expr(&mut self, n: &NewExpr) { - self.show("NewExpr", n); - n.visit_children_with(self) - } - - fn visit_null(&mut self, n: &Null) { - self.show_name("Null", n); - n.visit_children_with(self) - } - - fn visit_number(&mut self, n: &Number) { - self.show("Number", n); - n.visit_children_with(self) - } - - fn visit_object_lit(&mut self, n: &ObjectLit) { - self.show("ObjectLit", n); - n.visit_children_with(self) - } - - fn visit_object_pat(&mut self, n: &ObjectPat) { - self.show("ObjectPat", n); - n.visit_children_with(self) - } - - fn visit_object_pat_prop(&mut self, n: &ObjectPatProp) { - self.show("ObjectPatProp", n); - n.visit_children_with(self) - } - - fn visit_opt_chain_expr(&mut self, n: &OptChainExpr) { - self.show("OptChainExpr", n); - n.visit_children_with(self) - } - - fn visit_param(&mut self, n: &Param) { - self.show("Param", n); - n.visit_children_with(self) - } - - fn visit_param_or_ts_param_prop(&mut self, n: &ParamOrTsParamProp) { - self.show("ParamOrTsParamProp", n); - n.visit_children_with(self) - } - - fn visit_paren_expr(&mut self, n: &ParenExpr) { - self.show("ParenExpr", n); - n.visit_children_with(self) - } - - fn visit_pat(&mut self, n: &Pat) { - self.show("Pat", n); - n.visit_children_with(self) - } - - fn visit_private_method(&mut self, n: &PrivateMethod) { - self.show("PrivateMethod", n); - n.visit_children_with(self) - } - - fn visit_private_name(&mut self, n: &PrivateName) { - self.show("PrivateName", n); - n.visit_children_with(self) - } - - fn visit_private_prop(&mut self, n: &PrivateProp) { - self.show("PrivateProp", n); - n.visit_children_with(self) - } - - fn visit_program(&mut self, n: &Program) { - self.show("Program", n); - n.visit_children_with(self) - } - - fn visit_prop(&mut self, n: &Prop) { - self.show("Prop", n); - n.visit_children_with(self) - } - - fn visit_prop_name(&mut self, n: &PropName) { - self.show("PropName", n); - n.visit_children_with(self) - } - - fn visit_prop_or_spread(&mut self, n: &PropOrSpread) { - self.show("PropOrSpread", n); - n.visit_children_with(self) - } - - fn visit_regex(&mut self, n: &Regex) { - self.show_name("Regex", n); - n.visit_children_with(self) - } - - fn visit_rest_pat(&mut self, n: &RestPat) { - self.show("RestPat", n); - n.visit_children_with(self) - } - - fn visit_return_stmt(&mut self, n: &ReturnStmt) { - self.show("ReturnStmt", n); - n.visit_children_with(self) - } - - fn visit_script(&mut self, n: &Script) { - self.show("Script", n); - n.visit_children_with(self) - } - - fn visit_seq_expr(&mut self, n: &SeqExpr) { - self.show("SeqExpr", n); - n.visit_children_with(self) - } - - fn visit_setter_prop(&mut self, n: &SetterProp) { - self.show("SetterProp", n); - n.visit_children_with(self) - } - - fn visit_spread_element(&mut self, n: &SpreadElement) { - self.show("SpreadElement", n); - n.visit_children_with(self) - } - - fn visit_str(&mut self, n: &Str) { - self.show("Str", n); - n.visit_children_with(self) - } - - fn visit_super(&mut self, n: &Super) { - self.show("Super", n); - n.visit_children_with(self) - } - - fn visit_switch_case(&mut self, n: &SwitchCase) { - self.show("SwitchCase", n); - n.visit_children_with(self) - } - - fn visit_switch_stmt(&mut self, n: &SwitchStmt) { - self.show("SwitchStmt", n); - n.visit_children_with(self) - } - - fn visit_tagged_tpl(&mut self, n: &TaggedTpl) { - self.show("TaggedTpl", n); - n.visit_children_with(self) - } - - fn visit_this_expr(&mut self, n: &ThisExpr) { - self.show("ThisExpr", n); - n.visit_children_with(self) - } - - fn visit_throw_stmt(&mut self, n: &ThrowStmt) { - self.show("ThrowStmt", n); - n.visit_children_with(self) - } - - fn visit_tpl(&mut self, n: &Tpl) { - self.show("Tpl", n); - n.visit_children_with(self) - } - - fn visit_tpl_element(&mut self, n: &TplElement) { - self.show("TplElement", n); - n.visit_children_with(self) - } - - fn visit_try_stmt(&mut self, n: &TryStmt) { - self.show("TryStmt", n); - n.visit_children_with(self) - } - - fn visit_ts_array_type(&mut self, n: &TsArrayType) { - self.show("TsArrayType", n); - n.visit_children_with(self) - } - - fn visit_ts_as_expr(&mut self, n: &TsAsExpr) { - self.show("TsAsExpr", n); - n.visit_children_with(self) - } - - fn visit_ts_call_signature_decl(&mut self, n: &TsCallSignatureDecl) { - self.show("TsCallSignatureDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_conditional_type(&mut self, n: &TsConditionalType) { - self.show("TsConditionalType", n); - n.visit_children_with(self) - } - - fn visit_ts_const_assertion(&mut self, n: &TsConstAssertion) { - self.show("TsConstAssertion", n); - n.visit_children_with(self) - } - - fn visit_ts_construct_signature_decl(&mut self, n: &TsConstructSignatureDecl) { - self.show("TsConstructSignatureDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_constructor_type(&mut self, n: &TsConstructorType) { - self.show("TsConstructorType", n); - n.visit_children_with(self) - } - - fn visit_ts_entity_name(&mut self, n: &TsEntityName) { - self.show("TsEntityName", n); - n.visit_children_with(self) - } - - fn visit_ts_enum_decl(&mut self, n: &TsEnumDecl) { - self.show("TsEnumDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_enum_member(&mut self, n: &TsEnumMember) { - self.show("TsEnumMember", n); - n.visit_children_with(self) - } - - fn visit_ts_enum_member_id(&mut self, n: &TsEnumMemberId) { - self.show("TsEnumMemberId", n); - n.visit_children_with(self) - } - - fn visit_ts_export_assignment(&mut self, n: &TsExportAssignment) { - self.show("TsExportAssignment", n); - n.visit_children_with(self) - } - - fn visit_ts_expr_with_type_args(&mut self, n: &TsExprWithTypeArgs) { - self.show("TsExprWithTypeArgs", n); - n.visit_children_with(self) - } - - fn visit_ts_external_module_ref(&mut self, n: &TsExternalModuleRef) { - self.show("TsExternalModuleRef", n); - n.visit_children_with(self) - } - - fn visit_ts_fn_or_constructor_type(&mut self, n: &TsFnOrConstructorType) { - self.show("TsFnOrConstructorType", n); - n.visit_children_with(self) - } - - fn visit_ts_fn_param(&mut self, n: &TsFnParam) { - self.show("TsFnParam", n); - n.visit_children_with(self) - } - - fn visit_ts_fn_type(&mut self, n: &TsFnType) { - self.show("TsFnType", n); - n.visit_children_with(self) - } - - fn visit_ts_import_equals_decl(&mut self, n: &TsImportEqualsDecl) { - self.show("TsImportEqualsDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_import_type(&mut self, n: &TsImportType) { - self.show("TsImportType", n); - n.visit_children_with(self) - } - - fn visit_ts_index_signature(&mut self, n: &TsIndexSignature) { - self.show("TsIndexSignature", n); - n.visit_children_with(self) - } - - fn visit_ts_indexed_access_type(&mut self, n: &TsIndexedAccessType) { - self.show("TsIndexedAccessType", n); - n.visit_children_with(self) - } - - fn visit_ts_infer_type(&mut self, n: &TsInferType) { - self.show("TsInferType", n); - n.visit_children_with(self) - } - - fn visit_ts_interface_body(&mut self, n: &TsInterfaceBody) { - self.show("TsInterfaceBody", n); - n.visit_children_with(self) - } - - fn visit_ts_interface_decl(&mut self, n: &TsInterfaceDecl) { - self.show("TsInterfaceDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_intersection_type(&mut self, n: &TsIntersectionType) { - self.show("TsIntersectionType", n); - n.visit_children_with(self) - } - - fn visit_ts_keyword_type(&mut self, n: &TsKeywordType) { - self.show("TsKeywordType", n); - n.visit_children_with(self) - } - - fn visit_ts_lit(&mut self, n: &TsLit) { - self.show("TsLit", n); - n.visit_children_with(self) - } - - fn visit_ts_lit_type(&mut self, n: &TsLitType) { - self.show("TsLitType", n); - n.visit_children_with(self) - } - - fn visit_ts_mapped_type(&mut self, n: &TsMappedType) { - self.show("TsMappedType", n); - n.visit_children_with(self) - } - - fn visit_ts_method_signature(&mut self, n: &TsMethodSignature) { - self.show("TsMethodSignature", n); - n.visit_children_with(self) - } - - fn visit_ts_module_block(&mut self, n: &TsModuleBlock) { - self.show("TsModuleBlock", n); - n.visit_children_with(self) - } - - fn visit_ts_module_decl(&mut self, n: &TsModuleDecl) { - self.show("TsModuleDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_module_name(&mut self, n: &TsModuleName) { - self.show("TsModuleName", n); - n.visit_children_with(self) - } - - fn visit_ts_module_ref(&mut self, n: &TsModuleRef) { - self.show("TsModuleRef", n); - n.visit_children_with(self) - } - - fn visit_ts_namespace_body(&mut self, n: &TsNamespaceBody) { - self.show("TsNamespaceBody", n); - n.visit_children_with(self) - } - - fn visit_ts_namespace_decl(&mut self, n: &TsNamespaceDecl) { - self.show("TsNamespaceDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_namespace_export_decl(&mut self, n: &TsNamespaceExportDecl) { - self.show("TsNamespaceExportDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_non_null_expr(&mut self, n: &TsNonNullExpr) { - self.show("TsNonNullExpr", n); - n.visit_children_with(self) - } - - fn visit_ts_optional_type(&mut self, n: &TsOptionalType) { - self.show("TsOptionalType", n); - n.visit_children_with(self) - } - - fn visit_ts_param_prop(&mut self, n: &TsParamProp) { - self.show("TsParamProp", n); - n.visit_children_with(self) - } - - fn visit_ts_param_prop_param(&mut self, n: &TsParamPropParam) { - self.show("TsParamPropParam", n); - n.visit_children_with(self) - } - - fn visit_ts_parenthesized_type(&mut self, n: &TsParenthesizedType) { - self.show("TsParenthesizedType", n); - n.visit_children_with(self) - } - - fn visit_ts_property_signature(&mut self, n: &TsPropertySignature) { - self.show("TsPropertySignature", n); - n.visit_children_with(self) - } - - fn visit_ts_qualified_name(&mut self, n: &TsQualifiedName) { - self.show("TsQualifiedName", n); - n.visit_children_with(self) - } - - fn visit_ts_rest_type(&mut self, n: &TsRestType) { - self.show("TsRestType", n); - n.visit_children_with(self) - } - - fn visit_ts_this_type(&mut self, n: &TsThisType) { - self.show("TsThisType", n); - n.visit_children_with(self) - } - - fn visit_ts_this_type_or_ident(&mut self, n: &TsThisTypeOrIdent) { - self.show("TsThisTypeOrIdent", n); - n.visit_children_with(self) - } - - fn visit_ts_tuple_element(&mut self, n: &TsTupleElement) { - self.show("TsTupleElement", n); - n.visit_children_with(self) - } - - fn visit_ts_tuple_type(&mut self, n: &TsTupleType) { - self.show("TsTupleType", n); - n.visit_children_with(self) - } - - fn visit_ts_type(&mut self, n: &TsType) { - self.show("TsType", n); - n.visit_children_with(self) - } - - fn visit_ts_type_alias_decl(&mut self, n: &TsTypeAliasDecl) { - self.show("TsTypeAliasDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_type_ann(&mut self, n: &TsTypeAnn) { - self.show("TsTypeAnn", n); - n.visit_children_with(self) - } - - fn visit_ts_type_assertion(&mut self, n: &TsTypeAssertion) { - self.show("TsTypeAssertion", n); - n.visit_children_with(self) - } - - fn visit_ts_type_element(&mut self, n: &TsTypeElement) { - self.show("TsTypeElement", n); - n.visit_children_with(self) - } - - fn visit_ts_type_lit(&mut self, n: &TsTypeLit) { - self.show("TsTypeLit", n); - n.visit_children_with(self) - } - - fn visit_ts_type_operator(&mut self, n: &TsTypeOperator) { - self.show("TsTypeOperator", n); - n.visit_children_with(self) - } - - fn visit_ts_type_param(&mut self, n: &TsTypeParam) { - self.show("TsTypeParam", n); - n.visit_children_with(self) - } - - fn visit_ts_type_param_decl(&mut self, n: &TsTypeParamDecl) { - self.show("TsTypeParamDecl", n); - n.visit_children_with(self) - } - - fn visit_ts_type_param_instantiation(&mut self, n: &TsTypeParamInstantiation) { - self.show("TsTypeParamInstantiation", n); - n.visit_children_with(self) - } - - fn visit_ts_type_predicate(&mut self, n: &TsTypePredicate) { - self.show("TsTypePredicate", n); - n.visit_children_with(self) - } - - fn visit_ts_type_query(&mut self, n: &TsTypeQuery) { - self.show("TsTypeQuery", n); - n.visit_children_with(self) - } - - fn visit_ts_type_query_expr(&mut self, n: &TsTypeQueryExpr) { - self.show("TsTypeQueryExpr", n); - n.visit_children_with(self) - } - - fn visit_ts_type_ref(&mut self, n: &TsTypeRef) { - self.show("TsTypeRef", n); - n.visit_children_with(self) - } - - fn visit_ts_union_or_intersection_type(&mut self, n: &TsUnionOrIntersectionType) { - self.show("TsUnionOrIntersectionType", n); - n.visit_children_with(self) - } - - fn visit_ts_union_type(&mut self, n: &TsUnionType) { - self.show("TsUnionType", n); - n.visit_children_with(self) - } - - fn visit_unary_expr(&mut self, n: &UnaryExpr) { - self.show("UnaryExpr", n); - n.visit_children_with(self) - } - - fn visit_update_expr(&mut self, n: &UpdateExpr) { - self.show("UpdateExpr", n); - n.visit_children_with(self) - } - - fn visit_var_decl(&mut self, n: &VarDecl) { - self.show("VarDecl", n); - n.visit_children_with(self) - } - - fn visit_var_decl_or_expr(&mut self, n: &VarDeclOrExpr) { - self.show("VarDeclOrExpr", n); - n.visit_children_with(self) - } - - fn visit_for_head(&mut self, n: &ForHead) { - self.show("ForHead", n); - n.visit_children_with(self) - } - - fn visit_var_declarator(&mut self, n: &VarDeclarator) { - self.show("VarDeclarator", n); - n.visit_children_with(self) - } - - fn visit_while_stmt(&mut self, n: &WhileStmt) { - self.show("WhileStmt", n); - n.visit_children_with(self) - } - - fn visit_with_stmt(&mut self, n: &WithStmt) { - self.show("WithStmt", n); - n.visit_children_with(self) - } - - fn visit_yield_expr(&mut self, n: &YieldExpr) { - self.show("YieldExpr", n); - n.visit_children_with(self) - } -} - #[testing::fixture("tests/full/**/input.js")] fn full(input: PathBuf) { let dir = input.parent().unwrap(); diff --git a/crates/swc_ecma_parser/examples/lexer.rs b/crates/swc_ecma_parser/examples/lexer.rs index 8c1f90796d62..1726d7861429 100644 --- a/crates/swc_ecma_parser/examples/lexer.rs +++ b/crates/swc_ecma_parser/examples/lexer.rs @@ -1,5 +1,4 @@ use swc_common::{ - self, errors::{ColorConfig, Handler}, sync::Lrc, FileName, SourceMap, diff --git a/crates/swc_ecma_parser/examples/perf.rs b/crates/swc_ecma_parser/examples/perf.rs index 5930039f72d8..556cda00c588 100644 --- a/crates/swc_ecma_parser/examples/perf.rs +++ b/crates/swc_ecma_parser/examples/perf.rs @@ -3,7 +3,7 @@ extern crate swc_malloc; use std::{collections::hash_map::DefaultHasher, hash::Hash}; use criterion::black_box; -use swc_common::{self, sync::Lrc, SourceMap}; +use swc_common::{sync::Lrc, SourceMap}; use swc_ecma_parser::{lexer::Lexer, Parser, StringInput, Syntax, TsConfig}; fn main() { diff --git a/crates/swc_ecma_parser/examples/typescript.rs b/crates/swc_ecma_parser/examples/typescript.rs index ad9c1e618997..781861ddcd13 100644 --- a/crates/swc_ecma_parser/examples/typescript.rs +++ b/crates/swc_ecma_parser/examples/typescript.rs @@ -1,5 +1,4 @@ use swc_common::{ - self, errors::{ColorConfig, Handler}, sync::Lrc, FileName, SourceMap, diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs index c9d6161e3031..dd016afc2e08 100644 --- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs +++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs @@ -1755,8 +1755,8 @@ struct MakeMethodArgs { } #[cfg(test)] +#[allow(unused)] mod tests { - #![allow(unused)] use swc_common::DUMMY_SP as span; use swc_ecma_visit::assert_eq_ignore_span; diff --git a/crates/swc_ecma_parser/src/parser/expr/tests.rs b/crates/swc_ecma_parser/src/parser/expr/tests.rs index b41aa9d136be..afa964e2dcf5 100644 --- a/crates/swc_ecma_parser/src/parser/expr/tests.rs +++ b/crates/swc_ecma_parser/src/parser/expr/tests.rs @@ -1,10 +1,7 @@ -extern crate test; - use std::hint::black_box; use swc_common::{FileName, SourceMap, DUMMY_SP as span}; use swc_ecma_visit::assert_eq_ignore_span; -use test::Bencher; use super::*; use crate::{parse_file_as_expr, EsConfig}; diff --git a/crates/swc_ecma_parser/src/parser/expr/verifier.rs b/crates/swc_ecma_parser/src/parser/expr/verifier.rs index 8e1907e7fc98..c38f41aee6fd 100644 --- a/crates/swc_ecma_parser/src/parser/expr/verifier.rs +++ b/crates/swc_ecma_parser/src/parser/expr/verifier.rs @@ -1,6 +1,4 @@ #[cfg(feature = "verify")] -use swc_common::{Span, Spanned}; -#[cfg(feature = "verify")] use swc_ecma_visit::{noop_visit_type, Visit, VisitWith}; use super::*; @@ -16,7 +14,7 @@ impl Parser { self.emit_err(span, error); } - return Ok(expr); + Ok(expr) } #[cfg(not(feature = "verify"))] diff --git a/crates/swc_ecma_parser/src/parser/jsx/tests.rs b/crates/swc_ecma_parser/src/parser/jsx/tests.rs index 092c84e70bb5..1e59e3a89126 100644 --- a/crates/swc_ecma_parser/src/parser/jsx/tests.rs +++ b/crates/swc_ecma_parser/src/parser/jsx/tests.rs @@ -2,7 +2,6 @@ use swc_common::DUMMY_SP as span; use swc_ecma_visit::assert_eq_ignore_span; use super::*; -use crate::parser::test_parser; fn jsx(src: &'static str) -> Box { test_parser( diff --git a/crates/swc_ecma_parser/src/parser/pat.rs b/crates/swc_ecma_parser/src/parser/pat.rs index 0878402b983a..0f351add6c52 100644 --- a/crates/swc_ecma_parser/src/parser/pat.rs +++ b/crates/swc_ecma_parser/src/parser/pat.rs @@ -470,7 +470,6 @@ impl Parser { } } -/// #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum PatType { BindingPat, diff --git a/crates/swc_ecma_parser/src/parser/tests.rs b/crates/swc_ecma_parser/src/parser/tests.rs index 312804a4d68e..d1d554c47aa9 100644 --- a/crates/swc_ecma_parser/src/parser/tests.rs +++ b/crates/swc_ecma_parser/src/parser/tests.rs @@ -1,7 +1,7 @@ -use swc_common::{comments::SingleThreadedComments, BytePos}; +use swc_common::comments::SingleThreadedComments; use super::*; -use crate::{test_parser, EsConfig, TsConfig}; +use crate::EsConfig; fn program(src: &'static str) -> Program { test_parser(src, Default::default(), |p| p.parse_program()) diff --git a/crates/swc_ecma_parser/src/parser/typescript.rs b/crates/swc_ecma_parser/src/parser/typescript.rs index c47091fa0d60..dc960d7c38be 100644 --- a/crates/swc_ecma_parser/src/parser/typescript.rs +++ b/crates/swc_ecma_parser/src/parser/typescript.rs @@ -2828,7 +2828,7 @@ mod tests { use swc_ecma_ast::*; use swc_ecma_visit::assert_eq_ignore_span; - use crate::{lexer::Lexer, test_parser, token::*, Capturing, EsVersion, Parser, Syntax}; + use crate::{lexer::Lexer, test_parser, token::*, Capturing, Parser, Syntax}; #[test] fn issue_708_1() { diff --git a/crates/swc_ecma_parser/src/token.rs b/crates/swc_ecma_parser/src/token.rs index 5a23967f9a8a..22f359d749c6 100644 --- a/crates/swc_ecma_parser/src/token.rs +++ b/crates/swc_ecma_parser/src/token.rs @@ -259,9 +259,7 @@ pub enum Token { }, /// ':' Colon, - /// BinOp(BinOpToken), - /// AssignOp(AssignOp), /// '${' diff --git a/crates/swc_ecma_transforms_base/src/fixer.rs b/crates/swc_ecma_transforms_base/src/fixer.rs index 3b2c26f48285..bbdd662a8c88 100644 --- a/crates/swc_ecma_transforms_base/src/fixer.rs +++ b/crates/swc_ecma_transforms_base/src/fixer.rs @@ -3,7 +3,7 @@ use std::{hash::BuildHasherDefault, mem, ops::RangeFull}; use indexmap::IndexMap; use rustc_hash::FxHasher; use swc_common::{comments::Comments, util::take::Take, Span, Spanned, DUMMY_SP}; -use swc_ecma_ast::{AssignTarget, *}; +use swc_ecma_ast::*; use swc_ecma_visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith}; /// Fixes ast nodes before printing so semantics are preserved. @@ -50,8 +50,9 @@ struct Fixer<'a> { } #[repr(u8)] -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] enum Context { + #[default] Default, Callee { @@ -69,12 +70,6 @@ enum Context { FreeExpr, } -impl Default for Context { - fn default() -> Self { - Context::Default - } -} - macro_rules! array { ($name:ident, $T:tt) => { fn $name(&mut self, e: &mut $T) { diff --git a/crates/swc_ecma_transforms_base/src/helpers/mod.rs b/crates/swc_ecma_transforms_base/src/helpers/mod.rs index 691fddef79ce..c313faa912f3 100644 --- a/crates/swc_ecma_transforms_base/src/helpers/mod.rs +++ b/crates/swc_ecma_transforms_base/src/helpers/mod.rs @@ -602,7 +602,7 @@ impl VisitMut for Marker { #[cfg(test)] mod tests { - use swc_ecma_visit::{as_folder, FoldWith}; + use swc_ecma_visit::FoldWith; use testing::DebugUsingDisplay; use super::*; diff --git a/crates/swc_ecma_transforms_base/src/hygiene/tests.rs b/crates/swc_ecma_transforms_base/src/hygiene/tests.rs index 2ad396b46de4..e921ee34e7b0 100644 --- a/crates/swc_ecma_transforms_base/src/hygiene/tests.rs +++ b/crates/swc_ecma_transforms_base/src/hygiene/tests.rs @@ -2,7 +2,7 @@ use swc_atoms::JsWord; use swc_common::{collections::AHashMap, hygiene::*, DUMMY_SP}; use swc_ecma_parser::Syntax; use swc_ecma_utils::quote_ident; -use swc_ecma_visit::{Fold, FoldWith}; +use swc_ecma_visit::FoldWith; use testing::{assert_eq, DebugUsingDisplay}; use super::*; diff --git a/crates/swc_ecma_transforms_base/src/rename/mod.rs b/crates/swc_ecma_transforms_base/src/rename/mod.rs index d9b484f131b7..858397584314 100644 --- a/crates/swc_ecma_transforms_base/src/rename/mod.rs +++ b/crates/swc_ecma_transforms_base/src/rename/mod.rs @@ -1,3 +1,5 @@ +#![allow(unused_imports)] + use std::borrow::Cow; use rustc_hash::FxHashSet; diff --git a/crates/swc_ecma_transforms_base/src/resolver/tests.rs b/crates/swc_ecma_transforms_base/src/resolver/tests.rs index 14a3b8ac573d..69a2c633adc9 100644 --- a/crates/swc_ecma_transforms_base/src/resolver/tests.rs +++ b/crates/swc_ecma_transforms_base/src/resolver/tests.rs @@ -1,7 +1,6 @@ use swc_ecma_parser::Syntax; -use swc_ecma_visit::Fold; -use super::{InnerConfig, *}; +use super::*; use crate::hygiene::Config; // struct TsHygiene { diff --git a/crates/swc_ecma_transforms_base/src/scope.rs b/crates/swc_ecma_transforms_base/src/scope.rs index 89454e60b942..0e8ea17fe0a0 100644 --- a/crates/swc_ecma_transforms_base/src/scope.rs +++ b/crates/swc_ecma_transforms_base/src/scope.rs @@ -1,17 +1,12 @@ use swc_ecma_ast::VarDeclKind; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub enum ScopeKind { Block, + #[default] Fn, } -impl Default for ScopeKind { - fn default() -> Self { - ScopeKind::Fn - } -} - #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum IdentType { Binding, diff --git a/crates/swc_ecma_transforms_base/tests/fixer_test262.rs b/crates/swc_ecma_transforms_base/tests/fixer_test262.rs index 40615f6205f6..8ba6eba1d57e 100644 --- a/crates/swc_ecma_transforms_base/tests/fixer_test262.rs +++ b/crates/swc_ecma_transforms_base/tests/fixer_test262.rs @@ -10,7 +10,7 @@ use std::{ }; use swc_ecma_ast::*; -use swc_ecma_codegen::{self, Emitter}; +use swc_ecma_codegen::Emitter; use swc_ecma_parser::{lexer::Lexer, Parser, Syntax}; use swc_ecma_transforms_base::fixer::fixer; use swc_ecma_utils::DropSpan; diff --git a/crates/swc_ecma_transforms_optimization/src/const_modules.rs b/crates/swc_ecma_transforms_optimization/src/const_modules.rs index 5de11ae8d844..a6b39e95237a 100644 --- a/crates/swc_ecma_transforms_optimization/src/const_modules.rs +++ b/crates/swc_ecma_transforms_optimization/src/const_modules.rs @@ -162,7 +162,7 @@ impl VisitMut for ConstModules { return; } - if self.scope.namespace.get(&id.to_id()).is_some() { + if self.scope.namespace.contains(&id.to_id()) { panic!( "The const_module namespace `{}` cannot be used without member accessor", sym @@ -218,7 +218,7 @@ impl VisitMut for ConstModules { return; } - if self.scope.namespace.get(&id.to_id()).is_some() { + if self.scope.namespace.contains(&id.to_id()) { panic!( "The const_module namespace `{}` cannot be used without member accessor", id.sym diff --git a/crates/swc_ecma_transforms_optimization/src/inline_globals.rs b/crates/swc_ecma_transforms_optimization/src/inline_globals.rs index ab37e1230fca..4d56f737b428 100644 --- a/crates/swc_ecma_transforms_optimization/src/inline_globals.rs +++ b/crates/swc_ecma_transforms_optimization/src/inline_globals.rs @@ -202,7 +202,6 @@ impl VisitMut for InlineGlobals { mod tests { use swc_ecma_transforms_testing::{test, Tester}; use swc_ecma_utils::DropSpan; - use swc_ecma_visit::as_folder; use super::*; diff --git a/crates/swc_ecma_transforms_optimization/src/json_parse.rs b/crates/swc_ecma_transforms_optimization/src/json_parse.rs index df06b873961e..ae5b621e920d 100644 --- a/crates/swc_ecma_transforms_optimization/src/json_parse.rs +++ b/crates/swc_ecma_transforms_optimization/src/json_parse.rs @@ -142,10 +142,6 @@ mod tests { use super::*; - struct Normalizer; - - impl Fold for Normalizer {} - test!( ::swc_ecma_parser::Syntax::default(), |_| json_parse(0), diff --git a/crates/swc_ecma_transforms_optimization/src/simplify/inlining/scope.rs b/crates/swc_ecma_transforms_optimization/src/simplify/inlining/scope.rs index b4b5b97d6dd2..784ebb7ea239 100644 --- a/crates/swc_ecma_transforms_optimization/src/simplify/inlining/scope.rs +++ b/crates/swc_ecma_transforms_optimization/src/simplify/inlining/scope.rs @@ -290,7 +290,7 @@ impl<'a> Scope<'a> { /// True if the returned scope is self fn scope_for(&self, id: &Id) -> (&Scope, bool) { - if self.constants.get(id).is_some() { + if self.constants.contains_key(id) { return (self, true); } if self.find_binding_from_current(id).is_some() { @@ -508,7 +508,7 @@ impl<'a> Scope<'a> { } fn has_constant(&self, id: &Id) -> bool { - if self.constants.get(id).is_some() { + if self.constants.contains_key(id) { return true; } diff --git a/crates/swc_ecma_transforms_react/src/jsx/tests.rs b/crates/swc_ecma_transforms_react/src/jsx/tests.rs index eb6c94886082..e5856f6e6194 100644 --- a/crates/swc_ecma_transforms_react/src/jsx/tests.rs +++ b/crates/swc_ecma_transforms_react/src/jsx/tests.rs @@ -5,7 +5,7 @@ use std::{ path::{Path, PathBuf}, }; -use swc_common::{chain, Mark}; +use swc_common::chain; use swc_ecma_codegen::{Config, Emitter}; use swc_ecma_parser::{EsConfig, Parser, StringInput}; use swc_ecma_transforms_base::{fixer::fixer, hygiene, resolver}; diff --git a/crates/swc_ecma_transforms_react/src/jsx_src/tests.rs b/crates/swc_ecma_transforms_react/src/jsx_src/tests.rs index beaa7721603d..01dc0435c637 100644 --- a/crates/swc_ecma_transforms_react/src/jsx_src/tests.rs +++ b/crates/swc_ecma_transforms_react/src/jsx_src/tests.rs @@ -1,4 +1,4 @@ -use swc_common::{sync::Lrc, FilePathMapping}; +use swc_common::FilePathMapping; use swc_ecma_transforms_testing::{test, test_exec}; use super::*; diff --git a/crates/swc_ecma_transforms_react/src/refresh/tests.rs b/crates/swc_ecma_transforms_react/src/refresh/tests.rs index 0f1218b553d9..710c2db35263 100644 --- a/crates/swc_ecma_transforms_react/src/refresh/tests.rs +++ b/crates/swc_ecma_transforms_react/src/refresh/tests.rs @@ -1,4 +1,4 @@ -use swc_common::{chain, Mark}; +use swc_common::chain; use swc_ecma_transforms_base::resolver; use swc_ecma_transforms_module::common_js::common_js; use swc_ecma_transforms_testing::{test, Tester}; diff --git a/crates/swc_ecma_transforms_typescript/examples/ts_to_js.rs b/crates/swc_ecma_transforms_typescript/examples/ts_to_js.rs index 680d3ab0e04e..fd70e020fd72 100644 --- a/crates/swc_ecma_transforms_typescript/examples/ts_to_js.rs +++ b/crates/swc_ecma_transforms_typescript/examples/ts_to_js.rs @@ -5,7 +5,6 @@ use std::{env, path::Path}; use swc_common::{ - self, comments::SingleThreadedComments, errors::{ColorConfig, Handler}, sync::Lrc, diff --git a/crates/swc_ecma_transforms_typescript/tests/strip_correctness.rs b/crates/swc_ecma_transforms_typescript/tests/strip_correctness.rs index 8629fb871ad6..38debe9b86c7 100644 --- a/crates/swc_ecma_transforms_typescript/tests/strip_correctness.rs +++ b/crates/swc_ecma_transforms_typescript/tests/strip_correctness.rs @@ -6,11 +6,11 @@ use std::{ use swc_common::{FileName, Mark}; use swc_ecma_ast::*; -use swc_ecma_codegen::{self, Emitter}; +use swc_ecma_codegen::Emitter; use swc_ecma_parser::{lexer::Lexer, EsConfig, Parser, Syntax, TsConfig}; use swc_ecma_transforms_base::{fixer::fixer, hygiene::hygiene, resolver}; use swc_ecma_transforms_typescript::typescript; -use swc_ecma_visit::{Fold, FoldWith}; +use swc_ecma_visit::FoldWith; #[testing::fixture("../swc_ecma_parser/tests/tsc/**/*.ts")] #[testing::fixture("../swc_ecma_parser/tests/tsc/**/*.tsx")] @@ -194,58 +194,3 @@ impl Write for Buf { self.0.write().unwrap().flush() } } - -struct Normalizer; -impl Fold for Normalizer { - fn fold_new_expr(&mut self, expr: NewExpr) -> NewExpr { - let mut expr = expr.fold_children_with(self); - - expr.args = match expr.args { - Some(..) => expr.args, - None => Some(vec![]), - }; - - expr - } - - fn fold_prop_name(&mut self, name: PropName) -> PropName { - let name = name.fold_children_with(self); - - match name { - PropName::Ident(i) => PropName::Str(Str { - raw: None, - value: i.sym, - span: i.span, - }), - PropName::Num(n) => { - let s = if n.value.is_infinite() { - if n.value.is_sign_positive() { - "Infinity".into() - } else { - "-Infinity".into() - } - } else { - format!("{}", n.value) - }; - PropName::Str(Str { - raw: None, - value: s.into(), - span: n.span, - }) - } - _ => name, - } - } - - fn fold_stmt(&mut self, stmt: Stmt) -> Stmt { - let stmt = stmt.fold_children_with(self); - - match stmt { - Stmt::Expr(ExprStmt { span, expr }) => match *expr { - Expr::Paren(ParenExpr { expr, .. }) => Stmt::Expr(ExprStmt { span, expr }), - _ => Stmt::Expr(ExprStmt { span, expr }), - }, - _ => stmt, - } - } -} diff --git a/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs b/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs index 8547f10f7717..48b614f6f3c7 100644 --- a/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs +++ b/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs @@ -5,7 +5,7 @@ use swc_ecma_visit::{noop_visit_type, Visit, VisitWith}; use swc_timer::timer; pub use self::ctx::Ctx; -use self::storage::{Storage, *}; +use self::storage::*; use crate::{ alias::{collect_infects_from, AliasConfig}, marks::Marks, diff --git a/crates/swc_ecma_utils/src/lib.rs b/crates/swc_ecma_utils/src/lib.rs index 8d92575df9cb..83890a4c09c3 100644 --- a/crates/swc_ecma_utils/src/lib.rs +++ b/crates/swc_ecma_utils/src/lib.rs @@ -2272,10 +2272,7 @@ pub fn is_maybe_branch_directive(stmt: &Stmt) -> bool { } /// inject `stmts` after directives -pub fn prepend_stmts( - to: &mut Vec, - stmts: impl Iterator + ExactSizeIterator, -) { +pub fn prepend_stmts(to: &mut Vec, stmts: impl ExactSizeIterator) { let idx = to .iter() .position(|item| { diff --git a/crates/swc_estree_ast/src/flavor.rs b/crates/swc_estree_ast/src/flavor.rs index 8556bdf61b9c..6b670b887dc4 100644 --- a/crates/swc_estree_ast/src/flavor.rs +++ b/crates/swc_estree_ast/src/flavor.rs @@ -1,16 +1,13 @@ better_scoped_tls::scoped_tls!(static FLAVOR: Flavor); #[repr(u8)] -#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)] +#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Default)] pub enum Flavor { + #[default] Babel, - Acorn { extra_comments: bool }, -} - -impl Default for Flavor { - fn default() -> Self { - Flavor::Babel - } + Acorn { + extra_comments: bool, + }, } impl Flavor { diff --git a/crates/swc_fast_graph/src/digraph.rs b/crates/swc_fast_graph/src/digraph.rs index e6922e425b71..18b6852e8e81 100644 --- a/crates/swc_fast_graph/src/digraph.rs +++ b/crates/swc_fast_graph/src/digraph.rs @@ -7,7 +7,7 @@ use std::{ cmp::Ordering, fmt, hash::{self, BuildHasherDefault, Hash}, - iter::{Cloned, DoubleEndedIterator, FromIterator}, + iter::Cloned, marker::PhantomData, ops::Deref, slice::Iter, diff --git a/crates/swc_html_ast/Cargo.toml b/crates/swc_html_ast/Cargo.toml index d4d44ff477ad..1f98084e4ada 100644 --- a/crates/swc_html_ast/Cargo.toml +++ b/crates/swc_html_ast/Cargo.toml @@ -21,7 +21,7 @@ serde-impl = ["serde"] [dependencies] is-macro = "0.3.5" -rkyv = { version = "=0.7.42", optional = true, features = [ +rkyv = { version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_html_codegen/src/writer/basic.rs b/crates/swc_html_codegen/src/writer/basic.rs index 9b7307910504..773ad224767a 100644 --- a/crates/swc_html_codegen/src/writer/basic.rs +++ b/crates/swc_html_codegen/src/writer/basic.rs @@ -5,30 +5,20 @@ use swc_common::{BytePos, LineCol, Span}; use super::HtmlWriter; -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)] pub enum IndentType { Tab, + #[default] Space, } -impl Default for IndentType { - fn default() -> Self { - IndentType::Space - } -} - -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)] pub enum LineFeed { + #[default] LF, CRLF, } -impl Default for LineFeed { - fn default() -> Self { - LineFeed::LF - } -} - pub struct BasicHtmlWriterConfig { pub indent_type: IndentType, pub indent_width: i32, diff --git a/crates/swc_html_codegen/tests/fixture.rs b/crates/swc_html_codegen/tests/fixture.rs index 7d07b912c9af..31d63c0fa45a 100644 --- a/crates/swc_html_codegen/tests/fixture.rs +++ b/crates/swc_html_codegen/tests/fixture.rs @@ -24,18 +24,9 @@ fn print_document( codegen_config: Option, ) { let dir = input.parent().unwrap(); - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicHtmlWriterConfig::default(), - }; - let codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let codegen_config = codegen_config.unwrap_or_default(); let output = if codegen_config.minify { dir.join(format!( "output.min.{}", @@ -98,18 +89,9 @@ fn print_document_fragment( codegen_config: Option, ) { let dir = input.parent().unwrap(); - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicHtmlWriterConfig::default(), - }; - let codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let codegen_config = codegen_config.unwrap_or_default(); let output = if codegen_config.minify { dir.join(format!( "output.min.{}", @@ -185,18 +167,9 @@ fn verify_document( codegen_config: Option, ignore_errors: bool, ) { - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicHtmlWriterConfig::default(), - }; - let codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let codegen_config = codegen_config.unwrap_or_default(); testing::run_test2(false, |cm, handler| { let fm = cm.load_file(input).unwrap(); @@ -250,18 +223,9 @@ fn verify_document_fragment( codegen_config: Option, ignore_errors: bool, ) { - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicHtmlWriterConfig::default(), - }; - let mut codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let mut codegen_config = codegen_config.unwrap_or_default(); codegen_config.context_element = Some(&context_element); diff --git a/crates/swc_html_minifier/src/option.rs b/crates/swc_html_minifier/src/option.rs index 7ce287bd8a59..6003e63ad035 100644 --- a/crates/swc_html_minifier/src/option.rs +++ b/crates/swc_html_minifier/src/option.rs @@ -19,7 +19,7 @@ pub enum MinifierType { Html, } -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)] #[serde(deny_unknown_fields)] #[serde(rename_all = "kebab-case")] pub enum CollapseWhitespaces { @@ -41,16 +41,11 @@ pub enum CollapseWhitespaces { /// Remove all whitespace in the `head` element, trim whitespaces for the /// `body` element, remove spaces between `metadata` elements (i.e. /// `script`/`style`/etc, for elements that have `display: none`) + #[default] OnlyMetadata, } -impl Default for CollapseWhitespaces { - fn default() -> Self { - CollapseWhitespaces::OnlyMetadata - } -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)] #[serde(deny_unknown_fields)] #[serde(rename_all = "kebab-case")] pub enum RemoveRedundantAttributes { @@ -61,15 +56,10 @@ pub enum RemoveRedundantAttributes { /// Remove deprecated and svg redundant (they used for styling) and `xmlns` /// attributes (for example the `type` attribute for the `style` tag and /// `xmlns` for svg) + #[default] Smart, } -impl Default for RemoveRedundantAttributes { - fn default() -> Self { - RemoveRedundantAttributes::Smart - } -} - #[derive(Debug, Serialize, Deserialize, Clone)] #[serde(deny_unknown_fields)] #[serde(untagged)] diff --git a/crates/swc_html_parser/src/parser/mod.rs b/crates/swc_html_parser/src/parser/mod.rs index 19b327e16290..72df68a30af7 100644 --- a/crates/swc_html_parser/src/parser/mod.rs +++ b/crates/swc_html_parser/src/parser/mod.rs @@ -42,8 +42,9 @@ enum AdjustAttributes { Svg, } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Default)] enum InsertionMode { + #[default] Initial, BeforeHtml, BeforeHead, @@ -69,12 +70,6 @@ enum InsertionMode { AfterAfterFrameset, } -impl Default for InsertionMode { - fn default() -> Self { - InsertionMode::Initial - } -} - enum InsertionPosition { LastChild(RcNode), BeforeSibling(RcNode), diff --git a/crates/swc_macros_common/src/binder.rs b/crates/swc_macros_common/src/binder.rs index 14aa8f2608bc..921a019bc10d 100644 --- a/crates/swc_macros_common/src/binder.rs +++ b/crates/swc_macros_common/src/binder.rs @@ -61,7 +61,6 @@ impl<'a> Binder<'a> { Self::new(&input.ident, &input.data, &input.attrs) } - /// pub fn variants(&self) -> Vec> { match *self.body { Data::Enum(DataEnum { ref variants, .. }) => { diff --git a/crates/swc_macros_common/src/derive/generics.rs b/crates/swc_macros_common/src/derive/generics.rs index 7419c46bd1ec..855cb1485523 100644 --- a/crates/swc_macros_common/src/derive/generics.rs +++ b/crates/swc_macros_common/src/derive/generics.rs @@ -1,7 +1,7 @@ use std::collections::BTreeSet; use quote::quote; -use syn::visit::{self, Visit}; +use syn::visit::Visit; use super::*; diff --git a/crates/swc_node_bundler/src/loaders/json.rs b/crates/swc_node_bundler/src/loaders/json.rs index 63f4ed2cc0cb..76c2f2412de0 100644 --- a/crates/swc_node_bundler/src/loaders/json.rs +++ b/crates/swc_node_bundler/src/loaders/json.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use anyhow::{anyhow, Error}; use swc_common::{SourceFile, DUMMY_SP}; -use swc_ecma_ast::{EsVersion, *}; +use swc_ecma_ast::*; use swc_ecma_parser::{parse_file_as_expr, Syntax}; pub(super) fn load_json_as_module(fm: &Arc) -> Result { diff --git a/crates/swc_node_bundler/src/v1/mod.rs b/crates/swc_node_bundler/src/v1/mod.rs index a7b43f7ede14..f30031686ff2 100644 --- a/crates/swc_node_bundler/src/v1/mod.rs +++ b/crates/swc_node_bundler/src/v1/mod.rs @@ -66,22 +66,17 @@ impl Config { } } -#[derive(StringEnum)] +#[derive(StringEnum, Default)] pub enum Mode { /// `production` Production, /// `debug` Debug, /// `none` + #[default] None, } -impl Default for Mode { - fn default() -> Self { - Mode::None - } -} - #[derive(Debug, Clone, Deserialize)] #[serde(untagged, rename = "Entry")] pub enum EntryConfig { diff --git a/crates/swc_plugin_proxy/Cargo.toml b/crates/swc_plugin_proxy/Cargo.toml index 0bada6078556..8010e315a685 100644 --- a/crates/swc_plugin_proxy/Cargo.toml +++ b/crates/swc_plugin_proxy/Cargo.toml @@ -22,7 +22,7 @@ plugin-rt = ["__plugin_rt", "swc_common/plugin-base", "rkyv-impl"] [dependencies] -rkyv = { package = "rkyv", version = "=0.7.42", optional = true, features = [ +rkyv = { package = "rkyv", version = "=0.7.44", optional = true, features = [ "strict", "validation", ] } diff --git a/crates/swc_plugin_proxy/src/memory_interop/read_returned_result_from_host.rs b/crates/swc_plugin_proxy/src/memory_interop/read_returned_result_from_host.rs index 9f4ed4ab8530..5285aae1bc40 100644 --- a/crates/swc_plugin_proxy/src/memory_interop/read_returned_result_from_host.rs +++ b/crates/swc_plugin_proxy/src/memory_interop/read_returned_result_from_host.rs @@ -51,6 +51,8 @@ where let (serialized_allocated_bytes_raw_ptr, serialized_allocated_bytes_raw_ptr_size) = serialized_allocated_bytes_ptr.as_ptr(); + std::mem::forget(allocated_bytes_ptr); // We should not drop AllocatedBytesPtr(0, 0) + let ret = f(serialized_allocated_bytes_raw_ptr as _); // Host fn call completes: by contract in host proxy, if return value is 0 @@ -95,7 +97,7 @@ where let allocated_returned_value_ptr = read_returned_result_from_host_inner(f); // Using AllocatedBytesPtr's value, reconstruct actual return value - allocated_returned_value_ptr.map(|allocated_returned_value_ptr| unsafe { + allocated_returned_value_ptr.map(|allocated_returned_value_ptr| { PluginSerializedBytes::from_raw_ptr( allocated_returned_value_ptr.0 as _, allocated_returned_value_ptr diff --git a/crates/swc_plugin_runner/src/imported_fn/source_map.rs b/crates/swc_plugin_runner/src/imported_fn/source_map.rs index 3b6daa11e350..3b9623a8dee2 100644 --- a/crates/swc_plugin_runner/src/imported_fn/source_map.rs +++ b/crates/swc_plugin_runner/src/imported_fn/source_map.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + use std::sync::Arc; use parking_lot::Mutex; diff --git a/crates/swc_plugin_runner/src/transform_executor.rs b/crates/swc_plugin_runner/src/transform_executor.rs index ae8d3a5c9bc3..b79c9eb5ff2b 100644 --- a/crates/swc_plugin_runner/src/transform_executor.rs +++ b/crates/swc_plugin_runner/src/transform_executor.rs @@ -393,8 +393,7 @@ impl TransformExecutor { .run(program, self.unresolved_mark, should_enable_comments_proxy) .context( "failed to run Wasm plugin transform. Please ensure the version of `swc_core` \ - used by the plugin is compatible with the host runtime. See https://swc.rs/docs/plugin/selecting-swc-core\ - for compatibility information. If you are an author of the plugin, please update \ + used by the plugin is compatible with the host runtime. See https://swc.rs/docs/plugin/selecting-swc-core for compatibility information. If you are an author of the plugin, please update \ `swc_core` to the compatible version.", ) } diff --git a/crates/swc_plugin_runner/tests/css-plugins/swc_noop_plugin/Cargo.toml b/crates/swc_plugin_runner/tests/css-plugins/swc_noop_plugin/Cargo.toml index d03b359d9058..d46c7c433282 100644 --- a/crates/swc_plugin_runner/tests/css-plugins/swc_noop_plugin/Cargo.toml +++ b/crates/swc_plugin_runner/tests/css-plugins/swc_noop_plugin/Cargo.toml @@ -10,6 +10,7 @@ version = "0.1.0" crate-type = ["cdylib"] [dependencies] +proc-macro2 = "=1.0.79" serde = "1" swc_core = { path = "../../../../swc_core", features = [ "css_ast", diff --git a/crates/swc_plugin_runner/tests/ecma_integration.rs b/crates/swc_plugin_runner/tests/ecma_integration.rs index 0683c32535cf..b66d0763ad39 100644 --- a/crates/swc_plugin_runner/tests/ecma_integration.rs +++ b/crates/swc_plugin_runner/tests/ecma_integration.rs @@ -105,6 +105,8 @@ fn internal() { tokio::runtime::Runtime::new().unwrap().block_on(async { // run single plugin testing::run_test(false, |cm, _handler| { + eprint!("First run start"); + let fm = cm.new_source_file(FileName::Anon, "console.log(foo)".into()); let program = parse_file_as_program( @@ -157,6 +159,7 @@ fn internal() { .deserialize() .expect("Should able to deserialize") .into_inner(); + eprintln!("First run retured"); let mut visitor = TestVisitor { plugin_transform_found: false, }; @@ -164,13 +167,14 @@ fn internal() { visitor .plugin_transform_found - .then(|| visitor.plugin_transform_found) + .then_some(visitor.plugin_transform_found) .ok_or(()) }) .expect("Should able to run single plugin transform"); // run single plugin with handler testing::run_test2(false, |cm, handler| { + eprintln!("Second run start"); let fm = cm.new_source_file(FileName::Anon, "console.log(foo)".into()); let program = parse_file_as_program( @@ -215,86 +219,10 @@ fn internal() { .expect("Plugin should apply transform") }); + eprintln!("Second run retured"); + Ok(()) }) .expect("Should able to run single plugin transform with handler"); - - // Run multiple plugins. - testing::run_test(false, |cm, _handler| { - let fm = cm.new_source_file(FileName::Anon, "console.log(foo)".into()); - - let program = parse_file_as_program( - &fm, - Syntax::Es(Default::default()), - EsVersion::latest(), - None, - &mut vec![], - ) - .unwrap(); - - let mut serialized_program = - PluginSerializedBytes::try_serialize(&VersionedSerializable::new(program)) - .expect("Should serializable"); - - let experimental_metadata: AHashMap = [ - ( - "TestExperimental".to_string(), - "ExperimentalValue".to_string(), - ), - ("OtherTest".to_string(), "OtherVal".to_string()), - ] - .into_iter() - .collect(); - - let mut plugin_transform_executor = swc_plugin_runner::create_plugin_transform_executor( - &cm, - &Mark::new(), - &Arc::new(TransformPluginMetadataContext::new( - None, - "development".to_string(), - Some(experimental_metadata.clone()), - )), - Box::new(PLUGIN_BYTES.clone()), - Some(json!({ "pluginConfig": "testValue" })), - None, - ); - - serialized_program = plugin_transform_executor - .transform(&serialized_program, Some(false)) - .expect("Plugin should apply transform"); - - // TODO: we'll need to apply 2 different plugins - let mut plugin_transform_executor = swc_plugin_runner::create_plugin_transform_executor( - &cm, - &Mark::new(), - &Arc::new(TransformPluginMetadataContext::new( - None, - "development".to_string(), - Some(experimental_metadata), - )), - Box::new(PLUGIN_BYTES.clone()), - Some(json!({ "pluginConfig": "testValue" })), - None, - ); - - serialized_program = plugin_transform_executor - .transform(&serialized_program, Some(false)) - .expect("Plugin should apply transform"); - - let program: Program = serialized_program - .deserialize() - .expect("Should able to deserialize") - .into_inner(); - let mut visitor = TestVisitor { - plugin_transform_found: false, - }; - program.visit_with(&mut visitor); - - visitor - .plugin_transform_found - .then(|| visitor.plugin_transform_found) - .ok_or(()) - }) - .expect("Should able to run multiple plugins transform"); }); } diff --git a/crates/swc_plugin_runner/tests/fixture/issue_6404/Cargo.toml b/crates/swc_plugin_runner/tests/fixture/issue_6404/Cargo.toml index 77690a680939..ed9627fd027b 100644 --- a/crates/swc_plugin_runner/tests/fixture/issue_6404/Cargo.toml +++ b/crates/swc_plugin_runner/tests/fixture/issue_6404/Cargo.toml @@ -10,6 +10,7 @@ version = "0.1.0" crate-type = ["cdylib"] [dependencies] +proc-macro2 = "=1.0.79" serde = "1" swc_core = { path = "../../../../swc_core", features = [ "ecma_plugin_transform", diff --git a/crates/swc_plugin_runner/tests/fixture/issue_6404/src/lib.rs b/crates/swc_plugin_runner/tests/fixture/issue_6404/src/lib.rs index cb5afbd0b025..da544870bfd6 100644 --- a/crates/swc_plugin_runner/tests/fixture/issue_6404/src/lib.rs +++ b/crates/swc_plugin_runner/tests/fixture/issue_6404/src/lib.rs @@ -6,12 +6,12 @@ use swc_core::{ #[plugin_transform] pub fn process_transform(program: Program, metadata: TransformPluginProgramMetadata) -> Program { - for i in 1..50000 { + for i in 1..5 { let j: u32 = i; // println!("i {} j {}", i, j); let res = metadata.source_map.span_to_snippet(Span::new( BytePos(j), - BytePos(j + 1000), + BytePos(j + 10000000), SyntaxContext::empty(), )); // let _ = dbg!(res); diff --git a/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/Cargo.toml b/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/Cargo.toml index 78e28d0de3bc..51922415f44f 100644 --- a/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/Cargo.toml +++ b/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/Cargo.toml @@ -2,7 +2,7 @@ [package] edition = "2021" -name = "swc_internal_plugin" +name = "swc_internal_plugin" publish = false version = "0.1.0" @@ -10,8 +10,9 @@ version = "0.1.0" crate-type = ["cdylib"] [dependencies] +proc-macro2 = "=1.0.79" serde = "1" -swc_core = {path = "../../../../swc_core", features = [ +swc_core = { path = "../../../../swc_core", features = [ "ecma_plugin_transform", "ecma_quote", -]} +] } diff --git a/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/src/lib.rs b/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/src/lib.rs index e6a104dbe8cf..8234718e51f4 100644 --- a/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/src/lib.rs +++ b/crates/swc_plugin_runner/tests/fixture/swc_internal_plugin/src/lib.rs @@ -59,28 +59,38 @@ impl VisitMut for ConsoleOutputReplacer { /// results back to host. Refer swc_plugin_macro how does it work internally. #[plugin_transform] pub fn process(program: Program, metadata: TransformPluginProgramMetadata) -> Program { + dbg!(); HANDLER.with(|handler| { handler .struct_span_err(DUMMY_SP, "Test diagnostics from plugin") .emit(); }); + dbg!(); let _stmt = quote!( "const $name = 4;" as Stmt, name = Ident::new("ref".into(), DUMMY_SP) ); + dbg!(); + let filename = metadata .get_context(&TransformPluginMetadataContextKind::Filename) .expect("Filename should exists"); + dbg!(); + let env = metadata .get_context(&TransformPluginMetadataContextKind::Env) .expect("Metadata should exists"); + + dbg!(); + if env != "development" { panic!("Env should be development"); } + dbg!(); let experimental_value = metadata .get_experimental_context("TestExperimental") .expect("Experimental metadata should exist"); @@ -90,20 +100,30 @@ pub fn process(program: Program, metadata: TransformPluginProgramMetadata) -> Pr panic!("Experimental metadata should be `ExperimentalValue`"); } + dbg!(); + let experimental_value = metadata .get_experimental_context("OtherTest") .expect("Experimental metadata 'othertest' should exist"); + dbg!(); + if &experimental_value != "OtherVal" { panic!("Experimental metadata 'othertest' should be `OtherVal`"); } + dbg!(); + let nonexistent_value = metadata.get_experimental_context("Nonexistent"); + dbg!(); + if nonexistent_value.is_some() { panic!("Experimental metadata 'nonexistent' should not exist"); } + dbg!(); + let plugin_config = metadata .get_transform_plugin_config() .expect("Plugin config should exist"); @@ -111,5 +131,7 @@ pub fn process(program: Program, metadata: TransformPluginProgramMetadata) -> Pr panic!("Plugin config should be testValue"); } + dbg!(); + program.fold_with(&mut as_folder(ConsoleOutputReplacer { metadata })) } diff --git a/crates/swc_plugin_runner/tests/fixture/swc_noop_plugin/Cargo.toml b/crates/swc_plugin_runner/tests/fixture/swc_noop_plugin/Cargo.toml index 123d8ee93798..a878b20674aa 100644 --- a/crates/swc_plugin_runner/tests/fixture/swc_noop_plugin/Cargo.toml +++ b/crates/swc_plugin_runner/tests/fixture/swc_noop_plugin/Cargo.toml @@ -10,6 +10,7 @@ version = "0.1.0" crate-type = ["cdylib"] [dependencies] +proc-macro2 = "=1.0.79" serde = "1" swc_core = { path = "../../../../swc_core", features = [ "ecma_plugin_transform", diff --git a/crates/swc_plugin_runner/tests/issues.rs b/crates/swc_plugin_runner/tests/issues.rs index 754f9e8ec8f7..a4e9f9da51fb 100644 --- a/crates/swc_plugin_runner/tests/issues.rs +++ b/crates/swc_plugin_runner/tests/issues.rs @@ -12,9 +12,8 @@ use serde_json::json; #[cfg(feature = "__rkyv")] use swc_common::plugin::serialized::PluginSerializedBytes; use swc_common::{collections::AHashMap, plugin::metadata::TransformPluginMetadataContext, Mark}; -use swc_ecma_ast::{CallExpr, Callee, EsVersion, Expr, Lit, MemberExpr, Program, Str}; +use swc_ecma_ast::{EsVersion, Program}; use swc_ecma_parser::{parse_file_as_program, Syntax}; -use swc_ecma_visit::Visit; use testing::CARGO_TARGET_DIR; /// Returns the path to the built plugin @@ -48,27 +47,6 @@ fn build_plugin(dir: &Path, crate_name: &str) -> Result { Err(anyhow!("Could not find built plugin")) } -struct TestVisitor { - pub plugin_transform_found: bool, -} - -impl Visit for TestVisitor { - fn visit_call_expr(&mut self, call: &CallExpr) { - if let Callee::Expr(expr) = &call.callee { - if let Expr::Member(MemberExpr { obj, .. }) = &**expr { - if let Expr::Ident(ident) = &**obj { - if ident.sym == *"console" { - let args = &*(call.args[0].expr); - if let Expr::Lit(Lit::Str(Str { value, .. })) = args { - self.plugin_transform_found = value == "changed_via_plugin"; - } - } - } - } - } - } -} - #[cfg(feature = "__rkyv")] #[test] fn issue_6404() -> Result<(), Error> { diff --git a/crates/swc_xml_codegen/src/writer/basic.rs b/crates/swc_xml_codegen/src/writer/basic.rs index aa14e162782c..cc80a8d9dced 100644 --- a/crates/swc_xml_codegen/src/writer/basic.rs +++ b/crates/swc_xml_codegen/src/writer/basic.rs @@ -5,30 +5,20 @@ use swc_common::{BytePos, LineCol, Span}; use super::XmlWriter; -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)] pub enum IndentType { Tab, + #[default] Space, } -impl Default for IndentType { - fn default() -> Self { - IndentType::Space - } -} - -#[derive(Clone, Copy, PartialEq, Eq, Debug)] +#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)] pub enum LineFeed { + #[default] LF, CRLF, } -impl Default for LineFeed { - fn default() -> Self { - LineFeed::LF - } -} - pub struct BasicXmlWriterConfig { pub indent_type: IndentType, pub indent_width: i32, diff --git a/crates/swc_xml_codegen/tests/fixture.rs b/crates/swc_xml_codegen/tests/fixture.rs index 8690c76a840e..1b532cc79fd0 100644 --- a/crates/swc_xml_codegen/tests/fixture.rs +++ b/crates/swc_xml_codegen/tests/fixture.rs @@ -22,18 +22,9 @@ fn print_document( codegen_config: Option, ) { let dir = input.parent().unwrap(); - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicXmlWriterConfig::default(), - }; - let codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let codegen_config = codegen_config.unwrap_or_default(); let output = if codegen_config.minify { dir.join(format!( "output.min.{}", @@ -95,18 +86,9 @@ fn verify_document( codegen_config: Option, ignore_errors: bool, ) { - let parser_config = match parser_config { - Some(parser_config) => parser_config, - _ => ParserConfig::default(), - }; - let writer_config = match writer_config { - Some(writer_config) => writer_config, - _ => BasicXmlWriterConfig::default(), - }; - let codegen_config = match codegen_config { - Some(codegen_config) => codegen_config, - _ => CodegenConfig::default(), - }; + let parser_config = parser_config.unwrap_or_default(); + let writer_config = writer_config.unwrap_or_default(); + let codegen_config = codegen_config.unwrap_or_default(); testing::run_test2(false, |cm, handler| { let fm = cm.load_file(input).unwrap(); diff --git a/crates/swc_xml_parser/src/parser/mod.rs b/crates/swc_xml_parser/src/parser/mod.rs index abe540f52ba7..797149bd7adf 100644 --- a/crates/swc_xml_parser/src/parser/mod.rs +++ b/crates/swc_xml_parser/src/parser/mod.rs @@ -19,18 +19,14 @@ pub type PResult = Result; #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct ParserConfig {} +#[derive(Debug, Default)] pub enum Phase { + #[default] StartPhase, MainPhase, EndPhase, } -impl Default for Phase { - fn default() -> Self { - Phase::StartPhase - } -} - pub struct Parser where I: ParserInput, diff --git a/crates/swc_xml_parser/src/parser/node.rs b/crates/swc_xml_parser/src/parser/node.rs index 05696bf7d714..2d343b481548 100644 --- a/crates/swc_xml_parser/src/parser/node.rs +++ b/crates/swc_xml_parser/src/parser/node.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + use std::{ cell::{Cell, RefCell}, fmt, mem, diff --git a/crates/testing/src/output.rs b/crates/testing/src/output.rs index a95018358d85..930849fe1735 100644 --- a/crates/testing/src/output.rs +++ b/crates/testing/src/output.rs @@ -209,7 +209,6 @@ impl Deref for NormalizedOutput { } } -/// pub type StdOut = NormalizedOutput; impl TestOutput> { diff --git a/node-swc/e2e/fixtures/plugin_transform_schema_v1/rust-toolchain b/node-swc/e2e/fixtures/plugin_transform_schema_v1/rust-toolchain index 4f93cb25623e..f1104daa0f34 100644 --- a/node-swc/e2e/fixtures/plugin_transform_schema_v1/rust-toolchain +++ b/node-swc/e2e/fixtures/plugin_transform_schema_v1/rust-toolchain @@ -1 +1 @@ -nightly-2022-09-23 \ No newline at end of file +nightly-2024-04-03 \ No newline at end of file diff --git a/node-swc/e2e/fixtures/plugin_transform_schema_vtest/rust-toolchain b/node-swc/e2e/fixtures/plugin_transform_schema_vtest/rust-toolchain index 4f93cb25623e..f1104daa0f34 100644 --- a/node-swc/e2e/fixtures/plugin_transform_schema_vtest/rust-toolchain +++ b/node-swc/e2e/fixtures/plugin_transform_schema_vtest/rust-toolchain @@ -1 +1 @@ -nightly-2022-09-23 \ No newline at end of file +nightly-2024-04-03 \ No newline at end of file diff --git a/rust-toolchain b/rust-toolchain index 473a92993b58..f1104daa0f34 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2024-02-06 \ No newline at end of file +nightly-2024-04-03 \ No newline at end of file