nestcraftx 0.2.6 → 0.4.0

package/utils/setups/orms/typeOrmSetup.js

@@ -162,12 +162,39 @@ async function setupTypeORM(inputs) {
         columnOptions.push("default: Role.USER");
       }
 
-      if (field.optional) {
+      if (field.unique || field.name.toLowerCase() === "email") {
+        columnOptions.push("unique: true");
+      }
+
+      const isNullable = field.nullable || field.optional;
+      if (isNullable) {
         columnOptions.push("nullable: true");
       }
 
-      if (field.name.toLowerCase() === "email") {
-        columnOptions.push("unique: true");
+      if (field.default !== undefined && field.default !== null && field.default !== "") {
+        let defaultVal = field.default;
+        if (typeof defaultVal === "string") {
+          if (defaultVal === "true") defaultVal = true;
+          else if (defaultVal === "false") defaultVal = false;
+          else if (defaultVal.toLowerCase() === "now" || defaultVal.toLowerCase() === "now()") {
+            defaultVal = "CURRENT_TIMESTAMP";
+          } else if (!isNaN(defaultVal) && defaultVal.trim() !== "") {
+            defaultVal = Number(defaultVal);
+          }
+        }
+        if (defaultVal === "CURRENT_TIMESTAMP") {
+          columnOptions.push(`default: () => 'CURRENT_TIMESTAMP'`);
+        } else if (typeof defaultVal === "boolean" || typeof defaultVal === "number") {
+          columnOptions.push(`default: ${defaultVal}`);
+        } else if (mapping.type === "enum") {
+          if (mapping.tsType && /^[A-Z]/.test(mapping.tsType)) {
+            columnOptions.push(`default: ${mapping.tsType}.${defaultVal.toUpperCase()}`);
+          } else {
+            columnOptions.push(`default: '${defaultVal}'`);
+          }
+        } else {
+          columnOptions.push(`default: '${defaultVal}'`);
+        }
       }
 
       // 2. Gestion des Imports d'Enums Custom
@@ -186,7 +213,7 @@ async function setupTypeORM(inputs) {
       // 3. Construction du champ
       fieldsContent += `
           @Column({ ${columnOptions.join(", ")} })
-          ${field.name}${field.optional ? "?" : ""}: ${mapping.tsType};
+          ${field.name}${isNullable ? "?" : ""}: ${mapping.tsType};
           `;
     }
 

package/utils/setups/projectSetup.js

@@ -1,8 +1,22 @@
 const readline = require("readline-sync");
-const { logInfo } = require("../loggers/logInfo");
-const { runCommand } = require("../shell");
 const fs = require("fs");
+const path = require("path");
 const { info } = require("../colors");
+const { logInfo } = require("../loggers/logInfo");
+const { logError } = require("../loggers/logError");
+const { runCommand } = require("../shell");
+
+// Pipeline imports
+const { setupCleanArchitecture } = require("../configs/setupCleanArchitecture");
+const { setupLightArchitecture } = require("../configs/setupLightArchitecture");
+const { setupAuth } = require("./setupAuth");
+const { setupSwagger } = require("./setupSwagger");
+const { setupDatabase } = require("./setupDatabase");
+const { configureDocker } = require("../configs/configureDocker");
+const { setupBootstrapLogger } = require("./setupLogger");
+const { generateEnvFile, writeEnvFile } = require("../envGenerator");
+const { saveProjectConfig } = require("../file-utils/saveProjectConfig");
+const { printSetupWarnings } = require("../shell");
 
 async function createProject(inputs) {
   if (fs.existsSync(inputs.projectName)) {
@@ -13,34 +27,90 @@ async function createProject(inputs) {
     );
 
     if (confirmation) {
-      // confirmation is true if the user presses 'y'
       console.log("Deleting existing project...");
       fs.rmSync(inputs.projectName, { recursive: true, force: true });
     } else {
       console.log("Operation cancelled by user. Exiting.");
-      return; // Stop function execution if the user cancels
+      throw new Error("Operation cancelled by user.");
     }
   }
 
   logInfo(`Creating NestJS project: ${inputs.projectName}`);
 
-  // Remains asynchronous as runCommand likely involves external processes (npm/npx)
   await runCommand(
     `npx @nestjs/cli new ${inputs.projectName} --package-manager ${inputs.packageManager}`,
     "Failed to create NestJS project"
   );
 
   // Changing the current process directory to the project root
-  process.chdir(inputs.projectName);
+  const isDryRun = process.argv.includes("--dry-run");
+  if (!isDryRun) {
+    process.chdir(inputs.projectName);
+  } else {
+    console.log(`[DRY-RUN] Simulated: change directory to ${inputs.projectName}`);
+  }
 
   // Installing dependencies
   logInfo("Installing dependencies...");
 
-  // Remains asynchronous as runCommand likely involves external processes (npm/npx)
   await runCommand(
     `${inputs.packageManager} add @nestjs/config class-validator class-transformer dotenv`,
     "Failed to install dependencies"
   );
 }
 
-module.exports = { createProject };
+/**
+ * Runs the complete project scaffolding and setup pipeline in sequence.
+ * Handles CWD tracking and restores the working directory on failure.
+ * @param {object} inputs
+ */
+async function runProjectSetupPipeline(inputs) {
+  const originalCwd = process.cwd();
+  try {
+    logInfo("Starting project generation...");
+
+    await createProject(inputs);
+
+    if (inputs.mode === "light") {
+      await setupLightArchitecture(inputs);
+    } else {
+      await setupCleanArchitecture(inputs);
+    }
+
+    if (inputs.useAuth) {
+      await setupAuth(inputs);
+    }
+
+    if (inputs.useSwagger) {
+      await setupSwagger(inputs.swaggerInputs);
+    } else {
+      setupBootstrapLogger();
+    }
+
+    if (inputs.useDocker) {
+      await configureDocker(inputs);
+    }
+
+    await setupDatabase(inputs);
+
+    const envContent = await generateEnvFile(inputs);
+    writeEnvFile(envContent);
+
+    await saveProjectConfig(inputs);
+
+    // Show warnings
+    printSetupWarnings();
+
+  } catch (error) {
+    logError(`Error during project creation: ${error.message}`);
+    if (process.cwd() !== originalCwd) {
+      process.chdir(originalCwd);
+    }
+    throw error;
+  }
+}
+
+module.exports = {
+  createProject,
+  runProjectSetupPipeline,
+};

package/utils/setups/setupAuth.js

@@ -13,12 +13,15 @@ async function setupAuth(inputs) {
   const isFull = mode === "full";
 
   // 1. INSTALLATION DES DÉPENDANCES
+  const pkgManager = inputs.packageManager || "npm";
+  const installCmd = pkgManager === "yarn" || pkgManager === "pnpm" ? `${pkgManager} add` : "npm install";
+
   await runCommand(
-    `npm install @nestjs/jwt @nestjs/passport passport passport-jwt bcrypt uuid`,
+    `${installCmd} @nestjs/jwt @nestjs/passport passport passport-jwt bcrypt uuid`,
     "Erreur install deps auth",
   );
   await runCommand(
-    `npm install -D @types/passport-jwt @types/bcrypt @types/uuid`,
+    `${installCmd} -D @types/passport-jwt @types/bcrypt @types/uuid`,
     "Erreur install dev-deps auth",
   );
 
@@ -773,9 +776,6 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
     const request = context.switchToHttp().getRequest();
     const user = request.user;
 
-    console.log('🔍 Required Roles:', requiredRoles);
-    console.log('👤 User Role:', user?.role);
-
     // Check if the user has one of the required roles
     return user && user.role && requiredRoles.includes(user.role);
    }
@@ -805,8 +805,7 @@ import { Session, SessionSchema } from '${schemaRelativePath}';`;
   }
 
   if (inputs.mode == "full") {
-    dbImports =
-      +"import { ISessionRepositoryName } from '${paths.interfaces}/session.repository.interface';";
+    dbImports += `\nimport { ISessionRepositoryName } from '${paths.interfaces}/session.repository.interface';`;
   }
 
   await createFile({

package/utils/setups/setupDatabase.js

@@ -9,7 +9,8 @@ async function setupDatabase(inputs) {
 
   await runCommand(
     "npm install dotenv",
-    "Error installing dotenv automatically, please run it manually now"
+    "Error installing dotenv automatically, please run it manually now",
+    { critical: false },
   );
 
   switch (inputs.selectedDB) {

package/utils/setups/setupMongoose.js

@@ -1,5 +1,6 @@
 const { runCommand } = require("../shell");
 const path = require("path");
+const fs = require("fs");
 const {
   createFile,
   updateFile,
@@ -67,12 +68,33 @@ async function setupMongoose(inputs) {
     "Mongoose and its dependencies successfully installed!"
   );
 
+  const isDryRun = process.argv.includes("--dry-run");
+  if (isDryRun) {
+    console.log("[DRY-RUN] Simulated: write Mongoose configuration, app.module.ts config, and schemas");
+    logSuccess(
+      "Mongoose configuration complete. Schemas are generated in src/schemas!"
+    );
+    return;
+  }
+
   // --- Base Configuration (app.module.ts and .env) --- // Generating the .env file
-  const envContent = `
-  MONGO_URI=${inputs.dbConfig.MONGO_URI}
-  MONGO_DB=${inputs.dbConfig.MONGO_DB}
-   `.trim();
-  await createFile({ path: ".env", contente: envContent });
+  const envPath = ".env";
+  const mongoUriLine = `MONGO_URI=${inputs.dbConfig.MONGO_URI}`;
+  const mongoDbLine = `MONGO_DB=${inputs.dbConfig.MONGO_DB}`;
+
+  if (!fs.existsSync(envPath)) {
+    const envContent = `${mongoUriLine}\n${mongoDbLine}\n`;
+    await createFile({ path: envPath, contente: envContent });
+  } else {
+    let content = fs.readFileSync(envPath, "utf8");
+    if (!content.includes("MONGO_URI=")) {
+      content += `\n${mongoUriLine}`;
+    }
+    if (!content.includes("MONGO_DB=")) {
+      content += `\n${mongoDbLine}`;
+    }
+    fs.writeFileSync(envPath, content, "utf8");
+  }
 
   const appModulePath = path.join("src", "app.module.ts");
   const mongooseImport = `import { MongooseModule } from '@nestjs/mongoose';`;
@@ -81,21 +103,30 @@ async function setupMongoose(inputs) {
     dbName: process.env.MONGO_DB,
    }),`;
 
-  // 1. Adding MongooseModule import
-  await updateFile({
-    path: appModulePath,
-    pattern: /import {[\s\S]*?} from '@nestjs\/config';/,
-    replacement: (match) => `${match}\n${mongooseImport}`,
-  });
+  if (fs.existsSync(appModulePath)) {
+    let appModuleContent = fs.readFileSync(appModulePath, "utf8");
+
+    // 1. Adding MongooseModule import
+    if (!appModuleContent.includes("@nestjs/mongoose")) {
+      await updateFile({
+        path: appModulePath,
+        pattern: /import {[\s\S]*?} from '@nestjs\/config';/,
+        replacement: (match) => `${match}\n${mongooseImport}`,
+      });
+      appModuleContent = fs.readFileSync(appModulePath, "utf8");
+    }
 
-  // 2. Adding MongooseModule.forRoot() configuration
-  const importsPattern =
-    /imports:\s*\[[\s\S]*?ConfigModule\.forRoot\([\s\S]*?\),/;
-  await updateFile({
-    path: appModulePath,
-    pattern: importsPattern,
-    replacement: (match) => `${match}${mongooseForRoot}`,
-  });
+    // 2. Adding MongooseModule.forRoot() configuration
+    if (!appModuleContent.includes("MongooseModule.forRoot")) {
+      const importsPattern =
+        /imports:\s*\[[\s\S]*?ConfigModule\.forRoot\([\s\S]*?\),/;
+      await updateFile({
+        path: appModulePath,
+        pattern: importsPattern,
+        replacement: (match) => `${match}${mongooseForRoot}`,
+      });
+    }
+  }
 
   // --- Generating Mongoose Entities (Schemas) ---
   logInfo("📁 Generating Mongoose schemas (src/schemas)...");
@@ -144,10 +175,34 @@ role: Role;
       const mongooseType = mapTypeToMongoose(field.type);
       const tsType = field.type;
 
-      const isRequired =
-        field.name.toLowerCase() !== "isactive" &&
-        field.name.toLowerCase() !== "password";
-      const requiredOption = isRequired ? ", required: true" : "";
+      const isRequired = field.nullable !== undefined ? !field.nullable : (field.name.toLowerCase() !== "isactive" && field.name.toLowerCase() !== "password");
+      let propOpts = [`type: ${mongooseType}`];
+      if (isRequired) {
+        propOpts.push("required: true");
+      }
+      if (field.unique) {
+        propOpts.push("unique: true");
+      }
+      if (field.default !== undefined && field.default !== null && field.default !== "") {
+        let defaultVal = field.default;
+        if (typeof defaultVal === "string") {
+          if (defaultVal === "true") defaultVal = true;
+          else if (defaultVal === "false") defaultVal = false;
+          else if (defaultVal.toLowerCase() === "now" || defaultVal.toLowerCase() === "now()") {
+            defaultVal = "Date.now";
+          } else if (!isNaN(defaultVal) && defaultVal.trim() !== "") {
+            defaultVal = Number(defaultVal);
+          }
+        }
+        if (defaultVal === "Date.now") {
+          propOpts.push("default: Date.now");
+        } else if (typeof defaultVal === "boolean" || typeof defaultVal === "number") {
+          propOpts.push(`default: ${defaultVal}`);
+        } else {
+          propOpts.push(`default: '${defaultVal}'`);
+        }
+      }
+      const propOptionsStr = propOpts.join(", ");
 
       // Import des enums partagés si nécessaire
       if (
@@ -159,8 +214,8 @@ role: Role;
       }
 
       fieldsContent += `
-       @Prop({ type: ${mongooseType}${requiredOption} })
-       ${field.name}: ${tsType};
+       @Prop({ ${propOptionsStr} })
+       ${field.name}${field.nullable ? "?" : ""}: ${tsType};
       `;
     }
 
@@ -186,11 +241,22 @@ role: Role;
     ", "
   )}]),`;
 
-  await updateFile({
-    path: appModulePath,
-    pattern: new RegExp(mongooseForRoot.trim().replace(/[\n\r]/g, "\\s*"), "g"),
-    replacement: (match) => `${match}\n\t${forFeatureBlock}`,
-  });
+  if (fs.existsSync(appModulePath)) {
+    const appModuleContent = fs.readFileSync(appModulePath, "utf8");
+    if (appModuleContent.includes("MongooseModule.forFeature")) {
+      await updateFile({
+        path: appModulePath,
+        pattern: /MongooseModule\.forFeature\(\[[\s\S]*?\]\),/,
+        replacement: forFeatureBlock,
+      });
+    } else {
+      await updateFile({
+        path: appModulePath,
+        pattern: new RegExp(mongooseForRoot.trim().replace(/[\n\r]/g, "\\s*"), "g"),
+        replacement: (match) => `${match}\n\t${forFeatureBlock}`,
+      });
+    }
+  }
 
   if (inputs.isDemo) {
     // The generateSampleData function must be adapted for 'new Date()' usage and Mongoose types