fix(deps): support self-defined type

fix #267
compodoc · Sep 8, 2017 · 104b82f · 104b82f
1 parent c29204c
commit 104b82f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/dist/index-cli.js b/dist/index-cli.js
@@ -3578,6 +3578,11 @@ var Dependencies = /** @class */ (function () {
                         if (node.type.types[i].kind === ts$3.SyntaxKind.LiteralType && node.type.types[i].literal) {
                             _return += '"' + node.type.types[i].literal.text + '"';
                         }
+                        if (typeof node.type.types[i].typeName !== 'undefined') {
+                            if (typeof node.type.types[i].typeName.escapedText !== 'undefined') {
+                                _return += node.type.types[i].typeName.escapedText;
+                            }
+                        }
                         if (i < len - 1) {
                             _return += ' | ';
                         }

diff --git a/dist/index.js b/dist/index.js
@@ -3578,6 +3578,11 @@ var Dependencies = /** @class */ (function () {
                         if (node.type.types[i].kind === ts$3.SyntaxKind.LiteralType && node.type.types[i].literal) {
                             _return += '"' + node.type.types[i].literal.text + '"';
                         }
+                        if (typeof node.type.types[i].typeName !== 'undefined') {
+                            if (typeof node.type.types[i].typeName.escapedText !== 'undefined') {
+                                _return += node.type.types[i].typeName.escapedText;
+                            }
+                        }
                         if (i < len - 1) {
                             _return += ' | ';
                         }

diff --git a/src/app/compiler/dependencies.ts b/src/app/compiler/dependencies.ts
@@ -1059,6 +1059,13 @@ export class Dependencies {
                         if (node.type.types[i].kind === ts.SyntaxKind.LiteralType && node.type.types[i].literal) {
                             _return += '"' + node.type.types[i].literal.text + '"';
                         }
+
+                        if (typeof node.type.types[i].typeName !== 'undefined') {
+                            if (typeof node.type.types[i].typeName.escapedText !== 'undefined') {
+                                _return += node.type.types[i].typeName.escapedText;
+                            }
+                        }
+
                         if (i<len-1) {
                             _return += ' | ';
                         }

diff --git a/test/src/cli/cli-generation-big-app.spec.ts b/test/src/cli/cli-generation-big-app.spec.ts
@@ -260,4 +260,11 @@ describe('CLI simple generation - big app', () => {
           expect(file).to.contain('../classes/Todo.html#completed');
       });
 
+      it('should support self-defined type', () => {
+          let file = read('documentation/classes/Todo.html');
+          expect(file).to.contain('../miscellaneous/typealiases.html#PopupPosition');
+          file = read('documentation/miscellaneous/typealiases.html');
+          expect(file).to.contain('<code>ElementRef | HTMLElement</code>');
+      });
+
 });
diff --git a/test/src/todomvc-ng2/src/app/shared/models/todo.model.ts b/test/src/todomvc-ng2/src/app/shared/models/todo.model.ts
@@ -1,3 +1,7 @@
+import {
+    ElementRef
+} from "@angular/core";
+
 import { Direction } from '../miscellaneous/miscellaneous';
 
 export class Tada {
@@ -18,6 +22,8 @@ export class Todo extends Tada {
      */
     editing: boolean;
 
+    pos?: PopupPosition;
+
     [index: number]: string;
 
     testCommentFunction(dig: number, str: string, bool: boolean): object {
@@ -65,3 +71,5 @@ export class Todo extends Tada {
       return 5;
     }
 }
+
+export type PopupPosition = ElementRef | HTMLElement;