New: Add param decorators to the AST (fixes #68) (#69)

eslint · Aug 25, 2016 · 328259f · 328259f
1 parent 8b97fe7
commit 328259f
Show file tree

Hide file tree

Showing 14 changed files with 3,359 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ coverage
 node_modules
 npm-debug.log
 _test.js
-
+.DS_Store
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -956,7 +956,6 @@ module.exports = function(ast, extra) {
                     method = {
                         type: "FunctionExpression",
                         id: null,
-                        params: node.parameters.map(convertChild),
                         generator: false,
                         expression: false,
                         body: convertChild(node.body),
@@ -975,6 +974,9 @@ module.exports = function(ast, extra) {
                 }
 
                 if (parent.kind === SyntaxKind.ObjectLiteralExpression) {
+
+                    method.params = node.parameters.map(convertChild);
+
                     assign(result, {
                         type: "Property",
                         key: convertChild(node.name),
@@ -986,7 +988,20 @@ module.exports = function(ast, extra) {
                     });
 
                 } else { // class
+
+                    /**
+                     * Unlinke in object literal methods, class method params can have decorators
+                     */
+                    method.params = node.parameters.map(function(param) {
+                        var convertedParam = convertChild(param);
+                        convertedParam.decorators = (param.decorators) ? param.decorators.map(function(d) {
+                            return convertChild(d.expression);
+                        }) : [];
+                        return convertedParam;
+                    });
+
                     var methodNameIsComputed = (node.name.kind === SyntaxKind.ComputedPropertyName);
+
                     assign(result, {
                         type: "MethodDefinition",
                         key: convertChild(node.name),
@@ -998,6 +1013,7 @@ module.exports = function(ast, extra) {
                             return convertChild(d.expression);
                         }) : []
                     });
+
                 }
 
                 if (node.kind === SyntaxKind.GetAccessor) {
@@ -1020,7 +1036,13 @@ module.exports = function(ast, extra) {
                     constructor = {
                         type: "FunctionExpression",
                         id: null,
-                        params: node.parameters.map(convertChild),
+                        params: node.parameters.map(function(param) {
+                            var convertedParam = convertChild(param);
+                            convertedParam.decorators = (param.decorators) ? param.decorators.map(function(d) {
+                                return convertChild(d.expression);
+                            }) : [];
+                            return convertedParam;
+                        }),
                         generator: false,
                         expression: false,
                         body: convertChild(node.body),

diff --git a/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js b/tests/fixtures/ecma-features/classes/class-accessor-properties.result.js
@@ -221,7 +221,8 @@ module.exports = {
                                         25,
                                         26
                                     ],
-                                    "name": "c"
+                                    "name": "c",
+                                    "decorators": []
                                 }
                             ],
                             "body": {

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
@@ -299,7 +299,8 @@ module.exports = {
                                         52,
                                         53
                                     ],
-                                    "name": "b"
+                                    "name": "b",
+                                    "decorators": []
                                 }
                             ],
                             "body": {