ts: Check if param is assignable when parsing arrow return type (babe…

…l#13581)
nicolo-ribaudo · Jul 30, 2021 · 0484086 · 0484086
1 parent c97f9c4
commit 0484086
Show file tree

Hide file tree

Showing 13 changed files with 405 additions and 47 deletions.
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -1503,7 +1503,7 @@ export default class ExpressionParser extends LValParser {
     let arrowNode = this.startNodeAt(startPos, startLoc);
     if (
       canBeArrow &&
-      this.shouldParseArrow() &&
+      this.shouldParseArrow(exprList) &&
       (arrowNode = this.parseArrow(arrowNode))
     ) {
       this.expressionScope.validateAsPattern();
@@ -1544,7 +1544,8 @@ export default class ExpressionParser extends LValParser {
     return parenExpression;
   }
 
-  shouldParseArrow(): boolean {
+  // eslint-disable-next-line no-unused-vars -- `params` is used in typescript plugin
+  shouldParseArrow(params: Array<N.Node>): boolean {
     return !this.canInsertSemicolon();
   }
 

diff --git a/packages/babel-parser/src/parser/lval.js b/packages/babel-parser/src/parser/lval.js
@@ -60,7 +60,7 @@ export default class LValParser extends NodeUtils {
    - RestElement is not the last element
    - Missing `=` in assignment pattern
 
-   NOTE: There is a corresponding "isAssignable" method in flow.js.
+   NOTE: There is a corresponding "isAssignable" method.
    When this one is updated, please check if also that one needs to be updated.
 
    * @param {Node} node The expression atom
@@ -100,6 +100,7 @@ export default class LValParser extends NodeUtils {
       case "ObjectPattern":
       case "ArrayPattern":
       case "AssignmentPattern":
+      case "RestElement":
         break;
 
       case "ObjectExpression":
@@ -229,6 +230,50 @@ export default class LValParser extends NodeUtils {
     return exprList;
   }
 
+  isAssignable(node: Node, isBinding?: boolean): boolean {
+    switch (node.type) {
+      case "Identifier":
+      case "ObjectPattern":
+      case "ArrayPattern":
+      case "AssignmentPattern":
+      case "RestElement":
+        return true;
+
+      case "ObjectExpression": {
+        const last = node.properties.length - 1;
+        return node.properties.every((prop, i) => {
+          return (
+            prop.type !== "ObjectMethod" &&
+            (i === last || prop.type !== "SpreadElement") &&
+            this.isAssignable(prop)
+          );
+        });
+      }
+
+      case "ObjectProperty":
+        return this.isAssignable(node.value);
+
+      case "SpreadElement":
+        return this.isAssignable(node.argument);
+
+      case "ArrayExpression":
+        return node.elements.every(element => this.isAssignable(element));
+
+      case "AssignmentExpression":
+        return node.operator === "=";
+
+      case "ParenthesizedExpression":
+        return this.isAssignable(node.expression);
+
+      case "MemberExpression":
+      case "OptionalMemberExpression":
+        return !isBinding;
+
+      default:
+        return false;
+    }
+  }
+
   // Convert list of expression atoms to a list of
 
   toReferencedList(

diff --git a/packages/babel-parser/src/plugins/estree.js b/packages/babel-parser/src/plugins/estree.js
@@ -330,6 +330,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return (node: any);
     }
 
+    isAssignable(node: N.Node, isBinding?: boolean): boolean {
+      if (node != null && this.isObjectProperty(node)) {
+        return this.isAssignable(node.value, isBinding);
+      }
+      return super.isAssignable(node, isBinding);
+    }
+
     toAssignable(node: N.Node, isLHS: boolean = false): N.Node {
       if (node != null && this.isObjectProperty(node)) {
         this.toAssignable(node.value, isLHS);

diff --git a/packages/babel-parser/src/plugins/flow/index.js b/packages/babel-parser/src/plugins/flow/index.js
@@ -2257,46 +2257,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     isAssignable(node: N.Node, isBinding?: boolean): boolean {
-      switch (node.type) {
-        case "Identifier":
-        case "ObjectPattern":
-        case "ArrayPattern":
-        case "AssignmentPattern":
-          return true;
-
-        case "ObjectExpression": {
-          const last = node.properties.length - 1;
-          return node.properties.every((prop, i) => {
-            return (
-              prop.type !== "ObjectMethod" &&
-              (i === last || prop.type === "SpreadElement") &&
-              this.isAssignable(prop)
-            );
-          });
-        }
-
-        case "ObjectProperty":
-          return this.isAssignable(node.value);
-
-        case "SpreadElement":
-          return this.isAssignable(node.argument);
-
-        case "ArrayExpression":
-          return node.elements.every(element => this.isAssignable(element));
-
-        case "AssignmentExpression":
-          return node.operator === "=";
-
-        case "ParenthesizedExpression":
-        case "TypeCastExpression":
-          return this.isAssignable(node.expression);
-
-        case "MemberExpression":
-        case "OptionalMemberExpression":
-          return !isBinding;
-
-        default:
-          return false;
+      if (node.type === "TypeCastExpression") {
+        return this.isAssignable(node.expression, isBinding);
+      } else {
+        return super.isAssignable(node, isBinding);
       }
     }
 
@@ -2989,8 +2953,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return super.parseArrow(node);
     }
 
-    shouldParseArrow(): boolean {
-      return this.match(tt.colon) || super.shouldParseArrow();
+    shouldParseArrow(params: Array<N.Node>): boolean {
+      return this.match(tt.colon) || super.shouldParseArrow(params);
     }
 
     setArrowFunctionParameters(

diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -2877,6 +2877,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return param;
     }
 
+    isAssignable(node: N.Node, isBinding?: boolean): boolean {
+      switch (node.type) {
+        case "TSTypeCastExpression":
+          return this.isAssignable(node.expression, isBinding);
+        case "TSParameterProperty":
+          return true;
+        default:
+          return super.isAssignable(node, isBinding);
+      }
+    }
+
     toAssignable(node: N.Node, isLHS: boolean = false): N.Node {
       switch (node.type) {
         case "TSTypeCastExpression":
@@ -3071,8 +3082,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return node.expression;
     }
 
-    shouldParseArrow() {
-      return this.match(tt.colon) || super.shouldParseArrow();
+    shouldParseArrow(params: Array<N.Node>) {
+      if (this.match(tt.colon)) {
+        return params.every(expr => this.isAssignable(expr, true));
+      }
+      return super.shouldParseArrow(params);
     }
 
     shouldParseAsyncArrow(): boolean {

diff --git a/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-1/input.ts b/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-1/input.ts
@@ -0,0 +1,2 @@
+// https://github.com/babel/babel/issues/11038
+0 ? v => (sum += v) : v => 0;
diff --git a/...el-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-1/output.json b/...el-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-1/output.json
@@ -0,0 +1,100 @@
+{
+  "type": "File",
+  "start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":29}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":29}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":47,"end":76,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":29}},
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " https://github.com/babel/babel/issues/11038",
+            "start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":46}}
+          }
+        ],
+        "expression": {
+          "type": "ConditionalExpression",
+          "start":47,"end":75,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":28}},
+          "test": {
+            "type": "NumericLiteral",
+            "start":47,"end":48,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":1}},
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          },
+          "consequent": {
+            "type": "ArrowFunctionExpression",
+            "start":51,"end":66,"loc":{"start":{"line":2,"column":4},"end":{"line":2,"column":19}},
+            "id": null,
+            "generator": false,
+            "async": false,
+            "params": [
+              {
+                "type": "Identifier",
+                "start":51,"end":52,"loc":{"start":{"line":2,"column":4},"end":{"line":2,"column":5},"identifierName":"v"},
+                "name": "v"
+              }
+            ],
+            "body": {
+              "type": "AssignmentExpression",
+              "start":57,"end":65,"loc":{"start":{"line":2,"column":10},"end":{"line":2,"column":18}},
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 56
+              },
+              "operator": "+=",
+              "left": {
+                "type": "Identifier",
+                "start":57,"end":60,"loc":{"start":{"line":2,"column":10},"end":{"line":2,"column":13},"identifierName":"sum"},
+                "name": "sum"
+              },
+              "right": {
+                "type": "Identifier",
+                "start":64,"end":65,"loc":{"start":{"line":2,"column":17},"end":{"line":2,"column":18},"identifierName":"v"},
+                "name": "v"
+              }
+            }
+          },
+          "alternate": {
+            "type": "ArrowFunctionExpression",
+            "start":69,"end":75,"loc":{"start":{"line":2,"column":22},"end":{"line":2,"column":28}},
+            "id": null,
+            "generator": false,
+            "async": false,
+            "params": [
+              {
+                "type": "Identifier",
+                "start":69,"end":70,"loc":{"start":{"line":2,"column":22},"end":{"line":2,"column":23},"identifierName":"v"},
+                "name": "v"
+              }
+            ],
+            "body": {
+              "type": "NumericLiteral",
+              "start":74,"end":75,"loc":{"start":{"line":2,"column":27},"end":{"line":2,"column":28}},
+              "extra": {
+                "rawValue": 0,
+                "raw": "0"
+              },
+              "value": 0
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " https://github.com/babel/babel/issues/11038",
+      "start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":46}}
+    }
+  ]
+}
diff --git a/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-2/input.ts b/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-2/input.ts
@@ -0,0 +1 @@
+0 ? v => (sum = v) : v => 0;
diff --git a/...l-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-2/options.json b/...l-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-2/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \":\" (1:27)"
+}
diff --git a/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-3/input.ts b/...babel-parser/test/fixtures/typescript/arrow-function/arrow-like-in-conditional-3/input.ts
@@ -0,0 +1 @@
+0 ? v => (sum = v) : v => 0 : v => 0;