Unshadow class binding

babel · Apr 19, 2021 · 48415ba · 48415ba
1 parent 6f7cfa8
commit 48415ba
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/packages/babel-plugin-proposal-private-property-in-object/src/native-private-fields.js b/packages/babel-plugin-proposal-private-property-in-object/src/native-private-fields.js
@@ -4,6 +4,13 @@ import { injectInitialization as injectConstructorInit } from "@babel/helper-cre
 export default function pluginPrivateIn({ types: t, template }) {
   const ids = new WeakMap();
 
+  function unshadow(name, targetScope, scope) {
+    while (scope !== targetScope) {
+      if (scope.hasOwnBinding(name)) scope.rename(name);
+      scope = scope.parent;
+    }
+  }
+
   function injectInitialization(classPath, init) {
     let firstFieldPath;
     let consturctorPath;
@@ -68,7 +75,9 @@ export default function pluginPrivateIn({ types: t, template }) {
         }
 
         if (isStatic) {
-          if (!outerClass.node.id) {
+          if (outerClass.node.id) {
+            unshadow(outerClass.node.id.name, outerClass.scope, path.scope);
+          } else {
             outerClass.set("id", path.scope.generateUidIdentifier("class"));
           }
           path.replaceWith(

diff --git a/...rivate-property-in-object/test/fixtures/to-native-fields/static-shadowed-binding/input.js b/...rivate-property-in-object/test/fixtures/to-native-fields/static-shadowed-binding/input.js
@@ -0,0 +1,9 @@
+class A {
+  static #foo;
+
+  test() {
+    let A = function fn(A) {
+      return #foo in A;
+    };
+  }
+}
diff --git a/...ivate-property-in-object/test/fixtures/to-native-fields/static-shadowed-binding/output.js b/...ivate-property-in-object/test/fixtures/to-native-fields/static-shadowed-binding/output.js
@@ -0,0 +1,10 @@
+class A {
+  static #foo;
+
+  test() {
+    let _A2 = function fn(_A) {
+      return A === _A;
+    };
+  }
+
+}