fix: tagged template incorrect receiver

packages/babel-helper-member-expression-to-functions/src/index.ts

@@ -462,8 +462,13 @@ const handle = {
       return;
     }
 
-    // MEMBER   ->   _get(MEMBER)
-    member.replaceWith(this.get(member));
+    if (t.isTaggedTemplateExpression(parent)) {
+      // MEMBER   ->   _get(MEMBER).bind(this)
+      member.replaceWith(this.boundGet(member));
+    } else {
+      // MEMBER   ->   _get(MEMBER)
+      member.replaceWith(this.get(member));
+    }
   },
 };
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template-static/exec.js

@@ -0,0 +1,17 @@
+class Foo {
+    static #tag() {
+      return this;
+    }
+
+    static #tag2 = () => this
+
+    static getReceiver() {
+        return this.#tag``;
+    }
+
+    static getReceiver2() {
+        return this.#tag2``;
+    }
+}
+
+expect(Foo.getReceiver()).toBe(Foo.getReceiver2());

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template-static/input.js

@@ -0,0 +1,15 @@
+class Foo {
+    static #tag() {
+      return this;
+    }
+
+    static #tag2 = () => this
+
+    static getReceiver() {
+        return this.#tag``;
+    }
+
+    static getReceiver2() {
+        return this.#tag2``;
+    }
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template-static/options.json

@@ -0,0 +1,13 @@
+{
+    "presets": [
+      [
+        "@babel/preset-env",
+        {
+          "shippedProposals": true,
+          "targets": {
+            "chrome": "75"
+          }
+        }
+      ]
+    ]
+  }

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template-static/output.js

@@ -0,0 +1,29 @@
+var Foo = /*#__PURE__*/function () {
+  "use strict";
+
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+  }
+
+  babelHelpers.createClass(Foo, null, [{
+    key: "getReceiver",
+    value: function getReceiver() {
+      return babelHelpers.classStaticPrivateMethodGet(this, Foo, _tag).bind(this)``;
+    }
+  }, {
+    key: "getReceiver2",
+    value: function getReceiver2() {
+      return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _tag3).bind(this)``;
+    }
+  }]);
+  return Foo;
+}();
+
+function _tag() {
+  return this;
+}
+
+var _tag3 = {
+  writable: true,
+  value: () => Foo
+};

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template/exec.js

@@ -0,0 +1,17 @@
+class Foo {
+    #tag() {
+      return this;
+    }
+
+    #tag2 = this.#tag;
+
+    constructor() {
+      const receiver = this.#tag`tagged template`;
+      expect(receiver === this).toBe(true);
+
+      const receiver2 = this.#tag2`tagged template`;
+      expect(receiver2 === this).toBe(true);
+    }
+}
+
+  new Foo();

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

@@ -0,0 +1,8 @@
+class Foo {
+    #tag() {
+      return this;
+    }
+
+    #tag2 = this.#tag;
+  }
+  new Foo();

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template/options.json

@@ -0,0 +1,13 @@
+{
+    "presets": [
+      [
+        "@babel/preset-env",
+        {
+          "shippedProposals": true,
+          "targets": {
+            "chrome": "75"
+          }
+        }
+      ]
+    ]
+  }

packages/babel-plugin-proposal-class-properties/test/fixtures/private/tagged-template/output.js

@@ -0,0 +1,22 @@
+var _tag = /*#__PURE__*/new WeakSet();
+
+var _tag3 = /*#__PURE__*/new WeakMap();
+
+var Foo = function Foo() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _tag.add(this);
+
+  _tag3.set(this, {
+    writable: true,
+    value: babelHelpers.classPrivateMethodGet(this, _tag, _tag2)
+  });
+};
+
+function _tag2() {
+  return this;
+}
+
+new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/tagged-template/exec.js

@@ -0,0 +1,16 @@
+class Foo {
+  #tag() {
+    return this;
+  }
+
+  get #privateTagMethod(){
+      return this.#tag``
+  }
+
+  publicGetPrivateTagMethod(){
+      return this.#privateTagMethod
+  }
+}
+const instance = new Foo();
+
+expect(instance === instance.publicGetPrivateTagMethod()).toEqual(true)

packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/tagged-template/input.js

@@ -0,0 +1,14 @@
+class Foo {
+    #tag() {
+      return this;
+    }
+
+    get #privateTagMethod(){
+        return this.#tag``
+    }
+
+    publicGetPrivateTagMethod(){
+        return this.#privateTagMethod
+    }
+  }
+  const instance = new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/tagged-template/output.js

@@ -0,0 +1,29 @@
+var _tag = /*#__PURE__*/new WeakSet();
+
+var _privateTagMethod = /*#__PURE__*/new WeakMap();
+
+class Foo {
+  constructor() {
+    _privateTagMethod.set(this, {
+      get: _get_privateTagMethod,
+      set: void 0
+    });
+
+    _tag.add(this);
+  }
+
+  publicGetPrivateTagMethod() {
+    return babelHelpers.classPrivateFieldGet(this, _privateTagMethod);
+  }
+
+}
+
+function _tag2() {
+  return this;
+}
+
+function _get_privateTagMethod() {
+  return babelHelpers.classPrivateMethodGet(this, _tag, _tag2).bind(this)``;
+}
+
+var instance = new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/tagged-template/exec.js

@@ -0,0 +1,11 @@
+class Foo {
+    #tag() {
+      return this;
+    }
+
+    constructor() {
+      const receiver = this.#tag`tagged template`;
+      expect(receiver === this).toBe(true);
+    }
+  }
+  new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/tagged-template/input.js

@@ -0,0 +1,6 @@
+class Foo {
+  #tag() {
+    return this;
+  }
+}
+new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/tagged-template/output.js

@@ -0,0 +1,14 @@
+var _tag = /*#__PURE__*/new WeakSet();
+
+class Foo {
+  constructor() {
+    _tag.add(this);
+  }
+
+}
+
+function _tag2() {
+  return this;
+}
+
+new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/tagged-template/exec.js

@@ -0,0 +1,11 @@
+class Foo {
+  static #tag() {
+    return this;
+  }
+
+  static getReceiver() {
+    return this.#tag``;
+  }
+}
+
+expect(Foo.getReceiver()).toBe(Foo);

packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/tagged-template/input.js

@@ -0,0 +1,6 @@
+class Foo {
+  #tag() {
+    return this;
+  }
+}
+new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/tagged-template/output.js

@@ -0,0 +1,14 @@
+var _tag = /*#__PURE__*/new WeakSet();
+
+class Foo {
+  constructor() {
+    _tag.add(this);
+  }
+
+}
+
+function _tag2() {
+  return this;
+}
+
+new Foo();

packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/tagged-template/exe.js

@@ -0,0 +1,11 @@
+class Foo {
+  static #tag() {
+    return this;
+  }
+
+  static get privateTagMethod() {
+    return this.#tag``;
+  }
+}
+
+expect(Foo.privateTagMethod).toBe(Foo);

packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/tagged-template/input.js

@@ -0,0 +1,9 @@
+class Foo {
+    static #tag() {
+      return this;
+    }
+
+    static get privateTagMethod() {
+      return this.#tag``;
+    }
+}

packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/tagged-template/output.js

@@ -0,0 +1,10 @@
+class Foo {
+  static get privateTagMethod() {
+    return babelHelpers.classStaticPrivateMethodGet(this, Foo, _tag).bind(this)``;
+  }
+
+}
+
+function _tag() {
+  return this;
+}