mwalajs 1.1.15 → 1.1.17

package/createProject copy.mjs

@@ -0,0 +1,140 @@
+import fs from 'fs-extra';
+import path from 'path';
+import readline from 'readline';
+import os from 'os';
+import { fileURLToPath } from 'url';
+
+/**
+ * Get global template path (FIXED)
+ */
+function getMwalajsPath() {
+    const envPath = process.env.MWALAJSPATH;
+
+    if (envPath && fs.existsSync(envPath)) {
+        return envPath;
+    }
+
+    /**
+     * IMPORTANT FIX:
+     * Get path of installed npm package, NOT cwd
+     */
+    try {
+        const modulePath = path.dirname(fileURLToPath(import.meta.url));
+
+        // go up to package root
+        const rootPath = path.resolve(modulePath, '..');
+
+        if (fs.existsSync(path.join(rootPath, 'app.mjs'))) {
+            return rootPath;
+        }
+    } catch (err) {}
+
+    const fallbackPaths = {
+        win32: 'C:\\Program Files\\mwalajs',
+        linux: '/usr/local/lib/mwalajs',
+        darwin: '/usr/local/lib/mwalajs'
+    };
+
+    const fallback = fallbackPaths[os.platform()];
+
+    if (fallback && fs.existsSync(fallback)) {
+        return fallback;
+    }
+
+    throw new Error("❌ MwalaJS template source not found. Set MWALAJSPATH.");
+}
+
+/**
+ * Ask helper
+ */
+function askQuestion(rl, question) {
+    return new Promise(resolve => {
+        rl.question(question, ans => resolve(ans.trim()));
+    });
+}
+
+/**
+ * Create project
+ */
+export async function createProject(projectArg) {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    try {
+        let projectName = projectArg?.trim();
+
+        if (!projectName) {
+            projectName = await askQuestion(rl, "Enter project name: ");
+        }
+
+        if (!projectName) {
+            console.error("❌ Project name required");
+            return;
+        }
+
+        const newProjectPath = path.join(process.cwd(), projectName);
+
+        const templatePath = getMwalajsPath();
+
+        if (!fs.existsSync(templatePath)) {
+            throw new Error("Template path not found: " + templatePath);
+        }
+
+        if (fs.existsSync(newProjectPath)) {
+            console.error(`❌ Folder already exists: ${projectName}`);
+            return;
+        }
+
+        console.log(`📦 Creating project: ${projectName}`);
+        console.log(`📁 From template: ${templatePath}`);
+
+        fs.mkdirSync(newProjectPath, { recursive: true });
+
+        const itemsToCopy = [
+            "app.mjs",
+            "controllers",
+            "migrations",
+            "routes",
+            "views",
+            "middlewares",
+            "models",
+            "public",
+            "README.md"
+        ];
+
+        let copied = 0;
+
+        for (const item of itemsToCopy) {
+            const src = path.join(templatePath, item);
+            const dest = path.join(newProjectPath, item);
+
+            if (fs.existsSync(src)) {
+                console.log(`✔ Copying ${item}`);
+                fs.copySync(src, dest);
+                copied++;
+            } else {
+                console.warn(`⚠ Missing template item: ${item}`);
+            }
+        }
+
+        console.log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━");
+        console.log(`✅ Project created: ${projectName}`);
+        console.log(`📁 Location: ${newProjectPath}`);
+        console.log(`📦 Files copied: ${copied}/${itemsToCopy.length}`);
+        console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━");
+
+    } catch (err) {
+        console.error("❌ Create project failed:", err.message);
+    } finally {
+        rl.close();
+    }
+}
+
+/**
+ * CLI support
+ */
+if (import.meta.url === `file://${process.argv[1]}`) {
+    createProject(process.argv[2]);
+}

package/createProject.mjs

@@ -1,140 +1,364 @@
-import fs from 'fs-extra';
-import path from 'path';
-import readline from 'readline';
-import os from 'os';
-import { fileURLToPath } from 'url';
+// 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 global template path (FIXED)
+ * Detect best possible MwalaJS template path
+ * Works on ALL OS
  */
 function getMwalajsPath() {
-    const envPath = process.env.MWALAJSPATH;
+  const envPath = process.env.MWALAJSPATH;
 
-    if (envPath && fs.existsSync(envPath)) {
-        return envPath;
+  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",
+    "/opt/mwalajs"
+  ];
+
+  for (const p of possiblePaths) {
+    if (p && fs.existsSync(p)) {
+      return fs.realpathSync(p);
     }
+  }
 
-    /**
-     * IMPORTANT FIX:
-     * Get path of installed npm package, NOT cwd
-     */
-    try {
-        const modulePath = path.dirname(fileURLToPath(import.meta.url));
+  return null;
+}
 
-        // go up to package root
-        const rootPath = path.resolve(modulePath, '..');
+/* =========================
+   CLI INPUT
+========================= */
 
-        if (fs.existsSync(path.join(rootPath, 'app.mjs'))) {
-            return rootPath;
-        }
-    } catch (err) {}
+function ask(rl, question) {
+  return new Promise((resolve) => {
+    rl.question(question, (ans) => resolve(ans.trim()));
+  });
+}
 
-    const fallbackPaths = {
-        win32: 'C:\\Program Files\\mwalajs',
-        linux: '/usr/local/lib/mwalajs',
-        darwin: '/usr/local/lib/mwalajs'
-    };
+/* =========================
+   MANUAL TEMPLATE GENERATOR
+   (ALWAYS WORKS - FALLBACK)
+========================= */
 
-    const fallback = fallbackPaths[os.platform()];
+function createManualTemplate(target) {
+  console.log("\n⚠ No template found. Generating FULL MwalaJS scaffold...\n");
 
-    if (fallback && fs.existsSync(fallback)) {
-        return fallback;
-    }
+  const dirs = [
+    "controllers",
+    "routes",
+    "models",
+    "views",
+    "views/layouts",
+    "views/pages",
+    "middlewares",
+    "migrations",
+    "config",
+    "public",
+    "public/css",
+    "public/js",
+    "public/images",
+    "storage",
+    "logs"
+  ];
 
-    throw new Error("❌ MwalaJS template source not found. Set MWALAJSPATH.");
-}
+  dirs.forEach((dir) => {
+    fs.mkdirSync(path.join(target, dir), { recursive: true });
+  });
 
-/**
- * Ask helper
- */
-function askQuestion(rl, question) {
-    return new Promise(resolve => {
-        rl.question(question, ans => resolve(ans.trim()));
+  /* =========================
+     APP ENTRY
+  ========================= */
+
+  fs.writeFileSync(
+    path.join(target, "app.mjs"),
+`import mwalajs from 'mwalajs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+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 Application Running'
+  });
+});
+
+/* SERVER */
+const PORT = process.env.PORT || 3000;
+mwalajs.listen(PORT, () => {
+  console.log(\`🚀 Server running on http://localhost:\${PORT}\`);
+});
+`
+  );
+
+  /* =========================
+     CONTROLLER
+  ========================= */
+
+  fs.writeFileSync(
+    path.join(target, "controllers/homeController.mjs"),
+`export const homeController = {
+  index: (req, res) => {
+    res.render('pages/index', {
+      title: 'Home Page'
     });
+  }
+};`
+  );
+
+  /* =========================
+     ROUTES
+  ========================= */
+
+  fs.writeFileSync(
+    path.join(target, "routes/homeRoutes.mjs"),
+`import mwalajs from 'mwalajs';
+import { homeController } from '../controllers/homeController.mjs';
+
+const router = mwalajs.Router();
+
+router.get('/', homeController.index);
+
+export { router as homeRoutes };
+`
+  );
+
+  /* =========================
+     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: 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="box">
+    <h1>🚀 MwalaJS Ready</h1>
+    <p><%= title %></p>
+  </div>
+</body>
+</html>`
+  );
+
+  /* =========================
+     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": "*",
+    "ejs": "*"
+  }
+}`
+  );
+
+  /* =========================
+     README
+  ========================= */
+
+  fs.writeFileSync(
+    path.join(target, "README.md"),
+`# 🚀 MwalaJS Project
+
+## Run project
+
+npm install
+npm start
+
+## Structure
+- MVC architecture
+- Controllers
+- Routes
+- Models
+- Views
+`
+  );
+
+  console.log("✅ FULL manual scaffold created successfully!");
+}
+
+/* =========================
+   MAIN PROJECT CREATOR
+========================= */
 
-/**
- * Create project
- */
 export async function createProject(projectArg) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
 
-    try {
-        let projectName = projectArg?.trim();
+  let createdMode = "unknown";
 
-        if (!projectName) {
-            projectName = await askQuestion(rl, "Enter project name: ");
-        }
+  try {
+    let projectName = projectArg?.trim();
 
-        if (!projectName) {
-            console.error("❌ Project name required");
-            return;
-        }
+    if (!projectName) {
+      projectName = await ask(rl, "Enter project name: ");
+    }
 
-        const newProjectPath = path.join(process.cwd(), projectName);
+    if (!projectName) {
+      console.log("❌ Project name is required");
+      return;
+    }
 
-        const templatePath = getMwalajsPath();
+    const target = path.join(process.cwd(), projectName);
 
-        if (!fs.existsSync(templatePath)) {
-            throw new Error("Template path not found: " + templatePath);
-        }
+    if (fs.existsSync(target)) {
+      console.log("❌ Folder already exists");
+      return;
+    }
 
-        if (fs.existsSync(newProjectPath)) {
-            console.error(`❌ Folder already exists: ${projectName}`);
-            return;
-        }
+    fs.mkdirSync(target, { recursive: true });
+
+    const templatePath = getMwalajsPath();
+
+    /* =========================
+       TEMPLATE MODE
+    ========================= */
+
+    if (templatePath) {
+      console.log("📦 Template found:", templatePath);
+
+      const items = [
+        "controllers",
+        "routes",
+        "models",
+        "views",
+        "middlewares",
+        "migrations",
+        "public",
+        "app.mjs",
+        "README.md"
+      ];
+
+      let copied = 0;
 
-        console.log(`📦 Creating project: ${projectName}`);
-        console.log(`📁 From template: ${templatePath}`);
-
-        fs.mkdirSync(newProjectPath, { recursive: true });
-
-        const itemsToCopy = [
-            "app.mjs",
-            "controllers",
-            "migrations",
-            "routes",
-            "views",
-            "middlewares",
-            "models",
-            "public",
-            "README.md"
-        ];
-
-        let copied = 0;
-
-        for (const item of itemsToCopy) {
-            const src = path.join(templatePath, item);
-            const dest = path.join(newProjectPath, item);
-
-            if (fs.existsSync(src)) {
-                console.log(`✔ Copying ${item}`);
-                fs.copySync(src, dest);
-                copied++;
-            } else {
-                console.warn(`⚠ Missing template item: ${item}`);
-            }
+      for (const item of items) {
+        const src = path.join(templatePath, item);
+        const dest = path.join(target, item);
+
+        if (fs.existsSync(src)) {
+          fs.copySync(src, dest);
+          console.log("✔ copied:", item);
+          copied++;
+        } else {
+          console.log("⚠ missing:", item);
         }
+      }
+
+      if (copied === 0) {
+        console.log("⚠ Template empty → switching to manual mode...");
+        createManualTemplate(target);
+        createdMode = "manual";
+      } else {
+        createdMode = "template";
+      }
 
-        console.log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━");
-        console.log(`✅ Project created: ${projectName}`);
-        console.log(`📁 Location: ${newProjectPath}`);
-        console.log(`📦 Files copied: ${copied}/${itemsToCopy.length}`);
-        console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━");
+    } else {
+      /* =========================
+         MANUAL MODE
+      ========================= */
 
-    } catch (err) {
-        console.error("❌ Create project failed:", err.message);
-    } finally {
-        rl.close();
+      createManualTemplate(target);
+      createdMode = "manual";
     }
+
+    /* =========================
+       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);
+  } finally {
+    rl.close();
+  }
 }
 
-/**
- * CLI support
- */
+/* =========================
+   CLI EXECUTION
+========================= */
+
 if (import.meta.url === `file://${process.argv[1]}`) {
-    createProject(process.argv[2]);
+  createProject(process.argv[2]);
 }

package/package.json

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