Skip to content

Commit

Permalink
Fix class fields when super() is in a default param (#12729)
Browse files Browse the repository at this point in the history
* Fix class fields when `super()` is in a default param

* Use assertion instead of type cast
  • Loading branch information
nicolo-ribaudo committed Feb 2, 2021
1 parent 60ef190 commit bab5c62
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 1 deletion.
@@ -0,0 +1,6 @@
class Foo extends Bar {
bar = "foo";

constructor(x = test ? super() : 0) {
}
}
@@ -0,0 +1,6 @@
{
"plugins": [
["external-helpers", { "helperVersion": "7.100.0" }],
"proposal-class-properties"
]
}
@@ -0,0 +1,8 @@
class Foo extends Bar {
constructor(x = test ? (() => {
var _temp;

return _temp = super(), babelHelpers.defineProperty(this, "bar", "foo"), _temp;
})() : 0) {}

}
@@ -0,0 +1,6 @@
class Foo extends Bar {
bar = "foo";

constructor(x = () => { check(super()) }) {
}
}
@@ -0,0 +1,6 @@
{
"plugins": [
["external-helpers", { "helperVersion": "7.100.0" }],
"proposal-class-properties"
]
}
@@ -0,0 +1,8 @@
class Foo extends Bar {
constructor(x = () => {
var _temp;

check((_temp = super(), babelHelpers.defineProperty(this, "bar", "foo"), _temp));
}) {}

}
@@ -0,0 +1,6 @@
class Foo extends Bar {
bar = "foo";

constructor(x = super()) {
}
}
@@ -0,0 +1,6 @@
{
"plugins": [
["external-helpers", { "helperVersion": "7.100.0" }],
"proposal-class-properties"
]
}
@@ -0,0 +1,8 @@
class Foo extends Bar {
constructor(x = (() => {
var _temp;

return _temp = super(), babelHelpers.defineProperty(this, "bar", "foo"), _temp;
})()) {}

}
16 changes: 15 additions & 1 deletion packages/babel-traverse/src/path/modification.ts
Expand Up @@ -95,7 +95,10 @@ export function _containerInsertAfter(this: NodePath, nodes) {
* expression, ensure that the completion record is correct by pushing the current node.
*/

export function insertAfter(this: NodePath, nodes_: t.Node | t.Node[]) {
export function insertAfter(
this: NodePath,
nodes_: t.Node | t.Node[],
): NodePath[] {
this._assertUnremoved();

const nodes = this._verifyNodeList(nodes_);
Expand Down Expand Up @@ -127,6 +130,17 @@ export function insertAfter(this: NodePath, nodes_: t.Node | t.Node[]) {
if (this.node) {
const node = this.node as t.Expression | t.VariableDeclaration;
let { scope } = this;

if (scope.path.isPattern()) {
t.assertExpression(node);

this.replaceWith(
t.callExpression(t.arrowFunctionExpression([], node), []),
);
(this.get("callee.body") as NodePath).insertAfter(nodes);
return [this];
}

// Inserting after the computed key of a method should insert the
// temporary binding in the method's parent's scope.
if (parentPath.isMethod({ computed: true, key: node })) {
Expand Down

0 comments on commit bab5c62

Please sign in to comment.