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 source maps for private member expressions #16514

Merged
merged 6 commits into from
May 20, 2024
Merged

Fix source maps for private member expressions #16514

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a43f5d8
Add test
nicolo-ribaudo May 19, 2024
5c163b5
Properly map private names in member expresions
nicolo-ribaudo May 19, 2024
87b89b0
More tests
nicolo-ribaudo May 19, 2024
9bca8a8
Also map it in classPrivateFieldInitSpec
nicolo-ribaudo May 19, 2024
60a593d
Add one more test case
nicolo-ribaudo May 19, 2024
ee9585a
Fix it
nicolo-ribaudo May 19, 2024
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
62 changes: 37 additions & 25 deletions packages/babel-helper-create-class-features-plugin/src/fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
innerBinding,
noUninitializedPrivateFieldAccess,
} = this;
const { name } = (member.node.property as t.PrivateName).id;
const privateName = member.node.property as t.PrivateName;
const { name } = privateName.id;
const {
id,
static: isStatic,
Expand All @@ -449,6 +450,9 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
} = privateNamesMap.get(name);
const isGetterOrSetter = getId || setId;

const cloneId = (id: t.Identifier) =>
t.inherits(t.cloneNode(id), privateName);

if (isStatic) {
// if there are any local variable shadowing classRef, unshadow it
// see #12960
Expand All @@ -465,7 +469,7 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
return t.callExpression(file.addHelper(helperName), [
this.receiver(member),
t.cloneNode(classRef),
t.cloneNode(id),
cloneId(id),
]);
}

Expand All @@ -476,7 +480,7 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
if (!isMethod) {
if (skipCheck) {
return buildStaticPrivateFieldAccess(
t.cloneNode(id),
cloneId(id),
noUninitializedPrivateFieldAccess,
);
}
Expand All @@ -485,20 +489,20 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
t.callExpression(file.addHelper("assertClassBrand"), [
t.cloneNode(classRef),
receiver,
t.cloneNode(id),
cloneId(id),
]),
noUninitializedPrivateFieldAccess,
);
}

if (getId) {
if (skipCheck) {
return t.callExpression(t.cloneNode(getId), [receiver]);
return t.callExpression(cloneId(getId), [receiver]);
}
return t.callExpression(file.addHelper("classPrivateGetter"), [
t.cloneNode(classRef),
receiver,
t.cloneNode(getId),
cloneId(getId),
]);
}

Expand All @@ -514,11 +518,11 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
]);
}

if (skipCheck) return t.cloneNode(id);
if (skipCheck) return cloneId(id);
return t.callExpression(file.addHelper("assertClassBrand"), [
t.cloneNode(classRef),
receiver,
t.cloneNode(id),
cloneId(id),
]);
}

Expand All @@ -533,38 +537,38 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
if (!process.env.BABEL_8_BREAKING && !newHelpers(file)) {
return t.callExpression(file.addHelper("classPrivateFieldGet"), [
this.receiver(member),
t.cloneNode(id),
cloneId(id),
]);
}
return t.callExpression(file.addHelper("classPrivateGetter"), [
t.cloneNode(id),
this.receiver(member),
t.cloneNode(getId),
cloneId(getId),
]);
}
if (!process.env.BABEL_8_BREAKING && !newHelpers(file)) {
return t.callExpression(file.addHelper("classPrivateMethodGet"), [
this.receiver(member),
t.cloneNode(id),
t.cloneNode(methodId),
cloneId(methodId),
]);
}
return t.callExpression(file.addHelper("assertClassBrand"), [
t.cloneNode(id),
this.receiver(member),
t.cloneNode(methodId),
cloneId(methodId),
]);
}
if (process.env.BABEL_8_BREAKING || newHelpers(file)) {
return t.callExpression(file.addHelper("classPrivateFieldGet2"), [
t.cloneNode(id),
cloneId(id),
this.receiver(member),
]);
}

return t.callExpression(file.addHelper("classPrivateFieldGet"), [
this.receiver(member),
t.cloneNode(id),
cloneId(id),
]);
},

Expand All @@ -584,7 +588,8 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
file,
noUninitializedPrivateFieldAccess,
} = this;
const { name } = (member.node.property as t.PrivateName).id;
const privateName = member.node.property as t.PrivateName;
const { name } = privateName.id;
const {
id,
static: isStatic,
Expand All @@ -594,6 +599,9 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
} = privateNamesMap.get(name);
const isGetterOrSetter = getId || setId;

const cloneId = (id: t.Identifier) =>
t.inherits(t.cloneNode(id), privateName);

if (isStatic) {
if (!process.env.BABEL_8_BREAKING && !newHelpers(file)) {
const helperName =
Expand All @@ -604,7 +612,7 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
return t.callExpression(file.addHelper(helperName), [
this.receiver(member),
t.cloneNode(classRef),
t.cloneNode(id),
cloneId(id),
value,
]);
}
Expand Down Expand Up @@ -632,15 +640,15 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
}
return t.callExpression(file.addHelper("classPrivateSetter"), [
t.cloneNode(classRef),
t.cloneNode(setId),
cloneId(setId),
receiver,
value,
]);
}
return t.assignmentExpression(
"=",
buildStaticPrivateFieldAccess(
t.cloneNode(id),
cloneId(id),
noUninitializedPrivateFieldAccess,
),
skipCheck
Expand All @@ -657,13 +665,13 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
if (!process.env.BABEL_8_BREAKING && !newHelpers(file)) {
return t.callExpression(file.addHelper("classPrivateFieldSet"), [
this.receiver(member),
t.cloneNode(id),
cloneId(id),
value,
]);
}
return t.callExpression(file.addHelper("classPrivateSetter"), [
t.cloneNode(id),
t.cloneNode(setId),
cloneId(setId),
this.receiver(member),
value,
]);
Expand All @@ -677,15 +685,15 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =

if (process.env.BABEL_8_BREAKING || newHelpers(file)) {
return t.callExpression(file.addHelper("classPrivateFieldSet2"), [
t.cloneNode(id),
cloneId(id),
this.receiver(member),
value,
]);
}

return t.callExpression(file.addHelper("classPrivateFieldSet"), [
this.receiver(member),
t.cloneNode(id),
cloneId(id),
value,
]);
},
Expand All @@ -697,14 +705,18 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
file,
noUninitializedPrivateFieldAccess,
} = this;
const { name } = (member.node.property as t.PrivateName).id;
const privateName = member.node.property as t.PrivateName;
const { name } = privateName.id;
const {
id,
static: isStatic,
method: isMethod,
setId,
} = privateNamesMap.get(name);

const cloneId = (id: t.Identifier) =>
t.inherits(t.cloneNode(id), privateName);

if (!process.env.BABEL_8_BREAKING && !newHelpers(file)) {
if (isStatic) {
try {
Expand All @@ -723,7 +735,7 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
t.callExpression(helper, [
this.receiver(member),
t.cloneNode(classRef),
t.cloneNode(id),
cloneId(id),
]),
t.identifier("value"),
);
Expand All @@ -732,7 +744,7 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
return t.memberExpression(
t.callExpression(file.addHelper("classPrivateFieldDestructureSet"), [
this.receiver(member),
t.cloneNode(id),
cloneId(id),
]),
t.identifier("value"),
);
Expand Down
4 changes: 4 additions & 0 deletions packages/babel-plugin-transform-class-properties/test/fixtures/source-maps/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"plugins": ["transform-class-properties", "transform-private-methods"],
"sourceMaps": true
}
13 changes: 13 additions & 0 deletions ...es/babel-plugin-transform-class-properties/test/fixtures/source-maps/private-get/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
class A {
#field;

get #getter() {}

#method() {}

method() {
this.#field;
this.#getter;
this.#method;
}
}
15 changes: 15 additions & 0 deletions ...s/babel-plugin-transform-class-properties/test/fixtures/source-maps/private-get/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
var _field = /*#__PURE__*/new WeakMap();
var _A_brand = /*#__PURE__*/new WeakSet();
class A {
constructor() {
babelHelpers.classPrivateMethodInitSpec(this, _A_brand);
babelHelpers.classPrivateFieldInitSpec(this, _field, void 0);
}
method() {
babelHelpers.classPrivateFieldGet2(_field, this);
babelHelpers.classPrivateGetter(_A_brand, this, _get_getter);
babelHelpers.assertClassBrand(_A_brand, this, _method);
Comment on lines +9 to +11
Copy link
Member Author

@nicolo-ribaudo nicolo-ribaudo May 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Previously _field, _get_getter and _method were unmapped. Now they are mapped to #field, #getter and #method of the member expression.

}
}
function _get_getter(_this) {}
function _method() {}
Loading
Loading