fix(app): Nestjs controllers class inheritance

vogloblinsky · vogloblinsky · commit 06dad8ce66d0 · 2022-02-09T11:27:28.000+01:00
fix #1140
diff --git a/src/app/compiler/angular/deps/controller-dep.factory.ts b/src/app/compiler/angular/deps/controller-dep.factory.ts
@@ -15,7 +15,7 @@ export class ControllerDepFactory {
     ): IControllerDep {
         const sourceCode = srcFile.getText();
         const hash = crypto.createHash('sha512').update(sourceCode).digest('hex');
-        let infos: IControllerDep = {
+        const infos: IControllerDep = {
             name,
             id: 'controller-' + name + '-' + hash,
             file: file,
@@ -32,6 +32,9 @@ export class ControllerDepFactory {
                 infos.prefix = properties[0].text;
             }
         }
+        if (IO.extends) {
+            infos.extends = IO.extends;
+        }
         return infos;
     }
 }
@@ -45,4 +48,5 @@ export interface IControllerDep extends IDep {
     methodsClass: Array<any>;
     deprecated: boolean;
     deprecationMessage: string;
+    extends?: any;
 }
diff --git a/src/utils/extends-merger.util.ts b/src/utils/extends-merger.util.ts
@@ -8,6 +8,7 @@ export class ExtendsMerger {
     private classes;
     private injectables;
     private directives;
+    private controllers;
 
     private static instance: ExtendsMerger;
     private constructor() {}
@@ -23,6 +24,7 @@ export class ExtendsMerger {
         this.classes = deps.classes;
         this.injectables = deps.injectables;
         this.directives = deps.directives;
+        this.controllers = deps.controllers;
 
         const mergeExtendedProperties = component => {
             let ext;
@@ -121,6 +123,7 @@ export class ExtendsMerger {
 
         this.components.forEach(mergeExtendedProperties);
         this.directives.forEach(mergeExtendedProperties);
+        this.controllers.forEach(mergeExtendedProperties);
 
         const mergeExtendedClasses = el => {
             let ext;
@@ -155,6 +158,7 @@ export class ExtendsMerger {
         this.classes.forEach(mergeExtendedClasses);
         this.injectables.forEach(mergeExtendedClasses);
         this.directives.forEach(mergeExtendedClasses);
+        this.controllers.forEach(mergeExtendedClasses);
 
         return deps;
     }
@@ -189,7 +193,8 @@ export class ExtendsMerger {
             this.components,
             this.classes,
             this.injectables,
-            this.directives
+            this.directives,
+            this.controllers
         );
         const result = find(mergedData, { name: name } as any);
         return result || false;
diff --git a/test/fixtures/nest-app/src/app.controller.ts b/test/fixtures/nest-app/src/app.controller.ts
@@ -1,11 +1,12 @@
 import { Get, Controller } from '@nestjs/common';
 import { AppService } from './app.service';
+import { ControllerBase } from './controller.base';
 
 /**
  * The main app controller
  */
 @Controller()
-export class AppController {
+export class AppController extends ControllerBase {
     constructor(private readonly appService: AppService) {}
 
     @Get()
diff --git a/test/fixtures/nest-app/src/controller.base.ts b/test/fixtures/nest-app/src/controller.base.ts
@@ -0,0 +1,8 @@
+import { Get } from '@nestjs/common';
+export class ControllerBase {
+    protected controllerBaseString = 'How are you?';
+    @Get('how-are-you')
+    getHowAreYou(): string {
+        return this.controllerBaseString;
+    }
+}
diff --git a/test/src/cli/cli-nest.spec.ts b/test/src/cli/cli-nest.spec.ts
@@ -59,5 +59,12 @@ describe('CLI nest projects support', () => {
                 '@OneToMany(type &#x3D;&gt; ArticleEntity, article &#x3D;&gt; article.author)'
             );
         });
+
+        it('it should contain a controller page with inheritance', () => {
+            const file = read(`${distFolder}/controllers/AppController.html`);
+            expect(file).to.contain(
+                'code><a href="../classes/ControllerBase.html" target="_self" >ControllerBase'
+            );
+        });
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export class ControllerDepFactory {`
`15`	`15`	`): IControllerDep {`
`16`	`16`	`const sourceCode = srcFile.getText();`
`17`	`17`	`const hash = crypto.createHash('sha512').update(sourceCode).digest('hex');`
`18`		`- let infos: IControllerDep = {`
	`18`	`+ const infos: IControllerDep = {`
`19`	`19`	`name,`
`20`	`20`	`id: 'controller-' + name + '-' + hash,`
`21`	`21`	`file: file,`
`@@ -32,6 +32,9 @@ export class ControllerDepFactory {`
`32`	`32`	`infos.prefix = properties[0].text;`
`33`	`33`	`}`
`34`	`34`	`}`
	`35`	`+ if (IO.extends) {`
	`36`	`+ infos.extends = IO.extends;`
	`37`	`+ }`
`35`	`38`	`return infos;`
`36`	`39`	`}`
`37`	`40`	`}`
`@@ -45,4 +48,5 @@ export interface IControllerDep extends IDep {`
`45`	`48`	`methodsClass: Array<any>;`
`46`	`49`	`deprecated: boolean;`
`47`	`50`	`deprecationMessage: string;`
	`51`	`+ extends?: any;`
`48`	`52`	`}`