mwalajs 1.0.7 → 1.0.9

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/bin/mwala copy.mjs

@@ -0,0 +1,212 @@
+#!/usr/bin/env node
+
+import { execSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Dynamically import modules using relative paths
+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 args = process.argv.slice(2);
+const command = args[0];
+
+if (!command || command === 'help' || command === 'h') {
+  console.log(`
+    MwalaJS CLI - List of Commands:
+
+  General Commands:
+  - mwala -v | mwala --version → Show the MwalaJS version.
+  - mwala help | mwala h       → Show this help message.
+
+  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.
+
+  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.
+
+  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.
+
+   Use "mwala <command>" to execute a command.
+  `);
+  process.exit(0);
+}
+
+switch (command) {
+  case 'version':
+  case '-v':
+  case 'v':
+  case '--version':
+    console.log('MwalaJS Version: 1.0.6');
+    process.exit(0);
+
+  case 'create-project':
+    createProject();
+    break;
+
+    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);
+    }
+  });
+
+  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();
+    break;
+
+  case 'generate': {
+    const subCommand = args[1]?.toLowerCase();
+    const name = args[2];
+
+    if (!subCommand || !name) {
+      console.log(' Please specify both subCommand and name.');
+      process.exit(1);
+    }
+
+    const paths = {
+      model: 'models',
+      controller: 'controllers',
+      route: 'routes',
+      view: 'views',
+      midware: 'middlewares'
+    };
+
+    if (!paths[subCommand]) {
+      console.log(` Invalid subCommand: ${subCommand}. Valid options are: ${Object.keys(paths).join(', ')}`);
+      process.exit(1);
+    }
+
+    const filePath = path.join(process.cwd(), paths[subCommand], `${name}.mjs`);
+
+    if (fs.existsSync(filePath)) {
+      console.log(` ${name} ${subCommand} already exists.`);
+      process.exit(1);
+    }
+
+    let content = '';
+    switch (subCommand) {
+      case 'model':
+        content = `export const ${name}Model = {};`;
+        break;
+      case 'controller':
+        content = `export const ${name}Controller = { get${name}Page: (req, res) => { res.render('${name}', { title: '${name} Page' }); } };`;
+        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 };`;
+        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>`;
+        break;
+      case 'midware':
+        content = `export const ${name} = (req, res, next) => { next(); };`;
+        break;
+    }
+
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, content);
+    console.log(` ${name} ${subCommand} created successfully in ${paths[subCommand]}/.`);
+    break;
+  }
+
+  case 'create-db':
+    getDbConnection().then(() => console.log('Database created.')).catch(err => {
+      console.error(` Failed to create database: ${err.message}`);
+      process.exit(1);
+    });
+    break;
+
+  case 'create-table':
+    if (!args[1]) {
+      console.error(' Please specify a table name.');
+      process.exit(1);
+    }
+    createTable(args[1]);
+    break;
+
+  case 'drop-table':
+    if (!args[1]) {
+      console.error(' Please specify a table name.');
+      process.exit(1);
+    }
+    dropTable(args[1]);
+    break;
+
+  case 'migrate':
+    if (args[1] === 'all') {
+      migrateAll();
+    } else {
+      console.error(' Invalid migration command. Use: mwala migrate all');
+      process.exit(1);
+    }
+    break;
+    case 'rollback':
+    if (args[1] === 'all') {
+   
+      rollbackLastMigration();
+    } else {
+      console.error(' Invalid migration command. Use: mwala roll-back all');
+      process.exit(1);
+    }
+    break;
+
+  default:
+    console.error(` Unknown command: ${command}. Run "mwala help" to see available commands.`);
+    process.exit(1);
+}

package/bin/mwala.mjs

@@ -1,91 +1,146 @@
 #!/usr/bin/env node
 
-import { execSync } from 'child_process';
+import { spawn } 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
+const args = process.argv.slice(2);
+const command = args[0];
+
+// 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);
 
-const args = process.argv.slice(2);
-const command = args[0];
+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, '../utils/dbUtils.mjs')).href);
 
 if (!command || command === 'help' || command === 'h') {
   console.log(`
-    MwalaJS CLI - List of Commands:
+╔══════════════════════════════════════════════════════════╗
+║                  MwalaJS CLI v1.1.0                      ║
+╚══════════════════════════════════════════════════════════╝
+
+General:
+  mwala -v | --version         → Show version
+  mwala help | h               → Show this help
+
+Project:
+  mwala create-project         → Create new project
+  mwala init                   → Initialize MwalaJS
+
+Run:
+  mwala serve                  → Start the server (runs app.mjs)
 
-  General Commands:
-  - mwala -v | mwala --version → Show the MwalaJS version.
-  - mwala help | mwala h       → Show this help message.
+Generate:
+  mwala generate model <name>
+  mwala generate controller <name>
+  mwala generate route <name>
+  mwala generate view <name>
+  mwala generate midware <name>
 
-  Project Management:
-  - mwala create-project       → Create a new MwalaJS project.
-  - mwala init                 → Initialize MwalaJS in the current project.
+Database Setup:
+  mwala create-db              → Interactive DB setup & creation
+  mwala db:config              → Reconfigure database (.env)
 
-  Running the Application:
-  - mwala serve | mwala app.mjs → Start the MwalaJS application.
+Database Commands:
+  mwala db:table list                          → List all tables
+  mwala db:table describe <name>               → Show table structure
+  mwala db:table count <name>                  → Count rows
+  mwala db:table truncate <name>               → Empty table
+  mwala db:table rename <old> <new>            → Rename table
+  mwala db:table copy <src> <dest>             → Copy table
+  mwala db:table exists <name>                 → Check if exists
 
-  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.
+  mwala db:backup                              → Backup database
+  mwala db:restore <file.sql>                  → Restore from backup
+  mwala db:size                                → Show database size
+  mwala db:indexes <table>                     → List indexes
+  mwala db:vacuum                              → Optimize (SQLite/PostgreSQL)
+  mwala db:connections                         → Show active connections
+  mwala db:kill-connections                    → Kill other connections (admin)
+  mwala db:drop-all-tables                     → ⚠️ DROP ALL TABLES!
 
-  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 db:export <table> <file.csv>           → Export to CSV
+  mwala db:import <file.csv> <table>           → Import from CSV
+  mwala db:seed <seedFile.mjs>                 → Run seed file
 
-   Use "mwala <command>" to execute a command.
+Migrations:
+  mwala migrate all                            → Run all migrations
+  mwala rollback last                          → Rollback last migration
+
+Enjoy building with MwalaJS! 🚀
   `);
   process.exit(0);
 }
 
+// ====================== COMMAND SWITCH ======================
 switch (command) {
-  case 'version':
   case '-v':
-  case 'v':
+  case 'version':
   case '--version':
-    console.log('MwalaJS Version: 1.0.6');
+    console.log('MwalaJS Version: 1.1.0');
     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);
-    }
-    break;
-
   case 'init':
     setupMwalajs();
     break;
 
+  case 'serve':
+    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 'generate': {
-    const subCommand = args[1]?.toLowerCase();
+    const type = args[1]?.toLowerCase();
     const name = args[2];
 
-    if (!subCommand || !name) {
-      console.log(' Please specify both subCommand and name.');
+    if (!type || !name) {
+      console.error('Usage: mwala generate <model|controller|route|view|midware> <name>');
       process.exit(1);
     }
 
-    const paths = {
+    const folders = {
       model: 'models',
       controller: 'controllers',
       route: 'routes',
@@ -93,85 +148,198 @@ switch (command) {
       midware: 'middlewares'
     };
 
-    if (!paths[subCommand]) {
-      console.log(` Invalid subCommand: ${subCommand}. Valid options are: ${Object.keys(paths).join(', ')}`);
+    if (!folders[type]) {
+      console.error(`Invalid type. Use: ${Object.keys(folders).join(', ')}`);
       process.exit(1);
     }
 
-    const filePath = path.join(process.cwd(), paths[subCommand], `${name}.mjs`);
+    const filePath = path.join(process.cwd(), folders[type], `${name}.mjs`);
 
     if (fs.existsSync(filePath)) {
-      console.log(` ${name} ${subCommand} already exists.`);
+      console.error(`${name} ${type} already exists.`);
       process.exit(1);
     }
 
     let content = '';
-    switch (subCommand) {
+    switch (type) {
       case 'model':
-        content = `export const ${name}Model = {};`;
+        content = `export const ${name}Model = {};\n`;
         break;
       case 'controller':
-        content = `export const ${name}Controller = { get${name}Page: (req, res) => { res.render('${name}', { title: '${name} Page' }); } };`;
+        content = `export const ${name}Controller = {\n  getPage: (req, res) => {\n    res.render('${name}', { title: '${name}' });\n  }\n};\n`;
         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 };`;
+        content = `import mwalajs from 'mwalajs';\nimport { ${name}Controller } from '../controllers/${name}.mjs';\n\nconst router = mwalajs.Router();\nrouter.get('/', ${name}Controller.getPage);\nexport { router as ${name}Route };\n`;
         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>`;
+        content = `<!DOCTYPE html>\n<html lang="en">\n<head>\n  <meta charset="UTF-8">\n  <title>${name}</title>\n</head>\n<body>\n  <h1>Welcome to ${name} Page</h1>\n</body>\n</html>\n`;
         break;
       case 'midware':
-        content = `export const ${name} = (req, res, next) => { next(); };`;
+        content = `export const ${name} = (req, res, next) => {\n  next();\n};\n`;
         break;
     }
 
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, content);
-    console.log(` ${name} ${subCommand} created successfully in ${paths[subCommand]}/.`);
+    console.log(`✅ ${name} ${type} created at ${folders[type]}/${name}.mjs`);
     break;
   }
 
+  // ==================== DATABASE COMMANDS ====================
+
   case 'create-db':
-    getDbConnection().then(() => console.log('Database created.')).catch(err => {
-      console.error(` Failed to create database: ${err.message}`);
+    getDbConnection()
+      .then(() => console.log('✅ Database configured and connected successfully!'))
+      .catch(err => {
+        console.error('❌ Database setup failed:', err.message);
+        process.exit(1);
+      });
+    break;
+
+  case 'db:config':
+    getDbConnection();
+    break;
+
+  case 'db:table':
+    const action = args[1];
+    const tableName = args[2];
+    const extraArg = args[3];
+
+    if (!action) {
+      console.error('Usage: mwala db:table <list|describe|count|truncate|rename|copy|exists> [args]');
       process.exit(1);
-    });
+    }
+
+    switch (action) {
+      case 'list':
+        listTables();
+        break;
+      case 'describe':
+        if (!tableName) {
+          console.error('Table name required');
+          process.exit(1);
+        }
+        describeTable(tableName);
+        break;
+      case 'count':
+        if (!tableName) {
+          console.error('Table name required');
+          process.exit(1);
+        }
+        countRows(tableName);
+        break;
+      case 'truncate':
+        if (!tableName) {
+          console.error('Table name required');
+          process.exit(1);
+        }
+        if (readlineSync.keyInYN(`Truncate ${tableName}? This cannot be undone.`)) {
+          truncateTable(tableName);
+        }
+        break;
+      case 'rename':
+        if (!tableName || !extraArg) {
+          console.error('Usage: mwala db:table rename <oldName> <newName>');
+          process.exit(1);
+        }
+        renameTable(tableName, extraArg);
+        break;
+      case 'copy':
+        if (!tableName || !extraArg) {
+          console.error('Usage: mwala db:table copy <source> <destination>');
+          process.exit(1);
+        }
+        copyTable(tableName, extraArg);
+        break;
+      case 'exists':
+        if (!tableName) {
+          console.error('Table name required');
+          process.exit(1);
+        }
+        checkTableExists(tableName);
+        break;
+      default:
+        console.error(`Unknown db:table action: ${action}`);
+        process.exit(1);
+    }
+    break;
+
+  case 'db:backup':
+    backupDatabase();
     break;
 
-  case 'create-table':
+  case 'db:restore':
     if (!args[1]) {
-      console.error(' Please specify a table name.');
+      console.error('Usage: mwala db:restore <backup-file.sql>');
       process.exit(1);
     }
-    createTable(args[1]);
+    restoreDatabase(args[1]);
+    break;
+
+  case 'db:size':
+    showDatabaseSize();
     break;
 
-  case 'drop-table':
+  case 'db:indexes':
     if (!args[1]) {
-      console.error(' Please specify a table name.');
+      console.error('Table name required');
       process.exit(1);
     }
-    dropTable(args[1]);
+    listIndexes(args[1]);
+    break;
+
+  case 'db:vacuum':
+    vacuumDatabase();
     break;
 
-  case 'migrate':
-    if (args[1] === 'all') {
-      migrateAll();
+  case 'db:connections':
+    showConnections();
+    break;
+
+  case 'db:kill-connections':
+    if (readlineSync.keyInYN('⚠️ Kill all other database connections?')) {
+      killConnections();
     } else {
-      console.error(' Invalid migration command. Use: mwala migrate all');
+      console.log('Cancelled.');
+    }
+    break;
+
+  case 'db:drop-all-tables':
+    if (readlineSync.keyInYN('⚠️⚠️⚠️ DROP ALL TABLES PERMANENTLY? Type YES to confirm:')) {
+      if (readlineSync.question('Type database name to confirm: ') === process.env.DB_NAME) {
+        dropAllTables();
+      } else {
+        console.log('Database name mismatch. Aborted.');
+      }
+    }
+    break;
+
+  case 'db:export':
+    if (!args[1] || !args[2]) {
+      console.error('Usage: mwala db:export <table> <output.csv>');
       process.exit(1);
     }
+    exportTableToCsv(args[1], args[2]);
     break;
-    case 'rollback':
-    if (args[1] === 'all') {
-   
-      rollbackLastMigration();
-    } else {
-      console.error(' Invalid migration command. Use: mwala roll-back all');
+
+  case 'db:import':
+    if (!args[1] || !args[2]) {
+      console.error('Usage: mwala db:import <input.csv> <table>');
       process.exit(1);
     }
+    importCsvToTable(args[1], args[2]);
+    break;
+
+  case 'db:seed':
+    if (!args[1]) {
+      console.error('Usage: mwala db:seed <seedFile.mjs>');
+      process.exit(1);
+    }
+    seedDatabase(args[1]);
     break;
 
   default:
-    console.error(` Unknown command: ${command}. Run "mwala help" to see available commands.`);
+    console.error(`Unknown command: ${command}`);
+    console.log('Run "mwala help" for available commands.');
     process.exit(1);
-}
+}