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

Use simpler assertThisInitialized more often #16343

Merged
merged 1 commit into from Mar 12, 2024
Merged

Use simpler assertThisInitialized more often #16343

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-transform-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
value: "foo"
});
}
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...plugin-transform-class-properties/test/fixtures/private/derived-multiple-supers/output.js
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ let Foo = /*#__PURE__*/function (_Bar) {
_this = babelHelpers.callSuper(this, Foo);
babelHelpers.classPrivateFieldInitSpec(babelHelpers.assertThisInitialized(_this), _bar, "foo");
}
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...-plugin-transform-class-properties/test/fixtures/public/derived-multiple-supers/output.js
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
_this = babelHelpers.callSuper(this, Foo);
babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo");
}
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
22 changes: 12 additions & 10 deletions packages/babel-plugin-transform-classes/src/transformClass.ts
View file
Open in desktop
Expand Up @@ -406,17 +406,20 @@ export default function transformClass(
return ref;
};

const buildAssertThisInitialized = function () {
return t.callExpression(
classState.file.addHelper("assertThisInitialized"),
[thisRef()],
);
};

for (const thisPath of classState.superThises) {
const { node, parentPath } = thisPath;
if (parentPath.isMemberExpression({ object: node })) {
thisPath.replaceWith(thisRef());
continue;
}
thisPath.replaceWith(
t.callExpression(classState.file.addHelper("assertThisInitialized"), [
thisRef(),
]),
);
thisPath.replaceWith(buildAssertThisInitialized());
}

const bareSupers: NodePath<t.CallExpression>[] = [];
Expand Down Expand Up @@ -462,10 +465,7 @@ export default function transformClass(

if (classState.isLoose) {
wrapReturn = (returnArg: t.Expression | void) => {
const thisExpr = t.callExpression(
classState.file.addHelper("assertThisInitialized"),
[thisRef()],
);
const thisExpr = buildAssertThisInitialized();
return returnArg
? t.logicalExpression("||", returnArg, thisExpr)
: thisExpr;
Expand All @@ -490,7 +490,9 @@ export default function transformClass(
body.pushContainer(
"body",
t.returnStatement(
guaranteedSuperBeforeFinish ? thisRef() : wrapReturn(),
guaranteedSuperBeforeFinish
? thisRef()
: buildAssertThisInitialized(),
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...l-plugin-transform-classes/test/fixtures/assumption-noCallClass/with-superClass/output.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ var A = /*#__PURE__*/function (_B) {
function A(track) {
var _this;
if (track !== undefined) _this = babelHelpers.callSuper(this, A, [track]);else _this = babelHelpers.callSuper(this, A);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(A, _B);
return babelHelpers.createClass(A);
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ var A = /*#__PURE__*/function (_B) {
var _this;
babelHelpers.classCallCheck(this, A);
if (track !== undefined) _this = babelHelpers.callSuper(this, A, [track]);else _this = babelHelpers.callSuper(this, A);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(A, _B);
return babelHelpers.createClass(A);
Expand Down
2 changes: 1 addition & 1 deletion ...in-transform-classes/test/fixtures/spec/accessing-super-property-optional-chain/output.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ var Test = /*#__PURE__*/function (_Foo) {
babelHelpers.classCallCheck(this, Test);
(_babelHelpers$get = babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Test.prototype)), "foo", _thisSuper)) === null || _babelHelpers$get === void 0 || _babelHelpers$get.bar;
(_babelHelpers$get2 = babelHelpers.get((_thisSuper2 = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Test.prototype)), "foo", _thisSuper2)) === null || _babelHelpers$get2 === void 0 || _babelHelpers$get2.call(_thisSuper2);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Test, _Foo);
return babelHelpers.createClass(Test);
Expand Down
2 changes: 1 addition & 1 deletion ...ugin-transform-classes/test/fixtures/spec/derived-constructor-must-call-super-2/output.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
var _this;
babelHelpers.classCallCheck(this, Foo);
if (eval("false")) _this = babelHelpers.callSuper(this, Foo);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...ugin-transform-classes/test/fixtures/spec/derived-constructor-must-call-super-3/output.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
babelHelpers.classCallCheck(this, Foo);
var fn = () => _this = babelHelpers.callSuper(this, Foo);
fn();
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...ugin-transform-classes/test/fixtures/spec/derived-constructor-must-call-super-4/output.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
var _this;
babelHelpers.classCallCheck(this, Foo);
var fn = () => _this = babelHelpers.callSuper(this, Foo);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...plugin-transform-classes/test/fixtures/spec/derived-constructor-must-call-super/output.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
function Foo() {
var _this;
babelHelpers.classCallCheck(this, Foo);
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down
2 changes: 1 addition & 1 deletion ...m-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-5/output.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
var _this;
babelHelpers.classCallCheck(this, Foo);
Foo[babelHelpers.assertThisInitialized(_this)];
return babelHelpers.possibleConstructorReturn(_this);
return babelHelpers.assertThisInitialized(_this);
}
babelHelpers.inherits(Foo, _Bar);
return babelHelpers.createClass(Foo);
Expand Down