millas 0.2.29 → 0.2.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "millas",
-  "version": "0.2.29",
+  "version": "0.2.31",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
   "exports": {

package/src/cli.js

@@ -31,10 +31,28 @@ program.configureHelp({
   sortOptions: true,
 });
 
-// Handle --debug flag globally
-program.hook('preAction', (thisCommand) => {
+// Handle --debug flag globally and boot app before any command runs
+program.hook('preAction', async (thisCommand) => {
   if (thisCommand.opts().debug) {
-    process.env.DEBUG = 'true';
+    process.env.APP_DEBUG = 'true';
+  }
+
+  if (context.isMillasProject()) {
+    const bootstrapPath = require('path').join(context.cwd, 'bootstrap/app.js');
+    if (require('fs').existsSync(bootstrapPath)) {
+      await require(bootstrapPath);
+    }
+  }
+});
+
+// Close DB connection pool after CLI command finishes
+program.hook('postAction', async () => {
+  try {
+
+    const DatabaseManager = require('./orm/drivers/DatabaseManager');
+    await DatabaseManager.closeAll();
+  } catch(e) {
+    console.log(e)
   }
 });
 
@@ -56,6 +74,7 @@ async function bootstrap() {
 
   // Auto-discover user-defined commands (if inside a Millas project)
   if (context.isMillasProject()) {
+
     await registry.discoverUserCommands();
   }
 }

package/src/commands/{createsuperuser.js → admin.js}

@@ -1,12 +1,12 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
 const path = require('path');
 const fs = require('fs-extra');
-const readline = require('readline');
 const Hasher = require('../auth/Hasher');
+const Command = require("../console/Command");
+const DB = require("../facades/DB");
 
-class CreateSuperUserCommand extends BaseCommand {
+class AdminCommand extends Command {
   static description = 'Manage superusers and admin accounts';
 
   async onInit(register) {
@@ -14,14 +14,15 @@ class CreateSuperUserCommand extends BaseCommand {
       .command(async (email, name, noinput) => {
         const { User } = await this.#resolveUserModel();
 
-        this.logger.log(this.style.info('\n  Create Millas Superuser\n'));
+        this.info('Create Millas Superuser');
+        this.newLine()
 
         // Email
-        if (!email) email = await this.#prompt('  Email address: ');
-        email = (email || '').trim().toLowerCase();
-        if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-          throw new Error('Enter a valid email address.');
-        }
+        if (!email) email = await this.ask('Email address:', null, v => {
+          const t = v.trim().toLowerCase();
+          return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t) || 'Enter a valid email address.';
+        });
+        email = email.trim().toLowerCase();
 
         const existing = await User.findBy('email', email);
         if (existing) {
@@ -32,10 +33,8 @@ class CreateSuperUserCommand extends BaseCommand {
           );
         }
 
-        // Name
-        if (!name && !noinput) {
-          name = await this.#prompt('  Display name (optional, press Enter to skip): ');
-        }
+        if (!name && !noinput)
+          name = await this.ask('Display name (optional):', email.split('@')[0]);
         name = (name || '').trim() || email.split('@')[0];
 
         // Password
@@ -46,13 +45,9 @@ class CreateSuperUserCommand extends BaseCommand {
             throw new Error('--noinput requires ADMIN_PASSWORD to be set in the environment.');
           }
         } else {
-          plainPassword = await this.#promptPassword('  Password: ');
-          const confirm = await this.#promptPassword('  Password (again): ');
-          if (plainPassword !== confirm) throw new Error('Passwords do not match.');
+          plainPassword = await this.#promptPasswordWithBypass('Password:');
         }
 
-        this.#validatePassword(plainPassword);
-
         const hash = await Hasher.make(plainPassword);
 
         await User.create({
@@ -77,18 +72,18 @@ class CreateSuperUserCommand extends BaseCommand {
       .command(async (email) => {
         const { User } = await this.#resolveUserModel();
 
-        if (!email) email = await this.#prompt('\n  Email address: ');
-        email = (email || '').trim().toLowerCase();
+        if (!email) email = await this.ask('Email address:', null, v =>
+          /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v.trim()) || 'Enter a valid email address.'
+        );
+        email = email.trim().toLowerCase();
 
         const user = await User.findBy('email', email);
         if (!user) throw new Error(`No user found with email "${email}".`);
 
-        this.logger.log(this.style.info(`\n  Changing password for: ${user.email}\n`));
+        this.info(`Changing password for: ${user.email}`);
+        this.newLine();
 
-        const plain = await this.#promptPassword('  New password: ');
-        const confirm = await this.#promptPassword('  New password (again): ');
-        if (plain !== confirm) throw new Error('Passwords do not match.');
-        this.#validatePassword(plain);
+        const plain = await this.#promptPasswordWithBypass('New password:');
 
         const hash = await Hasher.make(plain);
 
@@ -101,7 +96,7 @@ class CreateSuperUserCommand extends BaseCommand {
       })
       .name('changepassword')
       .str('[email]', v => v.email().optional(), 'Email address of the user')
-      .description("Change a user's password in the users table");
+      .description("Change a user's password in the users table")
 
     register
       .command(async () => {
@@ -131,21 +126,27 @@ class CreateSuperUserCommand extends BaseCommand {
       .description('List all staff/superusers from the users table');
   }
 
-  async #resolveUserModel() {
-    const configPath = path.join(this.cwd, 'config/database.js');
-    if (!fs.existsSync(configPath)) {
-      throw new Error('config/database.js not found. Are you inside a Millas project?');
+    async after(...args) {
+        await DB.closeAll()
     }
 
-    const dbConfig = require(configPath);
-    let DatabaseManager;
-    try {
-      DatabaseManager = require(path.join(this.cwd, 'node_modules/millas/src/orm/drivers/DatabaseManager'));
-    } catch {
-      DatabaseManager = require('../orm/drivers/DatabaseManager');
+    async #promptPasswordWithBypass(question) {
+    while (true) {
+      const pw = await this.secret(question, {
+        confirm: { message: `${question.replace(':', '')} (again):`, error: 'Passwords do not match.', retry: true },
+      });
+
+      if (pw.length >= 8) return pw;
+
+      this.warn('This password is too short. It must contain at least 8 characters.');
+      const bypass = await this.confirm('Bypass password validation and create user anyway?', false);
+      if (bypass) return pw;
     }
-    DatabaseManager.configure(dbConfig);
-    const db = DatabaseManager.connection();
+  }
+
+  async #resolveUserModel() {  
+
+      const db = DB.connection()
 
     let User;
     let authUserName = null;
@@ -192,30 +193,6 @@ class CreateSuperUserCommand extends BaseCommand {
     return { User, db };
   }
 
-  #validatePassword(pw) {
-    if (!pw || pw.length < 8) {
-      throw new Error('This password is too short. It must contain at least 8 characters.');
-    }
-  }
-
-  #prompt(question) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise(resolve => rl.question(question, ans => { rl.close(); resolve(ans); }));
-  }
-
-  #promptPassword(question) {
-    return new Promise(resolve => {
-      if (!process.stdin.isTTY) return this.#prompt(question).then(resolve);
-
-      process.stdout.write(question);
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: new (require('stream').Writable)({ write(c, e, cb) { cb(); } }),
-        terminal: true,
-      });
-      rl.question('', ans => { rl.close(); process.stdout.write('\n'); resolve(ans); });
-    });
-  }
 }
 
-module.exports = CreateSuperUserCommand;
+module.exports = AdminCommand;

package/src/commands/key.js

@@ -1,18 +1,18 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const fs = require('fs');
 const path = require('path');
 
-class KeyCommand extends BaseCommand {
+class KeyCommand extends Command {
   static description = 'Manage application encryption keys';
 
   async onInit(register) {
     register
       .command(this.generate)
-      .arg('--show', 'Print the key without writing to .env')
-      .arg('--force', 'Overwrite existing APP_KEY without confirmation')
-      .arg('--cipher', v=>v.string(),'Cipher to use (default: AES-256-CBC)')
+      .bool('show', 'Print the key without writing to .env')
+      .bool('force', 'Overwrite existing APP_KEY without confirmation')
+      .str('--cipher', v => v.optional(), 'Cipher to use (default: AES-256-CBC)')
       .description('Generate a new application key and write it to .env');
   }
 
@@ -27,7 +27,7 @@ class KeyCommand extends BaseCommand {
     }
 
     if (show) {
-      this.logger.log('\n  ' + this.style.info(key) + '\n');
+      this.info(key);
       return;
     }
 
@@ -35,7 +35,7 @@ class KeyCommand extends BaseCommand {
 
     if (!fs.existsSync(envPath)) {
       this.error('.env file not found.');
-      this.logger.error(this.style.muted('     Run: millas new <project>  or create a .env file first.\n\n'));
+      this.error(this.style.muted('Run: millas new <project>  or create a .env file first.\n\n'));
       throw new Error('.env file not found');
     }
 
@@ -45,16 +45,9 @@ class KeyCommand extends BaseCommand {
     const hasValue = existing && existing[1] && existing[1].trim() !== '';
 
     if (hasValue && !force) {
-      const readline = require('readline');
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      const answer = await new Promise(resolve => {
-        rl.question(
-          this.style.warning('\n  ⚠  APP_KEY already set. Overwrite? (y/N) '),
-          ans => { rl.close(); resolve(ans); }
-        );
-      });
-      if ((answer || '').trim().toLowerCase() !== 'y') {
-        this.logger.log(this.style.muted('\n  Key not changed.\n'));
+      const ok = await this.confirm('APP_KEY already set. Overwrite?', false);
+      if (!ok) {
+        this.comment('Key not changed.');
         return;
       }
     }
@@ -68,7 +61,7 @@ class KeyCommand extends BaseCommand {
     fs.writeFileSync(envPath, envContent, 'utf8');
 
     this.success('Application key set.');
-    this.logger.log('  ' + this.style.muted('APP_KEY=') + this.style.info(key) + '\n');
+    this.comment(this.style.muted('APP_KEY=') + this.style.info(key));
   }
 }
 

package/src/commands/lang.js

@@ -1,32 +1,31 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const path = require('path');
 const fs = require('fs');
-const {string} = require("../core/validation");
 
 const DEFAULT_NS = 'messages';
 
-class LangCommand extends BaseCommand {
+class LangCommand extends Command {
   static description = 'Manage application translations';
 
   async onInit(register) {
     register
       .command(this.publish)
-      .arg('locale', 'Target locale (e.g., sw, fr)')
-      .arg('namespace',v=>v.string(),  'Specific namespace to publish')
-      .arg('--defaults', 'Include built-in Millas framework strings')
-      .arg('--fresh', 'Clear namespace files and rebuild from scratch')
-      .arg('--all', 'Publish to every locale in lang/')
-      .arg('--list', 'List available locales and exit')
-      .arg('--dry-run', 'Preview changes without writing')
-      .arg('--format',v=>v.string(), 'File format: js or json (default: js)')
-      .arg('--src',v=>v.string(), 'Extra directory to scan')
+      .str('[locale]', 'Target locale (e.g., sw, fr)')
+      .str('[namespace]', 'Specific namespace to publish')
+      .bool('defaults', 'Include built-in Millas framework strings')
+      .bool('fresh', 'Clear namespace files and rebuild from scratch')
+      .bool('all', 'Publish to every locale in lang/')
+      .bool('list', 'List available locales and exit')
+      .bool('dry-run', 'Preview changes without writing')
+      .str('[--format]', 'File format: js or json (default: js)')
+      .str('[--src]', 'Extra directory to scan')
       .description('Extract _() strings from app/ and write to lang/<locale>/<namespace>.js');
 
     register
       .command(this.missing)
-      .arg('locale', 'Target locale to check')
+      .str('[locale]', 'Target locale to check')
       .description('Show untranslated keys in locale files');
 
     register
@@ -35,7 +34,8 @@ class LangCommand extends BaseCommand {
 
     register
       .command(this.keys)
-      .arg('--src',v=>v.string(), 'Extra directory to scan')
+      .str('[--src]', 'Extra directory to scan')
+      .bool('ns', 'Group by namespace')
       .description('List all _() keys found in source files, grouped by namespace');
   }
 

package/src/commands/make.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const path = require('path');
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const SchematicEngine = require('../schematics/SchematicEngine');
 
-class MakeCommand extends BaseCommand {
+class MakeCommand extends Command {
   static description = 'Generate application scaffolding';
 
   #engine = new SchematicEngine(path.join(__dirname, '../templates'));
@@ -16,9 +16,9 @@ class MakeCommand extends BaseCommand {
         this.success(`Created: ${result.path}`);
       })
       .name('controller')
-      .arg('name')
-      .arg('--resource')
-      .arg('--model', v => v.string())
+      .str('name')
+      .str('--resource')
+      .str('--model')
       .description('Generate a new controller');
 
     register

package/src/commands/migrate.js

@@ -2,10 +2,10 @@
 
 const path = require('path');
 const fs = require('fs-extra');
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const DB = require('../facades/DB');
 
-class MigrateCommand extends BaseCommand {
+class MigrateCommand extends Command {
   static description = 'Database migration commands';
   static namespace = 'db';
 

package/src/commands/new.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const fs = require('fs-extra');
 const path = require('path');
 const ora = require('ora');
 const { generateProject } = require('../scaffold/generator');
 
-class NewCommand extends BaseCommand {
+class NewCommand extends Command {
   static description = 'Create a new Millas project';
 
   async onInit(register) {

package/src/commands/route.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 
-class RouteCommand extends BaseCommand {
+class RouteCommand extends Command {
   static description = 'Manage application routes';
 
   async onInit(register) {

package/src/commands/schedule.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 
-class ScheduleCommand extends BaseCommand {
+class ScheduleCommand extends Command {
   static description = 'Manage scheduled tasks';
 
   async onInit(register) {

package/src/commands/serve.js

@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const { fork } = require('child_process');
 const chokidar = require('chokidar');
-const BaseCommand = require('../console/BaseCommand');
+const Command = require('../console/Command');
 const patchConsole = require('../logger/patchConsole');
 const Logger = require('../logger/internal');
 
@@ -46,6 +46,7 @@ class HotReloader {
         ...process.env,
         ...extra,
         MILLAS_CHILD: '1',
+        MILLAS_CLI_MODE: true,
       },
       stdio: 'inherit',
     });
@@ -136,7 +137,7 @@ class HotReloader {
   }
 }
 
-class ServeCommand extends BaseCommand {
+class ServeCommand extends Command {
   static description = 'Start the development server with hot reload';
 
   async onInit(register) {

package/src/console/BaseCommand.js

@@ -47,8 +47,13 @@ const v = require("../core/validation");
  * Base class for all CLI commands
  */
 class BaseCommand extends AppCommand {
-  static command = '';
-  static namespace = ''; // Override to set custom namespace
+  static namespace = ''; // Override to set a fixed command name
+
+   /**
+   * Short description shown in `millas --help` and `millas list`.
+   *
+   * @type {string}
+   */
   static description = '';
   static aliases = [];
   static options = [];
@@ -68,20 +73,15 @@ class BaseCommand extends AppCommand {
   }
 
   /**
-   * Auto-derive command name from class name
-   * Supports CamelCase, underscores, and hyphens
+   * Derive command name from filename (set by CommandRegistry).
+   * Override with `static namespace = 'name'` to use a fixed name.
    */
   static getCommandName() {
-    // Use custom namespace if provided
     if (this.namespace) return this.namespace;
-    if (this.command) return this.command;
-    
-    const className = this.name.replace(/Command$/i, '');
-    if (!className) {
-      throw new Error(`Cannot derive command name from class ${this.name}`);
-    }
-    
-    return className
+
+    if (!this._filenameHint) throw new Error(`Cannot derive command name for ${this.name} — no filename hint set.`);
+
+    return this._filenameHint
       .replace(/[-_]/g, ':')
       .replace(/([A-Z]+)([A-Z][a-z])/g, '$1:$2')
       .replace(/([a-z\d])([A-Z])/g, '$1:$2')
@@ -104,6 +104,8 @@ class BaseCommand extends AppCommand {
    * Calls onInit() for subcommands or registerSimpleCommand() for simple commands
    */
   async register() {
+    // Expose filename to static getCommandName()
+    if (this._filename) this.constructor._filenameHint = this._filename;
     const commandName = this.constructor.getCommandName();
     const subcommands = this.getSubcommands();
 
@@ -230,22 +232,68 @@ class BaseCommand extends AppCommand {
     
     process.exitCode = 1;
   }
-
+/**
+   * Success message (green ✔).
+   * @param {string} message
+   */
   success(message) {
     this.logger.log(this.style.success(`\n  ✔ ${message}\n`));
   }
-
+  /**
+   * Informational message (cyan).
+   * @param {string} message
+   */
   info(message) {
     this.logger.log(this.style.info(`  ${message}`));
   }
-
+/**
+   * Warning message (yellow ⚠).
+   * @param {string} message
+   */
   warn(message) {
     this.logger.log(this.style.warning(`  ⚠ ${message}`));
   }
-
+/**
+   * Error message (red ✖). Does NOT exit — use fail() to exit.
+   * @param {string} message
+   */
   error(message) {
     this.logger.error(this.style.danger(`  ✖ ${message}`));
   }
+
+  /**
+   * Write a plain line to stdout.
+   * @param {string} [msg='']
+   */
+  line(msg = '') {
+    process.stdout.write(msg + '\n');
+  }
+
+  /**
+   * Write a blank line.
+   */
+  newLine() {
+    process.stdout.write('\n');
+  }
+
+
+
+
+  /**
+   * Dimmed / comment message.
+   * @param {string} msg
+   */
+  comment(msg) {
+    this.line(chalk.dim(`// ${msg}`));
+  }
+    /**
+   * Print an error and exit with code 1.
+   * @param {string} msg
+   */
+  fail(msg) {
+    this.error(msg);
+    process.exit(1);
+  }
 }
 
 /**
@@ -330,9 +378,13 @@ class CommandRegistrar {
     }
 
     const isFlag = name.startsWith('--') || name.startsWith('-');
-    const cleanName = name.replace(/^--?/, '').replace(/^\[|\]$/g, '');
-    let validator = null;
+    const isOptional = /^\[.*\]$/.test(name);
+    const cleanName = name
+    .replace(/^--?/, '')
+    .replace(/^\[|]$/g, '');let validator = null;
     let desc = description;
+
+
     
     if (typeof validatorOrDescription === 'string') {
       desc = validatorOrDescription;
@@ -346,6 +398,9 @@ class CommandRegistrar {
         desc = cleanName.charAt(0).toUpperCase() + cleanName.slice(1);
       }
     }
+     if (isOptional && validator && typeof validator.optional === 'function') {
+    validator = validator.optional();
+  }
     
     this.lastCommand.args.push({
       name: cleanName,