Urgent fixes (#25)

* changed the default grouping logic for command listing

* change dev-server commands to build and dev

* now a command can wait if it doesnt accept true as the return value.

Author: vinayak25

lib/config/command.ts

@@ -13,7 +13,7 @@ export class ViewConfigCommand {
   @Command('config:view {namespace}', {
     desc: 'Command to view config for a given namespace',
   })
-  async handle(_cli: ConsoleIO): Promise<void> {
+  async handle(_cli: ConsoleIO): Promise<boolean> {
     const namespace = _cli.argument<string>('namespace');
     const config = this.config.get(namespace);
     if (!config) {
@@ -31,6 +31,6 @@ export class ViewConfigCommand {
     // eslint-disable-next-line no-console
     console.log(printRows.join('\n'));
 
-    process.exit();
+    return true;
   }
 }

lib/console/commands/listCommands.ts

@@ -11,7 +11,7 @@ import { CommandMeta } from '../metadata';
 @Injectable()
 @Command('list', { desc: 'Command to list all the commands' })
 export class ListCommands {
-  public async handle(): Promise<void> {
+  public async handle(): Promise<boolean> {
     const commands = CommandMeta.getAllCommands();
 
     const list = [];
@@ -29,7 +29,9 @@ export class ListCommands {
     const formattedRows = columnify(list, { padStart: 2 });
     const groups = {};
     for (const row of formattedRows) {
-      const group = Str.before(row[0], ':').trim();
+      const group = Str.contains(row[0], ':')
+        ? Str.before(row[0], ':').trim()
+        : '#';
       if (groups[group]) {
         groups[group].push(row);
       } else {
@@ -60,8 +62,7 @@ export class ListCommands {
     );
     console.log();
     console.log(printRows.join('\n'));
-    console.log();
 
-    process.exit();
+    return true;
   }
 }

lib/console/interfaces/index.ts

@@ -6,7 +6,7 @@ export interface CommandMetaOptions {
 }
 
 export interface CommandObject extends ArgumentParserOutput {
-  target: (cli: ConsoleIO) => Promise<void>;
+  target: (cli: ConsoleIO) => Promise<void | boolean>;
   expression: string;
   meta: CommandMetaOptions;
 }

lib/console/runner.ts

@@ -42,7 +42,9 @@ export class CommandRunner {
       console.log(_cli);
     }
 
-    await command.target(_cli);
+    const returnFromCommand = await command.target(_cli);
+    returnFromCommand && process.exit(1);
+
     return;
   }
 

lib/database/commands/migrations.ts

@@ -11,7 +11,7 @@ export class DbOperationsCommand {
   @Command('migrate:status {--connection==}', {
     desc: 'Command to show the status of all migrations',
   })
-  async migrateStatus(_cli: ConsoleIO): Promise<void> {
+  async migrateStatus(_cli: ConsoleIO): Promise<void | boolean> {
     const options = ObjectionService.config;
 
     const conn = _cli.option<string>('connection') || options.default;
@@ -31,13 +31,13 @@ export class DbOperationsCommand {
     }
 
     _cli.table(['Migration', 'Status'], statusList);
-    process.exit();
+    return true;
   }
 
   @Command('migrate {--connection==}', {
     desc: 'Command to run the pending migrations',
   })
-  async migrationUp(_cli: ConsoleIO): Promise<void> {
+  async migrationUp(_cli: ConsoleIO): Promise<void | boolean> {
     const options = ObjectionService.config;
     const conn = _cli.option<string>('connection') || options.default;
     const knex = ObjectionService.connection(conn);
@@ -49,21 +49,21 @@ export class DbOperationsCommand {
 
     if (migrations.length === 0) {
       _cli.info('No migrations to run');
-      process.exit();
+      return true;
     }
 
     _cli.info(`Batch Number: ${batch}`);
     for (const migration of migrations) {
       _cli.success(migration);
     }
 
-    process.exit();
+    return true;
   }
 
   @Command('migrate:rollback {--connection==}', {
     desc: 'Command to rollback the previous batch of migrations',
   })
-  async migrateRollback(_cli: ConsoleIO) {
+  async migrateRollback(_cli: ConsoleIO): Promise<void | boolean> {
     const options = ObjectionService.config;
     const conn = _cli.option<string>('connection') || options.default;
     const knex = ObjectionService.connection(conn);
@@ -75,21 +75,21 @@ export class DbOperationsCommand {
 
     if (migrations.length === 0) {
       _cli.info('No migrations to rollback. Already at the base migration');
-      process.exit();
+      return true;
     }
 
     _cli.info(`Reverted Batch: ${batch}`);
     for (const migration of migrations) {
       _cli.success(migration);
     }
 
-    process.exit();
+    return true;
   }
 
   @Command('migrate:reset {--connection==}', {
     desc: 'Command to reset the migration',
   })
-  async migrateReset(_cli: ConsoleIO) {
+  async migrateReset(_cli: ConsoleIO): Promise<boolean> {
     const options = ObjectionService.config;
     const conn = _cli.option<string>('connection') || options.default;
     const knex = ObjectionService.connection(conn);
@@ -101,7 +101,7 @@ export class DbOperationsCommand {
 
     if (!confirm) {
       _cli.info('Thank you! Exiting...');
-      process.exit();
+      return true;
     }
 
     const password = await _cli.password(
@@ -112,7 +112,7 @@ export class DbOperationsCommand {
       const conPassword = connConfig.connection?.['password'];
       if (conPassword && password !== conPassword) {
         _cli.error(' Wrong Password. Exiting... ');
-        process.exit();
+        return true;
       }
     }
 
@@ -122,21 +122,21 @@ export class DbOperationsCommand {
 
     if (migrations.length === 0) {
       _cli.info('No migrations to rollback. Already at the base migration');
-      process.exit();
+      return true;
     }
 
     _cli.info('Rollback of following migrations are done:');
     for (const migration of migrations) {
       _cli.success(migration);
     }
 
-    process.exit();
+    return true;
   }
 
   @Command('make:migration {name} {--connection=}', {
     desc: 'Command to create a new migration',
   })
-  async makeMigration(_cli: ConsoleIO) {
+  async makeMigration(_cli: ConsoleIO): Promise<boolean> {
     const options = ObjectionService.config;
     const name = _cli.argument<string>('name');
     const conn = _cli.option<string>('connection') || options.default;
@@ -150,6 +150,6 @@ export class DbOperationsCommand {
 
     const paths = res.split('/');
     _cli.success(paths[paths.length - 1]);
-    process.exit();
+    return true;
   }
 }

lib/dev-server/build.ts

@@ -3,7 +3,7 @@ import { getTime, Package } from '../utils';
 import pc from 'picocolors';
 
 @Command(
-  `server:build
+  `build
   {--c|config : Path to the .intentrc file.}
   {--t|tsconfig : Path to tsconfig file.}
   {--d|debug : Run in debug mode (with --inspect flag).}

lib/dev-server/serve.ts

@@ -2,7 +2,7 @@ import { Command, ConsoleIO } from '../console';
 import { Package } from '../utils';
 
 @Command(
-  `server:dev
+  `dev
   {--config : Path to intent.config.json file}
   {--debug : Start debug mode in the server}
 `,