fix(deps): union type with generics

fix #501
compodoc · Mar 9, 2018 · eec9c4b · eec9c4b
1 parent 63d97e5
commit eec9c4b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/app/compiler/deps/helpers/class-helper.ts b/src/app/compiler/deps/helpers/class-helper.ts
@@ -631,6 +631,15 @@ export class ClassHelper {
                         if (type.typeName) {
                             _return += this.visitTypeName(type.typeName);
                         }
+                        if (type.typeArguments) {
+                            _return += '<';
+                            const typeArguments = [];
+                            for (const argument of type.typeArguments) {
+                                typeArguments.push(this.visitType(argument));
+                            }
+                            _return += typeArguments.join(' | ');
+                            _return += '>';
+                        }
                     }
                     if (i < len - 1) {
                         _return += ' | ';
@@ -677,7 +686,6 @@ export class ClassHelper {
             }
             _return += '>';
         }
-
         return _return;
     }
 

diff --git a/test/src/cli/cli-generation-big-app.spec.ts b/test/src/cli/cli-generation-big-app.spec.ts
@@ -568,4 +568,9 @@ describe('CLI simple generation - big app', () => {
         let file = read(distFolder + '/miscellaneous/typealiases.html');
         expect(file).to.contain('<code>number | string | (number | string)[]</code>');
     });
+
+    it('should support union type with generic', () => {
+        let file = read(distFolder + '/miscellaneous/typealiases.html');
+        expect(file).to.contain('<code>Type&lt;TableCellRendererBase&gt; | TemplateRef&lt;any&gt;</code>');
+    });
 });
diff --git a/test/src/todomvc-ng2/src/app/shared/miscellaneous/miscellaneous.ts b/test/src/todomvc-ng2/src/app/shared/miscellaneous/miscellaneous.ts
@@ -46,4 +46,6 @@ export let yo:{ [index:string] : {message: string} } = {};
 
 export type ChartChange = "creating" | "created" | "updating" | "updated";
 
-export type TableColumnTarget = number | string | (number | string)[];
+export type TableColumnTarget = number | string | (number | string)[];
+
+export type TableSyncRenderer = Type<TableCellRendererBase> | TemplateRef<any>;