New: Add method decorators to AST (fixes #65) (#64)

JamesHenry · nzakas · commit 7364cb95ba4b · 2016-08-24T16:25:37.000-07:00
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -993,7 +993,10 @@ module.exports = function(ast, extra) {
                         value: method,
                         computed: methodNameIsComputed,
                         static: Boolean(node.flags & ts.NodeFlags.Static),
-                        kind: "method"
+                        kind: "method",
+                        decorators: (node.decorators) ? node.decorators.map(function(d) {
+                            return convertChild(d.expression);
+                        }) : []
                     });
                 }
 
diff --git a/tests/fixtures/attach-comments/export-default-anonymous-class.result.js b/tests/fixtures/attach-comments/export-default-anonymous-class.result.js
@@ -72,6 +72,7 @@ module.exports = {
                             },
                             "kind": "method",
                             "computed": false,
+                            "decorators": [],
                             "range": [
                                 103,
                                 119
diff --git a/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js b/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js
@@ -85,6 +85,7 @@ module.exports = {
                             18
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             29
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             23
                         ],
                         "computed": true,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             22
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             19
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             41
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
diff --git a/tests/fixtures/ecma-features/classes/class-one-method.result.js b/tests/fixtures/ecma-features/classes/class-one-method.result.js
@@ -85,6 +85,7 @@ module.exports = {
                             19
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             33
                         ],
                         "computed": true,
+                        "decorators": [],
                         "key": {
                             "type": "Literal",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             26
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
diff --git a/tests/fixtures/ecma-features/classes/class-static-method.result.js b/tests/fixtures/ecma-features/classes/class-static-method.result.js
@@ -85,6 +85,7 @@ module.exports = {
                             21
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             21
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             38
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -239,6 +241,7 @@ module.exports = {
                             56
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             22
                         ],
                         "computed": true,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             37
                         ],
                         "computed": true,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             26
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Literal",
                             "loc": {
@@ -163,6 +164,7 @@ module.exports = {
                             46
                         ],
                         "computed": true,
+                        "decorators": [],
                         "key": {
                             "type": "Literal",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             14
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             20
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             15
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             21
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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
@@ -85,6 +85,7 @@ module.exports = {
                             14
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             20
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
diff --git a/tests/fixtures/ecma-features/classes/class-two-methods.result.js b/tests/fixtures/ecma-features/classes/class-two-methods.result.js
@@ -85,6 +85,7 @@ module.exports = {
                             14
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
@@ -162,6 +163,7 @@ module.exports = {
                             19
                         ],
                         "computed": false,
+                        "decorators": [],
                         "key": {
                             "type": "Identifier",
                             "loc": {
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-instance-member.src.ts b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-instance-member.src.ts
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-factory-static-member.src.ts b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-factory-static-member.src.ts
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-instance-member.src.ts b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-instance-member.src.ts
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
diff --git a/tests/fixtures/typescript/decorators/method-decorators/method-decorator-static-member.src.ts b/tests/fixtures/typescript/decorators/method-decorators/method-decorator-static-member.src.ts

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ module.exports = {`
`72`	`72`	`},`
`73`	`73`	`"kind": "method",`
`74`	`74`	`"computed": false,`
	`75`	`+ "decorators": [],`
`75`	`76`	`"range": [`
`76`	`77`	`103,`
`77`	`78`	`119`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ module.exports = {`
`85`	`85`	`18`
`86`	`86`	`],`
`87`	`87`	`"computed": false,`
	`88`	`+ "decorators": [],`
`88`	`89`	`"key": {`
`89`	`90`	`"type": "Identifier",`
`90`	`91`	`"loc": {`
`@@ -162,6 +163,7 @@ module.exports = {`
`162`	`163`	`29`
`163`	`164`	`],`
`164`	`165`	`"computed": false,`
	`166`	`+ "decorators": [],`
`165`	`167`	`"key": {`
`166`	`168`	`"type": "Identifier",`
`167`	`169`	`"loc": {`