Fix class private properties when privateFieldsAsProperties (#16275)

babel · Feb 14, 2024 · c6d409f · c6d409f
1 parent f830587
commit c6d409f
Show file tree

Hide file tree

Showing 92 changed files with 374 additions and 336 deletions.
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.ts b/packages/babel-helper-create-class-features-plugin/src/fields.ts
@@ -45,7 +45,12 @@ if (!process.env.BABEL_8_BREAKING) {
   };
 }
 
-export function buildPrivateNamesMap(props: PropPath[], file: File) {
+export function buildPrivateNamesMap(
+  className: string,
+  privateFieldsAsProperties: boolean,
+  props: PropPath[],
+  file: File,
+) {
   const privateNamesMap: PrivateNamesMap = new Map();
   let classBrandId: t.Identifier;
   for (const prop of props) {
@@ -58,12 +63,15 @@ export function buildPrivateNamesMap(props: PropPath[], file: File) {
         let initAdded = false;
         let id: t.Identifier;
         if (
+          !privateFieldsAsProperties &&
           (process.env.BABEL_8_BREAKING || newHelpers(file)) &&
           isMethod &&
           !isStatic
         ) {
           initAdded = !!classBrandId;
-          classBrandId ??= prop.scope.generateUidIdentifier(name);
+          classBrandId ??= prop.scope.generateUidIdentifier(
+            `${className}_brand`,
+          );
           id = classBrandId;
         } else {
           id = prop.scope.generateUidIdentifier(name);

diff --git a/packages/babel-helper-create-class-features-plugin/src/index.ts b/packages/babel-helper-create-class-features-plugin/src/index.ts
@@ -236,10 +236,12 @@ export function createClassFeaturePlugin({
         }
         const classRefForDefine = ref ?? t.cloneNode(innerBinding);
 
-        // NODE: These three functions don't support decorators yet,
-        //       but verifyUsedFeatures throws if there are both
-        //       decorators and private fields.
-        const privateNamesMap = buildPrivateNamesMap(props, file);
+        const privateNamesMap = buildPrivateNamesMap(
+          classRefForDefine.name,
+          privateFieldsAsProperties ?? loose,
+          props,
+          file,
+        );
         const privateNamesNodes = buildPrivateNamesNodes(
           privateNamesMap,
           privateFieldsAsProperties ?? loose,

diff --git a/...ate-class-features-plugin/test/fixtures/field-reinitialization/private-accessor/output.js b/...ate-class-features-plugin/test/fixtures/field-reinitialization/private-accessor/output.js
@@ -3,19 +3,19 @@ class Base {
     return obj;
   }
 }
-var _foo = /*#__PURE__*/new WeakSet();
+var _Derived_brand = /*#__PURE__*/new WeakSet();
 class Derived extends Base {
   constructor(...args) {
     super(...args);
-    babelHelpers.classPrivateMethodInitSpec(this, _foo);
+    babelHelpers.classPrivateMethodInitSpec(this, _Derived_brand);
   }
   static get(obj) {
-    return babelHelpers.classPrivateGetter(obj, _foo, _get_foo).call(obj);
+    return babelHelpers.classPrivateGetter(obj, _Derived_brand, _get_foo).call(obj);
   }
 }
 function _get_foo() {
   return 'bar';
 }
 function _set_foo(value) {
-  babelHelpers.classPrivateSetter(this, _foo, _set_foo, value);
+  babelHelpers.classPrivateSetter(this, _Derived_brand, _set_foo, value);
 }
diff --git a/...reate-class-features-plugin/test/fixtures/field-reinitialization/private-method/output.js b/...reate-class-features-plugin/test/fixtures/field-reinitialization/private-method/output.js
@@ -3,16 +3,16 @@ class Base {
     return obj;
   }
 }
-var _foo = /*#__PURE__*/new WeakSet();
+var _Derived_brand = /*#__PURE__*/new WeakSet();
 class Derived extends Base {
   constructor(...args) {
     super(...args);
-    babelHelpers.classPrivateMethodInitSpec(this, _foo);
+    babelHelpers.classPrivateMethodInitSpec(this, _Derived_brand);
   }
   static get(obj) {
-    return babelHelpers.classPrivateMethodGet(obj, _foo, _foo2).call(obj);
+    return babelHelpers.classPrivateMethodGet(obj, _Derived_brand, _foo).call(obj);
   }
 }
-function _foo2() {
+function _foo() {
   return 'bar';
 }
diff --git a/...class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js b/...class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js
@@ -1,9 +1,9 @@
-var _privateMethod = /*#__PURE__*/new WeakSet();
+var _X_brand = /*#__PURE__*/new WeakSet();
 class X {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _privateMethod);
+    babelHelpers.classPrivateMethodInitSpec(this, _X_brand);
   }
 }
-function _privateMethod2() {
+function _privateMethod() {
   return 42;
 }
diff --git a/...te-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/exec.js b/...te-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/exec.js
@@ -0,0 +1,18 @@
+class X {
+  #privateMethod() {
+    return 1;
+  }
+  #privateMethod2() {
+    return 2;
+  }
+  method1() {
+    return this.#privateMethod();
+  }
+  method2() {
+    return this.#privateMethod2();
+  }
+}
+
+const x = new X();
+expect(x.method1()).toBe(1);
+expect(x.method2()).toBe(2);
diff --git a/...e-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/input.js b/...e-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/input.js
@@ -2,4 +2,7 @@ class X {
   #privateMethod() {
     return 42;
   }
+  #privateMethod2() {
+    return 42;
+  }
 }
diff --git a/...-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js b/...-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js
@@ -1,6 +1,10 @@
 var _privateMethod = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("privateMethod");
+var _privateMethod3 = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("privateMethod2");
 class X {
   constructor() {
+    Object.defineProperty(this, _privateMethod3, {
+      value: _privateMethod4
+    });
     Object.defineProperty(this, _privateMethod, {
       value: _privateMethod2
     });
@@ -9,3 +13,6 @@ class X {
 function _privateMethod2() {
   return 42;
 }
+function _privateMethod4() {
+  return 42;
+}
diff --git a/...s/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js b/...s/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js
@@ -1,13 +1,13 @@
 var _A;
-var _foo = /*#__PURE__*/new WeakSet();
+var _A_brand = /*#__PURE__*/new WeakSet();
 class A extends B {
   constructor(...args) {
     super(...args);
-    babelHelpers.classPrivateMethodInitSpec(this, _foo);
+    babelHelpers.classPrivateMethodInitSpec(this, _A_brand);
   }
 }
 _A = A;
-function _foo2() {
+function _foo() {
   let _A2;
   babelHelpers.get(babelHelpers.getPrototypeOf(_A.prototype), "x", this);
 }
diff --git a/...l-plugin-proposal-decorators/test/fixtures/2021-12-accessors--to-es2015/private/output.js b/...l-plugin-proposal-decorators/test/fixtures/2021-12-accessors--to-es2015/private/output.js
@@ -1,11 +1,11 @@
 var _initProto, _init_a, _get_a, _set_a, _init_b, _get_b, _set_b, _Foo;
 const dec = () => {};
 var _A = /*#__PURE__*/new WeakMap();
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 var _B = /*#__PURE__*/new WeakMap();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_a(this)));
     babelHelpers.classPrivateFieldInitSpec(this, _B, _init_b(this, 123));
   }

diff --git a/...posal-decorators/test/fixtures/2021-12-accessors--to-es2015/undecorated-private/output.js b/...posal-decorators/test/fixtures/2021-12-accessors--to-es2015/undecorated-private/output.js
@@ -1,10 +1,10 @@
 const dec = () => {};
 var _A = /*#__PURE__*/new WeakMap();
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 var _B = /*#__PURE__*/new WeakMap();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.classPrivateFieldInitSpec(this, _A, void 0);
     babelHelpers.classPrivateFieldInitSpec(this, _B, 123);
   }

diff --git a/...xtures/2021-12-classes--to-es2015/replacement-static-installed-on-correct-class/output.js b/...xtures/2021-12-classes--to-es2015/replacement-static-installed-on-correct-class/output.js
@@ -1,13 +1,13 @@
-var _initClass, _x, _A, _a, _B, _temp;
+var _initClass, _x, _A, _Class_brand, _B, _temp;
 const dec = () => {};
 let hasX, hasA, hasM;
 let _Foo;
-new (_x = /*#__PURE__*/new WeakMap(), _A = /*#__PURE__*/new WeakMap(), _a = /*#__PURE__*/new WeakSet(), _B = /*#__PURE__*/new WeakMap(), (_temp = class extends babelHelpers.identity {
+new (_x = /*#__PURE__*/new WeakMap(), _A = /*#__PURE__*/new WeakMap(), _Class_brand = /*#__PURE__*/new WeakSet(), _B = /*#__PURE__*/new WeakMap(), (_temp = class extends babelHelpers.identity {
   constructor() {
-    (super(_Foo), babelHelpers.classPrivateMethodInitSpec(this, _a), babelHelpers.classPrivateFieldInitSpec(this, _x, void 0), babelHelpers.classPrivateFieldInitSpec(this, _A, void 0), babelHelpers.defineProperty(this, "x", void 0), babelHelpers.classPrivateFieldInitSpec(this, _B, void 0), this), (() => {
+    (super(_Foo), babelHelpers.classPrivateMethodInitSpec(this, _Class_brand), babelHelpers.classPrivateFieldInitSpec(this, _x, void 0), babelHelpers.classPrivateFieldInitSpec(this, _A, void 0), babelHelpers.defineProperty(this, "x", void 0), babelHelpers.classPrivateFieldInitSpec(this, _B, void 0), this), (() => {
       hasX = o => _x.has(babelHelpers.checkInRHS(o));
-      hasA = o => _a.has(babelHelpers.checkInRHS(o));
-      hasM = o => _a.has(babelHelpers.checkInRHS(o));
+      hasA = o => _Class_brand.has(babelHelpers.checkInRHS(o));
+      hasM = o => _Class_brand.has(babelHelpers.checkInRHS(o));
     })(), _initClass();
   }
 }, (_Foo2 => {

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/private/output.js
@@ -1,13 +1,13 @@
 var _initProto, _call_a, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
-    return babelHelpers.classPrivateGetter(this, _a, _get_a);
+    return babelHelpers.classPrivateGetter(this, _Foo_brand, _get_a);
   }
 }
 _Foo = Foo;

diff --git a/...roposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/private/output.js b/...roposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/private/output.js
@@ -1,16 +1,16 @@
 var _initProto, _call_a, _call_a2, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
-    return babelHelpers.classPrivateGetter(this, _a, _get_a);
+    return babelHelpers.classPrivateGetter(this, _Foo_brand, _get_a);
   }
   setA(v) {
-    babelHelpers.classPrivateSetter(this, _a, _set_a, v);
+    babelHelpers.classPrivateSetter(this, _Foo_brand, _set_a, v);
   }
 }
 _Foo = Foo;

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/private/output.js
@@ -1,13 +1,13 @@
 var _initProto, _call_a, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   setA(v) {
-    babelHelpers.classPrivateSetter(this, _a, _set_a, v);
+    babelHelpers.classPrivateSetter(this, _Foo_brand, _set_a, v);
   }
 }
 _Foo = Foo;

diff --git a/...l-plugin-proposal-decorators/test/fixtures/2022-03-accessors--to-es2015/private/output.js b/...l-plugin-proposal-decorators/test/fixtures/2022-03-accessors--to-es2015/private/output.js
@@ -1,11 +1,11 @@
 var _initProto, _init_a, _get_a, _set_a, _init_b, _get_b, _set_b, _Foo;
 const dec = () => {};
 var _A = /*#__PURE__*/new WeakMap();
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 var _B = /*#__PURE__*/new WeakMap();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_a(this)));
     babelHelpers.classPrivateFieldInitSpec(this, _B, _init_b(this, 123));
   }

diff --git a/...posal-decorators/test/fixtures/2022-03-accessors--to-es2015/undecorated-private/output.js b/...posal-decorators/test/fixtures/2022-03-accessors--to-es2015/undecorated-private/output.js
@@ -1,10 +1,10 @@
 const dec = () => {};
 var _A = /*#__PURE__*/new WeakMap();
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 var _B = /*#__PURE__*/new WeakMap();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.classPrivateFieldInitSpec(this, _A, void 0);
     babelHelpers.classPrivateFieldInitSpec(this, _B, 123);
   }

diff --git a/...xtures/2022-03-classes--to-es2015/replacement-static-installed-on-correct-class/output.js b/...xtures/2022-03-classes--to-es2015/replacement-static-installed-on-correct-class/output.js
@@ -1,13 +1,13 @@
-var _initClass, _x, _A, _a, _B, _temp;
+var _initClass, _x, _A, _Class_brand, _B, _temp;
 const dec = () => {};
 let hasX, hasA, hasM;
 let _Foo;
-new (_x = /*#__PURE__*/new WeakMap(), _A = /*#__PURE__*/new WeakMap(), _a = /*#__PURE__*/new WeakSet(), _B = /*#__PURE__*/new WeakMap(), (_temp = class extends babelHelpers.identity {
+new (_x = /*#__PURE__*/new WeakMap(), _A = /*#__PURE__*/new WeakMap(), _Class_brand = /*#__PURE__*/new WeakSet(), _B = /*#__PURE__*/new WeakMap(), (_temp = class extends babelHelpers.identity {
   constructor() {
-    (super(_Foo), babelHelpers.classPrivateMethodInitSpec(this, _a), babelHelpers.classPrivateFieldInitSpec(this, _x, void 0), babelHelpers.classPrivateFieldInitSpec(this, _A, void 0), babelHelpers.defineProperty(this, "x", void 0), babelHelpers.classPrivateFieldInitSpec(this, _B, void 0), this), (() => {
+    (super(_Foo), babelHelpers.classPrivateMethodInitSpec(this, _Class_brand), babelHelpers.classPrivateFieldInitSpec(this, _x, void 0), babelHelpers.classPrivateFieldInitSpec(this, _A, void 0), babelHelpers.defineProperty(this, "x", void 0), babelHelpers.classPrivateFieldInitSpec(this, _B, void 0), this), (() => {
       hasX = o => _x.has(babelHelpers.checkInRHS(o));
-      hasA = o => _a.has(babelHelpers.checkInRHS(o));
-      hasM = o => _a.has(babelHelpers.checkInRHS(o));
+      hasA = o => _Class_brand.has(babelHelpers.checkInRHS(o));
+      hasM = o => _Class_brand.has(babelHelpers.checkInRHS(o));
     })(), _initClass();
   }
 }, (_Foo2 => {

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/private/output.js
@@ -1,13 +1,13 @@
 var _initProto, _call_a, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
-    return babelHelpers.classPrivateGetter(this, _a, _get_a);
+    return babelHelpers.classPrivateGetter(this, _Foo_brand, _get_a);
   }
 }
 _Foo = Foo;

diff --git a/...roposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/private/output.js b/...roposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/private/output.js
@@ -1,16 +1,16 @@
 var _initProto, _call_a, _call_a2, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
-    return babelHelpers.classPrivateGetter(this, _a, _get_a);
+    return babelHelpers.classPrivateGetter(this, _Foo_brand, _get_a);
   }
   setA(v) {
-    babelHelpers.classPrivateSetter(this, _a, _set_a, v);
+    babelHelpers.classPrivateSetter(this, _Foo_brand, _set_a, v);
   }
 }
 _Foo = Foo;

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2022-03-setters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2022-03-setters--to-es2015/private/output.js
@@ -1,13 +1,13 @@
 var _initProto, _call_a, _Foo;
 const dec = () => {};
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   setA(v) {
-    babelHelpers.classPrivateSetter(this, _a, _set_a, v);
+    babelHelpers.classPrivateSetter(this, _Foo_brand, _set_a, v);
   }
 }
 _Foo = Foo;

diff --git a/...l-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/output.js b/...l-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/output.js
@@ -1,11 +1,11 @@
 var _initProto, _init_a, _get_a, _set_a, _init_b, _get_b, _set_b, _Foo;
 const dec = () => {};
 var _A = /*#__PURE__*/new WeakMap();
-var _a = /*#__PURE__*/new WeakSet();
+var _Foo_brand = /*#__PURE__*/new WeakSet();
 var _B = /*#__PURE__*/new WeakMap();
 class Foo {
   constructor() {
-    babelHelpers.classPrivateMethodInitSpec(this, _a);
+    babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     babelHelpers.classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_a(this)));
     babelHelpers.classPrivateFieldInitSpec(this, _B, _init_b(this, 123));
   }
@@ -23,4 +23,4 @@ function _set_b2(v) {
 function _get_b2() {
   return _get_b(this);
 }
-[_init_a, _get_a, _set_a, _init_b, _get_b, _set_b, _initProto] = babelHelpers.applyDecs2301(_Foo, [[dec, 1, "a", o => babelHelpers.classPrivateFieldGet2(o, _A), (o, v) => babelHelpers.classPrivateFieldSet2(o, _A, v)], [dec, 1, "b", o => babelHelpers.classPrivateFieldGet2(o, _B), (o, v) => babelHelpers.classPrivateFieldSet2(o, _B, v)]], [], _ => _a.has(babelHelpers.checkInRHS(_))).e;
+[_init_a, _get_a, _set_a, _init_b, _get_b, _set_b, _initProto] = babelHelpers.applyDecs2301(_Foo, [[dec, 1, "a", o => babelHelpers.classPrivateFieldGet2(o, _A), (o, v) => babelHelpers.classPrivateFieldSet2(o, _A, v)], [dec, 1, "b", o => babelHelpers.classPrivateFieldGet2(o, _B), (o, v) => babelHelpers.classPrivateFieldSet2(o, _B, v)]], [], _ => _Foo_brand.has(babelHelpers.checkInRHS(_))).e;