nestcraftx 0.2.5 → 0.2.6

package/commands/start.js

@@ -1,19 +1,19 @@
-const { execSync } = require("child_process");
-const path = require("path");
-
-// 🔐 Forcer UTF-8 uniquement sur Windows
-if (process.platform === "win32") {
-  try {
-    execSync("chcp 65001", { stdio: "ignore" }); // Changer l'encodage de la console
-  } catch (err) {
-    const message = `⚠️ Impossible de forcer UTF-8 dans le terminal Windows: ${err}`;
-    console.warn(message);
-  }
-}
-
-module.exports = function () {
-  console.log("🚀 Lancement de la génération NestJS...");
-
-  const setupPath = path.join(__dirname, "..", "setup.js");
-  require(setupPath);
-};
+const { execSync } = require("child_process");
+const path = require("path");
+
+// 🔐 Forcer UTF-8 uniquement sur Windows
+if (process.platform === "win32") {
+  try {
+    execSync("chcp 65001", { stdio: "ignore" }); // Changer l'encodage de la console
+  } catch (err) {
+    const message = `⚠️ Impossible de forcer UTF-8 dans le terminal Windows: ${err}`;
+    console.warn(message);
+  }
+}
+
+module.exports = function () {
+  console.log("🚀 Lancement de la génération NestJS...");
+
+  const setupPath = path.join(__dirname, "..", "setup.js");
+  require(setupPath);
+};

package/commands/test.js

@@ -1,7 +1,7 @@
-const { displaySystemCheck } = require('../utils/systemCheck');
-
-async function testCommand() {
-  displaySystemCheck();
-}
-
-module.exports = testCommand;
+const { displaySystemCheck } = require('../utils/systemCheck');
+
+async function testCommand() {
+  displaySystemCheck();
+}
+
+module.exports = testCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestcraftx",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Modern CLI to generate scalable NestJS projects with Clean Architecture (FULL) and MVP mode (LIGHT) - Enhanced with auto-generated .env secrets, complete ORM support, and entity relations",
   "main": "bin/nestcraft.js",
   "bin": {

package/utils/cliParser.js

@@ -1,76 +1,133 @@
-function parseCliArgs(args) {
-  const parsed = {
-    command: null,
-    projectName: null,
-    flags: {},
-    positional: [],
-    errors: []
-  };
-
-  for (let i = 2; i < args.length; i++) {
-    const arg = args[i];
-
-    if (i === 2 && !arg.startsWith('--')) {
-      parsed.command = arg;
-      continue;
-    }
-
-    if (i === 3 && !arg.startsWith('--') && parsed.command === 'new') {
-      if (!isValidProjectName(arg)) {
-        parsed.errors.push(`Nom de projet invalide: "${arg}". Utilisez uniquement des lettres, chiffres, tirets et underscores.`);
-      }
-      parsed.projectName = arg;
-      continue;
-    }
-
-    if (arg.startsWith('--')) {
-      const [key, value] = parseFlag(arg);
-      const nextArg = args[i + 1];
-
-      if (value !== null) {
-        parsed.flags[key] = value;
-      } else if (nextArg && !nextArg.startsWith('--')) {
-        parsed.flags[key] = nextArg;
-        i++;
-      } else {
-        parsed.flags[key] = true;
-      }
-    } else {
-      parsed.positional.push(arg);
-    }
-  }
-
-  validateFlags(parsed);
-  return parsed;
-}
-
-function parseFlag(arg) {
-  if (arg.includes('=')) {
-    const [key, ...valueParts] = arg.slice(2).split('=');
-    return [key, valueParts.join('=')];
-  }
-  return [arg.slice(2), null];
-}
-
-function isValidProjectName(name) {
-  return /^[a-zA-Z0-9_-]+$/.test(name);
-}
-
-function validateFlags(parsed) {
-  const validOrms = ['prisma', 'typeorm', 'mongoose'];
-  const validModes = ['full', 'light'];
-
-  if (parsed.flags.orm && !validOrms.includes(parsed.flags.orm)) {
-    parsed.errors.push(`ORM invalide: "${parsed.flags.orm}". Valeurs acceptées: ${validOrms.join(', ')}`);
-  }
-
-  if (parsed.flags.mode && !validModes.includes(parsed.flags.mode)) {
-    parsed.errors.push(`Mode invalide: "${parsed.flags.mode}". Valeurs acceptées: ${validModes.join(', ')}`);
-  }
-
-  if (parsed.flags.full && parsed.flags.light) {
-    parsed.errors.push('Les flags --full et --light sont mutuellement exclusifs.');
-  }
-}
-
-module.exports = { parseCliArgs };
+/* function parseCliArgs(args) {
+  const parsed = {
+    command: null,
+    projectName: null,
+    flags: {},
+    positional: [],
+    errors: []
+  };
+
+  for (let i = 2; i < args.length; i++) {
+    const arg = args[i];
+
+    if (i === 2 && !arg.startsWith('--')) {
+      parsed.command = arg;
+      continue;
+    }
+
+    if (i === 3 && !arg.startsWith('--') && parsed.command === 'new') {
+      if (!isValidProjectName(arg)) {
+        parsed.errors.push(`Nom de projet invalide: "${arg}". Utilisez uniquement des lettres, chiffres, tirets et underscores.`);
+      }
+      parsed.projectName = arg;
+      continue;
+    }
+
+    if (arg.startsWith('--')) {
+      const [key, value] = parseFlag(arg);
+      const nextArg = args[i + 1];
+
+      if (value !== null) {
+        parsed.flags[key] = value;
+      } else if (nextArg && !nextArg.startsWith('--')) {
+        parsed.flags[key] = nextArg;
+        i++;
+      } else {
+        parsed.flags[key] = true;
+      }
+    } else {
+      parsed.positional.push(arg);
+    }
+  }
+
+  validateFlags(parsed);
+  return parsed;
+} */
+
+function parseCliArgs(args) {
+  const parsed = {
+    command: null,
+    projectName: null, // Pour 'new'
+    subCommand: null, // Pour 'generate' (module, auth, etc.)
+    targetName: null, // Pour 'generate' (User, Product, etc.)
+    flags: {},
+    positional: [],
+    errors: [],
+  };
+
+  for (let i = 2; i < args.length; i++) {
+    const arg = args[i];
+
+    // Commande principale (new, g, info...)
+    if (i === 2 && !arg.startsWith("--")) {
+      parsed.command = arg;
+      continue;
+    }
+
+    if (arg.startsWith("--")) {
+      const [key, value] = parseFlag(arg);
+      // ... logique des flags inchangée ...
+      const nextArg = args[i + 1];
+      if (value !== null) {
+        parsed.flags[key] = value;
+      } else if (nextArg && !nextArg.startsWith("--")) {
+        parsed.flags[key] = nextArg;
+        i++;
+      } else {
+        parsed.flags[key] = true;
+      }
+    } else {
+      parsed.positional.push(arg);
+    }
+  }
+
+  // Distribution des arguments selon la commande
+  if (parsed.command === "new") {
+    parsed.projectName = parsed.positional[0] || null;
+    if (parsed.projectName && !isValidProjectName(parsed.projectName)) {
+      parsed.errors.push(`Nom de projet invalide: "${parsed.projectName}".`);
+    }
+  } else if (parsed.command === "generate" || parsed.command === "g") {
+    parsed.subCommand = parsed.positional[0] || null; // ex: module
+    parsed.targetName = parsed.positional[1] || null; // ex: User
+  }
+
+  validateFlags(parsed);
+  return parsed;
+}
+function parseFlag(arg) {
+  if (arg.includes("=")) {
+    const [key, ...valueParts] = arg.slice(2).split("=");
+    return [key, valueParts.join("=")];
+  }
+  return [arg.slice(2), null];
+}
+
+function isValidProjectName(name) {
+  return /^[a-zA-Z0-9_-]+$/.test(name);
+}
+
+function validateFlags(parsed) {
+  const validOrms = ["prisma", "typeorm", "mongoose"];
+  const validModes = ["full", "light"];
+
+  if (parsed.flags.orm && !validOrms.includes(parsed.flags.orm)) {
+    parsed.errors.push(
+      `ORM invalide: "${parsed.flags.orm}". Valeurs acceptées: ${validOrms.join(", ")}`,
+    );
+  }
+
+  if (parsed.flags.mode && !validModes.includes(parsed.flags.mode)) {
+    parsed.errors.push(
+      `Mode invalide: "${parsed.flags.mode}". Valeurs acceptées: ${validModes.join(", ")}`,
+    );
+  }
+
+  if (parsed.flags.full && parsed.flags.light) {
+    parsed.errors.push(
+      "Les flags --full et --light sont mutuellement exclusifs.",
+    );
+  }
+}
+
+module.exports = { parseCliArgs };

package/utils/colors.js

@@ -1,62 +1,62 @@
-const colors = {
-  reset: '\x1b[0m',
-  bold: '\x1b[1m',
-  dim: '\x1b[2m',
-
-  black: '\x1b[30m',
-  red: '\x1b[31m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  blue: '\x1b[34m',
-  magenta: '\x1b[35m',
-  cyan: '\x1b[36m',
-  white: '\x1b[37m',
-
-  bgBlack: '\x1b[40m',
-  bgRed: '\x1b[41m',
-  bgGreen: '\x1b[42m',
-  bgYellow: '\x1b[43m',
-  bgBlue: '\x1b[44m',
-  bgMagenta: '\x1b[45m',
-  bgCyan: '\x1b[46m',
-  bgWhite: '\x1b[47m'
-};
-
-function colorize(text, color) {
-  return `${colors[color]}${text}${colors.reset}`;
-}
-
-function success(text) {
-  return colorize(text, 'green');
-}
-
-function error(text) {
-  return colorize(text, 'red');
-}
-
-function warning(text) {
-  return colorize(text, 'yellow');
-}
-
-function info(text) {
-  return colorize(text, 'cyan');
-}
-
-function bold(text) {
-  return `${colors.bold}${text}${colors.reset}`;
-}
-
-function dim(text) {
-  return `${colors.dim}${text}${colors.reset}`;
-}
-
-module.exports = {
-  colors,
-  colorize,
-  success,
-  error,
-  warning,
-  info,
-  bold,
-  dim
-};
+const colors = {
+  reset: '\x1b[0m',
+  bold: '\x1b[1m',
+  dim: '\x1b[2m',
+
+  black: '\x1b[30m',
+  red: '\x1b[31m',
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  blue: '\x1b[34m',
+  magenta: '\x1b[35m',
+  cyan: '\x1b[36m',
+  white: '\x1b[37m',
+
+  bgBlack: '\x1b[40m',
+  bgRed: '\x1b[41m',
+  bgGreen: '\x1b[42m',
+  bgYellow: '\x1b[43m',
+  bgBlue: '\x1b[44m',
+  bgMagenta: '\x1b[45m',
+  bgCyan: '\x1b[46m',
+  bgWhite: '\x1b[47m'
+};
+
+function colorize(text, color) {
+  return `${colors[color]}${text}${colors.reset}`;
+}
+
+function success(text) {
+  return colorize(text, 'green');
+}
+
+function error(text) {
+  return colorize(text, 'red');
+}
+
+function warning(text) {
+  return colorize(text, 'yellow');
+}
+
+function info(text) {
+  return colorize(text, 'cyan');
+}
+
+function bold(text) {
+  return `${colors.bold}${text}${colors.reset}`;
+}
+
+function dim(text) {
+  return `${colors.dim}${text}${colors.reset}`;
+}
+
+module.exports = {
+  colors,
+  colorize,
+  success,
+  error,
+  warning,
+  info,
+  bold,
+  dim
+};

package/utils/configs/configureDocker.js

@@ -1,120 +1,120 @@
-const fs = require("fs");
-const { logInfo } = require("../loggers/logInfo");
-const { logSuccess } = require("../loggers/logSuccess");
-const { createFile } = require("../userInput");
-
-async function configureDocker(inputs) {
-  logInfo("Generating Docker files...");
-
-  const dockerfileContent = `
-# ------------------ Stage 1: Build & Dependencies ------------------
-FROM node:20-alpine AS builder
-
-# Set working directory
-WORKDIR /app
-
-# Copy package files first to leverage Docker cache
-COPY package.json package-lock.json ./
-
-# Install dependencies (Node dependencies and global tools like Prisma if needed)
-# The 'production' flag ensures only production dependencies are installed if applicable.
-# 'npm ci' is recommended for CI/CD/Docker builds instead of 'npm install'
-RUN ${
-    inputs.packageManager === "npm"
-      ? "npm ci"
-      : `${inputs.packageManager} install --frozen-lockfile`
-  }
-
-# Copy the rest of the application source code
-COPY . .
-
-# Build the NestJS application (if TypeScript is used)
-RUN ${inputs.packageManager} run build
-
-# ------------------ Stage 2: Production Runtime ------------------
-FROM node:20-alpine AS production
-
-# Set working directory
-WORKDIR /app
-
-# Copy production node_modules from the builder stage
-COPY --from=builder /app/node_modules ./node_modules
-
-# Copy built application and start scripts (dist and package.json)
-COPY --from=builder /app/dist ./dist
-COPY --from=builder /app/package.json ./package.json
-
-# Expose the application port (usually 3000 for NestJS)
-EXPOSE 3000
-
-# Run the application using the built files (production environment)
-# Use 'start:prod' if available, otherwise fall back to 'start'
-CMD [ "${inputs.packageManager}", "run", "start:prod" ]
-`;
-  await createFile({
-    path: "Dockerfile",
-    contente: dockerfileContent.trim(),
-  });
-  const dockerComposeContent = `
-version: '3.8'
-
-services:
-  # Application Service (NestJS)
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    # Links the container to the internal network
-    networks:
-      - backend_network
-    # Maps internal port 3000 (EXPOSE in Dockerfile) to external port 3000
-    ports:
-      - "3000:3000"
-    # Mount .env file (for local dev, not recommended for prod)
-    env_file:
-      - .env
-    # Restart policy
-    restart: always
-    # Wait for the DB to be ready (requires 'wait-for-it' or similar)
-    depends_on:
-      - db
-
-  # Database Service (PostgreSQL - generic image for example)
-  db:
-    image: postgres:15-alpine
-    container_name: ${inputs.projectName}_db
-    networks:
-      - backend_network
-    environment:
-      POSTGRES_USER: ${inputs.dbConfig.POSTGRES_USER || "postgres"}
-      POSTGRES_PASSWORD: ${inputs.dbConfig.POSTGRES_PASSWORD || "secret"}
-      POSTGRES_DB: ${inputs.dbConfig.POSTGRES_DB || "mydatabase"}
-      # Optional: Set timezone
-      TZ: Europe/Paris
-    # For dev purposes: map DB port externally (optional)
-    ports:
-      - "5432:5432"
-    # Persist database data
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    restart: always
-
-# Networks definition
-networks:
-  backend_network:
-    driver: bridge
-
-# Volumes definition
-volumes:
-  postgres_data:
-`;
-
-  await createFile({
-    path: "docker-compose.yml",
-    contente: dockerComposeContent.trim(),
-  });
-
-  logSuccess("Docker successfully configured with enhanced settings");
-}
-
-module.exports = { configureDocker };
+const fs = require("fs");
+const { logInfo } = require("../loggers/logInfo");
+const { logSuccess } = require("../loggers/logSuccess");
+const { createFile } = require("../userInput");
+
+async function configureDocker(inputs) {
+  logInfo("Generating Docker files...");
+
+  const dockerfileContent = `
+# ------------------ Stage 1: Build & Dependencies ------------------
+FROM node:20-alpine AS builder
+
+# Set working directory
+WORKDIR /app
+
+# Copy package files first to leverage Docker cache
+COPY package.json package-lock.json ./
+
+# Install dependencies (Node dependencies and global tools like Prisma if needed)
+# The 'production' flag ensures only production dependencies are installed if applicable.
+# 'npm ci' is recommended for CI/CD/Docker builds instead of 'npm install'
+RUN ${
+    inputs.packageManager === "npm"
+      ? "npm ci"
+      : `${inputs.packageManager} install --frozen-lockfile`
+  }
+
+# Copy the rest of the application source code
+COPY . .
+
+# Build the NestJS application (if TypeScript is used)
+RUN ${inputs.packageManager} run build
+
+# ------------------ Stage 2: Production Runtime ------------------
+FROM node:20-alpine AS production
+
+# Set working directory
+WORKDIR /app
+
+# Copy production node_modules from the builder stage
+COPY --from=builder /app/node_modules ./node_modules
+
+# Copy built application and start scripts (dist and package.json)
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/package.json ./package.json
+
+# Expose the application port (usually 3000 for NestJS)
+EXPOSE 3000
+
+# Run the application using the built files (production environment)
+# Use 'start:prod' if available, otherwise fall back to 'start'
+CMD [ "${inputs.packageManager}", "run", "start:prod" ]
+`;
+  await createFile({
+    path: "Dockerfile",
+    contente: dockerfileContent.trim(),
+  });
+  const dockerComposeContent = `
+version: '3.8'
+
+services:
+  # Application Service (NestJS)
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    # Links the container to the internal network
+    networks:
+      - backend_network
+    # Maps internal port 3000 (EXPOSE in Dockerfile) to external port 3000
+    ports:
+      - "3000:3000"
+    # Mount .env file (for local dev, not recommended for prod)
+    env_file:
+      - .env
+    # Restart policy
+    restart: always
+    # Wait for the DB to be ready (requires 'wait-for-it' or similar)
+    depends_on:
+      - db
+
+  # Database Service (PostgreSQL - generic image for example)
+  db:
+    image: postgres:15-alpine
+    container_name: ${inputs.projectName}_db
+    networks:
+      - backend_network
+    environment:
+      POSTGRES_USER: ${inputs.dbConfig.POSTGRES_USER || "postgres"}
+      POSTGRES_PASSWORD: ${inputs.dbConfig.POSTGRES_PASSWORD || "secret"}
+      POSTGRES_DB: ${inputs.dbConfig.POSTGRES_DB || "mydatabase"}
+      # Optional: Set timezone
+      TZ: Europe/Paris
+    # For dev purposes: map DB port externally (optional)
+    ports:
+      - "5432:5432"
+    # Persist database data
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    restart: always
+
+# Networks definition
+networks:
+  backend_network:
+    driver: bridge
+
+# Volumes definition
+volumes:
+  postgres_data:
+`;
+
+  await createFile({
+    path: "docker-compose.yml",
+    contente: dockerComposeContent.trim(),
+  });
+
+  logSuccess("Docker successfully configured with enhanced settings");
+}
+
+module.exports = { configureDocker };