New: Add class decorators to AST (fixes #66) (#67)

JamesHenry · nzakas · commit 8b97fe783b25 · 2016-08-25T08:27:32.000-07:00
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -1317,7 +1317,10 @@ module.exports = function(ast, extra) {
                         loc: getLocFor(openBrace.getStart(), node.end, ast)
                     },
                     superClass: (superClass ? convertChild(superClass.types[0].expression) : null),
-                    implements: hasImplements ? heritageClauses[0].types.map(convertClassImplements) : []
+                    implements: hasImplements ? heritageClauses[0].types.map(convertClassImplements) : [],
+                    decorators: (node.decorators) ? node.decorators.map(function(d) {
+                        return convertChild(d.expression);
+                    }) : []
                 });
 
                 var filteredMembers = node.members.filter(isESTreeClassMember);
diff --git a/tests/fixtures/attach-comments/export-default-anonymous-class.result.js b/tests/fixtures/attach-comments/export-default-anonymous-class.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportDefaultDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": null,
                 "superClass": null,
                 "implements": [],
diff --git a/tests/fixtures/ecma-features-mix/classes-and-generators/classes-and-generators.result.js b/tests/fixtures/ecma-features-mix/classes-and-generators/classes-and-generators.result.js
@@ -3,6 +3,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "id": {
                 "type": "Identifier",
                 "name": "Foo",
@@ -331,4 +332,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/classes-and-generators/computed-generator.result.js b/tests/fixtures/ecma-features-mix/classes-and-generators/computed-generator.result.js
@@ -3,6 +3,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "id": {
                 "type": "Identifier",
                 "name": "Foo",
diff --git a/tests/fixtures/ecma-features-mix/classes-and-generators/static-generators.result.js b/tests/fixtures/ecma-features-mix/classes-and-generators/static-generators.result.js
@@ -3,6 +3,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "id": {
                 "type": "Identifier",
                 "name": "Foo",
@@ -349,4 +350,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-anonymous-extends.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-anonymous-extends.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportDefaultDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": null,
                 "superClass": {
                     "type": "Identifier",
@@ -251,4 +252,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-anonymous.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-anonymous.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportDefaultDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": null,
                 "superClass": null,
                 "body": {
@@ -198,4 +199,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-extends.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class-default-extends.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportDefaultDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": {
                     "type": "Identifier",
                     "name": "foo",
@@ -286,4 +287,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class-default.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class-default.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportDefaultDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": {
                     "type": "Identifier",
                     "name": "foo",
@@ -233,4 +234,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class-extends.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class-extends.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportNamedDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": {
                     "type": "Identifier",
                     "name": "foo",
@@ -270,4 +271,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features-mix/modules-and-classes/class.result.js b/tests/fixtures/ecma-features-mix/modules-and-classes/class.result.js
@@ -5,6 +5,7 @@ module.exports = {
             "type": "ExportNamedDeclaration",
             "declaration": {
                 "type": "ClassDeclaration",
+                "decorators": [],
                 "id": {
                     "type": "Identifier",
                     "name": "foo",
@@ -217,4 +218,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js b/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-computed-static-method.result.js b/tests/fixtures/ecma-features/classes/class-computed-static-method.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-expression.result.js b/tests/fixtures/ecma-features/classes/class-expression.result.js
@@ -33,6 +33,7 @@ module.exports = {
             ],
             "expression": {
                 "type": "ClassExpression",
+                "decorators": [],
                 "loc": {
                     "start": {
                         "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-method-named-prototype.result.js b/tests/fixtures/ecma-features/classes/class-method-named-prototype.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-method-named-static.result.js b/tests/fixtures/ecma-features/classes/class-method-named-static.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-one-method-super.result.js b/tests/fixtures/ecma-features/classes/class-one-method-super.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-one-method.result.js b/tests/fixtures/ecma-features/classes/class-one-method.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-static-method-named-prototype.result.js b/tests/fixtures/ecma-features/classes/class-static-method-named-prototype.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-static-method-named-static.result.js b/tests/fixtures/ecma-features/classes/class-static-method-named-static.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-static-method.result.js b/tests/fixtures/ecma-features/classes/class-static-method.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-static-methods-and-accessor-properties.result.js b/tests/fixtures/ecma-features/classes/class-static-methods-and-accessor-properties.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-computed-static-methods.result.js b/tests/fixtures/ecma-features/classes/class-two-computed-static-methods.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods-computed-constructor.result.js b/tests/fixtures/ecma-features/classes/class-two-methods-computed-constructor.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods-semi.result.js b/tests/fixtures/ecma-features/classes/class-two-methods-semi.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods-three-semi.result.js b/tests/fixtures/ecma-features/classes/class-two-methods-three-semi.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods-two-semi.result.js b/tests/fixtures/ecma-features/classes/class-two-methods-two-semi.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods.result.js b/tests/fixtures/ecma-features/classes/class-two-methods.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-two-static-methods-named-constructor.result.js b/tests/fixtures/ecma-features/classes/class-two-static-methods-named-constructor.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/class-with-constructor.result.js b/tests/fixtures/ecma-features/classes/class-with-constructor.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/derived-class-assign-to-var.result.js b/tests/fixtures/ecma-features/classes/derived-class-assign-to-var.result.js
@@ -68,6 +68,7 @@ module.exports = {
                     },
                     "init": {
                         "type": "ClassExpression",
+                        "decorators": [],
                         "loc": {
                             "start": {
                                 "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/derived-class-expression.result.js b/tests/fixtures/ecma-features/classes/derived-class-expression.result.js
@@ -33,6 +33,7 @@ module.exports = {
             ],
             "expression": {
                 "type": "ClassExpression",
+                "decorators": [],
                 "loc": {
                     "start": {
                         "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/empty-class-double-semi.result.js b/tests/fixtures/ecma-features/classes/empty-class-double-semi.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/empty-class-semi.result.js b/tests/fixtures/ecma-features/classes/empty-class-semi.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/empty-class.result.js b/tests/fixtures/ecma-features/classes/empty-class.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/empty-literal-derived-class.result.js b/tests/fixtures/ecma-features/classes/empty-literal-derived-class.result.js
@@ -17,6 +17,7 @@ module.exports = {
     "body": [
         {
             "type": "ClassDeclaration",
+            "decorators": [],
             "loc": {
                 "start": {
                     "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/named-class-expression.result.js b/tests/fixtures/ecma-features/classes/named-class-expression.result.js
@@ -33,6 +33,7 @@ module.exports = {
             ],
             "expression": {
                 "type": "ClassExpression",
+                "decorators": [],
                 "loc": {
                     "start": {
                         "line": 1,
diff --git a/tests/fixtures/ecma-features/classes/named-derived-class-expression.result.js b/tests/fixtures/ecma-features/classes/named-derived-class-expression.result.js
@@ -33,6 +33,7 @@ module.exports = {
             ],
             "expression": {
                 "type": "ClassExpression",
+                "decorators": [],
                 "loc": {
                     "start": {
                         "line": 1,
diff --git a/tests/fixtures/typescript/basics/class-with-implements-generic-multiple.result.js b/tests/fixtures/typescript/basics/class-with-implements-generic-multiple.result.js
@@ -31,6 +31,7 @@ module.exports = {
                     "column": 1
                 }
             },
+            "decorators": [],
             "id": {
                 "type": "Identifier",
                 "range": [
diff --git a/tests/fixtures/typescript/basics/class-with-implements-generic.result.js b/tests/fixtures/typescript/basics/class-with-implements-generic.result.js
@@ -31,6 +31,7 @@ module.exports = {
                     "column": 1
                 }
             },
+            "decorators": [],
             "id": {
                 "type": "Identifier",
                 "range": [
@@ -153,7 +154,7 @@ module.exports = {
                                         }
                                     },
                                     "name": "S"
-                                },
+                                }
                             }
                         ]
                     }
@@ -326,4 +327,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/typescript/basics/class-with-implements.result.js b/tests/fixtures/typescript/basics/class-with-implements.result.js
diff --git a/tests/fixtures/typescript/decorators/class-decorators/class-decorator-factory.result.js b/tests/fixtures/typescript/decorators/class-decorators/class-decorator-factory.result.js
diff --git a/tests/fixtures/typescript/decorators/class-decorators/class-decorator-factory.src.ts b/tests/fixtures/typescript/decorators/class-decorators/class-decorator-factory.src.ts
diff --git a/tests/fixtures/typescript/decorators/class-decorators/class-decorator.result.js b/tests/fixtures/typescript/decorators/class-decorators/class-decorator.result.js
diff --git a/tests/fixtures/typescript/decorators/class-decorators/class-decorator.src.ts b/tests/fixtures/typescript/decorators/class-decorators/class-decorator.src.ts
diff --git a/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-instance-member.result.js b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-instance-member.result.js
diff --git a/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-static-member.result.js b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-static-member.result.js
diff --git a/tests/fixtures/typescript/decorators/method-decorators/method-decorator-instance-member.result.js b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-instance-member.result.js
diff --git a/tests/fixtures/typescript/decorators/method-decorators/method-decorator-static-member.result.js b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-static-member.result.js

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ module.exports = {`
`3`	`3`	`"body": [`
`4`	`4`	`{`
`5`	`5`	`"type": "ClassDeclaration",`
	`6`	`+ "decorators": [],`
`6`	`7`	`"id": {`
`7`	`8`	`"type": "Identifier",`
`8`	`9`	`"name": "Foo",`
`@@ -331,4 +332,4 @@ module.exports = {`
`331`	`332`	`}`
`332`	`333`	`}`
`333`	`334`	`]`
`334`		`-};`
	`335`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ module.exports = {`
`5`	`5`	`"type": "ExportDefaultDeclaration",`
`6`	`6`	`"declaration": {`
`7`	`7`	`"type": "ClassDeclaration",`
	`8`	`+ "decorators": [],`
`8`	`9`	`"id": null,`
`9`	`10`	`"superClass": {`
`10`	`11`	`"type": "Identifier",`
`@@ -251,4 +252,4 @@ module.exports = {`
`251`	`252`	`}`
`252`	`253`	`}`
`253`	`254`	`]`
`254`		`-};`
	`255`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ module.exports = {`
`5`	`5`	`"type": "ExportNamedDeclaration",`
`6`	`6`	`"declaration": {`
`7`	`7`	`"type": "ClassDeclaration",`
	`8`	`+ "decorators": [],`
`8`	`9`	`"id": {`
`9`	`10`	`"type": "Identifier",`
`10`	`11`	`"name": "foo",`
`@@ -270,4 +271,4 @@ module.exports = {`
`270`	`271`	`}`
`271`	`272`	`}`
`272`	`273`	`]`
`273`		`-};`
	`274`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ module.exports = {`
`17`	`17`	`"body": [`
`18`	`18`	`{`
`19`	`19`	`"type": "ClassDeclaration",`
	`20`	`+ "decorators": [],`
`20`	`21`	`"loc": {`
`21`	`22`	`"start": {`
`22`	`23`	`"line": 1,`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ module.exports = {`
`31`	`31`	`"column": 1`
`32`	`32`	`}`
`33`	`33`	`},`
	`34`	`+ "decorators": [],`
`34`	`35`	`"id": {`
`35`	`36`	`"type": "Identifier",`
`36`	`37`	`"range": [`