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: new.target with shadowed class name #14611

Merged
merged 4 commits into from Jun 10, 2022
Merged

fix: new.target with shadowed class name #14611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f15cf3f
fix
liuxingbaoyu May 28, 2022
1b280bd
fix
liuxingbaoyu May 28, 2022
897bf07
fix
liuxingbaoyu May 28, 2022
917f05f
review
liuxingbaoyu Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions packages/babel-plugin-transform-new-target/src/index.ts
View file
Open in desktop
Expand Up @@ -47,9 +47,6 @@ export default declare(api => {
path.replaceWith(scope.buildUndefinedNode());
return;
}
if (!node.id) {
node.id = scope.generateUidIdentifier("target");
}

const constructor = t.memberExpression(
t.thisExpression(),
Expand All @@ -61,6 +58,23 @@ export default declare(api => {
return;
}

if (!node.id) {
node.id = scope.generateUidIdentifier("target");
} else {
// packages/babel-helper-create-class-features-plugin/src/fields.ts#L192 unshadow
Copy link
Member

Choose a reason for hiding this comment

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

We could actually move this to a Scope#unshadow(name, targetAncestorScope) method, and use it here like

path.scope.unshadow?.(name, func.parentPath.scope);

It will only work when people update their @babel/traverse (usually by updating their @babel/core), but it's not a breaking change because when using older versions new.target will just continue to be broken.

Then, we can use scope.unshadow() in babel-helper-create-class-features-plugin starting from Babel 8 (or better, now with a fallback to the inline unshadow() function when !process.env.BABEL_8_BREAKING).

Copy link
Member Author

Choose a reason for hiding this comment

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

I feel a little unnecessary.
Because unshadow is only a few lines of code and may be different in different scenarios.
Another major reason is that our current Scope is a bit messy, eg binding is not always reliable.
Maybe we can do it in the future.

Copy link
Member

Choose a reason for hiding this comment

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

Oh ok fair enough, we can refactor if needed.

let scope = path.scope;
const name = node.id.name;
while (scope !== func.parentPath.scope) {
if (
scope.hasOwnBinding(name) &&
!scope.bindingIdentifierEquals(name, node.id)
) {
scope.rename(name);
}
scope = scope.parent;
}
}

path.replaceWith(
t.conditionalExpression(
t.binaryExpression(
Expand Down
12 changes: 6 additions & 6 deletions .../babel-plugin-transform-new-target/test/fixtures/general/class-properties-loose/output.js
View file
Open in desktop
Expand Up @@ -11,23 +11,23 @@ class Foo {
_newtarget;
};

this.Bar = (_class = class _target2 {
this.Bar = (_class = class {
constructor() {
this.q = this.constructor;
} // should not replace


}, _class.p = void 0, _class.p1 = class _target3 {
}, _class.p = void 0, _class.p1 = class {
constructor() {
this.constructor;
}

}, _class.p2 = new function _target4() {
this instanceof _target4 ? this.constructor : void 0;
}, _class.p2 = new function _target2() {
this instanceof _target2 ? this.constructor : void 0;
}(), _class.p3 = function () {
void 0;
}, _class.p4 = function _target5() {
this instanceof _target5 ? this.constructor : void 0;
}, _class.p4 = function _target3() {
this instanceof _target3 ? this.constructor : void 0;
}, _class);
}

Expand Down
12 changes: 6 additions & 6 deletions packages/babel-plugin-transform-new-target/test/fixtures/general/class-properties/output.js
View file
Open in desktop
Expand Up @@ -9,23 +9,23 @@ class Foo {
babelHelpers.defineProperty(this, "test2", function () {
_newtarget;
});
this.Bar = (_class = class _target2 {
this.Bar = (_class = class {
constructor() {
babelHelpers.defineProperty(this, "q", this.constructor);
} // should not replace


}, babelHelpers.defineProperty(_class, "p", void 0), babelHelpers.defineProperty(_class, "p1", class _target3 {
}, babelHelpers.defineProperty(_class, "p", void 0), babelHelpers.defineProperty(_class, "p1", class {
constructor() {
this.constructor;
}

}), babelHelpers.defineProperty(_class, "p2", new function _target4() {
this instanceof _target4 ? this.constructor : void 0;
}), babelHelpers.defineProperty(_class, "p2", new function _target2() {
this instanceof _target2 ? this.constructor : void 0;
}()), babelHelpers.defineProperty(_class, "p3", function () {
void 0;
}), babelHelpers.defineProperty(_class, "p4", function _target5() {
this instanceof _target5 ? this.constructor : void 0;
}), babelHelpers.defineProperty(_class, "p4", function _target3() {
this instanceof _target3 ? this.constructor : void 0;
}), _class);
}

Expand Down
13 changes: 13 additions & 0 deletions .../babel-plugin-transform-new-target/test/fixtures/general/function-duplicate-name/input.js
View file
Open in desktop
@@ -0,0 +1,13 @@
function Foo() {
function Foo() {
var Foo = new.target;
}

Foo.prototype.test = function() {
var Foo = new.target;
};
}

var Bar = function() {
var Bar = new.target;
};
13 changes: 13 additions & 0 deletions ...babel-plugin-transform-new-target/test/fixtures/general/function-duplicate-name/output.js
View file
Open in desktop
@@ -0,0 +1,13 @@
function Foo() {
function Foo() {
var _Foo = this instanceof Foo ? this.constructor : void 0;
}

Foo.prototype.test = function _target() {
var Foo = this instanceof _target ? this.constructor : void 0;
};
}

var Bar = function _target2() {
var Bar = this instanceof _target2 ? this.constructor : void 0;
};