mwalajs 1.1.1 → 1.1.3

package/bin/mwala.mjs

@@ -43,7 +43,7 @@ const {
 if (!command || command === 'help' || command === 'h') {
   console.log(`
 ╔══════════════════════════════════════════════════════════╗
-║                  MwalaJS CLI v1.2.0                     ║
+║                  MwalaJS CLI                     ║
 ╚══════════════════════════════════════════════════════════╝
 
 General:
@@ -181,7 +181,7 @@ switch (command) {
 
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, content);
-    console.log(`✅ ${name} ${type} created at ${folders[type]}/${name}.mjs`);
+    console.log(` ${name} ${type} created at ${folders[type]}/${name}.mjs`);
     break;
   }
 
@@ -189,7 +189,7 @@ switch (command) {
 
   case 'create-db':
     getDbConnection()
-      .then(() => console.log('✅ Database configured and connected successfully!'))
+      .then(() => console.log(' Database configured and connected successfully!'))
       .catch(err => {
         console.error('❌ Database setup failed:', err.message);
         process.exit(1);

package/package.json

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

package/utils/dbUtils.mjs

@@ -12,27 +12,74 @@ import sqlite3 from 'sqlite3';
 import readlineSync from 'readline-sync';
 import { fileURLToPath } from 'url';
 
-// Load .env
-dotenv.config();
+// Load .env from current project directory (important!)
+const envPath = path.join(process.cwd(), '.env');
+if (fs.existsSync(envPath)) {
+  dotenv.config({ path: envPath });
+} else {
+  dotenv.config(); // fallback to default behavior
+}
+
+const { 
+  DB_TYPE, 
+  DB_HOST = 'localhost', 
+  DB_USER, 
+  DB_PASSWORD = '', // Allow empty or missing password
+  DB_NAME, 
+  DB_PORT 
+} = process.env;
+
+// FIXED: Smart config check - allows empty password for MySQL/PostgreSQL
+const isDbConfigured = () => {
+  if (!DB_TYPE || !DB_NAME) {
+    return false;
+  }
 
-const { DB_TYPE, DB_HOST = 'localhost', DB_USER, DB_PASSWORD, DB_NAME, DB_PORT } = process.env;
+  // SQLite and MongoDB don't need user/password
+  if (DB_TYPE === 'sqlite' || DB_TYPE === 'mongodb') {
+    return true;
+  }
 
-// Helper to check if DB is configured
-const isDbConfigured = () => {
-  return DB_TYPE && DB_NAME && (DB_TYPE === 'sqlite' || (DB_USER && DB_PASSWORD));
+  // MySQL/PostgreSQL: need user, but password can be empty
+  return !!DB_USER; // Only require DB_USER, not DB_PASSWORD
 };
 
 const suggestDbSetup = () => {
   console.log('\n⚠️  Database not configured or connection failed.');
   console.log('   Run: mwala create-db   → to set up your database interactively');
-  console.log('   Or manually create a .env file with:');
+  console.log('   Or manually create a .env file in your project folder with:');
   console.log('   DB_TYPE=mysql|postgresql|sqlite|mongodb');
   console.log('   DB_NAME=your_db_name');
   console.log('   DB_HOST=localhost');
   console.log('   DB_USER=your_user');
-  console.log('   DB_PASSWORD=your_pass\n');
+  console.log('   DB_PASSWORD=               ← can be empty (just leave blank)\n');
 };
 
+// === WINDOWS MYSQL TOOLS AUTO-DETECTION ===
+let mysqlTools = null;
+if (process.platform === 'win32') {
+  const commonPaths = [
+    'C:\\Program Files\\MySQL\\MySQL Server 8.0\\bin',
+    'C:\\Program Files\\MySQL\\MySQL Server 8.4\\bin',
+    'C:\\Program Files (x86)\\MySQL\\MySQL Server 8.0\\bin',
+    'C:\\xampp\\mysql\\bin',
+    'C:\\wamp64\\bin\\mysql\\mysql8.0.31\\bin',
+    'C:\\laragon\\bin\\mysql\\mysql-8.0.30-winx64\\bin',
+    'C:\\Program Files\\MariaDB 10.6\\bin',
+  ];
+
+  for (const basePath of commonPaths) {
+    if (fs.existsSync(basePath)) {
+      const mysqldump = path.join(basePath, 'mysqldump.exe');
+      const mysqlCmd = path.join(basePath, 'mysql.exe');
+      if (fs.existsSync(mysqldump) && fs.existsSync(mysqlCmd)) {
+        mysqlTools = { mysqldump, mysql: mysqlCmd };
+        break;
+      }
+    }
+  }
+}
+
 // Global connection cache
 let connection = null;
 
@@ -63,7 +110,8 @@ const getConnection = async () => {
       });
       await connection.connect();
     } else if (DB_TYPE === 'sqlite') {
-      connection = new sqlite3.Database(`./${DB_NAME}.sqlite`);
+      const dbPath = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+      connection = new sqlite3.Database(dbPath);
       connection.serialize();
     } else if (DB_TYPE === 'mongodb') {
       const client = await MongoClient.connect(`mongodb://${DB_HOST}:${DB_PORT || 27017}`);
@@ -275,19 +323,43 @@ export const backupDatabase = () => {
 
   try {
     if (DB_TYPE === 'mysql') {
-      execSync(`mysqldump -h ${DB_HOST} -u ${DB_USER} -p${DB_PASSWORD} ${DB_NAME} > "${file}"`);
+      let cmd;
+      if (process.platform === 'win32' && mysqlTools) {
+        // Use full path on Windows
+        cmd = `"${mysqlTools.mysqldump}" -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} > "${file}"`;
+      } else {
+        // Linux/macOS or if in PATH
+        cmd = `mysqldump -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} > "${file}"`;
+      }
+      execSync(cmd, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'postgresql') {
       process.env.PGPASSWORD = DB_PASSWORD;
-      execSync(`pg_dump -h ${DB_HOST} -U ${DB_USER} ${DB_NAME} > "${file}"`);
+      execSync(`pg_dump -h ${DB_HOST} -U ${DB_USER} ${DB_NAME} > "${file}"`, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'sqlite') {
-      fs.copyFileSync(`./${DB_NAME}.sqlite`, file.replace('.sql', '.sqlite'));
+      const source = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+      const backupFile = file.replace('.sql', '.sqlite');
+      if (fs.existsSync(source)) {
+        fs.copyFileSync(source, backupFile);
+        console.log(` Backup saved: ${backupFile}`);
+        return;
+      } else {
+        console.log(' No SQLite database file found to backup.');
+        return;
+      }
     }
 
     console.log(` Backup saved: ${file}`);
   } catch (err) {
-    console.error(' Backup failed:', err.message);
+    console.error(' Backup failed.');
+    if (process.platform === 'win32' && !mysqlTools) {
+      console.log('\n❌ mysqldump.exe not found.');
+      console.log('   Install MySQL or use XAMPP/WAMP/Laragon.');
+      console.log('   Or add MySQL bin folder to your system PATH.');
+    } else {
+      console.error(' Error:', err.message);
+    }
   }
 };
 
@@ -299,17 +371,26 @@ export const restoreDatabase = (file) => {
 
   try {
     if (DB_TYPE === 'mysql') {
-      execSync(`mysql -h ${DB_HOST} -u ${DB_USER} -p${DB_PASSWORD} ${DB_NAME} < "${file}"`);
+      let cmd;
+      if (process.platform === 'win32' && mysqlTools) {
+        cmd = `"${mysqlTools.mysql}" -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} < "${file}"`;
+      } else {
+        cmd = `mysql -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} < "${file}"`;
+      }
+      execSync(cmd, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'postgresql') {
       process.env.PGPASSWORD = DB_PASSWORD;
-      execSync(`psql -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -f "${file}"`);
+      execSync(`psql -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -f "${file}"`, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'sqlite') {
-      fs.copyFileSync(file, `./${DB_NAME}.sqlite`);
+      const target = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+      fs.copyFileSync(file, target);
+      console.log(` Restored SQLite database to: ${target}`);
+      return;
     }
 
-    console.log(' Database restored from:', file);
+    console.log(` Database restored from: ${file}`);
   } catch (err) {
     console.error(' Restore failed:', err.message);
   }
@@ -333,8 +414,13 @@ export const showDatabaseSize = async () => {
     console.log(`Database size: ${res.rows[0].size}`);
   } 
   else if (DB_TYPE === 'sqlite') {
-    const stats = fs.statSync(`./${DB_NAME}.sqlite`);
-    console.log(`Database file size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
+    const dbFile = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+    if (fs.existsSync(dbFile)) {
+      const stats = fs.statSync(dbFile);
+      console.log(`Database file size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
+    } else {
+      console.log('Database file not created yet (0 MB)');
+    }
   } 
   else if (DB_TYPE === 'mongodb') {
     const stats = await conn.stats();