mwalajs 1.1.16 → 1.1.18

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 HEKIMA  MWALA
+Copyright (c) 2026 HEKIMA  MWALA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/bin/mwala.mjs

@@ -39,7 +39,24 @@ const __dirname = path.dirname(__filename);
 // ────────────────────────────────────────────────
 
 let imports = {};
-let setupMwalajs, createProject, dropAllTables, getDbConnection;
+// let setupMwalajs, createProject, dropAllTables, getDbConnection;
+let {
+  setupMwalajs,
+  createProject,
+  dropAllTables,
+  getDbConnection,
+  listTables,
+  createTable,
+  dropTable,
+  migrateAll,
+  rollbackLastMigration,
+showDatabaseSize,
+  listIndexes,
+  analyzeTable,
+  vacuumDatabase,
+  showConnections,
+  killConnections,
+} = imports;
 
 try {
   const [
@@ -48,6 +65,7 @@ try {
     setup,
     proj,
     dbUtilsRaw,
+    maintenance,
   ] = await Promise.all([
     import(pathToFileURL(path.join(__dirname, '../config/createdatabase.mjs')).href),
     import(pathToFileURL(path.join(__dirname, '../runMigrations.mjs')).href),
@@ -64,16 +82,31 @@ try {
     ...normalize(setup),
     ...normalize(proj),
     ...normalize(dbUtilsRaw),
+    ...normalize(maintenance),     // ← important
   };
 
   // 🔥 IMPORTANT FIX
-  ({
-    setupMwalajs,
-    createProject,
-    dropAllTables,
-    getDbConnection
-  } = imports);
-
+({
+  setupMwalajs,
+  createProject,
+  dropAllTables,
+  getDbConnection,
+  listTables,
+  createTable,
+  dropTable,
+  migrateAll,
+  rollbackLastMigration,
+  // ongeza hizi zingine ukizihitaji baadaye
+  showDatabaseSize,
+  listIndexes,
+  analyzeTable,
+  vacuumDatabase,
+  showConnections,
+  killConnections,
+  // n.k.
+} = imports);
+
+  
 } catch (err) {
   error(`Failed to load required modules:\n${err.stack || err.message}`);
   process.exit(1);
@@ -596,38 +629,67 @@ case 'db:restore': {
 }
 
 
+      // case 'db:size':
+      //   await runSafe(showDatabaseSize, 'Database size shown');
+      //   break;
+
+      // case 'db:indexes':
+      //   if (!args[1]) return error('Table name required');
+      //   await runSafe(() => listIndexes(args[1]), `Indexes for ${args[1]}`);
+      //   break;
+
+      // case 'db:analyze':
+      //   if (!args[1]) return error('Table name required');
+      //   await runSafe(() => analyzeTable(args[1]), `Table ${args[1]} analyzed`);
+      //   break;
+
+      // case 'db:reindex':
+      //   if (!args[1]) return error('Table name required');
+      //   await runSafe(() => reindexTable(args[1]), `Table ${args[1]} reindexed`);
+      //   break;
+
+      // case 'db:vacuum':
+      //   await runSafe(vacuumDatabase, 'Database vacuumed');
+      //   break;
+
+      // case 'db:connections':
+      //   await runSafe(showConnections, 'Active connections shown');
+      //   break;
+
+
       case 'db:size':
-        await runSafe(showDatabaseSize, 'Database size shown');
-        break;
+  await runSafe(() => imports.showDatabaseSize(), 'Database size shown');
+  break;
 
-      case 'db:indexes':
-        if (!args[1]) return error('Table name required');
-        await runSafe(() => listIndexes(args[1]), `Indexes for ${args[1]}`);
-        break;
+case 'db:indexes':
+  if (!args[1]) return error('Table name required: mwala db:indexes <table>');
+  await runSafe(() => imports.listIndexes(args[1]), `Indexes for ${args[1]}`);
+  break;
 
-      case 'db:analyze':
-        if (!args[1]) return error('Table name required');
-        await runSafe(() => analyzeTable(args[1]), `Table ${args[1]} analyzed`);
-        break;
+case 'db:analyze':
+  if (!args[1]) return error('Table name required');
+  await runSafe(() => imports.analyzeTable(args[1]), `Table ${args[1]} analyzed`);
+  break;
 
-      case 'db:reindex':
-        if (!args[1]) return error('Table name required');
-        await runSafe(() => reindexTable(args[1]), `Table ${args[1]} reindexed`);
-        break;
+case 'db:vacuum':
+  await runSafe(() => imports.vacuumDatabase(), 'Database vacuumed');
+  break;
 
-      case 'db:vacuum':
-        await runSafe(vacuumDatabase, 'Database vacuumed');
-        break;
+case 'db:connections':
+  await runSafe(() => imports.showConnections(), 'Active connections shown');
+  break;
 
-      case 'db:connections':
-        await runSafe(showConnections, 'Active connections shown');
-        break;
+case 'db:kill-connections':
+  if (readlineSync.keyInYNStrict('⚠️ Kill ALL other database connections? (hatari!)')) {
+    await runSafe(() => imports.killConnections(), 'Other connections killed');
+  }
+  break;
 
-      case 'db:kill-connections':
-        if (readlineSync.keyInYNStrict('⚠️  Kill ALL other database connections?')) {
-          await runSafe(killConnections, 'Other connections killed');
-        }
-        break;
+      // case 'db:kill-connections':
+      //   if (readlineSync.keyInYNStrict('⚠️  Kill ALL other database connections?')) {
+      //     await runSafe(killConnections, 'Other connections killed');
+      //   }
+      //   break;
 
       case 'db:drop-all-tables':
         if (readlineSync.keyInYNStrict('⚠️⚠️  THIS WILL DROP **ALL** TABLES! Continue?')) {

package/createProject.mjs

@@ -1,44 +1,67 @@
-// createProject.mjs
+// createProject.mjs (ULTIMATE CROSS-PLATFORM VERSION)
+
 import fs from "fs-extra";
 import path from "path";
 import readline from "readline";
 import os from "os";
+import { fileURLToPath } from "url";
+
+/* =========================
+   SAFE PATH HELPERS
+========================= */
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 /**
- * Get template source safely
+ * Detect best possible MwalaJS template path
+ * Works on ALL OS
  */
 function getMwalajsPath() {
   const envPath = process.env.MWALAJSPATH;
 
-  const defaultPaths = [
+  const possiblePaths = [
     envPath,
+    path.join(process.cwd(), "template"),
+    path.join(__dirname, "template"),
+    path.join(__dirname, "../template"),
+    path.join(__dirname, "../../template"),
     "C:\\Program Files\\mwalajs",
+    "C:\\mwalajs",
     "/usr/local/lib/mwalajs",
+    "/usr/lib/mwalajs",
     "/var/www/mwalajs",
-    path.join(process.cwd(), "template") // fallback local dev template
+    "/opt/mwalajs"
   ];
 
-  for (const p of defaultPaths) {
-    if (p && fs.existsSync(p)) return p;
+  for (const p of possiblePaths) {
+    if (p && fs.existsSync(p)) {
+      return fs.realpathSync(p);
+    }
   }
 
-  return null; // IMPORTANT: we will generate manual scaffold
+  return null;
 }
 
-/**
- * Ask CLI input
- */
-function ask(rl, q) {
-  return new Promise((resolve) => rl.question(q, (a) => resolve(a.trim())));
+/* =========================
+   CLI INPUT
+========================= */
+
+function ask(rl, question) {
+  return new Promise((resolve) => {
+    rl.question(question, (ans) => resolve(ans.trim()));
+  });
 }
 
-/**
- * Manual fallback template generator (VERY IMPORTANT FIX)
- */
+/* =========================
+   MANUAL TEMPLATE GENERATOR
+   (ALWAYS WORKS - FALLBACK)
+========================= */
+
 function createManualTemplate(target) {
-  console.log("⚠ No template found. Creating manual MwalaJS scaffold...");
+  console.log("\n⚠ No template found. Generating FULL MwalaJS scaffold...\n");
 
-  const structure = [
+  const dirs = [
     "controllers",
     "routes",
     "models",
@@ -47,16 +70,23 @@ function createManualTemplate(target) {
     "views/pages",
     "middlewares",
     "migrations",
+    "config",
+    "public",
     "public/css",
     "public/js",
-    "public/images"
+    "public/images",
+    "storage",
+    "logs"
   ];
 
-  structure.forEach((dir) => {
+  dirs.forEach((dir) => {
     fs.mkdirSync(path.join(target, dir), { recursive: true });
   });
 
-  // app.mjs
+  /* =========================
+     APP ENTRY
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "app.mjs"),
 `import mwalajs from 'mwalajs';
@@ -68,30 +98,43 @@ const __dirname = path.dirname(__filename);
 
 mwalajs.set('view engine', 'ejs');
 mwalajs.set('views', path.join(__dirname, 'views'));
+
 mwalajs.useStatic(path.join(__dirname, 'public'));
 
+/* ROUTES */
 mwalajs.get('/', (req, res) => {
-  res.render('pages/index', { title: 'MwalaJS App' });
+  res.render('pages/index', {
+    title: '🚀 MwalaJS Application Running'
+  });
 });
 
-const port = process.env.PORT || 3000;
-mwalajs.listen(port, () => {
-  console.log('🚀 Server running on http://localhost:' + port);
+/* SERVER */
+const PORT = process.env.PORT || 3000;
+mwalajs.listen(PORT, () => {
+  console.log(\`🚀 Server running on http://localhost:\${PORT}\`);
 });
 `
   );
 
-  // sample controller
+  /* =========================
+     CONTROLLER
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "controllers/homeController.mjs"),
 `export const homeController = {
-  getHome: (req, res) => {
-    res.render('pages/index', { title: 'Home Page' });
+  index: (req, res) => {
+    res.render('pages/index', {
+      title: 'Home Page'
+    });
   }
 };`
   );
 
-  // sample route
+  /* =========================
+     ROUTES
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "routes/homeRoutes.mjs"),
 `import mwalajs from 'mwalajs';
@@ -99,70 +142,127 @@ import { homeController } from '../controllers/homeController.mjs';
 
 const router = mwalajs.Router();
 
-router.get('/', homeController.getHome);
+router.get('/', homeController.index);
 
 export { router as homeRoutes };
 `
   );
 
-  // sample view
+  /* =========================
+     MODEL EXAMPLE
+  ========================= */
+
+  fs.writeFileSync(
+    path.join(target, "models/User.mjs"),
+`export class User {
+  constructor() {
+    this.table = "users";
+  }
+
+  // Add model logic here
+}
+`
+  );
+
+  /* =========================
+     VIEW
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "views/pages/index.ejs"),
 `<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="UTF-8" />
   <title><%= title %></title>
   <style>
-    body { font-family: Arial; background:#0f172a; color:white; text-align:center; padding:50px; }
-    .card { background:#1e293b; padding:20px; border-radius:12px; display:inline-block; }
+    body {
+      font-family: Arial;
+      background: linear-gradient(135deg,#0f172a,#1e293b);
+      color: white;
+      text-align: center;
+      padding: 60px;
+    }
+
+    .box {
+      background: rgba(255,255,255,0.05);
+      padding: 30px;
+      border-radius: 16px;
+      display: inline-block;
+      box-shadow: 0 10px 30px rgba(0,0,0,0.3);
+    }
+
+    h1 {
+      font-size: 40px;
+    }
   </style>
 </head>
 <body>
-  <div class="card">
-    <h1>🚀 Welcome to MwalaJS</h1>
+  <div class="box">
+    <h1>🚀 MwalaJS Ready</h1>
     <p><%= title %></p>
   </div>
 </body>
 </html>`
   );
 
-  // package.json
+  /* =========================
+     PACKAGE JSON
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "package.json"),
 `{
   "name": "mwalajs-app",
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
     "start": "node app.mjs"
   },
   "dependencies": {
-    "mwalajs": "*"
+    "mwalajs": "*",
+    "ejs": "*"
   }
 }`
   );
 
+  /* =========================
+     README
+  ========================= */
+
   fs.writeFileSync(
     path.join(target, "README.md"),
-`# MwalaJS App
+`# 🚀 MwalaJS Project
+
+## Run project
 
-Run:
 npm install
 npm start
+
+## Structure
+- MVC architecture
+- Controllers
+- Routes
+- Models
+- Views
 `
   );
 
-  console.log("✅ Manual template created successfully!");
+  console.log("✅ FULL manual scaffold created successfully!");
 }
 
-/**
- * Main project creator
- */
+/* =========================
+   MAIN PROJECT CREATOR
+========================= */
+
 export async function createProject(projectArg) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
 
+  let createdMode = "unknown";
+
   try {
     let projectName = projectArg?.trim();
 
@@ -171,7 +271,7 @@ export async function createProject(projectArg) {
     }
 
     if (!projectName) {
-      console.log("❌ Project name required");
+      console.log("❌ Project name is required");
       return;
     }
 
@@ -186,10 +286,12 @@ export async function createProject(projectArg) {
 
     const templatePath = getMwalajsPath();
 
-    if (!templatePath) {
-      createManualTemplate(target);
-    } else {
-      console.log("📦 Using template from:", templatePath);
+    /* =========================
+       TEMPLATE MODE
+    ========================= */
+
+    if (templatePath) {
+      console.log("📦 Template found:", templatePath);
 
       const items = [
         "controllers",
@@ -203,6 +305,8 @@ export async function createProject(projectArg) {
         "README.md"
       ];
 
+      let copied = 0;
+
       for (const item of items) {
         const src = path.join(templatePath, item);
         const dest = path.join(target, item);
@@ -210,19 +314,39 @@ export async function createProject(projectArg) {
         if (fs.existsSync(src)) {
           fs.copySync(src, dest);
           console.log("✔ copied:", item);
+          copied++;
         } else {
           console.log("⚠ missing:", item);
         }
       }
 
-      // fallback if empty project
-      if (!fs.existsSync(path.join(target, "app.mjs"))) {
+      if (copied === 0) {
+        console.log("⚠ Template empty → switching to manual mode...");
         createManualTemplate(target);
+        createdMode = "manual";
+      } else {
+        createdMode = "template";
       }
+
+    } else {
+      /* =========================
+         MANUAL MODE
+      ========================= */
+
+      createManualTemplate(target);
+      createdMode = "manual";
     }
 
-    console.log("\n🎉 Project created successfully!");
+    /* =========================
+       FINAL OUTPUT (NO FAKE SUCCESS)
+    ========================= */
+
+    console.log("\n============================");
+    console.log("🎉 PROJECT CREATED SUCCESSFULLY");
+    console.log("============================");
     console.log("📁 Path:", target);
+    console.log("⚙ Mode:", createdMode.toUpperCase());
+    console.log("============================\n");
 
   } catch (err) {
     console.error("❌ Create project failed:", err.message);
@@ -231,7 +355,10 @@ export async function createProject(projectArg) {
   }
 }
 
-// CLI support
+/* =========================
+   CLI EXECUTION
+========================= */
+
 if (import.meta.url === `file://${process.argv[1]}`) {
   createProject(process.argv[2]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mwalajs",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "MwalaJS Framework CLI Tool and Web Framework for Backend and Frontend Development.",
   "type": "module",
   "main": "app.mjs",

package/runMigrations.mjs

@@ -1,3 +1,5 @@
+// runMigrations.mjs
+
 import fs from 'fs';
 import path from 'path';
 import readline from 'readline';
@@ -134,6 +136,38 @@ export const listTables = async () => {
   }
 };
 
+
+export const dropAllTables = async () => {
+  try {
+    const tables = await sequelize.getQueryInterface().showAllTables();
+    
+    if (tables.length === 0) {
+      console.log('No tables exist in the database.');
+      return;
+    }
+
+    console.log(`Dropping ${tables.length} table(s): ${tables.join(', ')}`);
+
+    // Drop in reverse order to respect foreign key dependencies if any
+    for (const table of tables.reverse()) {
+      await sequelize.getQueryInterface().dropTable(table, { cascade: true });
+      console.log(`  Dropped: ${table}`);
+    }
+
+    // Clear the migration tracking file so future migrates start clean
+    fs.writeFileSync(migrationLog, JSON.stringify([]));
+    console.log('Migration log cleared – ready for fresh migrations.');
+
+  } catch (error) {
+    console.error('Error while dropping all tables:', error.message);
+    if (error.stack) console.error(error.stack);
+    throw error; // let runSafe show the full error
+  }
+};
+
+
+
+
 const askUser = (question) => {
   return new Promise((resolve) => {
     const rl = readline.createInterface({
@@ -146,3 +180,112 @@ const askUser = (question) => {
     });
   });
 };
+
+
+
+// ────────────────────────────────────────────────
+// MAINTENANCE TOOLS (MariaDB / MySQL compatible)
+// ────────────────────────────────────────────────
+
+export const showDatabaseSize = async () => {
+  const dbName = sequelize.getDatabaseName(); // au tumia sequelize.config.database kama haifanyi kazi
+  const [results] = await sequelize.query(`
+    SELECT 
+      ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS size_mb
+    FROM information_schema.tables 
+    WHERE table_schema = '${dbName}'
+  `);
+
+  const size = results[0]?.size_mb || '0.00';
+  console.log(`Database size: ${size} MB`);
+};
+
+export const listIndexes = async (tableName) => {
+  const dbName = sequelize.getDatabaseName();
+  const [results] = await sequelize.query(`
+    SHOW INDEXES FROM \`${tableName}\`
+  `);
+
+  if (results.length === 0) {
+    console.log(`Hakuna indexes kwenye table "${tableName}".`);
+    return;
+  }
+
+  console.log(`Indexes kwenye "${tableName}":`);
+  results.forEach(row => {
+    const unique = row.Non_unique === 0 ? 'UNIQUE' : 'NON-UNIQUE';
+    console.log(`  • ${row.Key_name.padEnd(35)} → ${unique} | Column: ${row.Column_name} | Type: ${row.Index_type}`);
+  });
+};
+
+export const analyzeTable = async (tableName) => {
+  await sequelize.query(`ANALYZE TABLE \`${tableName}\`;`);
+  console.log(`Table "${tableName}" ime-analyze (statistics zime-update).`);
+};
+
+export const vacuumDatabase = async () => {
+  // MySQL/MariaDB haina VACUUM kama PostgreSQL, lakini tunaweza optimize tables zote
+  const dbName = sequelize.getDatabaseName();
+  const [tables] = await sequelize.query(`
+    SELECT table_name 
+    FROM information_schema.tables 
+    WHERE table_schema = '${dbName}' 
+      AND table_type = 'BASE TABLE'
+  `);
+
+  if (tables.length === 0) {
+    console.log('Hakuna tables za ku-optimize.');
+    return;
+  }
+
+  console.log(`Optimizing ${tables.length} table(s)...`);
+  for (const row of tables) {
+    const table = row.table_name;
+    await sequelize.query(`OPTIMIZE TABLE \`${table}\`;`);
+    console.log(`  Optimized: ${table}`);
+  }
+  console.log('Optimization imekamilika (space reclaimed na stats updated).');
+};
+
+export const showConnections = async () => {
+  const [results] = await sequelize.query(`
+    SHOW PROCESSLIST
+  `);
+
+  const active = results.filter(row => row.Command !== 'Sleep' && row.Id !== 0); // exclude idle + our connection
+
+  if (active.length === 0) {
+    console.log('Hakuna connections zingine active (isipokuwa yako).');
+    return;
+  }
+
+  console.log(`Active connections (${active.length}):`);
+  active.forEach(r => {
+    const querySnippet = r.Info ? r.Info.substring(0, 60) + '...' : '(idle)';
+    console.log(`  ID ${r.Id} | User: ${r.User} | Host: ${r.Host} | State: ${r.State} | Query: ${querySnippet}`);
+  });
+};
+
+export const killConnections = async () => {
+  const [results] = await sequelize.query(`
+    SHOW PROCESSLIST
+  `);
+
+  const toKill = results.filter(row => row.Id !== 0 && row.Command !== 'Sleep'); // exclude our connection + idle
+
+  if (toKill.length === 0) {
+    console.log('Hakuna connections za ku-kill.');
+    return;
+  }
+
+  console.log(`Killing ${toKill.length} connection(s)...`);
+  for (const row of toKill) {
+    try {
+      await sequelize.query(`KILL ${row.Id};`);
+      console.log(`  Killed ID ${row.Id}`);
+    } catch (e) {
+      console.warn(`  Failed to kill ${row.Id}: ${e.message}`);
+    }
+  }
+  console.log('Kill operation imekamilika.');
+};