millas 0.1.7 → 0.1.9

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "millas",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
   "exports": {
-    ".":        "./src/index.js",
-    "./src":    "./src/index.js",
-    "./src/*":  "./src/*.js",
-    "./bin/*":  "./bin/*.js"
+    ".": "./src/index.js",
+    "./src": "./src/index.js",
+    "./src/*": "./src/*.js",
+    "./bin/*": "./bin/*.js"
   },
   "bin": {
     "millas": "./bin/millas.js"
@@ -16,9 +16,20 @@
     "test": "echo \"Run phase-specific tests in tests/\""
   },
   "keywords": [
-    "framework", "express", "orm", "cli", "auth",
-    "queue", "cache", "admin", "mail", "events",
-    "laravel", "django", "fastapi", "millas"
+    "framework",
+    "express",
+    "orm",
+    "cli",
+    "auth",
+    "queue",
+    "cache",
+    "admin",
+    "mail",
+    "events",
+    "laravel",
+    "django",
+    "fastapi",
+    "millas"
   ],
   "author": "Millas Framework",
   "license": "MIT",
@@ -26,22 +37,24 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "bcryptjs":    "3.0.2",
-    "chalk":       "4.1.2",
-    "commander":   "^11.0.0",
-    "fs-extra":    "^11.0.0",
-    "inquirer":    "8.2.6",
-    "jsonwebtoken":"^9.0.3",
-    "knex":        "^3.1.0",
-    "nodemailer":  "^6.9.0",
-    "nunjucks":    "^3.2.4",
-    "ora":         "5.4.1"
+    "bcryptjs": "3.0.2",
+    "chalk": "4.1.2",
+    "commander": "^11.0.0",
+    "fs-extra": "^11.0.0",
+    "inquirer": "8.2.6",
+    "jsonwebtoken": "^9.0.3",
+    "knex": "^3.1.0",
+    "nodemailer": "^6.9.0",
+    "nunjucks": "^3.2.4",
+    "ora": "5.4.1"
   },
   "peerDependencies": {
     "express": "^4.18.0"
   },
   "peerDependenciesMeta": {
-    "express": { "optional": false }
+    "express": {
+      "optional": false
+    }
   },
   "files": [
     "bin/",

package/src/commands/migrate.js

@@ -6,133 +6,185 @@ const fs    = require('fs-extra');
 
 module.exports = function (program) {
 
+  // ── makemigrations ────────────────────────────────────────────────────────
+
   program
     .command('makemigrations')
-    .description('Detect model changes and generate migration files')
+    .description('Scan model files, detect schema changes, generate migration files')
     .action(async () => {
-      const ctx = getProjectContext();
-      const ModelInspector = require('../orm/migration/ModelInspector');
-      const inspector = new ModelInspector(
-        ctx.modelsPath,
-        ctx.migrationsPath,
-        ctx.snapshotPath
-      );
-      const result = await inspector.makeMigrations();
-      if (result.files.length === 0) {
-        console.log(chalk.yellow(`\n  ${result.message}\n`));
-      } else {
-        console.log(chalk.green(`\n  ✔  ${result.message}`));
-        result.files.forEach(f => console.log(chalk.cyan(`     + ${f}`)));
-        console.log();
+      try {
+        const ctx       = getProjectContext();
+        // Fixed: was incorrectly destructured as { ModelInspector }
+        const ModelInspector = require('../orm/migration/ModelInspector');
+        const inspector = new ModelInspector(
+          ctx.modelsPath,
+          ctx.migrationsPath,
+          ctx.snapshotPath,
+        );
+        const result = await inspector.makeMigrations();
+
+        if (result.files.length === 0) {
+          console.log(chalk.yellow(`\n  ${result.message}\n`));
+        } else {
+          console.log(chalk.green(`\n  ✔  ${result.message}`));
+          result.files.forEach(f => console.log(chalk.cyan(`     + ${f}`)));
+          console.log(chalk.gray('\n  Run: millas migrate   to apply these migrations.\n'));
+        }
+      } catch (err) {
+        console.error(chalk.red(`\n  ✖  makemigrations failed: ${err.message}\n`));
+        if (process.env.DEBUG) console.error(err.stack);
+        process.exit(1);
       }
     });
 
+  // ── migrate ───────────────────────────────────────────────────────────────
+
   program
     .command('migrate')
     .description('Run all pending migrations')
     .action(async () => {
-      const runner = await getRunner();
-      const result = await runner.migrate();
-      printMigrationResult(result, 'Ran');
+      try {
+        const runner = await getRunner();
+        const result = await runner.migrate();
+        printResult(result, 'Ran');
+      } catch (err) {
+        bail('migrate', err);
+      }
     });
 
+  // ── migrate:fresh ─────────────────────────────────────────────────────────
+
   program
     .command('migrate:fresh')
-    .description('Drop all tables and re-run all migrations')
+    .description('Drop ALL tables then re-run every migration from scratch')
     .action(async () => {
-      console.log(chalk.yellow('\n  ⚠  Dropping all tables...\n'));
-      const runner = await getRunner();
-      const result = await runner.fresh();
-      printMigrationResult(result, 'Ran');
+      try {
+        console.log(chalk.yellow('\n  ⚠  Dropping all tables…\n'));
+        const runner = await getRunner();
+        const result = await runner.fresh();
+        printResult(result, 'Ran');
+      } catch (err) {
+        bail('migrate:fresh', err);
+      }
     });
 
+  // ── migrate:rollback ──────────────────────────────────────────────────────
+
   program
     .command('migrate:rollback')
     .description('Rollback the last batch of migrations')
     .option('--steps <n>', 'Number of batches to rollback', '1')
     .action(async (options) => {
-      const runner = await getRunner();
-      const result = await runner.rollback(Number(options.steps));
-      printMigrationResult(result, 'Rolled back');
+      try {
+        const runner = await getRunner();
+        const result = await runner.rollback(Number(options.steps));
+        printResult(result, 'Rolled back');
+      } catch (err) {
+        bail('migrate:rollback', err);
+      }
     });
 
+  // ── migrate:reset ─────────────────────────────────────────────────────────
+
   program
     .command('migrate:reset')
-    .description('Rollback all migrations')
+    .description('Rollback ALL migrations')
     .action(async () => {
-      const runner = await getRunner();
-      const result = await runner.reset();
-      printMigrationResult(result, 'Rolled back');
+      try {
+        const runner = await getRunner();
+        const result = await runner.reset();
+        printResult(result, 'Rolled back');
+      } catch (err) {
+        bail('migrate:reset', err);
+      }
     });
 
+  // ── migrate:refresh ───────────────────────────────────────────────────────
+
   program
     .command('migrate:refresh')
-    .description('Rollback all and re-run all migrations')
+    .description('Rollback all then re-run all migrations')
     .action(async () => {
-      const runner = await getRunner();
-      const result = await runner.refresh();
-      printMigrationResult(result, 'Ran');
+      try {
+        const runner = await getRunner();
+        const result = await runner.refresh();
+        printResult(result, 'Ran');
+      } catch (err) {
+        bail('migrate:refresh', err);
+      }
     });
 
+  // ── migrate:status ────────────────────────────────────────────────────────
+
   program
     .command('migrate:status')
-    .description('Show the status of all migrations')
+    .description('Show the status of all migration files')
     .action(async () => {
-      const runner = await getRunner();
-      const rows   = await runner.status();
-
-      if (rows.length === 0) {
-        console.log(chalk.yellow('\n  No migration files found.\n'));
-        return;
-      }
-
-      const colW = Math.max(...rows.map(r => r.name.length)) + 2;
-      console.log(`\n  ${'Migration'.padEnd(colW)}  ${'Status'.padEnd(10)}  Batch`);
-      console.log(chalk.gray('  ' + '─'.repeat(colW + 20)));
-
-      for (const row of rows) {
-        const status = row.status === 'Ran'
-          ? chalk.green(row.status.padEnd(10))
-          : chalk.yellow(row.status.padEnd(10));
-        const batch = row.batch ? chalk.gray(String(row.batch)) : chalk.gray('—');
-        console.log(`  ${chalk.cyan(row.name.padEnd(colW))}  ${status}  ${batch}`);
+      try {
+        const runner = await getRunner();
+        const rows   = await runner.status();
+
+        if (rows.length === 0) {
+          console.log(chalk.yellow('\n  No migration files found.\n'));
+          return;
+        }
+
+        const colW = Math.max(...rows.map(r => r.name.length)) + 2;
+        console.log(`\n  ${'Migration'.padEnd(colW)}  ${'Status'.padEnd(10)}  Batch`);
+        console.log(chalk.gray('  ' + '─'.repeat(colW + 20)));
+
+        for (const row of rows) {
+          const status = row.status === 'Ran'
+            ? chalk.green(row.status.padEnd(10))
+            : chalk.yellow(row.status.padEnd(10));
+          const batch = row.batch ? chalk.gray(String(row.batch)) : chalk.gray('—');
+          console.log(`  ${chalk.cyan(row.name.padEnd(colW))}  ${status}  ${batch}`);
+        }
+        console.log();
+      } catch (err) {
+        bail('migrate:status', err);
       }
-      console.log();
     });
 
+  // ── db:seed ───────────────────────────────────────────────────────────────
+
   program
     .command('db:seed')
     .description('Run all database seeders')
     .action(async () => {
-      const ctx = getProjectContext();
-      const seedersDir = ctx.seedersPath;
+      try {
+        const ctx        = getProjectContext();
+        const seedersDir = ctx.seedersPath;
 
-      if (!fs.existsSync(seedersDir)) {
-        console.log(chalk.yellow('\n  No seeders directory found.\n'));
-        return;
-      }
+        if (!fs.existsSync(seedersDir)) {
+          console.log(chalk.yellow('\n  No seeders directory found.\n'));
+          return;
+        }
 
-      const files = fs.readdirSync(seedersDir)
-        .filter(f => f.endsWith('.js') && !f.startsWith('.'))
-        .sort();
+        const files = fs.readdirSync(seedersDir)
+          .filter(f => f.endsWith('.js') && !f.startsWith('.'))
+          .sort();
 
-      if (files.length === 0) {
-        console.log(chalk.yellow('\n  No seeder files found.\n'));
-        return;
-      }
+        if (files.length === 0) {
+          console.log(chalk.yellow('\n  No seeder files found.\n'));
+          return;
+        }
 
-      console.log();
-      for (const file of files) {
-        const seeder = require(path.join(seedersDir, file));
         const db = await getDbConnection();
-        await seeder.run(db);
-        console.log(chalk.green(`  ✔  Seeded: ${file}`));
+        console.log();
+        for (const file of files) {
+          const seeder = require(path.join(seedersDir, file));
+          await seeder.run(db);
+          console.log(chalk.green(`  ✔  Seeded: ${file}`));
+        }
+        console.log();
+      } catch (err) {
+        bail('db:seed', err);
       }
-      console.log();
     });
 };
 
-// ─── Helpers ─────────────────────────────────────────────────────────────────
+// ─── Helpers ──────────────────────────────────────────────────────────────────
 
 function getProjectContext() {
   const cwd = process.cwd();
@@ -149,26 +201,35 @@ async function getDbConnection() {
   if (!fs.existsSync(configPath + '.js')) {
     throw new Error('config/database.js not found. Are you inside a Millas project?');
   }
-  const config = require(configPath);
+  const config         = require(configPath);
   const DatabaseManager = require('../orm/drivers/DatabaseManager');
   DatabaseManager.configure(config);
   return DatabaseManager.connection();
 }
 
 async function getRunner() {
+  // Fixed: was incorrectly destructured as { MigrationRunner }
   const MigrationRunner = require('../orm/migration/MigrationRunner');
   const ctx = getProjectContext();
   const db  = await getDbConnection();
   return new MigrationRunner(db, ctx.migrationsPath);
 }
 
-function printMigrationResult(result, verb) {
+function printResult(result, verb) {
   const list = result.ran || result.rolledBack || [];
   if (list.length === 0) {
     console.log(chalk.yellow(`\n  ${result.message}\n`));
     return;
   }
   console.log(chalk.green(`\n  ✔  ${result.message}`));
-  list.forEach(f => console.log(chalk.cyan(`     ${verb === 'Ran' ? '+' : '-'} ${f}`)));
+  list.forEach(f =>
+    console.log(chalk.cyan(`     ${verb === 'Ran' ? '+' : '-'} ${f}`)),
+  );
   console.log();
 }
+
+function bail(cmd, err) {
+  console.error(chalk.red(`\n  ✖  ${cmd} failed: ${err.message}\n`));
+  if (process.env.DEBUG) console.error(err.stack);
+  process.exit(1);
+}

package/src/index.js

@@ -16,8 +16,13 @@ const ServiceProvider    = require('./providers/ServiceProvider');
 const ProviderRegistry   = require('./providers/ProviderRegistry');
 
 // ── ORM ───────────────────────────────────────────────────────────
-const { Model, fields, QueryBuilder, DatabaseManager,
-        SchemaBuilder, MigrationRunner, ModelInspector } = require('./orm');
+const {
+  Model, fields, QueryBuilder, DatabaseManager,
+  SchemaBuilder, MigrationRunner, ModelInspector,
+  Q, LookupParser,
+  Sum, Avg, Min, Max, Count, AggregateExpression,
+  HasOne, HasMany, BelongsTo, BelongsToMany,
+} = require('./orm');
 const DatabaseServiceProvider = require('./providers/DatabaseServiceProvider');
 
 // ── Auth ──────────────────────────────────────────────────────────
@@ -68,6 +73,9 @@ module.exports = {
   // ORM
   Model, fields, QueryBuilder, DatabaseManager, SchemaBuilder,
   MigrationRunner, ModelInspector, DatabaseServiceProvider,
+  Q, LookupParser,
+  Sum, Avg, Min, Max, Count, AggregateExpression,
+  HasOne, HasMany, BelongsTo, BelongsToMany,
   // Auth
   Auth, Hasher, JwtDriver, AuthMiddleware, RoleMiddleware,
   AuthController, AuthServiceProvider,

package/src/orm/index.js

@@ -3,12 +3,17 @@
 const Model           = require('./model/Model');
 const { fields }      = require('./fields');
 const QueryBuilder    = require('./query/QueryBuilder');
+const Q               = require('./query/Q');
+const { AggregateExpression, Sum, Avg, Min, Max, Count } = require('./query/Aggregates');
+const LookupParser    = require('./query/LookupParser');
 const DatabaseManager = require('./drivers/DatabaseManager');
 const SchemaBuilder   = require('./migration/SchemaBuilder');
 const MigrationRunner = require('./migration/MigrationRunner');
 const ModelInspector  = require('./migration/ModelInspector');
+const { HasOne, HasMany, BelongsTo, BelongsToMany } = require('./relations');
 
 module.exports = {
+  // Core
   Model,
   fields,
   QueryBuilder,
@@ -16,4 +21,18 @@ module.exports = {
   SchemaBuilder,
   MigrationRunner,
   ModelInspector,
+
+  // Query helpers
+  Q,
+  LookupParser,
+
+  // Aggregate expressions
+  Sum, Avg, Min, Max, Count,
+  AggregateExpression,
+
+  // Relations
+  HasOne,
+  HasMany,
+  BelongsTo,
+  BelongsToMany,
 };

package/src/orm/migration/MigrationRunner.js

@@ -7,19 +7,19 @@ const path = require('path');
  * MigrationRunner
  *
  * Handles the full migration lifecycle:
- *   - run pending migrations (migrate)
- *   - rollback last batch (migrate:rollback)
- *   - show status table (migrate:status)
- *   - drop all + re-run (migrate:fresh)
- *   - rollback all (migrate:reset)
- *   - rollback all + re-run (migrate:refresh)
+ *   - run pending migrations          (migrate)
+ *   - rollback last batch             (migrate:rollback)
+ *   - show status table               (migrate:status)
+ *   - drop all + re-run               (migrate:fresh)
+ *   - rollback all                    (migrate:reset)
+ *   - rollback all + re-run           (migrate:refresh)
  *
  * Migration history is tracked in the `millas_migrations` table.
  * Each migration file must export { up(db), down(db) }.
  */
 class MigrationRunner {
   /**
-   * @param {object} knexConn   — live knex connection
+   * @param {object} knexConn      — live knex connection
    * @param {string} migrationsPath — absolute path to migrations dir
    */
   constructor(knexConn, migrationsPath) {
@@ -29,9 +29,7 @@ class MigrationRunner {
 
   // ─── Public commands ──────────────────────────────────────────────────────
 
-  /**
-   * Run all pending migrations.
-   */
+  /** Run all pending migrations. */
   async migrate() {
     await this._ensureTable();
     const pending = await this._pending();
@@ -53,9 +51,7 @@ class MigrationRunner {
     return { ran, batch, message: `Ran ${ran.length} migration(s).` };
   }
 
-  /**
-   * Rollback the last batch of migrations.
-   */
+  /** Rollback the last batch of migrations. */
   async rollback(steps = 1) {
     await this._ensureTable();
     const batches = await this._lastBatches(steps);
@@ -66,7 +62,6 @@ class MigrationRunner {
 
     const rolledBack = [];
 
-    // Run in reverse order
     for (const row of [...batches].reverse()) {
       const migration = this._load(row.name);
       await migration.down(this._db);
@@ -77,18 +72,14 @@ class MigrationRunner {
     return { rolledBack, message: `Rolled back ${rolledBack.length} migration(s).` };
   }
 
-  /**
-   * Drop all tables and re-run every migration.
-   */
+  /** Drop all tables and re-run every migration. */
   async fresh() {
     await this._dropAllTables();
     await this._ensureTable();
     return this.migrate();
   }
 
-  /**
-   * Rollback ALL migrations.
-   */
+  /** Rollback ALL migrations. */
   async reset() {
     await this._ensureTable();
     const all = await this._db('millas_migrations').orderBy('id', 'desc');
@@ -108,17 +99,13 @@ class MigrationRunner {
     return { rolledBack, message: `Reset ${rolledBack.length} migration(s).` };
   }
 
-  /**
-   * Rollback all then re-run all.
-   */
+  /** Rollback all then re-run all. */
   async refresh() {
     await this.reset();
     return this.migrate();
   }
 
-  /**
-   * Return status of all migration files.
-   */
+  /** Return status of all migration files. */
   async status() {
     await this._ensureTable();
     const files = this._files();
@@ -127,7 +114,7 @@ class MigrationRunner {
     return files.map(file => ({
       name:   file,
       status: ran.has(file) ? 'Ran' : 'Pending',
-      batch:  ran.get ? ran.get(file) : null,
+      batch:  ran.get(file) || null,
     }));
   }
 
@@ -153,9 +140,7 @@ class MigrationRunner {
 
   async _ranNames() {
     const rows = await this._db('millas_migrations').select('name', 'batch');
-    const map  = new Map(rows.map(r => [r.name, r.batch]));
-    // Map with has() and get()
-    return map;
+    return new Map(rows.map(r => [r.name, r.batch]));
   }
 
   async _nextBatch() {
@@ -168,34 +153,39 @@ class MigrationRunner {
     if (!maxBatch?.max) return [];
 
     const fromBatch = maxBatch.max - steps + 1;
-    // Fetch all then filter in JS to avoid needing >= support in all drivers
     const all = await this._db('millas_migrations').orderBy('id', 'desc');
     return all.filter(r => r.batch >= fromBatch);
   }
 
+  /**
+   * Drop all user tables — dialect-aware.
+   * Resolves the knex client name and delegates to the right helper.
+   */
   async _dropAllTables() {
-    // Get all table names (SQLite compatible)
-    const tables = await this._db
-      .select('name')
-      .from('sqlite_master')
-      .where('type', 'table')
-      .whereNot('name', 'like', 'sqlite_%');
-
-    for (const { name } of tables) {
-      await this._db.schema.dropTableIfExists(name);
+    const clientName = this._db.client.config.client || 'sqlite3';
+
+    let dialect;
+    if (clientName.includes('pg') || clientName.includes('postgres')) {
+      dialect = require('./dialects/postgres');
+    } else if (clientName.includes('mysql') || clientName.includes('maria')) {
+      dialect = require('./dialects/mysql');
+    } else {
+      // Default: sqlite / sqlite3
+      dialect = require('./dialects/sqlite');
     }
+
+    await dialect.dropAllTables(this._db);
   }
 
   _files() {
     if (!fs.existsSync(this._path)) return [];
     return fs.readdirSync(this._path)
       .filter(f => f.endsWith('.js') && !f.startsWith('.'))
-      .sort(); // Sorted by timestamp prefix
+      .sort();
   }
 
   _load(name) {
     const filePath = path.join(this._path, name);
-    // Clear require cache so fresh loads work in tests
     delete require.cache[require.resolve(filePath)];
     const migration = require(filePath);
     if (typeof migration.up !== 'function' || typeof migration.down !== 'function') {