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

Jump to bottom

fix(es/compat): Use return statements for method and setter decorator #8017

Merged
merged 1 commit into from
Sep 27, 2023
Merged

fix(es/compat): Use return statements for method and setter decorator #8017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions crates/swc_ecma_transforms_proposal/src/decorator_2022_03.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,18 +850,15 @@ impl VisitMut for Decorator202203 {

match p.kind {
MethodKind::Method => {
*n = ClassMember::PrivateProp(PrivateProp {
accessibility: Default::default(),
span: p.span,
key: p.key.clone(),
is_optional: Default::default(),
is_override: Default::default(),
is_static: p.is_static,
value: Some(init.into()),
type_ann: Default::default(),
decorators: Default::default(),
definite: Default::default(),
readonly: Default::default(),
let call_stmt = Stmt::Return(ReturnStmt {
span: DUMMY_SP,
arg: Some(Box::new(Expr::Ident(init))),
});

p.kind = MethodKind::Getter;
p.function.body = Some(BlockStmt {
span: DUMMY_SP,
stmts: vec![call_stmt],
});
}
MethodKind::Getter => {
Expand All @@ -881,17 +878,17 @@ impl VisitMut for Decorator202203 {
});
}
MethodKind::Setter => {
let call_stmt = Stmt::Expr(ExprStmt {
let call_stmt = Stmt::Return(ReturnStmt {
span: DUMMY_SP,
expr: Box::new(Expr::Call(CallExpr {
arg: Some(Box::new(Expr::Call(CallExpr {
span: DUMMY_SP,
callee: init.as_callee(),
args: vec![
ThisExpr { span: DUMMY_SP }.as_arg(),
p.function.params[0].pat.clone().expect_ident().id.as_arg(),
],
type_args: Default::default(),
})),
}))),
});

p.function.body = Some(BlockStmt {
Expand Down
2 changes: 1 addition & 1 deletion ...sforms_proposal/tests/decorators/2022-03-getters-and-setters--to-es2015/private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ function get_a() {
return _call_a(this);
}
function set_a(v) {
_call_a1(this, v);
return _call_a1(this, v);
}
4 changes: 2 additions & 2 deletions ...proposal/tests/decorators/2022-03-getters-and-setters--to-es2015/static-private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var _a = {
var __ = {
writable: true,
value: (()=>{
({ e: [_call_a, _call_a1, _initStatic] } = _apply_decs_2203_r(Foo, [
({ e: [_call_a, _call_a1, _initStatic] } = _apply_decs_2203_r(Foo, [
[
dec,
8,
Expand All @@ -41,5 +41,5 @@ function get_a() {
return _call_a(this);
}
function set_a(v) {
_call_a1(this, v);
return _call_a1(this, v);
}
4 changes: 2 additions & 2 deletions ...c_ecma_transforms_proposal/tests/decorators/2022-03-getters-and-setters/private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_a, _call_a1, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_a, _call_a1, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_a, _call_a1, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
3,
Expand All @@ -29,7 +29,7 @@ class Foo {
return _call_a(this);
}
set #a(v) {
_call_a1(this, v);
return _call_a1(this, v);
}
getA() {
return this.#a;
Expand Down
4 changes: 2 additions & 2 deletions ...transforms_proposal/tests/decorators/2022-03-getters-and-setters/static-private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_a, _call_a1, _initStatic;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_a, _call_a1, _initStatic] } = _apply_decs_2203_r(this, [
({ e: [_call_a, _call_a1, _initStatic] } = _apply_decs_2203_r(this, [
[
dec,
8,
Expand All @@ -27,7 +27,7 @@ class Foo {
return _call_a(this);
}
static set #a(v) {
_call_a1(this, v);
return _call_a1(this, v);
}
static getA() {
return this.#a;
Expand Down
9 changes: 6 additions & 3 deletions ...wc_ecma_transforms_proposal/tests/decorators/2022-03-methods--to-es2015/private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ class Foo {
return _class_private_field_get(this, _a).call(this);
}
constructor(){
_define_property(this, "value", 1);
_class_private_field_init(this, _a, {
writable: true,
value: _call_a
get: get_a,
set: void 0
});
_define_property(this, "value", 1);
_initProto(this);
}
}
Expand All @@ -27,3 +27,6 @@ var __ = {
]
], [])
};
function get_a() {
return _call_a;
}
13 changes: 8 additions & 5 deletions ..._transforms_proposal/tests/decorators/2022-03-methods--to-es2015/static-private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ class Foo {
return _class_static_private_field_spec_get(this, Foo, _a).call(Foo);
}
}
var _a = {
get: get_a,
set: void 0
};
var __ = {
writable: true,
value: (()=>{
({ e: [_call_a, _initStatic] } = _apply_decs_2203_r(Foo, [
({ e: [_call_a, _initStatic] } = _apply_decs_2203_r(Foo, [
[
dec,
7,
Expand All @@ -22,7 +26,6 @@ var __ = {
})()
};
_define_property(Foo, "value", 1);
var _a = {
writable: true,
value: _call_a
};
function get_a() {
return _call_a;
}
6 changes: 4 additions & 2 deletions crates/swc_ecma_transforms_proposal/tests/decorators/2022-03-methods/private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_a, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_a, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_a, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -17,7 +17,9 @@ class Foo {
_initProto(this);
}
value = 1;
#a = _call_a;
get #a() {
return _call_a;
}
callA() {
return this.#a();
}
Expand Down
6 changes: 4 additions & 2 deletions ...es/swc_ecma_transforms_proposal/tests/decorators/2022-03-methods/static-private/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_a, _initStatic;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_a, _initStatic] } = _apply_decs_2203_r(this, [
({ e: [_call_a, _initStatic] } = _apply_decs_2203_r(this, [
[
dec,
7,
Expand All @@ -15,7 +15,9 @@ class Foo {
_initStatic(this);
}
static value = 1;
static #a = _call_a;
static get #a() {
return _call_a;
}
static callA() {
return this.#a();
}
Expand Down
14 changes: 9 additions & 5 deletions crates/swc_ecma_transforms_proposal/tests/decorators/2022-03-misc/all-decorators/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ new class extends _identity {
static{
class Class {
static{
({ e: [_init_m, _call_o, _call_p, _call_q, _init_r, _get___r, _set___r, _init_i, _init_n, _init_d, _call_f, _call_g, _call_g1, _init_h, _get___h, _set___h, _init_a, _init_e, _initProto, _initStatic] , c: [_Class, _initClass] } = _apply_decs_2203_r(this, [
({ e: [_init_m, _call_o, _call_p, _call_q, _init_r, _get___r, _set___r, _init_i, _init_n, _init_d, _call_f, _call_g, _call_g1, _init_h, _get___h, _set___h, _init_a, _init_e, _initProto, _initStatic], c: [_Class, _initClass] } = _apply_decs_2203_r(this, [
[
dec,
7,
Expand Down Expand Up @@ -156,12 +156,14 @@ new class extends _identity {
this.#___private_d = _v;
}
#e = _init_e(this);
#f = _call_f;
get #f() {
return _call_f;
}
get #g() {
return _call_g(this);
}
set #g(v) {
_call_g1(this, v);
return _call_g1(this, v);
}
#__h = _init_h(this);
get #h() {
Expand All @@ -184,12 +186,14 @@ new class extends _identity {
}
#___private_m = _init_m(this);
#n = _init_n(this);
#o = _call_o;
get #o() {
return _call_o;
}
get #p() {
return _call_p(this);
}
set #q(v) {
_call_q(this, v);
return _call_q(this, v);
}
#__r = _init_r(this);
get #r() {
Expand Down
6 changes: 4 additions & 2 deletions ...proposal/tests/decorators/2022-03-misc/setting-private-method-via-array-pattern/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,7 +14,9 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
[this.#x] = this.baz;
}
Expand Down
6 changes: 4 additions & 2 deletions ...sforms_proposal/tests/decorators/2022-03-misc/setting-private-method-via-for-of/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,7 +14,9 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
for (this.#x of this.baz);
}
Expand Down
8 changes: 5 additions & 3 deletions ...roposal/tests/decorators/2022-03-misc/setting-private-method-via-object-pattern/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,8 +14,10 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
({ x: this.#x } = this.baz);
({ x: this.#x } = this.baz);
}
}
6 changes: 4 additions & 2 deletions ...ansforms_proposal/tests/decorators/2022-03-misc/setting-private-method-via-rest/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,7 +14,9 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
[...this.#x] = this.baz;
}
Expand Down
6 changes: 4 additions & 2 deletions ...sforms_proposal/tests/decorators/2022-03-misc/setting-private-method-via-update/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,7 +14,9 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
this.#x++;
}
Expand Down
6 changes: 4 additions & 2 deletions ...c_ecma_transforms_proposal/tests/decorators/2022-03-misc/setting-private-method/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -14,7 +14,9 @@ class Foo {
constructor(){
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
bar() {
this.#x = 123;
}
Expand Down
6 changes: 4 additions & 2 deletions ..._ecma_transforms_proposal/tests/decorators/2022-03-misc/super-in-private-method/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _call_x, _initProto;
const dec = ()=>{};
class Foo extends Bar {
static{
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
({ e: [_call_x, _initProto] } = _apply_decs_2203_r(this, [
[
dec,
2,
Expand All @@ -17,5 +17,7 @@ class Foo extends Bar {
super(...args);
_initProto(this);
}
#x = _call_x;
get #x() {
return _call_x;
}
}
6 changes: 4 additions & 2 deletions ...wc_ecma_transforms_proposal/tests/decorators/2022-03-ordering/accessor-simple/1/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _initClass, _init_b, _init_c, _get___c, _set___c, _call_d, _initProto, _init
let _A;
class A {
static{
({ e: [_init_b, _init_c, _get___c, _set___c, _call_d, _initProto, _initStatic] , c: [_A, _initClass] } = _apply_decs_2203_r(this, [
({ e: [_init_b, _init_c, _get___c, _set___c, _call_d, _initProto, _initStatic], c: [_A, _initClass] } = _apply_decs_2203_r(this, [
[
dec3,
6,
Expand Down Expand Up @@ -53,7 +53,9 @@ class A {
static set #c(_v) {
_set___c(this, _v);
}
#d = _call_d;
get #d() {
return _call_d;
}
static{
_initClass();
}
Expand Down
Loading
Loading