create-backlist 6.1.8 → 6.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-backlist",
-  "version": "6.1.8",
+  "version": "6.2.0",
   "description": "An advanced, multi-language backend generator based on frontend analysis.",
   "type": "commonjs",
   "bin": {

package/src/generators/node.js

@@ -7,24 +7,35 @@ const ejs = require("ejs");
 const { analyzeFrontend } = require("../analyzer");
 const { renderAndWrite, getTemplatePath } = require("./template");
 
+function stripQuery(p) {
+  return String(p || "").split("?")[0];
+}
+
+function safePascalName(name) {
+  const cleaned = String(name || "Default")
+    .split("?")[0]
+    .replace(/[^a-zA-Z0-9]/g, "");
+
+  if (!cleaned) return "Default";
+  return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
+}
+
 function sanitizeEndpoints(endpoints) {
   if (!Array.isArray(endpoints)) return [];
 
   return endpoints.map((ep) => {
-    const rawPath = String(ep.path || ep.route || "/");
+    const rawPath = stripQuery(ep.path || ep.route || "/");
 
-    // remove empty, api, and version segments (v1/v2/v10...)
     const parts = rawPath
       .split("/")
       .filter(Boolean)
       .filter((p) => p !== "api" && !/^v\d+$/i.test(p));
 
     const resource = parts[0] || "Default";
-    const controllerName = `${resource.charAt(0).toUpperCase()}${resource.slice(1)}`;
+    const controllerName = safePascalName(resource);
 
     let functionName = "";
 
-    // AUTH naming
     if (controllerName.toLowerCase() === "auth") {
       if (rawPath.includes("login")) functionName = "loginUser";
       else if (rawPath.includes("register")) functionName = "registerUser";
@@ -33,13 +44,15 @@ function sanitizeEndpoints(endpoints) {
       const singularName = resource.endsWith("s") ? resource.slice(0, -1) : resource;
       const pluralName = resource.endsWith("s") ? resource : `${resource}s`;
 
-      const pascalSingular = `${singularName.charAt(0).toUpperCase()}${singularName.slice(1)}`;
-      const pascalPlural = `${pluralName.charAt(0).toUpperCase()}${pluralName.slice(1)}`;
+      const pascalSingular = safePascalName(singularName);
+      const pascalPlural = safePascalName(pluralName);
 
       const method = String(ep.method || "GET").toUpperCase();
 
-      // detect id param in route/path
-      const hasId = rawPath.includes(":id") || /\/\d+/.test(rawPath) || rawPath.includes("{id}") || rawPath.includes("/:");
+      const hasId =
+        rawPath.includes(":") || 
+        rawPath.includes("{") || 
+        /\/\d+/.test(rawPath);
 
       if (method === "GET") {
         functionName = hasId ? `get${pascalSingular}ById` : `getAll${pascalPlural}`;
@@ -54,7 +67,7 @@ function sanitizeEndpoints(endpoints) {
       }
     }
 
-    return { ...ep, controllerName, functionName };
+    return { ...ep, path: rawPath, controllerName, functionName };
   });
 }
 
@@ -76,10 +89,11 @@ async function generateNodeProject(options) {
     console.log(chalk.blue("  -> Analyzing frontend for API endpoints..."));
     let endpoints = await analyzeFrontend(frontendSrcDir);
 
-    if (endpoints.length > 0) {
+    if (Array.isArray(endpoints) && endpoints.length > 0) {
       console.log(chalk.green(`  -> Found ${endpoints.length} endpoints.`));
       endpoints = sanitizeEndpoints(endpoints);
     } else {
+      endpoints = [];
       console.log(chalk.yellow("  -> No API endpoints found. A basic project will be created."));
     }
 
@@ -87,9 +101,11 @@ async function generateNodeProject(options) {
     const modelsToGenerate = new Map();
 
     endpoints.forEach((ep) => {
-      if (!ep || !ep.controllerName) return;
+      if (!ep) return;
+      const ctrl = safePascalName(ep.controllerName);
+      if (ctrl === "Default" || ctrl === "Auth") return;
 
-      if (ep.controllerName !== "Default" && ep.controllerName !== "Auth" && !modelsToGenerate.has(ep.controllerName)) {
+      if (!modelsToGenerate.has(ctrl)) {
         let fields = [];
         if (ep.schemaFields) {
           fields = Object.entries(ep.schemaFields).map(([key, type]) => ({
@@ -98,8 +114,7 @@ async function generateNodeProject(options) {
             isUnique: key === "email",
           }));
         }
-
-        modelsToGenerate.set(ep.controllerName, { name: ep.controllerName, fields });
+        modelsToGenerate.set(ctrl, { name: ctrl, fields });
       }
     });
 
@@ -175,7 +190,7 @@ async function generateNodeProject(options) {
         await fs.ensureDir(path.join(destSrcDir, "models"));
 
         for (const [modelName, modelData] of modelsToGenerate.entries()) {
-          const schema = modelData.fields.reduce((acc, field) => {
+          const schema = (modelData.fields || []).reduce((acc, field) => {
             acc[field.name] = field.type;
             return acc;
           }, {});
@@ -242,13 +257,14 @@ async function generateNodeProject(options) {
       );
     }
 
-    // --- Step 8: Extras ---
+    // --- Step 8: Extras (FIXED) ---
     if (extraFeatures.includes("docker")) {
       console.log(chalk.blue("  -> Generating Docker files..."));
-      await renderAndWrite(getTemplatePath("node-ts-express/partials/Dockerfile.ejs"), path.join(projectDir, "Dockerfile"), {
-        dbType,
-        port,
-      });
+      await renderAndWrite(
+        getTemplatePath("node-ts-express/partials/Dockerfile.ejs"),
+        path.join(projectDir, "Dockerfile"),
+        { dbType, port }
+      );
       await renderAndWrite(
         getTemplatePath("node-ts-express/partials/docker-compose.yml.ejs"),
         path.join(projectDir, "docker-compose.yml"),
@@ -259,10 +275,11 @@ async function generateNodeProject(options) {
     if (extraFeatures.includes("swagger")) {
       console.log(chalk.blue("  -> Generating API documentation setup..."));
       await fs.ensureDir(path.join(destSrcDir, "utils"));
+      // FIX: Added 'paths' to the EJS data object
       await renderAndWrite(
         getTemplatePath("node-ts-express/partials/ApiDocs.ts.ejs"),
         path.join(destSrcDir, "utils", "swagger.ts"),
-        { projectName, port, addAuth }
+        { projectName, port, addAuth, paths: endpoints }
       );
     }
 
@@ -274,7 +291,6 @@ async function generateNodeProject(options) {
       await fs.writeFile(path.join(projectDir, "jest.config.js"), jestConfig);
       await fs.ensureDir(path.join(projectDir, "src", "__tests__"));
 
-      // IMPORTANT: pass endpoints for auto-tests
       await renderAndWrite(
         getTemplatePath("node-ts-express/partials/App.test.ts.ejs"),
         path.join(projectDir, "src", "__tests__", "api.test.ts"),
@@ -283,7 +299,7 @@ async function generateNodeProject(options) {
     }
 
     // --- Step 9: routes.ts + server inject ---
-    const nonAuthEndpoints = endpoints.filter((ep) => ep.controllerName !== "Auth");
+    const nonAuthEndpoints = endpoints.filter((ep) => safePascalName(ep.controllerName) !== "Auth");
 
     await renderAndWrite(
       getTemplatePath("node-ts-express/partials/routes.ts.ejs"),