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

Handle logical assignment in super property transforms #14164

Merged
merged 6 commits into from Jan 17, 2022
Merged

Handle logical assignment in super property transforms #14164

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffee2ee
fix: add test cases
magic-akari Jan 17, 2022
50a2449
Fix logical assignment in super property transforms
magic-akari Jan 17, 2022
a2cd315
fix: test cases
magic-akari Jan 17, 2022
f47fb15
Fix logical assignment in super property transforms
magic-akari Jan 17, 2022
bc98816
chore: clean code
magic-akari Jan 17, 2022
b171bba
chore: clean code
magic-akari Jan 17, 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
90 changes: 68 additions & 22 deletions packages/babel-traverse/src/path/conversion.ts
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ import {
identifier,
isIdentifier,
jsxIdentifier,
logicalExpression,
memberExpression,
metaProperty,
numericLiteral,
Expand Down Expand Up @@ -397,63 +398,89 @@ function hoistFunctionEnvironment(
return { thisBinding, fnPath };
}

function standardizeSuperProperty(superProp) {
function standardizeSuperProperty(superProp: NodePath<t.MemberExpression>) {
if (
superProp.parentPath.isAssignmentExpression() &&
superProp.parentPath.node.operator !== "="
) {
const assignmentPath = superProp.parentPath;

const op = assignmentPath.node.operator.slice(0, -1);
const op = assignmentPath.node.operator.slice(0, -1) as
| LogicalOp
| BinaryOp;

const value = assignmentPath.node.right;

assignmentPath.node.operator = "=";
const isLogicalAssignment = op === "||" || op === "&&" || op === "??";
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: @babel/types exports LOGICAL_OPERATORS so we don't have to hardcode them.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.
Type narrowing is hard.


if (superProp.node.computed) {
// from: super[foo] **= 4;
// to: super[tmp = foo] = super[tmp] ** 4;

// from: super[foo] ??= 4;
// to: super[tmp = foo] ?? super[tmp] = 4;

const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");

const object = superProp.node.object;
const property = superProp.node.property as t.Expression;

assignmentPath
.get("left")
.replaceWith(
memberExpression(
superProp.node.object,
assignmentExpression("=", tmp, superProp.node.property),
object,
assignmentExpression("=", tmp, property),
true /* computed */,
),
);

assignmentPath
.get("right")
.replaceWith(
binaryExpression(
op,
memberExpression(
superProp.node.object,
identifier(tmp.name),
true /* computed */,
),
rightExpression(
isLogicalAssignment ? "=" : op,
memberExpression(object, identifier(tmp.name), true /* computed */),
value,
),
);
} else {
// from: super.foo **= 4;
// to: super.foo = super.foo ** 4;

// from: super.foo ??= 4;
// to: super.foo ?? super.foo = 4;

const object = superProp.node.object;
const property = superProp.node.property as t.Identifier;

assignmentPath
.get("left")
.replaceWith(
memberExpression(superProp.node.object, superProp.node.property),
);
.replaceWith(memberExpression(object, property));

assignmentPath
.get("right")
.replaceWith(
binaryExpression(
op,
memberExpression(
superProp.node.object,
identifier(superProp.node.property.name),
),
rightExpression(
isLogicalAssignment ? "=" : op,
memberExpression(object, identifier(property.name)),
value,
),
);
}

if (isLogicalAssignment) {
assignmentPath.replaceWith(
logicalExpression(
op,
assignmentPath.node.left as t.Expression,
assignmentPath.node.right as t.Expression,
),
);
} else {
assignmentPath.node.operator = "=";
}

return [
assignmentPath.get("left"),
assignmentPath.get("right").get("left"),
Expand All @@ -473,7 +500,11 @@ function standardizeSuperProperty(superProp) {
memberExpression(
superProp.node.object,
computedKey
? assignmentExpression("=", computedKey, superProp.node.property)
? assignmentExpression(
"=",
computedKey,
superProp.node.property as t.Expression,
)
: superProp.node.property,
superProp.node.computed,
),
Expand Down Expand Up @@ -506,6 +537,21 @@ function standardizeSuperProperty(superProp) {
}

return [superProp];

type LogicalOp = Parameters<typeof logicalExpression>[0];
type BinaryOp = Parameters<typeof binaryExpression>[0];

function rightExpression(
op: BinaryOp | "=",
left: t.MemberExpression,
right: t.Expression,
) {
if (op === "=") {
return assignmentExpression("=", left, right);
} else {
return binaryExpression(op, left, right);
}
}
}

function hasSuperClass(thisEnvFn) {
Expand Down
150 changes: 150 additions & 0 deletions packages/babel-traverse/test/arrow-transform.js
View file
Open in desktop
Expand Up @@ -518,6 +518,156 @@ describe("arrow function conversion", () => {
);
});

it("should convert super.prop operator logical assign `??=`", () => {
assertConversion(
`
() => {
super.foo ??= 4;
};
super.foo ??= 4;
() => super.foo ??= 4;
`,
`
var _superprop_getFoo = () => super.foo,
_superprop_setFoo = _value => super.foo = _value;

(function () {
_superprop_getFoo() ?? _superprop_setFoo(4);
});

super.foo ??= 4;

() => super.foo ??= 4;
`,
);
});

it("should convert super.prop operator logical assign `&&=`", () => {
assertConversion(
`
() => {
super.foo &&= true;
};
super.foo &&= true;
() => super.foo &&= true;
`,
`
var _superprop_getFoo = () => super.foo,
_superprop_setFoo = _value => super.foo = _value;

(function () {
_superprop_getFoo() && _superprop_setFoo(true);
});

super.foo &&= true;

() => super.foo &&= true;
`,
);
});

it("should convert super.prop operator logical assign `||=`", () => {
assertConversion(
`
() => {
super.foo ||= true;
};
super.foo ||= true;
() => super.foo ||= true;
`,
`
var _superprop_getFoo = () => super.foo,
_superprop_setFoo = _value => super.foo = _value;

(function () {
_superprop_getFoo() || _superprop_setFoo(true);
});

super.foo ||= true;

() => super.foo ||= true;
`,
);
});

it("should convert super[prop] operator logical assign `??=`", () => {
assertConversion(
`
() => {
super[foo] ??= 4;
};
super[foo] ??= 4;
() => super[foo] ??= 4;
`,
`
var _superprop_get = _prop => super[_prop],
_superprop_set = (_prop2, _value) => super[_prop2] = _value;

(function () {
var _tmp;

_superprop_get(_tmp = foo) ?? _superprop_set(_tmp, 4);
});

super[foo] ??= 4;

() => super[foo] ??= 4;
`,
);
});

it("should convert super[prop] operator logical assign `&&=`", () => {
assertConversion(
`
() => {
super[foo] &&= true;
};
super[foo] &&= true;
() => super[foo] &&= true;
`,
`
var _superprop_get = _prop => super[_prop],
_superprop_set = (_prop2, _value) => super[_prop2] = _value;

(function () {
var _tmp;

_superprop_get(_tmp = foo) && _superprop_set(_tmp, true);
});

super[foo] &&= true;

() => super[foo] &&= true;
`,
);
});

it("should convert super[prop] operator logical assign `||=`", () => {
assertConversion(
`
() => {
super[foo] ||= true;
};
super[foo] ||= true;
() => super[foo] ||= true;
`,
`
var _superprop_get = _prop => super[_prop],
_superprop_set = (_prop2, _value) => super[_prop2] = _value;

(function () {
var _tmp;

_superprop_get(_tmp = foo) || _superprop_set(_tmp, true);
});

super[foo] ||= true;

() => super[foo] ||= true;
`,
);
});

it("should convert `++super.prop` prefix update", () => {
assertConversion(
`
Expand Down