Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(es/proposal): Use tsc version of explicit resource management #9585

Merged
merged 28 commits into from
Oct 17, 2024
Merged

fix(es/proposal): Use tsc version of explicit resource management #9585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d1d637d
Add a test
kdy1 Sep 25, 2024
c463305
fiup
kdy1 Sep 25, 2024
091197f
disposable
kdy1 Sep 25, 2024
814c5e4
WIP: wrap_with_try
kdy1 Sep 25, 2024
986d8be
more fix
kdy1 Sep 25, 2024
06f6e57
env
kdy1 Sep 25, 2024
2f67cef
wrap_with_try
kdy1 Sep 26, 2024
16ad620
Fix build issues
kdy1 Sep 27, 2024
6bd1dec
Init
kdy1 Sep 27, 2024
90d59f6
Sync test suite
kdy1 Sep 27, 2024
42e076f
Update helpers
kdy1 Sep 27, 2024
e0a3563
_ts_dispose_resources
kdy1 Oct 17, 2024
a1c6d13
Improve helper
kdy1 Oct 17, 2024
19a4eae
fix fielkd name
kdy1 Oct 17, 2024
5cc3f98
await result if required
kdy1 Oct 17, 2024
2bd2267
cleanup
kdy1 Oct 17, 2024
1aae5dc
result
kdy1 Oct 17, 2024
86dd461
remove init for loops
kdy1 Oct 17, 2024
f29400d
update tslib
kdy1 Oct 17, 2024
91c72d3
bump
kdy1 Oct 17, 2024
1671474
Fix helpers
kdy1 Oct 17, 2024
fefe5c0
fix helper
kdy1 Oct 17, 2024
a4bd7de
for loop
kdy1 Oct 17, 2024
6137d6f
Remove wrong test
kdy1 Oct 17, 2024
e66aa1f
Update test refs
kdy1 Oct 17, 2024
4a258b4
Create dull-shirts-judge.md
kdy1 Oct 17, 2024
d5c79c8
Update test refs
kdy1 Oct 17, 2024
cc5c52d
Update test refs
kdy1 Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .changeset/dull-shirts-judge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
swc_ecma_transforms_proposal: patch
swc_core: patch
---

fix(es/proposal): Call `asyncDispose` correctly
18 changes: 12 additions & 6 deletions crates/swc/tests/fixture/issues-8xxx/8020/output/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
var _using_ctx = require("@swc/helpers/_/_using_ctx");
var _ts_add_disposable_resource = require("@swc/helpers/_/_ts_add_disposable_resource");
var _ts_dispose_resources = require("@swc/helpers/_/_ts_dispose_resources");
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx = _using_ctx._();
const foo = _usingCtx.u(null);
const foo = _ts_add_disposable_resource._(env, null, false);
const bar = 1;
console.log(baz());
function baz() {
return bar;
}
} catch (_) {
_usingCtx.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx.d();
_ts_dispose_resources._(env);
}
31 changes: 17 additions & 14 deletions crates/swc/tests/fixture/issues-8xxx/8629/output/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx";
var _Disposable;
import { _ as _ts_add_disposable_resource } from "@swc/helpers/_/_ts_add_disposable_resource";
import { _ as _ts_dispose_resources } from "@swc/helpers/_/_ts_dispose_resources";
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx = _using_ctx();
var _computedKey;
_computedKey = Symbol.dispose;
class Disposable {
[_computedKey]() {
console.log('dispose');
}
}
_Disposable = Disposable;
var _disposable = _usingCtx.u(new Disposable());
const _disposable = _ts_add_disposable_resource(env, new Disposable(), false);
console.log('ok');
} catch (_) {
_usingCtx.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx.d();
_ts_dispose_resources(env);
}
export class Disposable {
[_computedKey]() {
console.log('dispose');
}
}
export { _Disposable as Disposable };
23 changes: 13 additions & 10 deletions crates/swc/tests/fixture/issues-8xxx/8629/output/2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { _ as _using_ctx } from "@swc/helpers/_/_using_ctx";
var _Disposable;
import { _ as _ts_add_disposable_resource } from "@swc/helpers/_/_ts_add_disposable_resource";
import { _ as _ts_dispose_resources } from "@swc/helpers/_/_ts_dispose_resources";
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx = _using_ctx();
var Disposable = 1334;
_Disposable = Disposable;
var _disposable = _usingCtx.u(new Disposable());
const _disposable = _ts_add_disposable_resource(env, new Disposable(), false);
console.log('ok');
} catch (_) {
_usingCtx.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx.d();
_ts_dispose_resources(env);
}
export { _Disposable as Disposable };
export var Disposable = 1334;
56 changes: 39 additions & 17 deletions crates/swc/tests/fixture/issues-8xxx/8774/output/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var _using_ctx = require("@swc/helpers/_/_using_ctx");
var _ts_add_disposable_resource = require("@swc/helpers/_/_ts_add_disposable_resource");
var _ts_dispose_resources = require("@swc/helpers/_/_ts_dispose_resources");
const logClean = function() {
return {
[Symbol.dispose] () {
Expand All @@ -10,40 +11,61 @@ const logClean = function() {
};
};
async function foo() {
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx = _using_ctx._();
const a = _usingCtx.u(logClean());
const b = _usingCtx.a(logClean());
for (const a of [
const a = _ts_add_disposable_resource._(env, logClean(), false);
;
const b = _ts_add_disposable_resource._(env, logClean(), true);
;
for (const _ of [
logClean(),
logClean()
]){
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx1 = _using_ctx._();
const a = _ts_add_disposable_resource._(env, _, false);
{}
} catch (_) {
_usingCtx1.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx1.d();
_ts_dispose_resources._(env);
}
}
for (const a of [
for (const _ of [
logClean(),
logClean()
]){
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx2 = _using_ctx._();
const a = _ts_add_disposable_resource._(env, _, true);
{}
} catch (_) {
_usingCtx2.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx2.d();
const result = _ts_dispose_resources._(env);
if (result) await result;
}
}
} catch (_) {
_usingCtx.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
await _usingCtx.d();
const result = _ts_dispose_resources._(env);
if (result) await result;
}
}
foo();
19 changes: 13 additions & 6 deletions crates/swc/tests/fixture/issues-8xxx/8895/output/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var _using_ctx = require("@swc/helpers/_/_using_ctx");
var _ts_add_disposable_resource = require("@swc/helpers/_/_ts_add_disposable_resource");
var _ts_dispose_resources = require("@swc/helpers/_/_ts_dispose_resources");
class File {
read() {
return 'content';
Expand All @@ -8,16 +9,22 @@ class File {
}
}
function main() {
const env = {
stack: [],
error: void 0,
hasError: false
};
try {
var _usingCtx = _using_ctx._();
const file = _usingCtx.u(new File());
const file = _ts_add_disposable_resource._(env, new File(), false);
;
function readFile() {
file.read();
}
readFile();
} catch (_) {
_usingCtx.e = _;
} catch (e) {
env.error = e;
env.hasError = true;
} finally{
_usingCtx.d();
_ts_dispose_resources._(env);
}
}
Loading
Loading