Fix the support of arguments in private get/set method

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

@@ -1261,19 +1261,6 @@ function buildPrivateMethodDeclaration(
   const isGetter = getId && !getterDeclared && params.length === 0;
   const isSetter = setId && !setterDeclared && params.length > 0;
 
-  if (
-    (process.env.BABEL_8_BREAKING || newHelpers(file)) &&
-    (isGetter || isSetter) &&
-    !privateFieldsAsProperties
-  ) {
-    const thisArg = prop.get("body").scope.generateUidIdentifier("this");
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    prop.traverse(thisContextVisitor, {
-      thisRef: thisArg,
-    });
-    params.unshift(t.cloneNode(thisArg));
-  }
-
   let declId = methodId;
 
   if (isGetter) {
@@ -1294,6 +1281,43 @@ function buildPrivateMethodDeclaration(
     declId = id;
   }
 
+  if (
+    (process.env.BABEL_8_BREAKING || newHelpers(file)) &&
+    (isGetter || isSetter) &&
+    !privateFieldsAsProperties
+  ) {
+    const thisArg = prop.get("body").scope.generateUidIdentifier("this");
+    const state: ReplaceThisState = {
+      thisPaths: [],
+    };
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    prop.traverse(thisContextVisitor, state);
+    if (state.hasArguments) {
+      return t.variableDeclaration("var", [
+        t.variableDeclarator(
+          t.cloneNode(declId),
+          t.callExpression(file.addHelper("curryThis"), [
+            inheritPropComments(
+              t.functionExpression(
+                t.cloneNode(declId),
+                // @ts-expect-error params for ClassMethod has TSParameterProperty
+                params,
+                body,
+                generator,
+                async,
+              ),
+              prop,
+            ),
+          ]),
+        ),
+      ]);
+    } else {
+      for (const path of state.thisPaths) {
+        path.replaceWith(t.cloneNode(thisArg));
+      }
+      params.unshift(t.cloneNode(thisArg));
+    }
+  }
   return inheritPropComments(
     t.functionDeclaration(
       t.cloneNode(declId),
@@ -1308,7 +1332,9 @@ function buildPrivateMethodDeclaration(
 }
 
 type ReplaceThisState = {
-  thisRef: t.Identifier;
+  thisRef?: t.Identifier;
+  thisPaths?: NodePath<t.ThisExpression>[];
+  hasArguments?: boolean;
   needsClassRef?: boolean;
   innerBinding?: t.Identifier | null;
 };
@@ -1317,6 +1343,11 @@ type ReplaceInnerBindingReferenceState = ReplaceThisState;
 
 const thisContextVisitor = traverse.visitors.merge<ReplaceThisState>([
   {
+    Identifier(path, state) {
+      if (path.node.name === "arguments") {
+        state.hasArguments = true;
+      }
+    },
     UnaryExpression(path) {
       // Replace `delete this` with `true`
       const { node } = path;
@@ -1329,7 +1360,11 @@ const thisContextVisitor = traverse.visitors.merge<ReplaceThisState>([
     },
     ThisExpression(path, state) {
       state.needsClassRef = true;
-      path.replaceWith(t.cloneNode(state.thisRef));
+      if (state.thisPaths) {
+        state.thisPaths.push(path);
+      } else {
+        path.replaceWith(t.cloneNode(state.thisRef));
+      }
     },
     MetaProperty(path) {
       const { node, scope } = path;
@@ -1456,7 +1491,7 @@ export function buildFieldsInitNodes(
   const instanceNodes: t.ExpressionStatement[] = [];
   let lastInstanceNodeReturnsThis = false;
   // These nodes are pure and can be moved to the closest statement position
-  const pureStaticNodes: t.FunctionDeclaration[] = [];
+  const pureStaticNodes: (t.FunctionDeclaration | t.VariableDeclaration)[] = [];
   let classBindingNode: t.ExpressionStatement | null = null;
 
   const getSuperRef = t.isIdentifier(superRef)

packages/babel-helper-create-class-features-plugin/src/index.ts

@@ -269,7 +269,7 @@ export function createClassFeaturePlugin({
           staticNodes: t.Statement[],
           instanceNodes: t.ExpressionStatement[],
           lastInstanceNodeReturnsThis: boolean,
-          pureStaticNodes: t.FunctionDeclaration[],
+          pureStaticNodes: (t.FunctionDeclaration | t.VariableDeclaration)[],
           classBindingNode: t.Statement | null,
           wrapClass: (path: NodePath<t.Class>) => NodePath;
 

packages/babel-helpers/src/helpers-generated.ts

@@ -108,6 +108,11 @@ export default Object.freeze({
     "7.0.0-beta.0",
     'import setPrototypeOf from"setPrototypeOf";import isNativeReflectConstruct from"isNativeReflectConstruct";export default function _construct(t,e,r){if(isNativeReflectConstruct())return Reflect.construct.apply(null,arguments);var o=[null];o.push.apply(o,e);var p=new(t.bind.apply(t,o));return r&&setPrototypeOf(p,r.prototype),p}',
   ),
+  // size: 103, gzip size: 103
+  curryThis: helper(
+    "7.24.0",
+    "export default function _curryThis(r){return function(n){return r.apply(n,[].slice.call(arguments,1))}}",
+  ),
   // size: 130, gzip size: 130
   defineAccessor: helper(
     "7.20.7",

packages/babel-helpers/src/helpers/curryThis.ts

@@ -0,0 +1,7 @@
+/* @minVersion 7.24.0 */
+
+export default function _curryThis(fn: Function) {
+  return function (thisArg: any) {
+    return fn.apply(thisArg, [].slice.call(arguments, 1));
+  };
+}

packages/babel-plugin-transform-private-methods/test/fixtures/accessors/arguments/exec.js

@@ -0,0 +1,32 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    expect(arguments[0]).toBeUndefined();
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = arguments[0];
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}
+
+const cl = new Cl();
+
+expect(cl.publicGetPrivateField()).toEqual("top secret string");
+
+cl.publicSetPrivateField("new secret string");
+expect(cl.publicGetPrivateField()).toEqual("new secret string");
+

packages/babel-plugin-transform-private-methods/test/fixtures/accessors/arguments/input.js

@@ -0,0 +1,23 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = arguments[0];
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}

packages/babel-plugin-transform-private-methods/test/fixtures/accessors/arguments/output.js

@@ -0,0 +1,21 @@
+var _privateField = /*#__PURE__*/new WeakMap();
+var _Cl_brand = /*#__PURE__*/new WeakSet();
+class Cl {
+  constructor() {
+    babelHelpers.classPrivateMethodInitSpec(this, _Cl_brand);
+    babelHelpers.classPrivateFieldInitSpec(this, _privateField, "top secret string");
+    this.publicField = "not secret string";
+  }
+  publicGetPrivateField() {
+    return babelHelpers.classPrivateGetter(_Cl_brand, this, _get_privateFieldValue);
+  }
+  publicSetPrivateField(newValue) {
+    babelHelpers.classPrivateSetter(_Cl_brand, _set_privateFieldValue, this, newValue);
+  }
+}
+function _get_privateFieldValue(_this) {
+  return babelHelpers.classPrivateFieldGet2(_privateField, _this);
+}
+var _set_privateFieldValue = babelHelpers.curryThis(function _set_privateFieldValue(newValue) {
+  babelHelpers.classPrivateFieldSet2(_privateField, this, arguments[0]);
+});

packages/babel-runtime-corejs2/package.json

@@ -189,6 +189,15 @@
       "./helpers/construct.js"
     ],
     "./helpers/esm/construct": "./helpers/esm/construct.js",
+    "./helpers/curryThis": [
+      {
+        "node": "./helpers/curryThis.js",
+        "import": "./helpers/esm/curryThis.js",
+        "default": "./helpers/curryThis.js"
+      },
+      "./helpers/curryThis.js"
+    ],
+    "./helpers/esm/curryThis": "./helpers/esm/curryThis.js",
     "./helpers/defineAccessor": [
       {
         "node": "./helpers/defineAccessor.js",

packages/babel-runtime-corejs3/package.json

@@ -188,6 +188,15 @@
       "./helpers/construct.js"
     ],
     "./helpers/esm/construct": "./helpers/esm/construct.js",
+    "./helpers/curryThis": [
+      {
+        "node": "./helpers/curryThis.js",
+        "import": "./helpers/esm/curryThis.js",
+        "default": "./helpers/curryThis.js"
+      },
+      "./helpers/curryThis.js"
+    ],
+    "./helpers/esm/curryThis": "./helpers/esm/curryThis.js",
     "./helpers/defineAccessor": [
       {
         "node": "./helpers/defineAccessor.js",

packages/babel-runtime/package.json

@@ -188,6 +188,15 @@
       "./helpers/construct.js"
     ],
     "./helpers/esm/construct": "./helpers/esm/construct.js",
+    "./helpers/curryThis": [
+      {
+        "node": "./helpers/curryThis.js",
+        "import": "./helpers/esm/curryThis.js",
+        "default": "./helpers/curryThis.js"
+      },
+      "./helpers/curryThis.js"
+    ],
+    "./helpers/esm/curryThis": "./helpers/esm/curryThis.js",
     "./helpers/defineAccessor": [
       {
         "node": "./helpers/defineAccessor.js",