Merge branch 'feature/fix-templates' into develop

Author: hirsch88

package.json

@@ -23,9 +23,9 @@
     "db:migrate:rollback": "npm run banner rollback && npm run ts-node:fast -- ./node_modules/.bin/knex migrate:rollback",
     "db:seed": "npm run banner seed && npm run ts-node:fast -- ./node_modules/.bin/knex seed:run",
     "db:reset": "npm run console db:reset",
-    "console": "npm run ts-node:fast -- ./src/console/commander.ts",
-    "console:dev": "npm run ts-node -- ./src/console/commander.ts",
-    "console:help": "npm run ts-node:fast -- ./src/console/commander.ts --help",
+    "console": "npm run ts-node:fast -- ./src/console/lib/commander.ts",
+    "console:dev": "npm run ts-node -- ./src/console/lib/commander.ts",
+    "console:help": "npm run ts-node:fast -- ./src/console/lib/commander.ts --help",
     "setup": "npm run banner setup && yarn install && npm run db:migrate && npm run db:seed",
     "serve": "npm run banner serve && ./node_modules/.bin/nodemon --watch 'src/**/*.ts' --watch 'src/**/*.json' --watch '.env'",
     "clean": "npm run banner clean && npm run clean:dist",

src/console/commander.ts src/console/lib/commander.tssrc/console/commander.ts renamed to src/console/lib/commander.ts

@@ -21,28 +21,38 @@ import { config } from 'dotenv';
 config();
 
 // Configures the logger
-import { LoggerConfig } from '../config/LoggerConfig';
+import { LoggerConfig } from '../../config/LoggerConfig';
 new LoggerConfig().configure();
 
 figlet('console', (error: any, data: any) => {
     console.log(chalk.blue(data));
-    console.log(chalk.green('➜ ') + chalk.bold(process.argv[2]));
-    console.log();
 
     // Find all command files
-    glob(path.join(__dirname, '**/*Command.ts'), (err: any, matches: string[]) => {
+    glob(path.join(__dirname, '../**/*Command.ts'), (err: any, matches: string[]) => {
         if (err) {
             console.log(err);
             return;
         }
+
         const files = matches
             .filter(m => m.indexOf('/lib') < 0)
             .map(m => ({
                 path: m,
-                name: m.replace(__dirname, '').replace('.ts', '').substring(1)
+                name: m.replace(__dirname.replace('/lib', ''), '').replace('.ts', '').substring(1)
             }));
 
         const commands = files.map(f => require(f.path)[f.name]);
+        const keys = commands.map(c => c.command);
+        const key = process.argv[2];
+
+        if (keys.indexOf(key) < 0) {
+            console.log(chalk.red('➜ ') + chalk.bold(`Command ${key} was not found!`));
+            console.log();
+            return;
+        }
+
+        console.log(chalk.green('➜ ') + chalk.bold(key));
+        console.log();
 
         commands.forEach((c) => {
             commander

src/console/templates/controller.hbs

@@ -11,14 +11,13 @@ import { Types, Targets } from '../../{{deepness}}constants';
 {{/if}}
 
 // Get middlewares
-const authenticate = app.Container.getNamed<interfaces.Middleware>(Types.Middleware, Targets.Middleware.AuthenticateMiddleware);
+const authenticate = app.IoC.getNamed<interfaces.Middleware>(Types.Middleware, Targets.Middleware.AuthenticateMiddleware);
 
 
 @Controller('/{{name.pluralize}}', authenticate.use)
 export class {{name.capitalize}}Controller {
 
-    {{#if isResourceTemplate}}
-    constructor( @inject(Types.Service) @named(Targets.Service.{{name.capitalize}}Service) private {{name.camelCase}}Service: {{name.capitalize}}Service) { }
+    {{#if isResourceTemplate}}constructor( @inject(Types.Service) @named(Targets.Service.{{name.capitalize}}Service) private {{name.camelCase}}Service: {{name.capitalize}}Service) { }
 
     @Get('/')
     public async findAll( @Response() res: myExpress.Response): Promise<any> {
@@ -49,5 +48,5 @@ export class {{name.capitalize}}Controller {
         await this.{{name.camelCase}}Service.destroy(parseInt(id, 10));
         return res.destroyed();
     }{{/if}}
-
+    // Implement your routes here
 }

src/console/templates/middleware.hbs

@@ -13,7 +13,6 @@ export class {{name.capitalize}}Middleware implements interfaces.Middleware {
         this.log = new Logger(__filename);
     }
 
-
     public use = (req: myExpress.Request, res: myExpress.Response, next: myExpress.NextFunction): void => {
         // TODO add your middleware logic here
         next();

src/console/templates/repository.hbs

@@ -12,14 +12,13 @@ import { NotFoundException } from '../{{deepness}}exceptions/NotFoundException';
 
 export class {{name.capitalize}}Repository {
 
-    {{#if isResourceTemplate}}
-    constructor(
+    {{#if isResourceTemplate}}constructor(
         @inject(Types.Model) @named(Targets.Model.{{name.capitalize}}) public {{name.capitalize}}Model: typeof {{name.capitalize}}
     ) { }
 
     public async findAll(): Promise<Bookshelf.Collection<{{name.capitalize}}>> {
         const list = await this.{{name.capitalize}}Model.fetchAll();
-        return <Bookshelf.Collection<{{name.capitalize}}>>list;
+        return list as Bookshelf.Collection<{{name.capitalize}}>;
     }
 
     public async findOne(id: number): Promise<{{name.capitalize}}> {
@@ -37,7 +36,7 @@ export class {{name.capitalize}}Repository {
     }
 
     public async update(id: number, data: any): Promise<{{name.capitalize}}> {
-        const {{name.camelCase}} = this.{{name.capitalize}}Model.forge<{{name.capitalize}}>({ id: id });
+        const {{name.camelCase}} = this.{{name.capitalize}}Model.forge<{{name.capitalize}}>({ id });
         try {
             const {{name.camelCase}}Updated = await {{name.camelCase}}.save(data, { patch: true });
             return this.{{name.capitalize}}Model.fetchById({{name.camelCase}}Updated.id);
@@ -47,7 +46,7 @@ export class {{name.capitalize}}Repository {
     }
 
     public async destroy(id: number): Promise<void> {
-        let {{name.camelCase}} = this.{{name.capitalize}}Model.forge<{{name.capitalize}}>({ id: id });
+        let {{name.camelCase}} = this.{{name.capitalize}}Model.forge<{{name.capitalize}}>({ id });
         try {
             {{name.camelCase}} = await {{name.camelCase}}.fetch({ require: true });
         } catch (error) {

src/console/templates/request.hbs

@@ -7,7 +7,7 @@ export class {{name.capitalize}}Request extends RequestBody {
     {{#each properties}}
 
     @IsNotEmpty()
-    {{name.camelCase}}: {{type.script}};
+    public {{name.camelCase}}: {{type.script}};
     {{/each}}
     {{else}}
 

src/console/templates/service.hbs

@@ -2,7 +2,7 @@
 import * as Bookshelf from 'bookshelf';
 {{/if}}
 import { inject, named } from 'inversify';
-import { Types, Core, Targets } from '../../{{deepness}}constants';
+import { Types, Core } from '../../{{deepness}}constants';
 import { Logger as LoggerType } from '../../{{deepness}}core/Logger';
 {{#if isResourceTemplate}}
 import { Validate, Request } from '../../{{deepness}}core/api/Validate';
@@ -18,8 +18,7 @@ export class {{name.capitalize}}Service {
 
     public log: LoggerType;
 
-    {{#if isResourceTemplate}}
-    constructor(
+    {{#if isResourceTemplate}}constructor(
         @inject(Types.Repository) @named(Targets.Repository.{{name.capitalize}}Repository) public {{name.camelCase}}Repo: {{name.capitalize}}Repository,
         @inject(Types.Core) @named(Core.Logger) public Logger: typeof LoggerType
     ) {
@@ -71,7 +70,7 @@ export class {{name.capitalize}}Service {
     }
     {{else}}
     constructor(
-        @inject(Types.Core) @named(Core.Logger) public Logger: typeof Log
+        @inject(Types.Core) @named(Core.Logger) public Logger: typeof LoggerType
     ) {
         this.log = new Logger(__filename);
     }