Disallow in object literals, params, class props

And add tests to reflect the same
babel · hzoo · Jun 22, 2017 · Jun 17, 2017 · Jun 17, 2017 · Jun 17, 2017
commit 9c639743dd0ea8c4f33f77232bb3b95698cfcd92
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -847,8 +847,16 @@ export default class ExpressionParser extends LValParser {
         if (this.eat(tt.braceR)) break;
       }
 
-      while (this.match(tt.at)) {
-        decorators.push(this.parseDecorator());
+      if (this.match(tt.at)) {
+        if (this.hasPlugin("decorators-stage-2")) {
+          this.raise(this.state.start, "decorators-stage-2 disallows object literal property decorators");
+        } else {
+          // we needn't check if decorators (stage 0) plugin is enabled since it's checked by
+          // the call to this.parseDecorator
+          while (this.match(tt.at)) {
+            decorators.push(this.parseDecorator());
+          }
+        }
       }
 
       let prop = this.startNode(), isGenerator = false, isAsync = false, startPos, startLoc;

diff --git a/src/parser/lval.js b/src/parser/lval.js
@@ -187,6 +187,9 @@ export default class LValParser extends NodeUtils {
         break;
       } else {
         const decorators = [];
+        if (this.match(tt.at) && this.hasPlugin("decorators-stage-2")) {
+          this.raise(this.state.start, "Stage 2 decorators cannot be used to decorate parameters");
+        }
         while (this.match(tt.at)) {
           decorators.push(this.parseDecorator());
         }

diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -709,6 +709,10 @@ export default class StatementParser extends ExpressionParser {
       }
 
       this.parseClassMember(classBody, member, state);
+
+      if (this.hasPlugin("decorators-stage-2") && member.kind != "method" && member.decorators && member.decorators.length > 0) {
+        this.raise(member.start, "Stage 2 decorators may only be used with a class or a class method");
+      }
     }
 
     if (decorators.length) {
@@ -776,6 +780,7 @@ export default class StatementParser extends ExpressionParser {
     if (!methodOrProp.computed && methodOrProp.static && (methodOrProp.key.name === "prototype" || methodOrProp.key.value === "prototype")) {
       this.raise(methodOrProp.key.start, "Classes may not have static property named prototype");
     }
+
     if (this.isClassMethod()) {
       // a normal method
       if (this.isNonstaticConstructor(method)) {

diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/actual.js b/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/actual.js
@@ -0,0 +1,2 @@
+@foo('bar')
+class Foo {}
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/expected.json b/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/expected.json
@@ -0,0 +1,154 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 12,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 12
+          }
+        },
+        "decorators": [
+          {
+            "type": "Decorator",
+            "start": 0,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "expression": {
+              "type": "CallExpression",
+              "start": 1,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 1,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": [
+                {
+                  "type": "StringLiteral",
+                  "start": 5,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "bar",
+                    "raw": "'bar'"
+                  },
+                  "value": "bar"
+                }
+              ]
+            }
+          }
+        ],
+        "id": {
+          "type": "Identifier",
+          "start": 18,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 9
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 22,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 12
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator/actual.js b/test/fixtures/experimental/decorators-stage-2/class-decorator/actual.js
@@ -0,0 +1,4 @@
+@abc
+class Foo {
+
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator/expected.json b/test/fixtures/experimental/decorators-stage-2/class-decorator/expected.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 5,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "decorators": [
+          {
+            "type": "Decorator",
+            "start": 0,
+            "end": 4,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 4
+              }
+            },
+            "expression": {
+              "type": "Identifier",
+              "start": 1,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                },
+                "identifierName": "abc"
+              },
+              "name": "abc"
+            }
+          }
+        ],
+        "id": {
+          "type": "Identifier",
+          "start": 11,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 9
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 15,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/class-method-parameter/actual.js b/test/fixtures/experimental/decorators-stage-2/class-method-parameter/actual.js
@@ -0,0 +1,3 @@
+class Foo {
+  constructor(@foo x) {}
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/class-method-parameter/options.json b/test/fixtures/experimental/decorators-stage-2/class-method-parameter/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Stage 2 decorators cannot be used to decorate parameters (2:14)"
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/actual.js b/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/actual.js
@@ -0,0 +1,3 @@
+class Foo {
+  @foo[bar] a = 1;
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/options.json b/test/fixtures/experimental/decorators-stage-2/computed-member-expr-on-prop/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["decorators-stage-2", "classProperties"],
+  "throws": "Unexpected token (2:12)"
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expression/actual.js b/test/fixtures/experimental/decorators-stage-2/computed-member-expression/actual.js
@@ -0,0 +1,6 @@
+class Foo {
+  @bar[bizz]
+  abc() {
+
+  }
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/computed-member-expression/options.json b/test/fixtures/experimental/decorators-stage-2/computed-member-expression/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["decorators-stage-2", "classProperties"],
+  "throws": "Stage 2 decorators may only be used with a class or a class method (2:6)"
+}
diff --git a/test/fixtures/experimental/decorators-stage-2/export-decorators-on-class/actual.js b/test/fixtures/experimental/decorators-stage-2/export-decorators-on-class/actual.js
@@ -0,0 +1,2 @@
+@foo
+export default class {}