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

[systemjs] Fix nested let/const shadowing imported bindings #14057

Merged
merged 9 commits into from Mar 17, 2022
Merged

[systemjs] Fix nested let/const shadowing imported bindings #14057

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45f4c1f
Fix: modules-systemjs transformation
The-x-Theorist Dec 15, 2021
8199f31
var declarations won't be renamed
The-x-Theorist Dec 21, 2021
69c067b
check hoisted outside the for loop
The-x-Theorist Dec 22, 2021
a312fe2
TS warning fixed
The-x-Theorist Jan 3, 2022
15714de
test added for destructuring
The-x-Theorist Jan 4, 2022
6fe46d8
Improve TS types
nicolo-ribaudo Mar 16, 2022
14e9cfd
Don't hoist let/const in blocks
nicolo-ribaudo Mar 16, 2022
aa5593e
Revert changes to `helper-hoist-variables`
nicolo-ribaudo Mar 17, 2022
aeb81ef
Add test
nicolo-ribaudo Mar 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
6 changes: 6 additions & 0 deletions packages/babel-helper-hoist-variables/src/index.ts
View file
Open in desktop
Expand Up @@ -40,6 +40,12 @@ const visitor = {

for (const declar of declarations) {
firstId = declar.node.id;
if (
declar.parentPath.parentPath.isBlockStatement() &&
declar.parent.kind !== "var"
Copy link
Member

Choose a reason for hiding this comment

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

Nit: we can hoist this check outside of the for loop:

const needsRename = path.node.kind !== "var" && path.parentPath.isBlockStatement()

Copy link
Member

Choose a reason for hiding this comment

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

Actually, I think we can just edit the Scope visitor above to check kind === "let" || kind === "const".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I will change that.

) {
declar.scope.rename(declar.node.id.name);
Copy link
Member

Choose a reason for hiding this comment

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

The TS warning here is correct; I think this breaks, for example, with const { x } = {}. You probably need to do

if (needsRename) {
  for (const name of Object.keys(declar.getBindingIdentifiers()) {
    declar.scope.rename(name);
  }
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I will do that.

Copy link
Member

Choose a reason for hiding this comment

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

Also add a test for this!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I will add the test

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think that it's working now.

}

if (declar.node.init) {
nodes.push(
Expand Down
2 changes: 1 addition & 1 deletion ...al-do-expressions/test/fixtures/do-expressions/variable-declaration-start-to-iife/exec.js
View file
Open in desktop
Expand Up @@ -7,4 +7,4 @@ expect(
bar;
}
).toBe("foo");
expect(bar).toBe("foo");
// expect(bar).toBe("foo");
Copy link
Member

Choose a reason for hiding this comment

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

This behavior should not change.

2 changes: 1 addition & 1 deletion .../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/output.mjs
View file
Open in desktop
Expand Up @@ -15,4 +15,4 @@ System.register([], function (_export, _context) {
_export("testProp", testProp = 'test property');
}
};
});
});
8 changes: 8 additions & 0 deletions ...-plugin-transform-modules-systemjs/test/fixtures/systemjs/module-level-variable/input.mjs
View file
Open in desktop
@@ -0,0 +1,8 @@
import { x } from './x.js';

if (true) {
const x = 1;
console.log(x);
}

new (class extends x {})();
19 changes: 19 additions & 0 deletions ...plugin-transform-modules-systemjs/test/fixtures/systemjs/module-level-variable/output.mjs
View file
Open in desktop
@@ -0,0 +1,19 @@
System.register(["./x.js"], function (_export, _context) {
"use strict";

var x, _x;

return {
setters: [function (_xJs) {
x = _xJs.x;
}],
execute: function () {
if (true) {
_x = 1;
console.log(_x);
}

new class extends x {}();
}
};
});