Skip to content

Ensure non-static decorators are applied when a class is instantiated. #15059

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

Merged
JLHwung merged 2 commits into from
Oct 19, 2022
Merged

Ensure non-static decorators are applied when a class is instantiated. #15059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
956d234
rename test cases
JLHwung Oct 18, 2022
4bf2018
fix: protoInit call should not be injected to static field initializer
JLHwung Oct 18, 2022
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
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/src/transformer-2022-03.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ function transformClass(

const elementDecoratorInfo: (DecoratorInfo | ComputedPropInfo)[] = [];

// The initializer of the first non-static field will be injected with the protoInit call
let firstFieldPath:
| NodePath<t.ClassProperty | t.ClassPrivateProperty>
| undefined;
Expand Down Expand Up @@ -767,7 +768,11 @@ function transformClass(
element.node.decorators = null;
}

if (!firstFieldPath && (kind === FIELD || kind === ACCESSOR)) {
if (
!firstFieldPath &&
!isStatic &&
(kind === FIELD || kind === ACCESSOR)
) {
firstFieldPath = element as NodePath<
t.ClassProperty | t.ClassPrivateProperty
>;
Expand Down
67 changes: 67 additions & 0 deletions ...decorators/test/fixtures/2022-03-ordering--to-es2015/accessor-initializers-fields/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
var log = [];

function push(x) {
log.push(x);
return x;
}

function logClassDecoratorRun(a, b, c) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return el;
};
}

function logAccessorDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return {
init: () => push(d),
};
};
}

function logFieldDecoratorRun(a, b) {
push(a);
return function (el) { push(b); return el; };
}

@logClassDecoratorRun(0, 19, 21)
@logClassDecoratorRun(1, 18, 20)
class A {
@logAccessorDecoratorRun(2, 11, 23, 27)
@logAccessorDecoratorRun(3, 10, 22, 26)
accessor a;

@logFieldDecoratorRun(4, 15)
@logFieldDecoratorRun(5, 14)
b;

@logFieldDecoratorRun(6, 17)
@logFieldDecoratorRun(7, 16)
#c;

@logAccessorDecoratorRun(8, 13, 25, 29)
@logAccessorDecoratorRun(9, 12, 24, 28)
accessor #d;

constructor() {
this.a = this.#d = null;
}
}

var nums = Array.from({ length: 22 }, (_, i) => i);
expect(log).toEqual(nums);

new A();

var nums = Array.from({ length: 30 }, (_, i) => i);
expect(log).toEqual(nums);
75 changes: 75 additions & 0 deletions ...decorators/test/fixtures/2022-03-ordering--to-es2015/accessor-method-initializers/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
var log = [];

function push(x) {
log.push(x);
return x;
}

function logClassDecoratorRun(a, b, c) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return el;
};
}

function logAccessorDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return {
init: () => push(d),
};
};
}

function logMethodDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return () => (el(), push(d))
};
}

@logClassDecoratorRun(0, 19, 21)
@logClassDecoratorRun(1, 18, 20)
class A {
@logAccessorDecoratorRun(2, 11, 23, 31)
@logAccessorDecoratorRun(3, 10, 22, 30)
accessor a;

@logMethodDecoratorRun(4, 13, 25, 35)
@logMethodDecoratorRun(5, 12, 24, 34)
b() {};

@logMethodDecoratorRun(6, 15, 27, 37)
@logMethodDecoratorRun(7, 14, 26, 36)
#c() {};

@logAccessorDecoratorRun(8, 17, 29, 33)
@logAccessorDecoratorRun(9, 16, 28, 32)
accessor #d;

constructor() {
this.b();
this.#c();
this.a = this.#d = null;
}
}

var nums = Array.from({ length: 22 }, (_, i) => i);
expect(log).toEqual(nums);

new A();

var nums = Array.from({ length: 38 }, (_, i) => i);
expect(log).toEqual(nums);
3 changes: 3 additions & 0 deletions ...--to-es2015/accessor-initializers/exec.js → ...ssor-static-accessor-initializers/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class A {
accessor #d;
}

var nums = Array.from({ length: 30 }, (_, i) => i);
expect(log).toEqual(nums);
Copy link
Contributor Author

@JLHwung JLHwung Oct 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test here becomes more stringent: we assert that certain log must be printed before the class is instantiated.


new A();

var nums = Array.from({ length: 38 }, (_, i) => i);
Expand Down
77 changes: 77 additions & 0 deletions ...ors/test/fixtures/2022-03-ordering--to-es2015/accessor-static-method-initializers/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
var log = [];

function push(x) {
log.push(x);
return x;
}

function logClassDecoratorRun(a, b, c) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return el;
};
}

function logAccessorDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return {
init: () => push(d),
};
};
}

function logMethodDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return () => (el(), push(d))
};
}

@logClassDecoratorRun(0, 19, 29)
@logClassDecoratorRun(1, 18, 28)
class A {
static {
A.b(), A.#c();
}

@logAccessorDecoratorRun(2, 15, 31, 35)
@logAccessorDecoratorRun(3, 14, 30, 34)
accessor a;

@logMethodDecoratorRun(4, 11, 21, 25)
@logMethodDecoratorRun(5, 10, 20, 24)
static b() {};

@logMethodDecoratorRun(6, 13, 23, 27)
@logMethodDecoratorRun(7, 12, 22, 26)
static #c() {};

@logAccessorDecoratorRun(8, 17, 33, 37)
@logAccessorDecoratorRun(9, 16, 32, 36)
accessor #d;

constructor() {
this.a = this.#d = null;
}
}

var nums = Array.from({ length: 30 }, (_, i) => i);
expect(log).toEqual(nums);

new A();

var nums = Array.from({ length: 38 }, (_, i) => i);
expect(log).toEqual(nums);
31 changes: 0 additions & 31 deletions ...l-plugin-proposal-decorators/test/fixtures/2022-03-ordering--to-es2015/decorators/exec.js
View file
Open in desktop

This file was deleted.

0 ...tures/2022-03-ordering/decorators/exec.js → ...2022-03-ordering--to-es2015/field/exec.js
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions ...plugin-proposal-decorators/test/fixtures/2022-03-ordering--to-es2015/initializers/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class A {
accessor #h;
}

var nums = Array.from({ length: 46 }, (_, i) => i);
expect(log).toEqual(nums);

new A();

var nums = Array.from({ length: 54 }, (_, i) => i);
Expand Down
74 changes: 74 additions & 0 deletions ...ors/test/fixtures/2022-03-ordering--to-es2015/static-accessor-method-initializers/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
var log = [];

function push(x) {
log.push(x);
return x;
}

function logClassDecoratorRun(a, b, c) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return el;
};
}

function logAccessorDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return {
init: () => push(d),
};
};
}

function logMethodDecoratorRun(a, b, c, d) {
push(a);
return function (el, { addInitializer }) {
push(b);
addInitializer(function () {
push(c);
});
return () => (el(), push(d))
};
}

@logClassDecoratorRun(0, 19, 29)
@logClassDecoratorRun(1, 18, 28)
class A {
@logMethodDecoratorRun(2, 15, 31, 35)
@logMethodDecoratorRun(3, 14, 30, 34)
a() {}

@logAccessorDecoratorRun(4, 11, 21, 25)
@logAccessorDecoratorRun(5, 10, 20, 24)
static accessor b;

@logAccessorDecoratorRun(6, 13, 23, 27)
@logAccessorDecoratorRun(7, 12, 22, 26)
static accessor #c;

@logMethodDecoratorRun(8, 17, 33, 37)
@logMethodDecoratorRun(9, 16, 32, 36)
#d() {}

constructor() {
this.a();
this.#d();
}
}

var nums = Array.from({ length: 30 }, (_, i) => i);
expect(log).toEqual(nums);

new A();

var nums = Array.from({ length: 38 }, (_, i) => i);
expect(log).toEqual(nums);
Loading