Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix(es/decorators): Fix a regression about class expressions #8102

Merged
merged 17 commits into from
Oct 11, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ define([
function state() {}
class Controller {
}
var _cls;
class _class extends Controller {
onChange() {}
constructor(...args){
Expand All @@ -26,5 +27,5 @@ define([
}
_ts_decorate._([
state
], _class.prototype, "isTest", void 0);
], _cls.prototype, "isTest", void 0);
});
5 changes: 3 additions & 2 deletions crates/swc/tests/fixture/issues-4xxx/4127/1/output/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ const _ts_decorate = require("@swc/helpers/_/_ts_decorate");
function test(constructor) {
console.log(constructor);
}
var _cls;
let _class = class _class {
};
_class = _ts_decorate._([
_cls = _ts_decorate._([
test
], _class);
], _cls);
5 changes: 3 additions & 2 deletions crates/swc/tests/fixture/issues-4xxx/4127/2/output/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate";
function test(constructor) {
console.log(constructor);
}
var _cls;
let _class = class _class {
};
_class = _ts_decorate([
_cls = _ts_decorate([
test
], _class);
], _cls);
export { _class as default };
20 changes: 20 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es2020/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true
},
"target": "es2020",
"loose": false,
"minify": {
"compress": false,
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const foo = class { @foo foo(v) { return v } }
10 changes: 10 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es2020/output/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate";
var _cls;
const foo = _cls = class _class {
foo(v) {
return v;
}
};
_ts_decorate([
foo
], _cls.prototype, "foo", null);
20 changes: 20 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es2022/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true
},
"target": "es2022",
"loose": false,
"minify": {
"compress": false,
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const foo = class { @foo foo(v) { return v } }
10 changes: 10 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es2022/output/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate";
var _cls;
const foo = _cls = class _class {
foo(v) {
return v;
}
};
_ts_decorate([
foo
], _cls.prototype, "foo", null);
20 changes: 20 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es5/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true
},
"target": "es5",
"loose": false,
"minify": {
"compress": false,
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true
}
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es5/input/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const foo = class { @foo foo(v) { return v } }
22 changes: 22 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8095/es5/output/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
import { _ as _create_class } from "@swc/helpers/_/_create_class";
import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate";
var _cls;
var foo = _cls = /*#__PURE__*/ function() {
"use strict";
function _class() {
_class_call_check(this, _class);
}
_create_class(_class, [
{
key: "foo",
value: function foo(v) {
return v;
}
}
]);
return _class;
}();
_ts_decorate([
foo
], _cls.prototype, "foo", null);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let A = class A {
};
export default class A {
}
A = _ts_decorate([
dec
], A);
Expand All @@ -8,4 +8,3 @@ let B = class B {
B = _ts_decorate([
dec
], B);
export { A as default };
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
function myDecorator(decoratee) {}
let _class = class _class {
var _cls;
_cls = class _class {
};
_class = _ts_decorate([
_cls = _ts_decorate([
myDecorator
], _class);
export { _class as default };
], _cls);
export { _cls as default };
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export default class _class {
var _cls;
_cls = class _class {
bar() {}
}
};
_ts_decorate([
foo
], _class.prototype, "bar", null);
], _cls.prototype, "bar", null);
export { _cls as default };
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ pub(super) fn new(metadata: bool) -> TscDecorator {
class_name: Default::default(),
constructor_exprs: Default::default(),
exports: Default::default(),
assign_class_expr_to: Default::default(),
}
}

Expand All @@ -49,6 +50,8 @@ pub(super) struct TscDecorator {
constructor_exprs: Vec<Box<Expr>>,

exports: Vec<ExportSpecifier>,

assign_class_expr_to: Option<Ident>,
}

impl TscDecorator {
Expand Down Expand Up @@ -291,14 +294,49 @@ impl VisitMut for TscDecorator {
self.class_name = old;
}

fn visit_mut_expr(&mut self, e: &mut Expr) {
e.visit_mut_children_with(self);

if let Some(var_name) = self.assign_class_expr_to.take() {
*e = Expr::Assign(AssignExpr {
span: DUMMY_SP,
op: op!("="),
left: var_name.into(),
right: Box::new(e.take()),
});
}
}

fn visit_mut_class_expr(&mut self, n: &mut ClassExpr) {
let old = self.class_name.take();

if contains_decorator(n) && n.ident.is_none() {
n.ident = Some(private_ident!("_class"));
}
let ident = private_ident!("_class");

let var_name = private_ident!("_cls");

self.vars.push(VarDeclarator {
span: DUMMY_SP,
name: Pat::Ident(var_name.clone().into()),
init: None,
definite: Default::default(),
});

self.class_name = Some(var_name.clone());
n.ident = Some(ident);

n.visit_mut_children_with(self);

self.class_name = old;

self.assign_class_expr_to = Some(var_name);

return;
}
if let Some(ident) = &n.ident {
self.class_name = Some(ident.clone());
if self.class_name.is_none() {
self.class_name = Some(ident.clone());
}
}

n.visit_mut_children_with(self);
Expand Down Expand Up @@ -405,6 +443,33 @@ impl VisitMut for TscDecorator {

fn visit_mut_module_item(&mut self, module_item: &mut ModuleItem) {
match module_item {
ModuleItem::ModuleDecl(ModuleDecl::ExportDefaultDecl(ExportDefaultDecl {
decl: DefaultDecl::Class(c),
..
})) => {
c.visit_mut_with(self);

if let Some(var_name) = self.assign_class_expr_to.take() {
*module_item = ModuleItem::Stmt(
Expr::Assign(AssignExpr {
span: DUMMY_SP,
op: op!("="),
left: var_name.clone().into(),
right: Box::new(Expr::Class(c.take())),
})
.into_stmt(),
);

self.exports
.push(ExportSpecifier::Named(ExportNamedSpecifier {
span: DUMMY_SP,
orig: ModuleExportName::Ident(var_name),
exported: Some(ModuleExportName::Ident(quote_ident!("default"))),
is_type_only: Default::default(),
}));
}
}

ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(n)) => {
let export_decl_span = n.span;

Expand Down