Fix nested classes reference private fields

packages/babel-helper-create-class-features-plugin/src/fields.js

@@ -85,24 +85,36 @@ const privateNameVisitor = {
     const { privateNamesMap } = this;
     const body = path.get("body.body");
 
+    const visiblePrivateNames = new Map(privateNamesMap);
     for (const prop of body) {
-      if (!prop.isPrivate()) {
-        continue;
-      }
-      if (!privateNamesMap.has(prop.node.key.id.name)) continue;
+      if (!prop.isPrivate()) continue;
+      visiblePrivateNames.delete(prop.node.key.id.name);
+    }
 
-      // This class redeclares the private name.
-      // So, we can only evaluate the things in the outer scope.
-      path.traverse(privateNameInnerVisitor, this);
-      path.skip();
-      break;
+    // If the class doesn't redeclare any private fields, we can continue with
+    // our overall traversal.
+    if (visiblePrivateNames.size === privateNamesMap.size) {
+      return;
     }
+
+    // This class redeclares some private field. We need to process the outer
+    // environment with access to all the outer privates, then we can process
+    // the inner environment with only the still-visible outer privates.
+    path.traverse(privateNameNestedVisitor, this);
+    path.traverse(privateNameVisitor, {
+      ...this,
+      privateNamesMap: visiblePrivateNames,
+    });
+
+    // We'll eventually hit this class node again with the overall Class
+    // Features visitor, which'll process the redeclared privates.
+    path.skip();
   },
 };
 
 // Traverses the outer portion of a class, without touching the class's inner
 // scope, for private names.
-const privateNameInnerVisitor = traverse.visitors.merge([
+const privateNameNestedVisitor = traverse.visitors.merge([
   {
     PrivateName: privateNameVisitor.PrivateName,
   },
@@ -263,6 +275,8 @@ export function transformPrivateNamesUsage(
   loose,
   state,
 ) {
+  if (!privateNamesMap.size) return;
+
   const body = path.get("body");
 
   if (loose) {

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/input.js

@@ -0,0 +1,18 @@
+class Foo {
+  #foo = 1;
+  #bar = 1;
+
+  test() {
+    class Nested {
+      #bar = 2;
+
+      test() {
+        this.#foo;
+        this.#bar;
+      }
+    }
+
+    this.#foo;
+    this.#bar;
+  }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/output.js

@@ -0,0 +1,49 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+    Object.defineProperty(this, _foo, {
+      writable: true,
+      value: 1
+    });
+    Object.defineProperty(this, _bar, {
+      writable: true,
+      value: 1
+    });
+  }
+
+  babelHelpers.createClass(Foo, [{
+    key: "test",
+    value: function test() {
+      var Nested = /*#__PURE__*/function () {
+        function Nested() {
+          babelHelpers.classCallCheck(this, Nested);
+          Object.defineProperty(this, _bar2, {
+            writable: true,
+            value: 2
+          });
+        }
+
+        babelHelpers.createClass(Nested, [{
+          key: "test",
+          value: function test() {
+            babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo];
+            babelHelpers.classPrivateFieldLooseBase(this, _bar2)[_bar2];
+          }
+        }]);
+        return Nested;
+      }();
+
+      var _bar2 = babelHelpers.classPrivateFieldLooseKey("bar");
+
+      babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo];
+      babelHelpers.classPrivateFieldLooseBase(this, _bar)[_bar];
+    }
+  }]);
+  return Foo;
+}();
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");
+
+var _bar = babelHelpers.classPrivateFieldLooseKey("bar");

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/input.js

@@ -0,0 +1,15 @@
+class Foo {
+  #foo = 1;
+
+  test() {
+    class Nested {
+      #foo = 2;
+
+      test() {
+        this.#foo;
+      }
+    }
+
+    this.#foo;
+  }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/output.js

@@ -0,0 +1,41 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+    Object.defineProperty(this, _foo, {
+      writable: true,
+      value: 1
+    });
+  }
+
+  babelHelpers.createClass(Foo, [{
+    key: "test",
+    value: function test() {
+      var Nested = /*#__PURE__*/function () {
+        function Nested() {
+          babelHelpers.classCallCheck(this, Nested);
+          Object.defineProperty(this, _foo2, {
+            writable: true,
+            value: 2
+          });
+        }
+
+        babelHelpers.createClass(Nested, [{
+          key: "test",
+          value: function test() {
+            babelHelpers.classPrivateFieldLooseBase(this, _foo2)[_foo2];
+          }
+        }]);
+        return Nested;
+      }();
+
+      var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo");
+
+      babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo];
+    }
+  }]);
+  return Foo;
+}();
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/input.js

@@ -0,0 +1,13 @@
+class Foo {
+  #foo = 1;
+
+  test() {
+    class Nested {
+      test() {
+        this.#foo;
+      }
+    }
+
+    this.#foo;
+  }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/output.js

@@ -0,0 +1,35 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+    Object.defineProperty(this, _foo, {
+      writable: true,
+      value: 1
+    });
+  }
+
+  babelHelpers.createClass(Foo, [{
+    key: "test",
+    value: function test() {
+      var Nested = /*#__PURE__*/function () {
+        function Nested() {
+          babelHelpers.classCallCheck(this, Nested);
+        }
+
+        babelHelpers.createClass(Nested, [{
+          key: "test",
+          value: function test() {
+            babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo];
+          }
+        }]);
+        return Nested;
+      }();
+
+      babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo];
+    }
+  }]);
+  return Foo;
+}();
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");

packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/input.js

@@ -0,0 +1,18 @@
+class Foo {
+  #foo = 1;
+  #bar = 1;
+
+  test() {
+    class Nested {
+      #bar = 2;
+
+      test() {
+        this.#foo;
+        this.#bar;
+      }
+    }
+
+    this.#foo;
+    this.#bar;
+  }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/output.js

@@ -0,0 +1,52 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+
+    _foo.set(this, {
+      writable: true,
+      value: 1
+    });
+
+    _bar.set(this, {
+      writable: true,
+      value: 1
+    });
+  }
+
+  babelHelpers.createClass(Foo, [{
+    key: "test",
+    value: function test() {
+      var Nested = /*#__PURE__*/function () {
+        function Nested() {
+          babelHelpers.classCallCheck(this, Nested);
+
+          _bar2.set(this, {
+            writable: true,
+            value: 2
+          });
+        }
+
+        babelHelpers.createClass(Nested, [{
+          key: "test",
+          value: function test() {
+            babelHelpers.classPrivateFieldGet(this, _foo);
+            babelHelpers.classPrivateFieldGet(this, _bar2);
+          }
+        }]);
+        return Nested;
+      }();
+
+      var _bar2 = new WeakMap();
+
+      babelHelpers.classPrivateFieldGet(this, _foo);
+      babelHelpers.classPrivateFieldGet(this, _bar);
+    }
+  }]);
+  return Foo;
+}();
+
+var _foo = new WeakMap();
+
+var _bar = new WeakMap();

packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/input.js

@@ -0,0 +1,15 @@
+class Foo {
+  #foo = 1;
+
+  test() {
+    class Nested {
+      #foo = 2;
+
+      test() {
+        this.#foo;
+      }
+    }
+
+    this.#foo;
+  }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/output.js

@@ -0,0 +1,43 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+
+    _foo.set(this, {
+      writable: true,
+      value: 1
+    });
+  }
+
+  babelHelpers.createClass(Foo, [{
+    key: "test",
+    value: function test() {
+      var Nested = /*#__PURE__*/function () {
+        function Nested() {
+          babelHelpers.classCallCheck(this, Nested);
+
+          _foo2.set(this, {
+            writable: true,
+            value: 2
+          });
+        }
+
+        babelHelpers.createClass(Nested, [{
+          key: "test",
+          value: function test() {
+            babelHelpers.classPrivateFieldGet(this, _foo2);
+          }
+        }]);
+        return Nested;
+      }();
+
+      var _foo2 = new WeakMap();
+
+      babelHelpers.classPrivateFieldGet(this, _foo);
+    }
+  }]);
+  return Foo;
+}();
+
+var _foo = new WeakMap();

packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class/input.js

@@ -0,0 +1,13 @@
+class Foo {
+  #foo = 1;
+
+  test() {
+    class Nested {
+      test() {
+        this.#foo;
+      }
+    }
+
+    this.#foo;
+  }
+}