fix(deps): Type casting inside decorator

fix #727
compodoc · Feb 12, 2019 · f597531 · f597531
1 parent daa03cc
commit f597531
Show file tree

Hide file tree

Showing 7 changed files with 225 additions and 184 deletions.
diff --git a/src/app/compiler/angular/deps/helpers/class-helper.ts b/src/app/compiler/angular/deps/helpers/class-helper.ts
@@ -169,7 +169,26 @@ export class ClassHelper {
                     )}: <a href="${path}" target="_blank">${arg.type}</a>`;
                 } else {
                     if (arg.type) {
-                        return `${arg.name}${this.getOptionalString(arg)}: ${arg.type}`;
+                        let finalStringifiedArgument = '';
+                        let separator = ':';
+                        if (arg.name) {
+                            finalStringifiedArgument += arg.name;
+                        }
+                        if (
+                            arg.kind === SyntaxKind.AsExpression &&
+                            arg.expression &&
+                            arg.expression.text
+                        ) {
+                            finalStringifiedArgument += arg.expression.text;
+                            separator = ' as';
+                        }
+                        if (arg.optional) {
+                            finalStringifiedArgument += this.getOptionalString(arg);
+                        }
+                        if (arg.type) {
+                            finalStringifiedArgument += separator + ' ' + this.visitType(arg.type);
+                        }
+                        return finalStringifiedArgument;
                     } else if (arg.text) {
                         return `${arg.text}`;
                     } else {

diff --git a/src/templates/partials/block-method.hbs b/src/templates/partials/block-method.hbs
diff --git a/src/utils/basic-type.util.ts b/src/utils/basic-type.util.ts
@@ -28,7 +28,7 @@ export class BasicTypeUtil {
      * @param type The type to check
      */
     public isJavascriptType(type: string): boolean {
-        if (typeof type !== 'undefined') {
+        if (typeof type !== 'undefined' && type.toLowerCase) {
             return type.toLowerCase() in BasicTypes;
         } else {
             return false;
@@ -41,7 +41,7 @@ export class BasicTypeUtil {
      * @param type The type to check
      */
     public isTypeScriptType(type: string): boolean {
-        if (typeof type !== 'undefined') {
+        if (typeof type !== 'undefined' && type.toLowerCase) {
             return type.toLowerCase() in BasicTypeScriptTypes;
         } else {
             return false;

diff --git a/src/utils/object-literal-expression.util.ts b/src/utils/object-literal-expression.util.ts
@@ -11,6 +11,10 @@ export function StringifyObjectLiteralExpression(ole) {
             if (property.initializer) {
                 if (property.initializer.kind === SyntaxKind.StringLiteral) {
                     returnedString += `'` + property.initializer.text + `'`;
+                } else if (property.initializer.kind === SyntaxKind.TrueKeyword) {
+                    returnedString += `true`;
+                } else if (property.initializer.kind === SyntaxKind.FalseKeyword) {
+                    returnedString += `false`;
                 } else {
                     returnedString += property.initializer.text;
                 }

diff --git a/test/src/cli/cli-generation-big-app.spec.ts b/test/src/cli/cli-generation-big-app.spec.ts
@@ -700,7 +700,7 @@ describe('CLI simple generation - big app', () => {
     it('should support Type parameters', () => {
         let file = read(distFolder + '/components/AppComponent.html');
         expect(file).to.contain(
-            `<ul class="type-parameters">\n                                        <li>T</li>\n                                        <li>K</li>\n                                </ul>`
+            `<ul class="type-parameters">\n                        <li>T</li>\n                        <li>K</li>\n                    </ul>`
         );
     });
 
@@ -774,4 +774,9 @@ describe('CLI simple generation - big app', () => {
         let file = read(distFolder + '/classes/Todo.html');
         expect(file).to.contain('() &#x3D;&gt; {...}</code>');
     });
+
+    it('correct supports 1000 as PollingSpeed for decorator arguments', () => {
+        let file = read(distFolder + '/classes/SomeFeature.html');
+        expect(file).to.contain('code>@throttle(1000 as PollingSpeed');
+    });
 });
diff --git a/test/src/todomvc-ng2/src/app/shared/miscellaneous/some-feature.ts b/test/src/todomvc-ng2/src/app/shared/miscellaneous/some-feature.ts
@@ -0,0 +1,10 @@
+import { throttle } from 'lodash-decorators';
+
+import { PollingSpeed } from './util.const.ts';
+
+export class SomeFeature {
+    @throttle(1000 as PollingSpeed, { leading: true })
+    doSomething() {
+        // do something throttled
+    }
+}
diff --git a/test/src/todomvc-ng2/src/app/shared/miscellaneous/util.const.ts b/test/src/todomvc-ng2/src/app/shared/miscellaneous/util.const.ts
@@ -0,0 +1,4 @@
+export const enum PollingSpeed {
+    Low = 1000,
+    High = 100
+}