Do not report invalid lhs in toAssignable

babel · Aug 24, 2019 · fd9ca7c · fd9ca7c
1 parent d29d917
commit fd9ca7c
Show file tree

Hide file tree

Showing 44 changed files with 66 additions and 83 deletions.
diff --git a/packages/babel-parser/src/parser/lval.js b/packages/babel-parser/src/parser/lval.js
@@ -85,6 +85,7 @@ export default class LValParser extends NodeUtils {
           if (node.operator === "=") {
             node.type = "AssignmentPattern";
             delete node.operator;
+            this.toAssignable(node.left, isBinding, contextDescription);
           } else {
             this.raise(
               node.left.end,
@@ -104,14 +105,9 @@ export default class LValParser extends NodeUtils {
         case "MemberExpression":
           if (!isBinding) break;
 
-        default: {
-          const message =
-            "Invalid left-hand side" +
-            (contextDescription
-              ? " in " + contextDescription
-              : /* istanbul ignore next */ "expression");
-          this.raise(node.start, message);
-        }
+        default:
+        // We don't know to do with this node. It will
+        // be reported by a later call to checkLVal
       }
     }
     return node;
@@ -175,6 +171,45 @@ export default class LValParser extends NodeUtils {
     return exprList;
   }
 
+  isAssignable(node: Node, isBinding?: 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":
+        return this.isAssignable(node.expression);
+
+      case "MemberExpression":
+        return !isBinding;
+    }
+  }
+
   // Convert list of expression atoms to a list of
 
   toReferencedList(

diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js
@@ -1735,10 +1735,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           this.state.noArrowAt = noArrowAt.concat(valid[0].start);
           ({ consequent, failed } = this.tryParseConditionalConsequent());
         }
-
-        this.getArrowLikeExpressions(consequent, true);
       }
 
+      this.getArrowLikeExpressions(consequent, true);
+
       this.state.noArrowAt = originalNoArrowAt;
       this.expect(tt.colon);
 
@@ -1784,18 +1784,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         if (node.type === "ArrowFunctionExpression") {
           if (node.typeParameters || !node.returnType) {
             // This is an arrow expression without ambiguity, so check its parameters
-            this.toAssignableList(
-              // node.params is Expression[] instead of $ReadOnlyArray<Pattern> because it
-              // has not been converted yet.
-              ((node.params: any): N.Expression[]),
-              true,
-              "arrow function parameters",
-            );
-            // Enter scope, as checkParams defines bindings
-            this.scope.enter(functionFlags(false, false) | SCOPE_ARROW);
-            // Use super's method to force the parameters to be checked
-            super.checkParams(node, false, true);
-            this.scope.exit();
+            this.finishArrowValidation(node);
           } else {
             arrows.push(node);
           }
@@ -1807,26 +1796,29 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
 
       if (disallowInvalid) {
-        for (let i = 0; i < arrows.length; i++) {
-          this.toAssignableList(
-            ((node.params: any): N.Expression[]),
-            true,
-            "arrow function parameters",
-          );
-        }
+        arrows.forEach(node => this.finishArrowValidation(node));
         return [arrows, []];
       }
 
-      return partition(arrows, node => {
-        const result = this.tryParse(() =>
-          this.toAssignableList(
-            ((node.params: any): N.Expression[]),
-            true,
-            "arrow function parameters",
-          ),
-        );
-        return !result.error;
-      });
+      return partition(arrows, node =>
+        node.params.every(param => this.isAssignable(param, true)),
+      );
+    }
+
+    finishArrowValidation(node: N.ArrowFunctionExpression) {
+      this.toAssignableList(
+        // node.params is Expression[] instead of $ReadOnlyArray<Pattern> because it
+        // has not been converted yet.
+        ((node.params: any): N.Expression[]),
+        true,
+        "arrow function parameters",
+        true,
+      );
+      // Enter scope, as checkParams defines bindings
+      this.scope.enter(functionFlags(false, false) | SCOPE_ARROW);
+      // Use super's method to force the parameters to be checked
+      super.checkParams(node, false, true);
+      this.scope.exit();
     }
 
     forwardNoArrowParamsConversionAt<T>(node: N.Node, parse: () => T): T {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/367/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/367/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/368/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/368/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/369/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/369/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:1)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:1)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/374/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/374/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in for-in statement (1:5)",
     "SyntaxError: Invalid left-hand side in for-in statement (1:5)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/383/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/383/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/384/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/384/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/417/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/417/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in for-in statement (1:5)",
     "SyntaxError: Invalid left-hand side in for-in statement (1:5)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/418/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/418/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in for-in statement (1:5)",
     "SyntaxError: Invalid left-hand side in for-in statement (1:5)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/221/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/221/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:1)",
     "SyntaxError: Invalid left-hand side in array destructuring pattern (1:1)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/222/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/222/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in object destructuring pattern (1:7)",
     "SyntaxError: Invalid left-hand side in object destructuring pattern (1:7)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/251/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/251/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:1)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (1:1)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/252/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/252/output.json
@@ -13,8 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:1)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:5)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (1:1)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (1:5)"
   ],

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/284/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/284/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:3)",
     "SyntaxError: Binding invalid left-hand side in array destructuring pattern (1:3)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/37/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/37/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:2)",
     "SyntaxError: Binding member expression (1:2)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/395/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/395/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:2)",
     "SyntaxError: Binding member expression (1:2)"
   ],
   "program": {

diff --git a/.../test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/output.json b/.../test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (2:8)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (2:8)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (2:8)"
   ],
   "program": {

diff --git a/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/output.json b/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (2:3)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (2:3)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (2:3)"
   ],
   "program": {

diff --git a/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/output.json b/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (2:3)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (2:3)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (2:3)"
   ],
   "program": {

diff --git a/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/output.json b/...bel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (2:9)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (2:9)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (2:9)"
   ],
   "program": {

diff --git a/...ures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/output.json b/...ures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in object destructuring pattern (1:4)",
     "SyntaxError: Binding member expression (1:4)"
   ],
   "program": {

diff --git a/...res/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/output.json b/...res/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in object destructuring pattern (1:24)",
     "SyntaxError: Binding member expression (1:24)"
   ],
   "program": {

diff --git a/...ixtures/esprima/es2015-destructuring-assignment-object-pattern/invalid-lhs-01/output.json b/...ixtures/esprima/es2015-destructuring-assignment-object-pattern/invalid-lhs-01/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in object destructuring pattern (1:4)",
     "SyntaxError: Invalid left-hand side in object destructuring pattern (1:4)"
   ],
   "program": {

diff --git a/...ixtures/esprima/es2015-destructuring-assignment-object-pattern/invalid-lhs-02/output.json b/...ixtures/esprima/es2015-destructuring-assignment-object-pattern/invalid-lhs-02/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in object destructuring pattern (1:5)",
     "SyntaxError: Invalid left-hand side in object destructuring pattern (1:5)"
   ],
   "program": {

diff --git a/...est/fixtures/esprima/es2015-destructuring-assignment/invalid-group-assignment/output.json b/...est/fixtures/esprima/es2015-destructuring-assignment/invalid-group-assignment/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:1)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:1)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-lhs-init/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-lhs-init/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in for-of statement (1:5)",
     "SyntaxError: Invalid left-hand side in for-of statement (1:5)"
   ],
   "program": {

diff --git a/...er/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/output.json b/...er/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (1:16)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:16)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (1:16)"
   ],
   "program": {

diff --git a/...r/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/output.json b/...r/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/output.json
@@ -14,7 +14,6 @@
   },
   "errors": [
     "SyntaxError: Yield cannot be used as name inside a generator function (1:25)",
-    "SyntaxError: Invalid left-hand side in arrow function parameters (1:25)",
     "SyntaxError: Binding invalid left-hand side in function paramter list (1:25)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0045/output.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0045/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0046/output.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0046/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:0)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:0)"
   ],
   "program": {

diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0047/output.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0047/output.json
@@ -13,7 +13,6 @@
     }
   },
   "errors": [
-    "SyntaxError: Invalid left-hand side in assignment expression (1:1)",
     "SyntaxError: Invalid left-hand side in assignment expression (1:1)"
   ],
   "program": {