fix(app): interfaces multiple extends support

fix #1364

src/app/compiler/angular-dependencies.ts

@@ -229,9 +229,9 @@ export class AngularDependencies extends FrameworkDependencies {
         return deps;
     }
 
-    private processClass(node, file, srcFile, outputSymbols, fileBody) {
+    private processClass(node, file, srcFile, outputSymbols, fileBody, astFile) {
         const name = this.getSymboleName(node);
-        const IO = this.getClassIO(file, srcFile, node, fileBody);
+        const IO = this.getClassIO(file, srcFile, node, fileBody, astFile);
         const sourceCode = srcFile.getText();
         const hash = crypto.createHash('sha512').update(sourceCode).digest('hex');
         const deps: any = {
@@ -363,7 +363,7 @@ export class AngularDependencies extends FrameworkDependencies {
             ) {
                 return;
             }
-            const parseNode = (file, srcFile, node, fileBody) => {
+            const parseNode = (file, srcFile, node, fileBody, astFile) => {
                 const sourceCode = srcFile.getText();
                 const hash = crypto.createHash('sha512').update(sourceCode).digest('hex');
 
@@ -379,7 +379,8 @@ export class AngularDependencies extends FrameworkDependencies {
                             file,
                             srcFile,
                             node,
-                            fileBody
+                            fileBody,
+                            astFile
                         );
 
                         if (this.isModule(visitedDecorator)) {
@@ -572,10 +573,10 @@ export class AngularDependencies extends FrameworkDependencies {
                     nodeDecorators.filter(filterByDecorators).forEach(visitDecorator);
                 } else if (node.symbol) {
                     if (node.symbol.flags === ts.SymbolFlags.Class) {
-                        this.processClass(node, file, srcFile, outputSymbols, fileBody);
+                        this.processClass(node, file, srcFile, outputSymbols, fileBody, astFile);
                     } else if (node.symbol.flags === ts.SymbolFlags.Interface) {
                         const name = this.getSymboleName(node);
-                        const IO = this.getInterfaceIO(file, srcFile, node, fileBody);
+                        const IO = this.getInterfaceIO(file, srcFile, node, fileBody, astFile);
                         const interfaceDeps: IInterfaceDep = {
                             name,
                             id: 'interface-' + name + '-' + hash,
@@ -709,7 +710,7 @@ export class AngularDependencies extends FrameworkDependencies {
                         if (node.body) {
                             if (node.body.statements && node.body.statements.length > 0) {
                                 node.body.statements.forEach(statement =>
-                                    parseNode(file, srcFile, statement, node.body)
+                                    parseNode(file, srcFile, statement, node.body, astFile)
                                 );
                             }
                         }
@@ -986,7 +987,7 @@ export class AngularDependencies extends FrameworkDependencies {
                 }
             };
 
-            parseNode(fileName, scannedFile, initialNode);
+            parseNode(fileName, scannedFile, initialNode, null, astFile);
         });
     }
 
@@ -1523,7 +1524,13 @@ export class AngularDependencies extends FrameworkDependencies {
         }
     }
 
-    private getClassIO(filename: string, sourceFile: ts.SourceFile, node: ts.Node, fileBody) {
+    private getClassIO(
+        filename: string,
+        sourceFile: ts.SourceFile,
+        node: ts.Node,
+        fileBody,
+        astFile
+    ) {
         /**
          * Copyright https://github.com/ng-bootstrap/ng-bootstrap
          */
@@ -1532,7 +1539,12 @@ export class AngularDependencies extends FrameworkDependencies {
             if (ts.isClassDeclaration(statement)) {
                 if (statement.pos === node.pos && statement.end === node.end) {
                     return directive.concat(
-                        this.classHelper.visitClassDeclaration(filename, statement, sourceFile)
+                        this.classHelper.visitClassDeclaration(
+                            filename,
+                            statement,
+                            sourceFile,
+                            astFile
+                        )
                     );
                 }
             }
@@ -1543,7 +1555,7 @@ export class AngularDependencies extends FrameworkDependencies {
         return res[0] || {};
     }
 
-    private getInterfaceIO(filename: string, sourceFile, node, fileBody) {
+    private getInterfaceIO(filename: string, sourceFile, node, fileBody, astFile) {
         /**
          * Copyright https://github.com/ng-bootstrap/ng-bootstrap
          */
@@ -1552,7 +1564,12 @@ export class AngularDependencies extends FrameworkDependencies {
             if (ts.isInterfaceDeclaration(statement)) {
                 if (statement.pos === node.pos && statement.end === node.end) {
                     return directive.concat(
-                        this.classHelper.visitClassDeclaration(filename, statement, sourceFile)
+                        this.classHelper.visitClassDeclaration(
+                            filename,
+                            statement,
+                            sourceFile,
+                            astFile
+                        )
                     );
                 }
             }

src/app/compiler/angular/deps/helpers/class-helper.ts

@@ -467,7 +467,8 @@ export class ClassHelper {
     public visitClassDeclaration(
         fileName: string,
         classDeclaration: ts.ClassDeclaration | ts.InterfaceDeclaration,
-        sourceFile?: ts.SourceFile
+        sourceFile?: ts.SourceFile,
+        astFile?: ts.SourceFile
     ): any {
         let symbol = this.typeChecker.getSymbolAtLocation(classDeclaration.name);
         let rawdescription = '';
@@ -512,7 +513,7 @@ export class ClassHelper {
         let className = classDeclaration.name.text;
         let members;
         let implementsElements = [];
-        let extendsElement;
+        let extendsElements = [];
 
         if (typeof ts.getEffectiveImplementsTypeNodes !== 'undefined') {
             let implementedTypes = ts.getEffectiveImplementsTypeNodes(classDeclaration);
@@ -528,10 +529,38 @@ export class ClassHelper {
         }
 
         if (typeof ts.getClassExtendsHeritageElement !== 'undefined') {
-            let extendsTypes = ts.getClassExtendsHeritageElement(classDeclaration);
-            if (extendsTypes) {
-                if (extendsTypes.expression) {
-                    extendsElement = extendsTypes.expression.text;
+            if (astFile) {
+                let interfaceOrClassNode = astFile.getInterface(className);
+                if (!interfaceOrClassNode) {
+                    interfaceOrClassNode = astFile.getClass(className);
+                }
+                if (interfaceOrClassNode) {
+                    const extendsListRaw = interfaceOrClassNode.getExtends();
+                    let extendsList = [];
+                    if (extendsListRaw) {
+                        if (Array.isArray(extendsListRaw)) {
+                            if (extendsListRaw.length > 0) {
+                                extendsListRaw.forEach(extendElement => {
+                                    const extendElementExpression = extendElement.getExpression();
+                                    if (extendElementExpression) {
+                                        const text = extendElementExpression.getText();
+                                        if (text) {
+                                            extendsList.push(text);
+                                        }
+                                    }
+                                });
+                            }
+                        } else {
+                            const extendElementExpression = extendsListRaw.getExpression();
+                            if (extendElementExpression) {
+                                const text = extendElementExpression.getText();
+                                if (text) {
+                                    extendsList.push(text);
+                                }
+                            }
+                        }
+                    }
+                    extendsElements = extendsList;
                 }
             }
         }
@@ -575,7 +604,7 @@ export class ClassHelper {
                     kind: members.kind,
                     constructor: members.constructor,
                     jsdoctags: jsdoctags,
-                    extends: extendsElement,
+                    extends: extendsElements,
                     implements: implementsElements,
                     accessors: members.accessors
                 };
@@ -594,7 +623,7 @@ export class ClassHelper {
                         kind: members.kind,
                         constructor: members.constructor,
                         jsdoctags: jsdoctags,
-                        extends: extendsElement,
+                        extends: extendsElements,
                         implements: implementsElements,
                         accessors: members.accessors
                     }
@@ -639,7 +668,7 @@ export class ClassHelper {
                         kind: members.kind,
                         constructor: members.constructor,
                         jsdoctags: jsdoctags,
-                        extends: extendsElement,
+                        extends: extendsElements,
                         implements: implementsElements,
                         accessors: members.accessors
                     }
@@ -662,7 +691,7 @@ export class ClassHelper {
                     kind: members.kind,
                     constructor: members.constructor,
                     jsdoctags: jsdoctags,
-                    extends: extendsElement,
+                    extends: extendsElements,
                     implements: implementsElements,
                     accessors: members.accessors
                 }
@@ -682,7 +711,7 @@ export class ClassHelper {
                     kind: members.kind,
                     constructor: members.constructor,
                     jsdoctags: jsdoctags,
-                    extends: extendsElement,
+                    extends: extendsElements,
                     implements: implementsElements,
                     accessors: members.accessors
                 }

src/app/compiler/angular/deps/helpers/component-helper.ts

@@ -321,7 +321,8 @@ export class ComponentHelper {
         filename: string,
         sourceFile: ts.SourceFile,
         node: ts.Node,
-        fileBody
+        fileBody,
+        astFile: ts.SourceFile
     ): any {
         /**
          * Copyright https://github.com/ng-bootstrap/ng-bootstrap
@@ -331,7 +332,12 @@ export class ComponentHelper {
             if (ts.isClassDeclaration(statement)) {
                 if (statement.pos === node.pos && statement.end === node.end) {
                     return directive.concat(
-                        this.classHelper.visitClassDeclaration(filename, statement, sourceFile)
+                        this.classHelper.visitClassDeclaration(
+                            filename,
+                            statement,
+                            sourceFile,
+                            astFile
+                        )
                     );
                 }
             }

src/templates/partials/class.hbs

@@ -49,7 +49,9 @@
                 <h3>{{t "extends" }}</h3>
             </p>
             <p class="comment">
-                {{> link-type type=class.extends }}
+                {{#each class.extends}}
+                    {{> link-type type=this }}
+                {{/each}}
             </p>
         {{/if}}
 

src/templates/partials/component-detail.hbs

@@ -28,7 +28,9 @@
         <h3>{{t "extends" }}</h3>
     </p>
     <p class="comment">
-        {{> link-type type=component.extends }}
+        {{#each component.extends}}
+            {{> link-type type=this }}
+        {{/each}}
     </p>
 {{/if}}
 

src/templates/partials/controller.hbs

@@ -58,7 +58,9 @@
                 <h3>{{t "extends" }}</h3>
             </p>
             <p class="comment">
-                {{> link-type type=controller.extends }}
+                {{#each controllerextends}}
+                    {{> link-type type=this }}
+                {{/each}}
             </p>
         {{/if}}
 

src/templates/partials/directive.hbs

@@ -49,7 +49,9 @@
                 <h3>{{t "extends" }}</h3>
             </p>
             <p class="comment">
-                {{> link-type type=directive.extends }}
+                {{#each directive.extends}}
+                    {{> link-type type=this }}
+                {{/each}}
             </p>
         {{/if}}
 

src/templates/partials/guard.hbs

@@ -49,7 +49,9 @@
                 <h3>{{t "extends" }}</h3>
                 </p>
                 <p class="comment">
-                    {{> link-type type=injectable.extends }}
+                    {{#each injectable.extends}}
+                        {{> link-type type=this }}
+                    {{/each}}
                 </p>
             {{/if}}
 

src/templates/partials/injectable.hbs

@@ -49,7 +49,9 @@
                 <h3>{{t "extends" }}</h3>
             </p>
             <p class="comment">
-                {{> link-type type=injectable.extends }}
+                {{#each injectable.extends}}
+                    {{> link-type type=this }}
+                {{/each}}
             </p>
         {{/if}}
 

src/templates/partials/interface.hbs

@@ -52,7 +52,9 @@
                 <h3>{{t "extends" }}</h3>
             </p>
             <p class="comment">
-                {{> link-type type=interface.extends }}
+                {{#each interface.extends}}
+                    {{> link-type type=this }}
+                {{/each}}
             </p>
         {{/if}}
 

src/utils/extends-merger.util.ts

@@ -29,7 +29,7 @@ export class ExtendsMerger {
         const mergeExtendedProperties = component => {
             let ext;
             if (typeof component.extends !== 'undefined') {
-                ext = this.findInDependencies(component.extends);
+                ext = this.findInDependencies(component.extends[0]);
 
                 if (ext) {
                     const recursiveScanWithInheritance = cls => {
@@ -112,7 +112,7 @@ export class ExtendsMerger {
                             );
                         }
                         if (cls.extends) {
-                            recursiveScanWithInheritance(this.findInDependencies(cls.extends));
+                            recursiveScanWithInheritance(this.findInDependencies(cls.extends[0]));
                         }
                     };
                     // From class to class
@@ -128,7 +128,7 @@ export class ExtendsMerger {
         const mergeExtendedClasses = el => {
             let ext;
             if (typeof el.extends !== 'undefined') {
-                ext = this.findInDependencies(el.extends);
+                ext = this.findInDependencies(el.extends[0]);
                 if (ext) {
                     const recursiveScanWithInheritance = cls => {
                         if (typeof cls.methods !== 'undefined' && cls.methods.length > 0) {
@@ -146,7 +146,7 @@ export class ExtendsMerger {
                             }
                         }
                         if (cls.extends) {
-                            recursiveScanWithInheritance(this.findInDependencies(cls.extends));
+                            recursiveScanWithInheritance(this.findInDependencies(cls.extends[0]));
                         }
                     };
                     // From elss to elss

test/fixtures/sample-files-extends/src/app/boo.interface.ts

@@ -0,0 +1,9 @@
+/**
+ * A boo interface just for documentation purpose
+ */
+export interface BooInterface {
+    /**
+     * The boo
+     */
+    boo: string;
+}

test/fixtures/sample-files-extends/src/app/clock.interface.ts

@@ -0,0 +1,25 @@
+import { BooInterface } from './boo.interface';
+import { TimeInterface } from './time.interface';
+
+/**
+ * A class interface just for documentation purpose
+ *
+ * ```typescript
+ * class Clock implements ClockInterface {
+ *     currentTime: Date;
+ *     constructor(h: number, m: number) { }
+ * }
+ * ```
+ */
+interface ClockInterface extends TimeInterface, BooInterface {
+    /**
+     * The current time
+     * @type {Date}
+     * @deprecated The current time property is deprecated
+     */
+    currentTime: Date;
+    /**
+     * A simple reset method
+     */
+    reset(): void;
+}