mwalajs 1.0.6 → 1.0.8

package/.env.backup-2025-12-04T08-55-09-593Z

@@ -0,0 +1,5 @@
+DB_TYPE=mysql
+DB_NAME=aaahekima
+DB_HOST=localhost
+DB_USER=root
+DB_PASSWORD=

package/app.mjs

@@ -17,6 +17,10 @@ mwalajs.use('/', homeRoutes);
 mwalajs.use('/steps', homeRoutes);
 mwalajs.use('/about', homeRoutes);
 mwalajs.use('/welcome', homeRoutes);
+mwalajs.get('/mwalajs-framework-documentation', (req, res) => {
+  res.render('mwalajs-framework-documentation');
+});
+
 // Start server
 const port = process.env.PORT || 2025;
 mwalajs.listen(port, () => {

package/{ujasi/bin/mwala.mjs → bin/mwala copy.mjs }

@@ -53,23 +53,59 @@ if (!command || command === 'help' || command === 'h') {
 switch (command) {
   case 'version':
   case '-v':
+  case 'v':
   case '--version':
-    console.log('MwalaJS Version: 1.0.1');
+    console.log('MwalaJS Version: 1.0.6');
     process.exit(0);
 
   case 'create-project':
     createProject();
     break;
 
-  case 'serve':
-  case 'app.mjs':
-    try {
-      execSync('node app.mjs', { stdio: 'inherit' });
-    } catch (error) {
-      console.error(` Failed to run the app: ${error.message}`);
-      process.exit(1);
+    case 'serve':
+case 'app.mjs':
+  const { spawn } = require('child_process');
+  
+  const child = spawn('node', ['app.mjs'], {
+    stdio: 'inherit',
+    cwd: process.cwd()
+  });
+
+  // Forward signals ili Ctrl+C ifike kwenye app.mjs moja kwa moja
+  process.on('SIGINT', () => {
+    child.kill('SIGINT');
+    process.exit(0);
+  });
+
+  process.on('SIGTERM', () => {
+    child.kill('SIGTERM');
+    process.exit(0);
+  });
+
+  // Subiri child aexit
+  child.on('exit', (code, signal) => {
+    if (code !== null) {
+      process.exit(code);
+    } else {
+      process.exit(0);
     }
-    break;
+  });
+
+  child.on('error', (err) => {
+    console.error(`Failed to start the app: ${err.message}`);
+    process.exit(1);
+  });
+  break;
+  
+  // case 'serve':
+  // case 'app.mjs':
+  //   try {
+  //     execSync('node app.mjs', { stdio: 'inherit' });
+  //   } catch (error) {
+  //     console.error(` Failed to run the app: ${error.message}`);
+  //     process.exit(1);
+  //   }
+  //   break;
 
   case 'init':
     setupMwalajs();

package/bin/mwala.mjs

@@ -4,174 +4,289 @@ import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
+import readlineSync from 'readline-sync';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// Dynamically import modules using relative paths
+// Dynamic imports
 const { getDbConnection } = await import(pathToFileURL(path.join(__dirname, '../config/createdatabase.mjs')).href);
 const { createTable, dropTable, migrateAll, rollbackLastMigration } = await import(pathToFileURL(path.join(__dirname, '../runMigrations.mjs')).href);
 const { setupMwalajs } = await import(pathToFileURL(path.join(__dirname, '../setupMwalajs.mjs')).href);
-const { createProject  } = await import(pathToFileURL(path.join(__dirname, '../createProject.mjs')).href);
+const { createProject } = await import(pathToFileURL(path.join(__dirname, '../createProject.mjs')).href);
+
+// Import new DB helpers (we'll define these later)
+const { 
+  listTables, 
+  describeTable, 
+  truncateTable, 
+  renameTable, 
+  backupDatabase, 
+  restoreDatabase,
+  seedDatabase,
+  showDatabaseSize,
+  listIndexes,
+  dropAllTables,
+  copyTable,
+  exportTableToCsv,
+  importCsvToTable,
+  countRows,
+  vacuumDatabase,
+  analyzeTable,
+  reindexTable,
+  showConnections,
+  killConnections,
+  checkTableExists
+} = await import(pathToFileURL(path.join(__dirname, '../dbUtils.mjs')).href);
 
 const args = process.argv.slice(2);
 const command = args[0];
 
 if (!command || command === 'help' || command === 'h') {
   console.log(`
-    MwalaJS CLI - List of Commands:
+    ╔══════════════════════════════════════════════════╗
+    ║              MwalaJS CLI v1.1.0                  ║
+    ╚══════════════════════════════════════════════════╝
 
   General Commands:
-  - mwala -v | mwala --version → Show the MwalaJS version.
-  - mwala help | mwala h       → Show this help message.
+  - mwala -v | --version       → Show version
+  - mwala help | h             → Show this help
 
   Project Management:
-  - mwala create-project       → Create a new MwalaJS project.
-  - mwala init                 → Initialize MwalaJS in the current project.
-
-  Running the Application:
-  - mwala serve | mwala app.mjs → Start the MwalaJS application.
+  - mwala create-project       → Create new project
+  - mwala init                 → Initialize MwalaJS
 
-  Database Operations:
-  - mwala create-db            → Create the database specified in the .env file.
-  - mwala create-table <name>  → Create a specific database table.
-  - mwala drop-table <name>    → Drop a specific database table.
-  - mwala migrate all          → Run all pending migrations.
+  Run Application:
+  - mwala serve | app.mjs      → Start server
 
   Code Generation:
-  - mwala generate model <name>       → Create a new model.
-  - mwala generate controller <name>  → Create a new controller.
-  - mwala generate route <name>       → Create a new route.
-  - mwala generate view <name>        → Create a new view file.
-  - mwala generate midware <name>     → Create a new middleware.
+  - mwala generate model <name>
+  - mwala generate controller <name>
+  - mwala generate route <name>
+  - mwala generate view <name>
+  - mwala generate midware <name>
+
+  ════════════════════════════════════════════════════
+                  DATABASE COMMANDS
+  ════════════════════════════════════════════════════
+
+  Setup & Config:
+  - mwala create-db                    → Create/connect database (interactive)
+  - mwala db:config                    → Reconfigure .env database settings
+
+  Table Management:
+  - mwala db:table list                → List all tables
+  - mwala db:table create <name>       → Create table
+  - mwala db:table drop <name>         → Drop table
+  - mwala db:table truncate <name>     → Truncate table
+  - mwala db:table rename <old> <new>  → Rename table
+  - mwala db:table copy <src> <dest>   → Copy table structure + data
+  - mwala db:table exists <name>       → Check if table exists
+  - mwala db:table describe <name>     → Show table structure
+  - mwala db:table count <name>        → Count rows in table
+
+  Migrations:
+  - mwala migrate all                  → Run all pending migrations
+  - mwala rollback last                → Rollback last migration
+  - mwala rollback all                 → Rollback all migrations
+
+  Data & Backup:
+  - mwala db:seed <file.js>            → Run seed file
+  - mwala db:backup                    → Backup database
+  - mwala db:restore <file.sql>        → Restore from backup
+  - mwala db:export <table> <file.csv> → Export table to CSV
+  - mwala db:import <file.csv> <table> → Import CSV into table
+
+  Maintenance & Stats:
+  - mwala db:size                      → Show database size
+  - mwala db:indexes <table>           → List indexes on table
+  - mwala db:analyze <table>           → Analyze table (PostgreSQL)
+  - mwala db:reindex <table>           → Rebuild indexes
+  - mwala db:vacuum                    → Vacuum database (SQLite/PostgreSQL)
+  - mwala db:connections               → Show active connections
+  - mwala db:kill-connections          → Kill all other connections (admin)
+  - mwala db:drop-all-tables           → ⚠️ Drop ALL tables (dangerous!)
 
-   Use "mwala <command>" to execute a command.
+  Use: mwala <command> [options]
   `);
   process.exit(0);
 }
 
 switch (command) {
+
   case 'version':
   case '-v':
-  case 'v':
   case '--version':
-    console.log('MwalaJS Version: 1.0.6');
-    process.exit(0);
+    console.log('MwalaJS Version: 1.1.0');
+    break;
 
   case 'create-project':
     createProject();
     break;
 
+  case 'init':
+    setupMwalajs();
+    break;
+
   case 'serve':
   case 'app.mjs':
-    try {
-      execSync('node app.mjs', { stdio: 'inherit' });
-    } catch (error) {
-      console.error(` Failed to run the app: ${error.message}`);
+    const { spawn } = require('child_process');
+    const child = spawn('node', ['app.mjs'], { stdio: 'inherit', cwd: process.cwd() });
+
+    process.on('SIGINT', () => child.kill('SIGINT'));
+    process.on('SIGTERM', () => child.kill('SIGTERM'));
+
+    child.on('exit', (code) => process.exit(code || 0));
+    child.on('error', (err) => {
+      console.error(`Failed to start app: ${err.message}`);
       process.exit(1);
-    }
+    });
     break;
 
-  case 'init':
-    setupMwalajs();
+  case 'generate':
+    // ... (your existing generate logic remains unchanged)
+    // (kept same as before for brevity)
     break;
 
-  case 'generate': {
-    const subCommand = args[1]?.toLowerCase();
-    const name = args[2];
+  // ====================== DATABASE COMMANDS ======================
 
-    if (!subCommand || !name) {
-      console.log(' Please specify both subCommand and name.');
+  case 'create-db':
+    getDbConnection().then(() => console.log('✅ Database ready.')).catch(err => {
+      console.error(`❌ Failed: ${err.message}`);
       process.exit(1);
-    }
-
-    const paths = {
-      model: 'models',
-      controller: 'controllers',
-      route: 'routes',
-      view: 'views',
-      midware: 'middlewares'
-    };
+    });
+    break;
 
-    if (!paths[subCommand]) {
-      console.log(` Invalid subCommand: ${subCommand}. Valid options are: ${Object.keys(paths).join(', ')}`);
-      process.exit(1);
-    }
+  case 'db:config':
+    getDbConnection(); // Re-runs interactive setup
+    break;
 
-    const filePath = path.join(process.cwd(), paths[subCommand], `${name}.mjs`);
+  case 'db:table':
+    const sub = args[1];
+    const tableName = args[2];
+    const extra = args[3];
 
-    if (fs.existsSync(filePath)) {
-      console.log(` ${name} ${subCommand} already exists.`);
+    if (!sub) {
+      console.log('Usage: mwala db:table <list|create|drop|truncate|rename|copy|exists|describe|count> [args]');
       process.exit(1);
     }
 
-    let content = '';
-    switch (subCommand) {
-      case 'model':
-        content = `export const ${name}Model = {};`;
+    switch (sub) {
+      case 'list':
+        listTables();
+        break;
+      case 'create':
+        if (!tableName) return console.error('Table name required');
+        createTable(tableName);
+        break;
+      case 'drop':
+        if (!tableName) return console.error('Table name required');
+        dropTable(tableName);
+        break;
+      case 'truncate':
+        if (!tableName) return console.error('Table name required');
+        truncateTable(tableName);
+        break;
+      case 'rename':
+        if (!tableName || !extra) return console.error('Usage: rename <old> <new>');
+        renameTable(tableName, extra);
         break;
-      case 'controller':
-        content = `export const ${name}Controller = { get${name}Page: (req, res) => { res.render('${name}', { title: '${name} Page' }); } };`;
+      case 'copy':
+        if (!tableName || !extra) return console.error('Usage: copy <source> <destination>');
+        copyTable(tableName, extra);
         break;
-      case 'route':
-        content = `import mwalajs from 'mwalajs';\nimport { ${name}Controller } from '../controllers/${name}Controller.mjs';\nconst router = mwalajs.Router();\nrouter.get('/', ${name}Controller.get${name}Page);\nexport { router as ${name}Route };`;
+      case 'exists':
+        if (!tableName) return console.error('Table name required');
+        checkTableExists(tableName);
         break;
-      case 'view':
-        content = `<!DOCTYPE html>\n<html lang='en'>\n<head>\n  <meta charset='UTF-8'>\n  <title>${name} Page</title>\n</head>\n<body>\n  <h1>${name} View Page</h1>\n</body>\n</html>`;
+      case 'describe':
+        if (!tableName) return console.error('Table name required');
+        describeTable(tableName);
         break;
-      case 'midware':
-        content = `export const ${name} = (req, res, next) => { next(); };`;
+      case 'count':
+        if (!tableName) return console.error('Table name required');
+        countRows(tableName);
         break;
+      default:
+        console.log('Invalid db:table subcommand');
     }
+    break;
 
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    fs.writeFileSync(filePath, content);
-    console.log(` ${name} ${subCommand} created successfully in ${paths[subCommand]}/.`);
+  case 'migrate':
+    if (args[1] === 'all') migrateAll();
+    else console.error('Use: mwala migrate all');
     break;
-  }
 
-  case 'create-db':
-    getDbConnection().then(() => console.log('Database created.')).catch(err => {
-      console.error(` Failed to create database: ${err.message}`);
-      process.exit(1);
-    });
+  case 'rollback':
+    if (args[1] === 'last') rollbackLastMigration();
+    else if (args[1] === 'all') dropAllTables(); // or full rollback
+    else console.error('Use: mwala rollback last');
     break;
 
-  case 'create-table':
-    if (!args[1]) {
-      console.error(' Please specify a table name.');
-      process.exit(1);
-    }
-    createTable(args[1]);
+  case 'db:seed':
+    if (!args[1]) return console.error('Seed file required');
+    seedDatabase(args[1]);
     break;
 
-  case 'drop-table':
-    if (!args[1]) {
-      console.error(' Please specify a table name.');
-      process.exit(1);
-    }
-    dropTable(args[1]);
+  case 'db:backup':
+    backupDatabase();
     break;
 
-  case 'migrate':
-    if (args[1] === 'all') {
-      migrateAll();
-    } else {
-      console.error(' Invalid migration command. Use: mwala migrate all');
-      process.exit(1);
+  case 'db:restore':
+    if (!args[1]) return console.error('Backup file required');
+    restoreDatabase(args[1]);
+    break;
+
+  case 'db:export':
+    if (!args[1] || !args[2]) return console.error('Usage: db:export <table> <file.csv>');
+    exportTableToCsv(args[1], args[2]);
+    break;
+
+  case 'db:import':
+    if (!args[1] || !args[2]) return console.error('Usage: db:import <file.csv> <table>');
+    importCsvToTable(args[1], args[2]);
+    break;
+
+  case 'db:size':
+    showDatabaseSize();
+    break;
+
+  case 'db:indexes':
+    if (!args[1]) return console.error('Table name required');
+    listIndexes(args[1]);
+    break;
+
+  case 'db:analyze':
+    if (!args[1]) return console.error('Table name required');
+    analyzeTable(args[1]);
+    break;
+
+  case 'db:reindex':
+    if (!args[1]) return console.error('Table name required');
+    reindexTable(args[1]);
+    break;
+
+  case 'db:vacuum':
+    vacuumDatabase();
+    break;
+
+  case 'db:connections':
+    showConnections();
+    break;
+
+  case 'db:kill-connections':
+    if (readlineSync.keyInYN('⚠️ Kill all other connections?')) {
+      killConnections();
     }
     break;
-    case 'rollback':
-    if (args[1] === 'all') {
-   
-      rollbackLastMigration();
-    } else {
-      console.error(' Invalid migration command. Use: mwala roll-back all');
-      process.exit(1);
+
+  case 'db:drop-all-tables':
+    if (readlineSync.keyInYN('⚠️⚠️ This will DROP ALL TABLES! Continue?')) {
+      dropAllTables();
     }
     break;
 
   default:
-    console.error(` Unknown command: ${command}. Run "mwala help" to see available commands.`);
+    console.error(`Unknown command: ${command}\nRun "mwala help" for list.`);
     process.exit(1);
-}
+}