Do not use classPrivateMethodGet (#16283)

classPrivateMethodGet
babel · Feb 19, 2024 · fa48c7a · fa48c7a
1 parent 6e79c05
commit fa48c7a
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 20 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
@@ -507,11 +507,14 @@ const privateNameHandlerSpec: Handler<PrivateNameState & Receiver> & Receiver =
             t.cloneNode(getId),
           ]);
         }
-        return t.callExpression(file.addHelper("classPrivateMethodGet"), [
-          this.receiver(member),
-          t.cloneNode(id),
-          t.cloneNode(methodId),
-        ]);
+        return t.callExpression(
+          file.addHelper(
+            !process.env.BABEL_8_BREAKING && !newHelpers(file)
+              ? "classPrivateMethodGet"
+              : "assertClassBrand",
+          ),
+          [this.receiver(member), t.cloneNode(id), t.cloneNode(methodId)],
+        );
       }
       return t.callExpression(
         process.env.BABEL_8_BREAKING || newHelpers(file)

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
@@ -10,7 +10,7 @@ class Derived extends Base {
     babelHelpers.classPrivateMethodInitSpec(this, _Derived_brand);
   }
   static get(obj) {
-    return babelHelpers.classPrivateMethodGet(obj, _Derived_brand, _foo).call(obj);
+    return babelHelpers.assertClassBrand(obj, _Derived_brand, _foo).call(obj);
   }
 }
 function _foo() {

diff --git a/packages/babel-helpers/src/helpers.ts b/packages/babel-helpers/src/helpers.ts
@@ -1728,6 +1728,7 @@ helpers.decorate = helper("7.1.5")`
 
 `;
 
+// TODO: Remove in Babel 8
 helpers.classPrivateMethodGet = helper("7.1.6")`
   import assertClassBrand from "assertClassBrand";
   export default function _classPrivateMethodGet(receiver, privateSet, fn) {

diff --git a/...orm-private-methods/test/fixtures/assumption-constantSuper/private-method-super/output.js b/...orm-private-methods/test/fixtures/assumption-constantSuper/private-method-super/output.js
@@ -13,7 +13,7 @@ class Sub extends Base {
     return 'bad';
   }
   publicMethod() {
-    return babelHelpers.classPrivateMethodGet(this, _Sub_brand, _privateMethod).call(this);
+    return babelHelpers.assertClassBrand(this, _Sub_brand, _privateMethod).call(this);
   }
 }
 function _privateMethod() {

diff --git a/packages/babel-plugin-transform-private-methods/test/fixtures/misc/multiple/output.js b/packages/babel-plugin-transform-private-methods/test/fixtures/misc/multiple/output.js
@@ -2,7 +2,7 @@ var _A_brand = /*#__PURE__*/new WeakSet();
 class A {
   constructor() {
     babelHelpers.classPrivateMethodInitSpec(this, _A_brand);
-    babelHelpers.classPrivateMethodGet(this, _A_brand, _method).call(this);
+    babelHelpers.assertClassBrand(this, _A_brand, _method).call(this);
     babelHelpers.classPrivateGetter(this, _A_brand, _get_getter);
     babelHelpers.classPrivateSetter(this, _A_brand, _set_setter, 1);
     babelHelpers.classPrivateGetter(this, _A_brand, _get_getset);

diff --git a/.../babel-plugin-transform-private-methods/test/fixtures/private-method/assignment/output.js b/.../babel-plugin-transform-private-methods/test/fixtures/private-method/assignment/output.js
@@ -2,7 +2,7 @@ var _Foo_brand = /*#__PURE__*/new WeakSet();
 class Foo {
   constructor() {
     babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
-    this.publicField = babelHelpers.classPrivateMethodGet(this, _Foo_brand, _privateMethod).call(this);
+    this.publicField = babelHelpers.assertClassBrand(this, _Foo_brand, _privateMethod).call(this);
   }
 }
 function _privateMethod() {

diff --git a/packages/babel-plugin-transform-private-methods/test/fixtures/private-method/async/output.js b/packages/babel-plugin-transform-private-methods/test/fixtures/private-method/async/output.js
@@ -4,7 +4,7 @@ class Cl {
     babelHelpers.classPrivateMethodInitSpec(this, _Cl_brand);
   }
   test() {
-    return babelHelpers.classPrivateMethodGet(this, _Cl_brand, _foo).call(this);
+    return babelHelpers.assertClassBrand(this, _Cl_brand, _foo).call(this);
   }
 }
 async function _foo() {

diff --git a/...bel-plugin-transform-private-methods/test/fixtures/private-method/before-fields/output.js b/...bel-plugin-transform-private-methods/test/fixtures/private-method/before-fields/output.js
@@ -3,8 +3,8 @@ var _Cl_brand = /*#__PURE__*/new WeakSet();
 class Cl {
   constructor() {
     babelHelpers.classPrivateMethodInitSpec(this, _Cl_brand);
-    babelHelpers.defineProperty(this, "prop", babelHelpers.classPrivateMethodGet(this, _Cl_brand, _method).call(this, 1));
-    babelHelpers.classPrivateFieldInitSpec(this, _priv, babelHelpers.classPrivateMethodGet(this, _Cl_brand, _method).call(this, 2));
+    babelHelpers.defineProperty(this, "prop", babelHelpers.assertClassBrand(this, _Cl_brand, _method).call(this, 1));
+    babelHelpers.classPrivateFieldInitSpec(this, _priv, babelHelpers.assertClassBrand(this, _Cl_brand, _method).call(this, 2));
   }
   getPriv() {
     return babelHelpers.classPrivateFieldGet2(this, _priv);

diff --git a/...-plugin-transform-private-methods/test/fixtures/private-method/class-expression/output.js b/...-plugin-transform-private-methods/test/fixtures/private-method/class-expression/output.js
@@ -4,7 +4,7 @@ console.log((_A_brand = /*#__PURE__*/new WeakSet(), class A {
     babelHelpers.classPrivateMethodInitSpec(this, _A_brand);
   }
   method() {
-    babelHelpers.classPrivateMethodGet(this, _A_brand, _foo).call(this);
+    babelHelpers.assertClassBrand(this, _A_brand, _foo).call(this);
   }
 }));
 function _foo() {}
diff --git a/...ges/babel-plugin-transform-private-methods/test/fixtures/private-method/context/output.js b/...ges/babel-plugin-transform-private-methods/test/fixtures/private-method/context/output.js
@@ -5,13 +5,13 @@ class Foo {
     this.status = status;
   }
   getCurrentStatus() {
-    return babelHelpers.classPrivateMethodGet(this, _Foo_brand, _getStatus).call(this);
+    return babelHelpers.assertClassBrand(this, _Foo_brand, _getStatus).call(this);
   }
   setCurrentStatus(newStatus) {
     this.status = newStatus;
   }
   getFakeStatus(fakeStatus) {
-    var fakeGetStatus = babelHelpers.classPrivateMethodGet(this, _Foo_brand, _getStatus);
+    var fakeGetStatus = babelHelpers.assertClassBrand(this, _Foo_brand, _getStatus);
     return function () {
       return fakeGetStatus.call({
         status: fakeStatus
@@ -21,7 +21,7 @@ class Foo {
   getFakeStatusFunc() {
     return {
       status: 'fake-status',
-      getFakeStatus: babelHelpers.classPrivateMethodGet(this, _Foo_brand, _getStatus)
+      getFakeStatus: babelHelpers.assertClassBrand(this, _Foo_brand, _getStatus)
     };
   }
 }

diff --git a/...babel-plugin-transform-private-methods/test/fixtures/private-method/exfiltrated/output.js b/...babel-plugin-transform-private-methods/test/fixtures/private-method/exfiltrated/output.js
@@ -4,7 +4,7 @@ class Foo {
   constructor() {
     babelHelpers.classPrivateMethodInitSpec(this, _Foo_brand);
     if (exfiltrated === undefined) {
-      exfiltrated = babelHelpers.classPrivateMethodGet(this, _Foo_brand, _privateMethod);
+      exfiltrated = babelHelpers.assertClassBrand(this, _Foo_brand, _privateMethod);
     }
   }
 }

diff --git a/...s/babel-plugin-transform-private-methods/test/fixtures/private-method/generator/output.js b/...s/babel-plugin-transform-private-methods/test/fixtures/private-method/generator/output.js
@@ -4,7 +4,7 @@ class Cl {
     babelHelpers.classPrivateMethodInitSpec(this, _Cl_brand);
   }
   test() {
-    return babelHelpers.classPrivateMethodGet(this, _Cl_brand, _foo).call(this);
+    return babelHelpers.assertClassBrand(this, _Cl_brand, _foo).call(this);
   }
 }
 function* _foo() {

diff --git a/packages/babel-plugin-transform-private-methods/test/fixtures/private-method/super/output.js b/packages/babel-plugin-transform-private-methods/test/fixtures/private-method/super/output.js
@@ -14,7 +14,7 @@ class Sub extends Base {
     return 'bad';
   }
   publicMethod() {
-    return babelHelpers.classPrivateMethodGet(this, _Sub_brand, _privateMethod).call(this);
+    return babelHelpers.assertClassBrand(this, _Sub_brand, _privateMethod).call(this);
   }
 }
 _Sub = Sub;

diff --git a/...l-plugin-transform-private-methods/test/fixtures/private-method/tagged-template/output.js b/...l-plugin-transform-private-methods/test/fixtures/private-method/tagged-template/output.js
@@ -5,6 +5,6 @@ class Foo {
   }
 }
 function _tag() {
-  babelHelpers.classPrivateMethodGet(this, _Foo_brand, _tag).bind(this)``;
+  babelHelpers.assertClassBrand(this, _Foo_brand, _tag).bind(this)``;
 }
 new Foo();