Update ModelDir and model constructor only modelBaseClass

index.js

@@ -161,7 +161,7 @@ prog
         let outPathModel = outPath;
         if (o.modelDir) {
             outPathModel += '/' + o.modelDir;
-            o.modelDir = _ensureTrailingSlash(o.modelClass);
+            o.modelDir = _ensureTrailingSlash(o.modelDir);
         } else {
             o.modelDir = '';
         }

readme.md

@@ -108,7 +108,7 @@ Your custom auth guard class name and location can be defined with `--auth-guard
             "authGuardClass": "PrincipalGuard",
             "authGuardDir": "modules/auth/lib",
             "modelBaseClass": "EntityBase",
-            "modelBaseDIr": "modules/auth/lib"
+            "modelBaseDir": "modules/auth/lib"
         }
     }
 

templates/controller.ejs

@@ -4,7 +4,7 @@ import { Controller, Request, Param, Body, Get, Post, Put, Delete, ParseUUIDPipe
 <% if (repository) { %>import { <%=: name | capitalize %>Repository } from './<%= repositoryFileName %>';
 <% } else if (crud) { %>import { Repository } from 'typeorm'; <% } -%>
 <% } -%>
-<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelFileName %>';<% } %>
+<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelDir %><%= modelFileName %>';<% } %>
 <% if (auth) { %>import { <%= authGuardClass %> } from '<%= authGuardDir %>';<% } %>
 
 @Controller('/<%= name %>')
@@ -95,4 +95,4 @@ public async search(@Request() req): Promise<Array<<%= modelClass %>>> {
     }
 <% } -%>
 
-}
+}

templates/model.ejs

@@ -3,14 +3,15 @@ import { Entity<% if (modelProps) { %>, Column, PrimaryGeneratedColumn<% } %> }
 
 @Entity('<%= modelClassLower %>')
 export class <%= modelClass %> <% if (modelBaseClass) { %>extends <%= modelBaseClass %> <% } %>{
-
+<% if (modelBaseClass) { %>
     constructor() {
         super();
     }
+<% } %>
 <% if (modelProps) { -%>
     <% Object.keys(modelProps).forEach(function(prop) { %>
     @Column()
     <%= prop %>: <%= modelProps[prop] %>;
     <% }) %>
 <% } -%>
-}
+}

templates/module.ejs

@@ -4,7 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 <% if (service) { %>import { <%=: name | capitalize %>Service } from './<%= serviceFileName %>';<% } %>
 <% if (repository) { %>import { <%=: name | capitalize %>Repository } from './<%= repositoryFileName %>';
 <% } else if (false && crud) { %>import { Repository } from 'typeorm'; <% } -%>
-<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelFileName %>';<% } %>
+<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelDir %><%= modelFileName %>';<% } %>
 
 @Module({
 <% if (model || repository || crud) { %>imports: [TypeOrmModule.forFeature([<%= modelClass %>])]<% if (controller || service || repository || crud) { %>,<% } %><% } %>
@@ -16,4 +16,4 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 <% } -%>
     exports: []
 })
-export class <%=: name | capitalize %>Module {}
+export class <%=: name | capitalize %>Module {}

templates/service.ejs

@@ -1,7 +1,7 @@
 import { Injectable, UnauthorizedException, Request } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 <% if (repository) { %>import { <%=: name | capitalize %>Repository } from './<%= repositoryFileName %>';<% } %>
-<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelFileName %>';<% } %>
+<% if (model || repository || crud) { %>import { <%= modelClass %> } from './<%= modelDir %><%= modelFileName %>';<% } %>
 
 @Injectable()
 export class <%=: name | capitalize %>Service {
@@ -47,4 +47,4 @@ export class <%=: name | capitalize %>Service {
     <% } %>
     }
 <% } %>
-}
+}