nestcraftx 0.2.6 → 0.3.0

package/utils/shell.js

@@ -1,26 +1,75 @@
 const { execSync } = require("child_process");
 const fs = require("fs");
 const { logError } = require("./loggers/logError");
+const { logWarning } = require("./loggers/logWarning");
 const { spinner } = require("./spinner");
+const { warning, info } = require("./colors");
+
+/**
+ * Accumulated warnings collected during a generation session.
+ * Displayed as a summary at the end via printSetupWarnings().
+ */
+const _warnings = [];
+
+/**
+ * Runs a shell command synchronously.
+ *
+ * @param {string} command - The shell command to execute.
+ * @param {string} errorMessage - Human-readable error message shown on failure.
+ * @param {object} [options] - Optional configuration.
+ * @param {boolean} [options.critical=true] - If true (default), a failure calls process.exit(1).
+ *   If false, the failure is logged as a warning and execution continues.
+ * @param {string|null} [options.spinner] - Optional spinner label shown during execution.
+ * @returns {Promise<boolean>} Resolves to true on success, false on non-critical failure.
+ */
+async function runCommand(command, errorMessage, options = {}) {
+  // Support old call signature: runCommand(cmd, msg, spinnerText)
+  // New signature: runCommand(cmd, msg, { critical, spinner })
+  let critical = true;
+  let spinnerText = null;
+
+  if (typeof options === "string") {
+    // Legacy: third arg was spinnerText string
+    spinnerText = options;
+  } else if (typeof options === "object" && options !== null) {
+    critical = options.critical !== false; // default true
+    spinnerText = options.spinner || null;
+  }
 
-async function runCommand(command, errorMessage, spinnerText = null) {
   const spin = spinnerText ? spinner(spinnerText) : null;
 
   try {
     if (spin) spin.start();
     execSync(command, { stdio: spinnerText ? "pipe" : "inherit" });
     if (spin) spin.succeed(spinnerText);
+    return true;
   } catch (error) {
     if (spin) spin.fail(errorMessage);
-    logError(errorMessage);
-    fs.appendFileSync(
-      "setup.log",
-      `[Erreur] ${errorMessage}: ${error.message}\n`,
-    );
-    process.exit(1);
+
+    const logLine = `[${new Date().toISOString()}] ${errorMessage}: ${error.message}\n`;
+    fs.appendFileSync("setup.log", logLine);
+
+    if (critical) {
+      // Fatal — stop everything
+      logError(`${errorMessage}`);
+      logError(`Run: ${command}`);
+      process.exit(1);
+    } else {
+      // Non-critical — warn and continue
+      logWarning(`${errorMessage} (non-fatal, continuing...)`);
+      logWarning(`  Command: ${command}`);
+      logWarning(`  See setup.log for details`);
+      _warnings.push({ command, errorMessage });
+      return false;
+    }
   }
 }
 
+/**
+ * Silent command — returns stdout string or null on failure. Never exits.
+ * @param {string} command
+ * @returns {string|null}
+ */
 async function runCommandSilent(command) {
   try {
     return execSync(command, { stdio: "pipe" }).toString();
@@ -29,4 +78,35 @@ async function runCommandSilent(command) {
   }
 }
 
-module.exports = { runCommand, runCommandSilent };
+/**
+ * Prints a summary of all non-critical warnings accumulated during the session.
+ * Call this at the very end of the generation pipeline.
+ */
+function printSetupWarnings() {
+  if (_warnings.length === 0) return;
+
+  console.log(
+    `\n${warning("⚠️  Setup completed with")} ${warning(String(_warnings.length))} ${warning("warning(s):")}`,
+  );
+  _warnings.forEach((w, i) => {
+    console.log(`  ${info(`${i + 1}.`)} ${w.errorMessage}`);
+    console.log(`     ${info("Command:")} ${w.command}`);
+  });
+  console.log(
+    `\n  ${info("➜")} Full details in: ${info("setup.log")}\n`,
+  );
+}
+
+/**
+ * Clears the warnings accumulator (useful between test runs).
+ */
+function clearSetupWarnings() {
+  _warnings.length = 0;
+}
+
+module.exports = {
+  runCommand,
+  runCommandSilent,
+  printSetupWarnings,
+  clearSetupWarnings,
+};

package/utils/userInput.js

@@ -1,8 +1,18 @@
-import * as readline from "readline-sync";
-import * as fs from "fs";
-import { logInfo } from "./loggers/logInfo.js";
-
-export async function getUserInputs2() {
+const readline = require("readline-sync");
+const fs = require("fs");
+const { logInfo } = require("./loggers/logInfo");
+
+// ── Modules extraits (Phase 1A) ────────────────────────────────────────────────
+const {
+  createDirectory,
+  createFile,
+  updateFile,
+} = require("./file-system");
+const { safeUpdateAppModule } = require("./app-module.updater");
+const { capitalize, decapitalize } = require("./helpers");
+// ──────────────────────────────────────────────────────────────────────────────
+
+async function getUserInputs2() {
   console.log("\n🔹🔹🔹 Configuration du projet 🔹🔹🔹\n");
 
   const dataBases = [
@@ -299,7 +309,7 @@ export async function getUserInputs2() {
   };
 }
 
-export function getUserInputsSwagger() {
+function getUserInputsSwagger() {
   console.log("\n🔹 Configuration de Swagger 🔹");
 
   const title = readline.question("Titre de l'API ? (ex: Mon API) ", {
@@ -324,98 +334,24 @@ export function getUserInputsSwagger() {
   return { title, description, version, endpoint };
 }
 
-export async function createDirectory(directoryPath) {
-  try {
-    if (!fs.existsSync(directoryPath)) {
-      fs.mkdirSync(directoryPath, { recursive: true });
-      // console.log(`Dossier créé : ${directoryPath}`);
-    }
-  } catch (error) {
-    console.error(
-      `Erreur lors de la création du dossier ${directoryPath}:`,
-      error,
-    );
-  }
-}
-
-export async function createFile(fileData) {
-  try {
-    if (!fs.existsSync(fileData.path)) {
-      fs.writeFileSync(`${fileData.path}`, `${fileData.contente}`);
-    } else {
-      console.log(`Existing file : ${fileData.path}`);
-      fs.writeFileSync(`${fileData.path}`, `${fileData.contente}`);
-    }
-  } catch (error) {
-    console.error(`Erreur creating file ${fileData.path}:`, error);
-  }
-}
-
-export async function updateFile({ path, pattern, replacement }) {
-  try {
-    let mainTs = fs.readFileSync(path, "utf8");
-    const updatedContent = mainTs.replace(pattern, replacement);
-    fs.writeFileSync(path, updatedContent, "utf-8");
-    // console.log(` Updated file: ${path}`);
-  } catch (error) {
-    console.error(` Error updating file ${path}:`, error);
-  }
-}
-
-export async function safeUpdateAppModule(entity) {
-  const filePath = "src/app.module.ts";
-  const moduleName = `${capitalize(entity)}Module`;
-  const importLine = `import { ${moduleName} } from 'src/${entity}/${entity}.module';`;
-
-  let content = fs.readFileSync(filePath, "utf-8");
-
-  // Étape 1 : Ajout de l'import si nécessaire
-  if (!content.includes(importLine)) {
-    const importMarker = `import { ConfigModule } from '@nestjs/config';`;
-
-    if (content.includes(importMarker)) {
-      await updateFile({
-        path: filePath,
-        pattern: importMarker,
-        replacement: `${importMarker}\n${importLine}`,
-      });
-      content = fs.readFileSync(filePath, "utf-8");
-    } else {
-      logInfo(
-        "  Impossible de trouver le point d'insertion de l'import (ConfigModule manquant)",
-      );
-    }
-  }
-
-  // Étape 2 : Vérifier le bloc des imports du @Module
-  const importsBlockRegex = /imports:\s*\[((.|\n)*?)\]/m;
-  const match = content.match(importsBlockRegex);
-
-  if (!match) {
-    logInfo("  Impossible de trouver le bloc 'imports' dans AppModule.");
-    return;
-  }
-
-  const currentImportsBlock = match[1];
-  const isAlreadyImportedInModule = currentImportsBlock.includes(moduleName);
-
-  if (!isAlreadyImportedInModule) {
-    const updatedBlock = currentImportsBlock.trim().endsWith(",")
-      ? `${currentImportsBlock.trim()} ${moduleName},`
-      : `${currentImportsBlock.trim()}, ${moduleName},`;
-
-    const newContent = content.replace(
-      importsBlockRegex,
-      `imports: [${updatedBlock}]`,
-    );
-    fs.writeFileSync(filePath, newContent, "utf-8");
-  }
-}
-
-export function capitalize(str) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
-export function decapitalize(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1);
-}
+// ── Fonctions déléguées aux modules extraits (Phase 1A) ───────────────────────
+// createDirectory, createFile, updateFile → ./file-system.js
+// safeUpdateAppModule                     → ./app-module.updater.js
+// capitalize, decapitalize                → ./helpers.js
+//
+// Les implémentations inline ont été supprimées. Toutes sont importées en haut
+// du fichier et ré-exportées dans module.exports ci-dessous.
+// ──────────────────────────────────────────────────────────────────────────────
+
+module.exports = {
+  // Fonctions locales
+  getUserInputs2,
+  getUserInputsSwagger,
+  // Ré-exports des modules extraits (compatibilité ascendante 100%)
+  createDirectory,
+  createFile,
+  updateFile,
+  safeUpdateAppModule,
+  capitalize,
+  decapitalize,
+};