servcraft 0.4.8 → 0.4.9

package/ROADMAP.md

@@ -4,7 +4,8 @@ This document outlines the planned features and improvements for Servcraft.
 
 ## Version History
 
-- **v0.4.8** (Current) - Automatic module installation during init - Phase 3 in progress 🚧
+- **v0.4.9** (Current) - Flexible JS module system (ESM/CommonJS + .js/.cjs) - Phase 3 in progress 🚧
+- **v0.4.8** - Automatic module installation during init
 - **v0.4.7** - CLI header alignment fix
 - **v0.4.6** - Improved CLI design
 - **v0.4.5** - Lazy Prisma client initialization

package/dist/cli/index.cjs

@@ -1949,7 +1949,7 @@ async function findServercraftModules() {
   }
   return null;
 }
-async function generateModuleFiles(moduleName, moduleDir) {
+async function generateModuleFiles(moduleName, moduleDir, language = "typescript", moduleSystem = "esm", fileExtension = "ts") {
   const moduleNameMap = {
     users: "user",
     "rate-limit": "rate-limit",
@@ -1962,7 +1962,8 @@ async function generateModuleFiles(moduleName, moduleDir) {
   if (servercraftModulesDir) {
     const sourceModuleDir = import_path3.default.join(servercraftModulesDir, sourceDirName);
     if (await fileExists(sourceModuleDir)) {
-      await copyModuleFromSource(sourceModuleDir, moduleDir);
+      const jsExt = language === "javascript" ? fileExtension : "js";
+      await copyModuleFromSource(sourceModuleDir, moduleDir, language, moduleSystem, jsExt);
       return;
     }
   }
@@ -1989,16 +1990,48 @@ async function generateModuleFiles(moduleName, moduleDir) {
       await generateGenericModule(moduleDir, moduleName);
   }
 }
-async function copyModuleFromSource(sourceDir, targetDir) {
+function convertESMtoCommonJS(content) {
+  return content.replace(/^export\s+class\s+/gm, "class ").replace(/^export\s+function\s+/gm, "function ").replace(/^export\s+const\s+/gm, "const ").replace(/^export\s+let\s+/gm, "let ").replace(/^export\s+var\s+/gm, "var ").replace(
+    /import\s*\{\s*([^}]+)\s*\}\s*from\s*['"]([^'"]+)['"]/g,
+    "const { $1 } = require('$2')"
+  ).replace(/import\s+(\w+)\s+from\s*['"]([^'"]+)['"]/g, "const $1 = require('$2')").replace(
+    /import\s+(\w+)\s*,\s*\{\s*([^}]+)\s*\}\s*from\s*['"]([^'"]+)['"]/g,
+    "const $1 = require('$3');\nconst { $2 } = require('$3')"
+  ).replace(/^(class\s+(\w+)\s+\{[\s\S]*?\n\})/gm, "$1\nmodule.exports.$2 = $2;").replace(/export\s*\{\s*([^}]+)\s*\}/g, (match, exports2) => {
+    const items = exports2.split(",").map((item) => item.trim()).filter(Boolean);
+    return items.map((item) => `module.exports.${item} = ${item};`).join("\n");
+  });
+}
+async function copyModuleFromSource(sourceDir, targetDir, language = "typescript", moduleSystem = "esm", fileExtension = "js") {
   const entries = await fs4.readdir(sourceDir, { withFileTypes: true });
   for (const entry of entries) {
     const sourcePath = import_path3.default.join(sourceDir, entry.name);
-    const targetPath = import_path3.default.join(targetDir, entry.name);
+    let targetPath = import_path3.default.join(targetDir, entry.name);
     if (entry.isDirectory()) {
       await fs4.mkdir(targetPath, { recursive: true });
-      await copyModuleFromSource(sourcePath, targetPath);
+      await copyModuleFromSource(sourcePath, targetPath, language, moduleSystem, fileExtension);
     } else {
-      await fs4.copyFile(sourcePath, targetPath);
+      if (language === "javascript" && entry.name.endsWith(".ts")) {
+        const ext = `.${fileExtension}`;
+        targetPath = targetPath.replace(/\.ts$/, ext);
+        let content = await fs4.readFile(sourcePath, "utf-8");
+        for (let i = 0; i < 3; i++) {
+          content = content.replace(/import\s+type\s+\{[^}]+\}\s+from\s+['"][^'"]+['"];?\s*\n/g, "").replace(/import\s+\{([^}]+)\}\s+from/g, (match, imports) => {
+            const filtered = imports.split(",").map((imp) => imp.trim()).filter((imp) => !imp.startsWith("type ")).join(", ");
+            return filtered ? `import {${filtered}} from` : "";
+          }).replace(/from\s+['"](.+?)\.js['"]/g, `from '$1${ext}'`).replace(/\b(private|public|protected|readonly)\s+/g, "").replace(
+            /:\s*[A-Z]\w+(<[^>]+>)?(\[\])?(\s*[|&]\s*[A-Z]\w+(<[^>]+>)?(\[\])?)*(?=[,)\s=\n])/g,
+            ""
+          ).replace(/(\w+)\s*:\s*[^,)=\n]+([,)])/g, "$1$2").replace(/(\w+)\s*:\s*[^=\n{]+(\s*=)/g, "$1$2").replace(/\)\s*:\s*[^{=\n]+\s*([{=])/g, ") $1").replace(/^export\s+(interface|type)\s+[^;]+;?\s*$/gm, "").replace(/^(interface|type)\s+[^;]+;?\s*$/gm, "").replace(/\s+as\s+\w+/g, "").replace(/<[A-Z][\w,\s<>[\]|&]*>/g, "");
+        }
+        content = content.replace(/^\s*\n/gm, "");
+        if (moduleSystem === "commonjs") {
+          content = convertESMtoCommonJS(content);
+        }
+        await fs4.writeFile(targetPath, content, "utf-8");
+      } else {
+        await fs4.copyFile(sourcePath, targetPath);
+      }
     }
   }
 }
@@ -2139,13 +2172,13 @@ var initCommand = new import_commander2.Command("init").alias("new").description
     console.log(import_chalk6.default.cyan("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E"));
     console.log(import_chalk6.default.cyan("\u2502") + "                                       " + import_chalk6.default.cyan("\u2502"));
     console.log(
-      import_chalk6.default.cyan("\u2502") + "   " + import_chalk6.default.bold.white("\u{1F680} Servcraft") + import_chalk6.default.gray(" - Project Generator") + "   " + import_chalk6.default.cyan("\u2502")
+      import_chalk6.default.cyan("\u2502") + import_chalk6.default.bold.white("\u{1F680} Servcraft") + import_chalk6.default.gray(" - Project Generator") + "  " + import_chalk6.default.cyan("\u2502")
     );
     console.log(
-      import_chalk6.default.cyan("\u2502") + "      " + import_chalk6.default.gray("by ") + import_chalk6.default.blue("Yao Logan") + import_chalk6.default.gray(" (@Le-Sourcier)") + "     " + import_chalk6.default.cyan("\u2502")
+      import_chalk6.default.cyan("\u2502") + "   " + import_chalk6.default.gray("by ") + import_chalk6.default.blue("Yao Logan") + import_chalk6.default.gray(" (@Le-Sourcier)") + "   " + import_chalk6.default.cyan("\u2502")
     );
     console.log(
-      import_chalk6.default.cyan("\u2502") + "         " + import_chalk6.default.bgBlue.white(" in/yao-logan ") + "         " + import_chalk6.default.cyan("\u2502")
+      import_chalk6.default.cyan("\u2502") + "      " + import_chalk6.default.bgBlue.white(" in/yao-logan ") + "       " + import_chalk6.default.cyan("\u2502")
     );
     console.log(import_chalk6.default.cyan("\u2502") + "                                       " + import_chalk6.default.cyan("\u2502"));
     console.log(import_chalk6.default.cyan("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F"));
@@ -2153,17 +2186,24 @@ var initCommand = new import_commander2.Command("init").alias("new").description
     let options;
     if (cmdOptions?.yes) {
       const db = cmdOptions.db || "postgresql";
+      const language = cmdOptions.javascript ? "javascript" : "typescript";
+      const moduleSystem = cmdOptions.commonjs ? "commonjs" : "esm";
+      let fileExtension = "ts";
+      if (language === "javascript") {
+        fileExtension = moduleSystem === "commonjs" ? "cjs" : "js";
+      }
       options = {
         name: name || "my-servcraft-app",
-        language: cmdOptions.javascript ? "javascript" : "typescript",
-        moduleSystem: cmdOptions.commonjs ? "commonjs" : "esm",
+        language,
+        moduleSystem,
+        fileExtension,
         database: db,
         orm: db === "mongodb" ? "mongoose" : db === "none" ? "none" : "prisma",
         validator: "zod",
         features: ["auth", "users", "email"]
       };
     } else {
-      const answers = await import_inquirer2.default.prompt([
+      const basicAnswers = await import_inquirer2.default.prompt([
         {
           type: "input",
           name: "name",
@@ -2185,17 +2225,43 @@ var initCommand = new import_commander2.Command("init").alias("new").description
             { name: "   JavaScript", value: "javascript" }
           ],
           default: "typescript"
-        },
-        {
-          type: "list",
-          name: "moduleSystem",
-          message: "\u{1F4E6} Select module system:",
-          choices: [
-            { name: "\u2728 ESM (import/export) - Recommended", value: "esm" },
-            { name: "   CommonJS (require/module.exports)", value: "commonjs" }
-          ],
-          default: "esm"
-        },
+        }
+      ]);
+      let moduleSystem = "esm";
+      let fileExtension = "ts";
+      if (basicAnswers.language === "javascript") {
+        const jsConfigAnswers = await import_inquirer2.default.prompt([
+          {
+            type: "list",
+            name: "moduleSystem",
+            message: "\u{1F4E6} Select module syntax:",
+            choices: [
+              { name: "\u2728 ESM (import/export)", value: "esm" },
+              { name: "   CommonJS (require/module.exports)", value: "commonjs" }
+            ],
+            default: "esm"
+          },
+          {
+            type: "list",
+            name: "fileExtension",
+            message: "\u{1F4C4} Select file extension:",
+            choices: (answers2) => {
+              if (answers2.moduleSystem === "esm") {
+                return [{ name: "\u2728 .js (standard for ESM)", value: "js" }];
+              } else {
+                return [
+                  { name: "\u2728 .cjs (explicit CommonJS)", value: "cjs" },
+                  { name: "   .js (CommonJS in .js)", value: "js" }
+                ];
+              }
+            },
+            default: (answers2) => answers2.moduleSystem === "esm" ? "js" : "cjs"
+          }
+        ]);
+        moduleSystem = jsConfigAnswers.moduleSystem;
+        fileExtension = jsConfigAnswers.fileExtension;
+      }
+      const restAnswers = await import_inquirer2.default.prompt([
         {
           type: "list",
           name: "database",
@@ -2234,6 +2300,12 @@ var initCommand = new import_commander2.Command("init").alias("new").description
           ]
         }
       ]);
+      const answers = {
+        ...basicAnswers,
+        moduleSystem,
+        fileExtension,
+        ...restAnswers
+      };
       const db = answers.database;
       options = {
         ...answers,
@@ -2339,7 +2411,13 @@ var initCommand = new import_commander2.Command("init").alias("new").description
             moduleSpinner.text = `Installing ${feature} module...`;
             const moduleDir = import_path4.default.join(projectDir, "src/modules", feature);
             await ensureDir(moduleDir);
-            await generateModuleFiles(feature, moduleDir);
+            await generateModuleFiles(
+              feature,
+              moduleDir,
+              options.language,
+              options.moduleSystem,
+              options.fileExtension
+            );
           }
           moduleSpinner.succeed(`${options.features.length} module(s) installed!`);
         } catch (err) {