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

Author: JamesHenry

.gitignore

@@ -3,4 +3,4 @@ coverage
 node_modules
 npm-debug.log
 _test.js
-
+.DS_Store

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),

tests/fixtures/ecma-features/classes/class-accessor-properties.result.js

@@ -221,7 +221,8 @@ module.exports = {
                                         25,
                                         26
                                     ],
-                                    "name": "c"
+                                    "name": "c",
+                                    "decorators": []
                                 }
                             ],
                             "body": {

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": {

tests/fixtures/typescript/decorators/parameter-decorators/parameter-decorator-constructor.result.js

@@ -0,0 +1,5 @@
+class Service {
+    constructor(@Inject(APP_CONFIG) config: AppConfig) {
+        this.title = config.title;
+    }
+}

tests/fixtures/typescript/decorators/parameter-decorators/parameter-decorator-constructor.src.ts

@@ -0,0 +1,3 @@
+class Foo {
+    bar(@special(true) baz: number) {}
+}

tests/fixtures/typescript/decorators/parameter-decorators/parameter-decorator-decorator-instance-member.result.js

@@ -0,0 +1,3 @@
+class StaticFoo {
+    static bar(@special(true) baz: number) {}
+}

tests/fixtures/typescript/decorators/parameter-decorators/parameter-decorator-decorator-instance-member.src.ts

@@ -0,0 +1,5 @@
+class Greeter {
+    greet(@required name: string) {
+        return "Hello " + name + "!";
+    }
+}

tests/fixtures/typescript/decorators/parameter-decorators/parameter-decorator-decorator-static-member.result.js

@@ -0,0 +1,5 @@
+class StaticGreeter {
+    static greet(@required name: string) {
+        return "Hello " + name + "!";
+    }
+}