Skip TSAsExpression when transforming spread in CallExpression

packages/babel-helper-skip-transparent-expression-wrappers/.npmignore

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

packages/babel-helper-skip-transparent-expression-wrappers/README.md

@@ -0,0 +1,17 @@
+# @babel/helper-skip-transparent-expression-wrappers
+
+> Helper which skips types and parentheses
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/helper-skip-transparent-expression-wrappers
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/helper-skip-transparent-expression-wrappers --dev
+```

packages/babel-helper-skip-transparent-expression-wrappers/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@babel/helper-skip-transparent-expression-wrappers",
+  "version": "7.9.6",
+  "description": "Helper which skips types and parentheses",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/babel/babel.git",
+    "directory": "packages/babel-helper-skip-transparent-expression-wrappers"
+  },
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
+  "dependencies": {
+    "@babel/types": "^7.9.6"
+  },
+  "devDependencies": {
+    "@babel/traverse": "^7.9.6"
+  }
+}

packages/babel-helper-skip-transparent-expression-wrappers/src/index.js

@@ -0,0 +1,27 @@
+// @flow
+
+import * as t from "@babel/types";
+import type { NodePath } from "@babel/traverse";
+
+// A transparent expression wrapper is an AST node that most plugins will wish
+// to skip, as its presence does not affect the behaviour of the code. This
+// includes expressions used for types, and extra parenthesis. For example, in
+// (a as any)(), this helper can be used to skip the TSAsExpression when
+// determining the callee.
+export function isTransparentExprWrapper(node: Node) {
+  return (
+    t.isTSAsExpression(node) ||
+    t.isTSTypeAssertion(node) ||
+    t.isTSNonNullExpression(node) ||
+    t.isTypeCastExpression(node) ||
+    t.isParenthesizedExpression(node)
+  );
+}
+
+export function skipTransparentExprWrappers(path: NodePath): NodePath {
+  while (isTransparentExprWrapper(path.node)) {
+    path = path.get("expression");
+  }
+
+  return path;
+}

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

@@ -17,7 +17,8 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.10.4",
-    "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+    "@babel/helper-skip-transparent-expression-wrappers": "^7.9.6"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"

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

@@ -1,4 +1,8 @@
 import { declare } from "@babel/helper-plugin-utils";
+import {
+  isTransparentExprWrapper,
+  skipTransparentExprWrappers,
+} from "@babel/helper-skip-transparent-expression-wrappers";
 import syntaxOptionalChaining from "@babel/plugin-syntax-optional-chaining";
 import { types as t } from "@babel/core";
 
@@ -8,6 +12,7 @@ export default declare((api, options) => {
   const { loose = false } = options;
 
   function isSimpleMemberExpression(expression) {
+    expression = skipTransparentExprWrappers(expression);
     return (
       t.isIdentifier(expression) ||
       t.isSuper(expression) ||
@@ -24,16 +29,16 @@ export default declare((api, options) => {
     visitor: {
       "OptionalCallExpression|OptionalMemberExpression"(path) {
         const { scope } = path;
-        // maybeParenthesized points to the outermost parenthesizedExpression
+        // maybeWrapped points to the outermost transparent expression wrapper
         // or the path itself
-        let maybeParenthesized = path;
+        let maybeWrapped = path;
         const parentPath = path.findParent(p => {
-          if (!p.isParenthesizedExpression()) return true;
-          maybeParenthesized = p;
+          if (!isTransparentExprWrapper(p)) return true;
+          maybeWrapped = p;
         });
         let isDeleteOperation = false;
         const parentIsCall =
-          parentPath.isCallExpression({ callee: maybeParenthesized.node }) &&
+          parentPath.isCallExpression({ callee: maybeWrapped.node }) &&
           // note that the first condition must implies that `path.optional` is `true`,
           // otherwise the parentPath should be an OptionalCallExpressioin
           path.isOptionalMemberExpression();
@@ -43,9 +48,7 @@ export default declare((api, options) => {
         let optionalPath = path;
         while (
           optionalPath.isOptionalMemberExpression() ||
-          optionalPath.isOptionalCallExpression() ||
-          optionalPath.isParenthesizedExpression() ||
-          optionalPath.isTSNonNullExpression()
+          optionalPath.isOptionalCallExpression()
         ) {
           const { node } = optionalPath;
           if (node.optional) {
@@ -54,13 +57,14 @@ export default declare((api, options) => {
 
           if (optionalPath.isOptionalMemberExpression()) {
             optionalPath.node.type = "MemberExpression";
-            optionalPath = optionalPath.get("object");
+            optionalPath = skipTransparentExprWrappers(
+              optionalPath.get("object"),
+            );
           } else if (optionalPath.isOptionalCallExpression()) {
             optionalPath.node.type = "CallExpression";
-            optionalPath = optionalPath.get("callee");
-          } else {
-            // unwrap TSNonNullExpression/ParenthesizedExpression if needed
-            optionalPath = optionalPath.get("expression");
+            optionalPath = skipTransparentExprWrappers(
+              optionalPath.get("callee"),
+            );
           }
         }
 
@@ -74,28 +78,36 @@ export default declare((api, options) => {
 
           const isCall = t.isCallExpression(node);
           const replaceKey = isCall ? "callee" : "object";
-          const chain = node[replaceKey];
+
+          const chainWithTypes = node[replaceKey];
+          let chain = chainWithTypes;
+
+          while (isTransparentExprWrapper(chain)) {
+            chain = chain.expression;
+          }
 
           let ref;
           let check;
           if (loose && isCall && isSimpleMemberExpression(chain)) {
             // If we are using a loose transform (avoiding a Function#call) and we are at the call,
             // we can avoid a needless memoize. We only do this if the callee is a simple member
             // expression, to avoid multiple calls to nested call expressions.
-            check = ref = chain;
+            check = ref = chainWithTypes;
           } else {
             ref = scope.maybeGenerateMemoised(chain);
             if (ref) {
               check = t.assignmentExpression(
                 "=",
                 t.cloneNode(ref),
-                // Here `chain` MUST NOT be cloned because it could be updated
-                // when generating the memoised context of a call espression
-                chain,
+                // Here `chainWithTypes` MUST NOT be cloned because it could be
+                // updated when generating the memoised context of a call
+                // expression
+                chainWithTypes,
               );
+
               node[replaceKey] = ref;
             } else {
-              check = ref = chain;
+              check = ref = chainWithTypes;
             }
           }
 
@@ -105,7 +117,7 @@ export default declare((api, options) => {
             if (loose && isSimpleMemberExpression(chain)) {
               // To avoid a Function#call, we can instead re-grab the property from the context object.
               // `a.?b.?()` translates roughly to `_a.b != null && _a.b()`
-              node.callee = chain;
+              node.callee = chainWithTypes;
             } else {
               // Otherwise, we need to memoize the context object, and change the call into a Function#call.
               // `a.?b.?()` translates roughly to `(_b = _a.b) != null && _b.call(_a)`
@@ -133,7 +145,9 @@ export default declare((api, options) => {
           // i.e. `?.b` in `(a?.b.c)()`
           if (i === 0 && parentIsCall) {
             // `(a?.b)()` to `(a == null ? undefined : a.b.bind(a))()`
-            const { object } = replacement;
+            const object = skipTransparentExprWrappers(
+              replacementPath.get("object"),
+            ).node;
             let baseRef;
             if (!loose || !isSimpleMemberExpression(object)) {
               // memoize the context object in non-loose mode
@@ -176,7 +190,9 @@ export default declare((api, options) => {
             ),
           );
 
-          replacementPath = replacementPath.get("alternate");
+          replacementPath = skipTransparentExprWrappers(
+            replacementPath.get("alternate"),
+          );
         }
       },
     },

packages/babel-plugin-proposal-optional-chaining/test/fixtures/regression/10959-transform-optional-chaining/output.js

@@ -1,10 +1,10 @@
-var _a, _a2, _a3, _b, _a4, _ref, _a5, _c, _a6, _a7;
+var _a, _a2, _a3, _b, _a4, _a4$b, _a5, _c, _a6, _a7;
 
 (_a = a) === null || _a === void 0 ? void 0 : _a.b!.c;
 (_a2 = a) === null || _a2 === void 0 ? void 0 : _a2.b!.c.d;
 (_a3 = a) === null || _a3 === void 0 ? void 0 : _a3.b.c!.d;
 (_b = a!.b) === null || _b === void 0 ? void 0 : _b.c;
-(_a4 = a) === null || _a4 === void 0 ? void 0 : (_ref = _a4.b!) === null || _ref === void 0 ? void 0 : _ref.c;
+(_a4 = a) === null || _a4 === void 0 ? void 0 : (_a4$b = _a4.b!) === null || _a4$b === void 0 ? void 0 : _a4$b.c;
 (_a5 = a) === null || _a5 === void 0 ? void 0 : (_c = _a5.b!.c) === null || _c === void 0 ? void 0 : _c.c;
 ((_a6 = a) === null || _a6 === void 0 ? void 0 : _a6.b)!.c;
 ((_a7 = a) === null || _a7 === void 0 ? void 0 : _a7.b)!.c;

packages/babel-plugin-proposal-optional-chaining/test/fixtures/regression/10959-transform-ts-and-optional-chaining/output.js

@@ -1,10 +1,10 @@
-var _a, _a2, _a3, _b, _a4, _ref, _a5, _c, _a6, _a7;
+var _a, _a2, _a3, _b, _a4, _a4$b, _a5, _c, _a6, _a7;
 
 (_a = a) === null || _a === void 0 ? void 0 : _a.b.c;
 (_a2 = a) === null || _a2 === void 0 ? void 0 : _a2.b.c.d;
 (_a3 = a) === null || _a3 === void 0 ? void 0 : _a3.b.c.d;
 (_b = a.b) === null || _b === void 0 ? void 0 : _b.c;
-(_a4 = a) === null || _a4 === void 0 ? void 0 : (_ref = _a4.b) === null || _ref === void 0 ? void 0 : _ref.c;
+(_a4 = a) === null || _a4 === void 0 ? void 0 : (_a4$b = _a4.b) === null || _a4$b === void 0 ? void 0 : _a4$b.c;
 (_a5 = a) === null || _a5 === void 0 ? void 0 : (_c = _a5.b.c) === null || _c === void 0 ? void 0 : _c.c;
 ((_a6 = a) === null || _a6 === void 0 ? void 0 : _a6.b).c;
 ((_a7 = a) === null || _a7 === void 0 ? void 0 : _a7.b).c;

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/options.json

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

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

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

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

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

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

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

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-function-call-loose/input.ts

@@ -0,0 +1 @@
+(((foo as A).bar) as B)?.(foo.bar, false)

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-function-call-loose/options.json

@@ -0,0 +1,13 @@
+{
+  "plugins": [
+    [
+      "syntax-typescript"
+    ],
+    [
+      "proposal-optional-chaining",
+      {
+        "loose": true
+      }
+    ]
+  ]
+}

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-function-call-loose/output.js

@@ -0,0 +1,3 @@
+var _bar, _ref;
+
+(_bar = ((_ref = (foo as A)).bar as B)) == null ? void 0 : _bar.call(_ref, foo.bar, false);

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-member-expression/input.ts

@@ -0,0 +1 @@
+(a?.b as ExampleType)?.c as ExampleType2

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-member-expression/options.json

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

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-member-expression/output.js

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

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-parenthesized-expression-member-call/input.ts

@@ -0,0 +1 @@
+((o?.Foo.m) as ExampleType)()

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-parenthesized-expression-member-call/options.json

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

packages/babel-plugin-proposal-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-parenthesized-expression-member-call/output.js

@@ -0,0 +1,3 @@
+var _o, _o$Foo;
+
+(((_o = o) === null || _o === void 0 ? void 0 : (_o$Foo = _o.Foo).m.bind(_o$Foo)) as ExampleType)();

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

@@ -16,7 +16,8 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-plugin-utils": "^7.10.4"
+    "@babel/helper-plugin-utils": "^7.10.4",
+    "@babel/helper-skip-transparent-expression-wrappers": "7.9.6"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"

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

@@ -1,4 +1,5 @@
 import { declare } from "@babel/helper-plugin-utils";
+import { skipTransparentExprWrappers } from "@babel/helper-skip-transparent-expression-wrappers";
 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 = skipTransparentExprWrappers(path.get("callee"));
+
         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);
@@ -130,11 +132,11 @@ export default declare((api, options) => {
           } else {
             contextLiteral = t.cloneNode(callee.object);
           }
-          t.appendToMemberExpression(callee, t.identifier("apply"));
-        } else {
-          node.callee = t.memberExpression(node.callee, t.identifier("apply"));
         }
 
+        // We use the original callee here, to preserve any types/parentheses
+        node.callee = t.memberExpression(node.callee, t.identifier("apply"));
+
         if (t.isSuper(contextLiteral)) {
           contextLiteral = t.thisExpression();
         }

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,3 @@
+{
+  "plugins": ["external-helpers", "transform-spread", "syntax-flow"]
+}

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

@@ -0,0 +1,3 @@
+var _a;
+
+((_a = a).b: any).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)