mwalajs 1.1.14 → 1.1.16

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,111 +1,237 @@
 // createProject.mjs
-import fs from 'fs-extra';
-import path from 'path';
-import readline from 'readline';
-import os from 'os';
+import fs from "fs-extra";
+import path from "path";
+import readline from "readline";
+import os from "os";
 
 /**
- * Detect base source path
+ * Get template source safely
  */
 function getMwalajsPath() {
-    const envPath = process.env.MWALAJSPATH;
+  const envPath = process.env.MWALAJSPATH;
 
-    if (envPath && fs.existsSync(envPath)) return envPath;
+  const defaultPaths = [
+    envPath,
+    "C:\\Program Files\\mwalajs",
+    "/usr/local/lib/mwalajs",
+    "/var/www/mwalajs",
+    path.join(process.cwd(), "template") // fallback local dev template
+  ];
 
-    const defaultPaths = {
-        win32: 'C:\\Program Files\\mwalajs',
-        linux: '/usr/local/lib/mwalajs',
-        darwin: '/usr/local/lib/mwalajs'
-    };
+  for (const p of defaultPaths) {
+    if (p && fs.existsSync(p)) return p;
+  }
 
-    const fallback = defaultPaths[os.platform()];
-    if (fs.existsSync(fallback)) return fallback;
+  return null; // IMPORTANT: we will generate manual scaffold
+}
 
-    console.warn("⚠ mwalajs source path not found. Using current directory.");
-    return process.cwd();
+/**
+ * Ask CLI input
+ */
+function ask(rl, q) {
+  return new Promise((resolve) => rl.question(q, (a) => resolve(a.trim())));
 }
 
 /**
- * Ask helper
+ * Manual fallback template generator (VERY IMPORTANT FIX)
  */
-function askQuestion(rl, question) {
-    return new Promise(resolve => {
-        rl.question(question, answer => resolve(answer.trim()));
-    });
+function createManualTemplate(target) {
+  console.log("⚠ No template found. Creating manual MwalaJS scaffold...");
+
+  const structure = [
+    "controllers",
+    "routes",
+    "models",
+    "views",
+    "views/layouts",
+    "views/pages",
+    "middlewares",
+    "migrations",
+    "public/css",
+    "public/js",
+    "public/images"
+  ];
+
+  structure.forEach((dir) => {
+    fs.mkdirSync(path.join(target, dir), { recursive: true });
+  });
+
+  // app.mjs
+  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'));
+
+mwalajs.get('/', (req, res) => {
+  res.render('pages/index', { title: 'MwalaJS App' });
+});
+
+const port = process.env.PORT || 3000;
+mwalajs.listen(port, () => {
+  console.log('🚀 Server running on http://localhost:' + port);
+});
+`
+  );
+
+  // sample controller
+  fs.writeFileSync(
+    path.join(target, "controllers/homeController.mjs"),
+`export const homeController = {
+  getHome: (req, res) => {
+    res.render('pages/index', { title: 'Home Page' });
+  }
+};`
+  );
+
+  // sample route
+  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.getHome);
+
+export { router as homeRoutes };
+`
+  );
+
+  // sample view
+  fs.writeFileSync(
+    path.join(target, "views/pages/index.ejs"),
+`<!DOCTYPE html>
+<html>
+<head>
+  <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; }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>🚀 Welcome to MwalaJS</h1>
+    <p><%= title %></p>
+  </div>
+</body>
+</html>`
+  );
+
+  // package.json
+  fs.writeFileSync(
+    path.join(target, "package.json"),
+`{
+  "name": "mwalajs-app",
+  "type": "module",
+  "scripts": {
+    "start": "node app.mjs"
+  },
+  "dependencies": {
+    "mwalajs": "*"
+  }
+}`
+  );
+
+  fs.writeFileSync(
+    path.join(target, "README.md"),
+`# MwalaJS App
+
+Run:
+npm install
+npm start
+`
+  );
+
+  console.log("✅ Manual template created successfully!");
 }
 
 /**
- * Create project
+ * Main project creator
  */
 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 {
-        // ✅ ONLY ONE SOURCE OF INPUT
-        let projectName = projectArg?.trim();
+  try {
+    let projectName = projectArg?.trim();
 
-        if (!projectName) {
-            projectName = await askQuestion(rl, "Enter the name of the new project: ");
-        }
+    if (!projectName) {
+      projectName = await ask(rl, "Enter project name: ");
+    }
 
-        if (!projectName) {
-            console.error("❌ Project name cannot be empty.");
-            return;
-        }
+    if (!projectName) {
+      console.log("❌ Project name required");
+      return;
+    }
 
-        const currentDir = process.cwd();
-        const newProjectPath = path.join(currentDir, projectName);
+    const target = path.join(process.cwd(), projectName);
 
-        const mwalajsSourcePath = getMwalajsPath();
+    if (fs.existsSync(target)) {
+      console.log("❌ Folder already exists");
+      return;
+    }
 
-        if (fs.existsSync(newProjectPath)) {
-            console.error(`❌ Error: Folder '${projectName}' already exists.`);
-            return;
+    fs.mkdirSync(target, { recursive: true });
+
+    const templatePath = getMwalajsPath();
+
+    if (!templatePath) {
+      createManualTemplate(target);
+    } else {
+      console.log("📦 Using template from:", templatePath);
+
+      const items = [
+        "controllers",
+        "routes",
+        "models",
+        "views",
+        "middlewares",
+        "migrations",
+        "public",
+        "app.mjs",
+        "README.md"
+      ];
+
+      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);
+        } else {
+          console.log("⚠ missing:", item);
         }
+      }
 
-        console.log(`Creating folder: ${newProjectPath}`);
-        fs.mkdirSync(newProjectPath, { recursive: true });
-
-        const itemsToCopy = [
-            "app.mjs",
-            "controllers",
-            "migrations",
-            "routes",
-            "views",
-            "middlewares",
-            "models",
-            "README.md",
-            "public"
-        ];
-
-        for (const item of itemsToCopy) {
-            const src = path.join(mwalajsSourcePath, item);
-            const dest = path.join(newProjectPath, item);
-
-            if (fs.existsSync(src)) {
-                console.log(`Copying '${item}'...`);
-                fs.copySync(src, dest);
-            } else {
-                console.warn(`⚠ '${item}' not found. Skipping...`);
-            }
-        }
+      // fallback if empty project
+      if (!fs.existsSync(path.join(target, "app.mjs"))) {
+        createManualTemplate(target);
+      }
+    }
 
-        console.log(`\n✅ Project '${projectName}' created successfully!`);
-        console.log(`📁 Location: ${newProjectPath}`);
+    console.log("\n🎉 Project created successfully!");
+    console.log("📁 Path:", target);
 
-    } catch (err) {
-        console.error("❌ Project creation failed:", err.message);
-    } finally {
-        rl.close();
-    }
+  } catch (err) {
+    console.error("❌ Create project failed:", err.message);
+  } finally {
+    rl.close();
+  }
 }
 
-/**
- * CLI run support
- */
+// CLI support
 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.14",
+  "version": "1.1.16",
   "description": "MwalaJS Framework CLI Tool and Web Framework for Backend and Frontend Development.",
   "type": "module",
   "main": "app.mjs",