Skip TSAsExpression when transforming spread in CallExpression

packages/babel-helper-get-call-context/.npmignore

@@ -0,0 +1,3 @@
+src
+test
+*.log

packages/babel-helper-get-call-context/README.md

@@ -0,0 +1,17 @@
+# @babel/helper-get-call-context
+
+> Helper function to get the context of a CallExpression
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/helper-get-call-context
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/helper-get-call-context --dev
+```

packages/babel-helper-get-call-context/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "@babel/helper-get-call-context",
+  "version": "7.9.6",
+  "description": "Helper function to get call context",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-get-call-context",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "dependencies": {
+    "@babel/traverse": "^7.9.6"
+  }
+}

packages/babel-helper-get-call-context/src/index.js

@@ -0,0 +1,23 @@
+import type { NodePath } from "@babel/traverse";
+
+export default function(callPath: NodePath): NodePath {
+  if (!callPath.isCallExpression() && !callPath.isOptionalCallExpression()) {
+    throw new Error(
+      `Expected type "CallExpression" or "OptionalCallExpression" ` +
+        `but instead got "${callPath.type}".`,
+    );
+  }
+
+  let calleePath = callPath.get("callee");
+
+  while (
+    calleePath.isTSAsExpression() ||
+    calleePath.isTypeCastExpression() ||
+    calleePath.isTSTypeAssertion() ||
+    calleePath.isParenthesizedExpression()
+  ) {
+    calleePath = calleePath.get("expression");
+  }
+
+  return calleePath;
+}

packages/babel-plugin-proposal-optional-chaining/package.json

@@ -21,6 +21,7 @@
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/helper-plugin-test-runner": "^7.8.3",
-    "@babel/plugin-transform-block-scoping": "^7.8.3"
+    "@babel/plugin-transform-block-scoping": "^7.8.3",
+    "@babel/helper-get-call-context": "7.9.6"
   }
 }

packages/babel-plugin-proposal-optional-chaining/src/index.js

@@ -1,4 +1,5 @@
 import { declare } from "@babel/helper-plugin-utils";
+import getCallContext from "@babel/helper-get-call-context";
 import syntaxOptionalChaining from "@babel/plugin-syntax-optional-chaining";
 import { types as t } from "@babel/core";
 
@@ -26,6 +27,7 @@ export default declare((api, options) => {
         const { parentPath, scope } = path;
         let isDeleteOperation = false;
         const optionals = [];
+        const chains = [];
 
         let optionalPath = path;
         while (
@@ -35,6 +37,11 @@ export default declare((api, options) => {
           const { node } = optionalPath;
           if (node.optional) {
             optionals.push(node);
+            chains.push(
+              optionalPath.isOptionalCallExpression()
+                ? getCallContext(optionalPath)["node"]
+                : node["object"],
+            );
           }
 
           if (optionalPath.isOptionalMemberExpression()) {
@@ -56,7 +63,7 @@ export default declare((api, options) => {
 
           const isCall = t.isCallExpression(node);
           const replaceKey = isCall ? "callee" : "object";
-          const chain = node[replaceKey];
+          const chain = chains[i];
 
           let ref;
           let check;

packages/babel-plugin-proposal-optional-chaining/test/fixtures/call-context/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["proposal-optional-chaining"]
+}

packages/babel-plugin-proposal-optional-chaining/test/fixtures/call-context/ts-as/input.ts

@@ -0,0 +1 @@
+(a.b as any)?.()

packages/babel-plugin-proposal-optional-chaining/test/fixtures/call-context/ts-as/options.json

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    [
+      "typescript"
+    ]
+  ]
+}

packages/babel-plugin-proposal-optional-chaining/test/fixtures/call-context/ts-as/output.js

@@ -0,0 +1,3 @@
+var _a$b, _a;
+
+(_a$b = (_a = a).b) === null || _a$b === void 0 ? void 0 : _a$b.call(_a);

packages/babel-plugin-proposal-private-methods/test/fixtures/call-context/options.json

@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "proposal-private-methods",
+    "proposal-class-properties"
+  ]
+}

packages/babel-plugin-proposal-private-methods/test/fixtures/call-context/ts-as-class-field/input.ts

@@ -0,0 +1,7 @@
+class A {
+  #x;
+
+  fn() {
+    (this.#x as any)();
+  }
+}

packages/babel-plugin-proposal-private-methods/test/fixtures/call-context/ts-as-class-field/options.json

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "typescript"
+    ]
+  ],
+  "plugins": [
+    [
+      "proposal-class-properties"
+    ]
+  ]
+}

packages/babel-plugin-proposal-private-methods/test/fixtures/call-context/ts-as-class-field/output.js

@@ -0,0 +1,17 @@
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to get private field on non-instance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+
+class A {
+  constructor() {
+    _x.set(this, {
+      writable: true,
+      value: void 0
+    });
+  }
+
+  fn() {
+    _classPrivateFieldGet(this, _x)();
+  }
+
+}
+
+var _x = new WeakMap();

packages/babel-plugin-transform-spread/package.json

@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.8.3",
-    "@babel/helper-plugin-test-runner": "^7.8.3"
+    "@babel/helper-plugin-test-runner": "^7.8.3",
+    "@babel/helper-get-call-context": "7.9.6"
   }
 }

packages/babel-plugin-transform-spread/src/index.js

@@ -1,4 +1,5 @@
 import { declare } from "@babel/helper-plugin-utils";
+import getCallContext from "@babel/helper-get-call-context";
 import { types as t } from "@babel/core";
 
 export default declare((api, options) => {
@@ -94,7 +95,8 @@ export default declare((api, options) => {
         const args = node.arguments;
         if (!hasSpread(args)) return;
 
-        const calleePath = path.get("callee");
+        const calleePath = getCallContext(path);
+
         if (calleePath.isSuper()) return;
 
         let contextLiteral = scope.buildUndefinedNode();
@@ -120,7 +122,7 @@ export default declare((api, options) => {
           node.arguments.push(first);
         }
 
-        const callee = node.callee;
+        const callee = calleePath.node;
 
         if (calleePath.isMemberExpression()) {
           const temp = scope.maybeGenerateMemoised(callee.object);
@@ -132,7 +134,7 @@ export default declare((api, options) => {
           }
           t.appendToMemberExpression(callee, t.identifier("apply"));
         } else {
-          node.callee = t.memberExpression(node.callee, t.identifier("apply"));
+          node.callee = t.memberExpression(callee, t.identifier("apply"));
         }
 
         if (t.isSuper(contextLiteral)) {

packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/input.ts

@@ -0,0 +1 @@
+(a.b: any)(...args)

packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/options.json

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    [
+      "flow"
+    ]
+  ]
+}

packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/output.js

@@ -0,0 +1,3 @@
+var _a;
+
+(_a = a).b.apply(_a, babelHelpers.toConsumableArray(args));

packages/babel-plugin-transform-spread/test/fixtures/call-context/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "transform-spread", "transform-parameters"]
+}

packages/babel-plugin-transform-spread/test/fixtures/call-context/parenthesized-expressions/input.js

@@ -0,0 +1 @@
+(a.b)(...args)

packages/babel-plugin-transform-spread/test/fixtures/call-context/parenthesized-expressions/options.json

@@ -0,0 +1,5 @@
+{
+  "parserOpts": {
+    "createParenthesizedExpressions": true
+  }
+}

packages/babel-plugin-transform-spread/test/fixtures/call-context/parenthesized-expressions/output.js

@@ -0,0 +1,3 @@
+var _a;
+
+((_a = a).b.apply)(_a, babelHelpers.toConsumableArray(args));

packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/input.ts

@@ -0,0 +1 @@
+(<any> a.b)(...args)

packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/options.json

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    [
+      "typescript"
+    ]
+  ]
+}

packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/output.js

@@ -0,0 +1,3 @@
+var _a;
+
+(_a = a).b.apply(_a, babelHelpers.toConsumableArray(args));

packages/babel-plugin-transform-spread/test/fixtures/regression/11400/input.ts

@@ -0,0 +1 @@
+(dog.bark as any)(...args)

packages/babel-plugin-transform-spread/test/fixtures/regression/11400/options.json

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    [
+      "typescript"
+    ]
+  ]
+}

packages/babel-plugin-transform-spread/test/fixtures/regression/11400/output.js

@@ -0,0 +1,3 @@
+var _dog;
+
+(_dog = dog).bark.apply(_dog, babelHelpers.toConsumableArray(args));