Fix console commands with knex

Author: hirsch88

knexfile.ts

@@ -4,14 +4,4 @@ require('dotenv').config();
  * This is the database configuration for the migrations and
  * the seeders.
  */
-module.exports = {
-    client: process.env.DB_CLIENT,
-    connection: process.env.DB_CONNECTION,
-    migrations: {
-        directory: process.env.DB_MIGRATION_DIR,
-        tableName: process.env.DB_MIGRATION_TABLE
-    },
-    seeds: {
-        directory: process.env.DB_SEEDS_DIR
-    }
-};
+module.exports = require('./src/config/Database').DatabaseConfig;

package.json

@@ -19,9 +19,9 @@
     "db:migrate:rollback": "npm run banner rollback && \"./node_modules/.bin/knex\" migrate:rollback",
     "db:seed": "npm run banner seed && \"./node_modules/.bin/knex\" seed:run",
     "db:reset": "npm run console db:reset",
-    "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",
+    "console": "npm run ts-node:fast -- ./src/console/lib/console.ts",
+    "console:dev": "npm run ts-node -- ./src/console/lib/console.ts",
+    "console:help": "npm run ts-node:fast -- ./src/console/lib/console.ts --help",
     "lint": "./node_modules/.bin/tslint -c ./tslint.json -p tsconfig.json 'src/**/*.ts' --format stylish",
     "transpile": "./node_modules/.bin/tsc",
     "clean": "npm run banner clean && npm run clean:dist",

src/config/Database.ts

@@ -12,14 +12,23 @@ import * as knex from 'knex';
 import * as bookshelf from 'bookshelf';
 
 
-export const Knex = (): knex => knex({
+export const DatabaseConfig = {
     client: process.env.DB_CLIENT,
     connection: process.env.DB_CONNECTION,
     pool: {
         min: parseInt(process.env.DB_POOL_MIN, 10),
         max: parseInt(process.env.DB_POOL_MAX, 10)
+    },
+    migrations: {
+        directory: process.env.DB_MIGRATION_DIR,
+        tableName: process.env.DB_MIGRATION_TABLE
+    },
+    seeds: {
+        directory: process.env.DB_SEEDS_DIR
     }
-});
+};
+
+export const Knex = (): knex => knex(DatabaseConfig);
 
 export const Bookshelf: bookshelf = bookshelf(Knex() as any);
 Bookshelf.plugin(['bookshelf-camelcase']);

src/console/DatabaseResetCommand.ts

@@ -2,7 +2,7 @@ import { Logger } from '../core/Logger';
 
 import * as Knex from 'knex';
 import { AbstractCommand } from './lib/AbstractCommand';
-import * as options from './../../knexfile';
+import { DatabaseConfig } from '../config/Database';
 
 const log = new Logger(__filename);
 
@@ -20,7 +20,7 @@ export class DatabaseResetCommand extends AbstractCommand {
     public static description = 'Reverse all current migrations and migrate to latest.';
 
     public async run(): Promise<void> {
-        const knex = Knex(options as Knex.Config);
+        const knex = Knex(DatabaseConfig as Knex.Config);
 
         const migrate: any = knex.migrate;
 

src/console/MakeResourceCommand.ts

@@ -3,7 +3,7 @@
  * -------------------------------------
  *
  */
-import { askFileName, askProperties } from './lib/utils';
+import { askProperties } from './lib/utils';
 import { AbstractMakeCommand } from './lib/AbstractMakeCommand';
 import { MakeModelCommand } from './MakeModelCommand';
 import { MakeRepoCommand } from './MakeRepoCommand';

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

@@ -46,14 +46,16 @@ figlet('console', (error: any, data: any) => {
         const keys = commands.map(c => c.command);
         const key = process.argv[2];
 
-        if (keys.indexOf(key) < 0) {
+        if (keys.indexOf(key) < 0 && key !== '--help') {
             console.log(chalk.red('➜ ') + chalk.bold(`Command ${key} was not found!`));
             console.log();
             return;
         }
 
-        console.log(chalk.green('➜ ') + chalk.bold(key));
-        console.log();
+        if (key !== '--help') {
+            console.log(chalk.green('➜ ') + chalk.bold(key));
+            console.log();
+        }
 
         commands.forEach((c) => {
             commander

tsconfig.json

@@ -34,5 +34,8 @@
     },
     "include": [
         "src/**/*"
+    ],
+    "exclude": [
+        "knexfile.ts"
     ]
 }