express-genix 1.1.4 → 2.0.0

package/index.js

@@ -1,114 +1,230 @@
-#!/usr/bin/env node
-
-const { program } = require('commander');
-const inquirer = require('inquirer');
-const path = require('path');
-const fs = require('fs');
-const { runPostGenerationCleanup } = require('./lib/cleanup');
-const { generateProject } = require('./lib/generator');
-
-// Create inquirer prompt module
-const prompt = inquirer.createPromptModule();
-
-async function main() {
-  program
-    .name('express-genix')
-    .description('CLI to generate a production-grade Express boilerplate with automatic code cleanup')
-    .version('1.1.0'); // Bumped for new features
-
-  program
-    .command('init')
-    .description('Initialize a new Express project with automatic formatting and linting')
-    .option('--skip-cleanup', 'Skip post-generation cleanup (for debugging)')
-    .action(async (options) => {
-      const answers = await prompt([
-        {
-          type: 'input',
-          name: 'projectName',
-          message: 'Project name:',
-          default: 'my-express-app',
-          validate: (input) => {
-            if (!/^[a-zA-Z0-9-_]+$/.test(input)) {
-              return 'Project name can only contain letters, numbers, hyphens, and underscores';
-            }
-            return true;
-          },
-        },
-        {
-          type: 'list',
-          name: 'db',
-          message: 'Choose a database:',
-          choices: [
-            { name: 'MongoDB (with Mongoose)', value: 'mongodb' },
-            { name: 'PostgreSQL (with Sequelize)', value: 'postgresql' },
-            { name: 'No Database (API without database)', value: 'none' },
-          ],
-        },
-      ]);
-
-      const config = {
-        ...answers,
-        hasDatabase: answers.db !== 'none',
-        isNoDatabase: answers.db === 'none',
-      };
-
-      const projectDir = path.join(process.cwd(), config.projectName);
-
-      if (fs.existsSync(projectDir)) {
-        console.error(`Directory ${projectDir} already exists!`);
-        process.exit(1);
-      }
-
-      console.log(`Creating ${config.projectName}${config.hasDatabase ? ` with ${config.db}` : ' without database'}...`);
-
-      try {
-        // Generate project files
-        await generateProject(config, projectDir);
-
-        console.log('Installing dependencies...');
-        
-        // Run post-generation cleanup
-        if (!options.skipCleanup) {
-          await runPostGenerationCleanup(projectDir);
-        } else {
-          console.log('Skipping post-generation cleanup');
-        }
-
-        console.log(`
-Project ${config.projectName} created successfully!
-
-${options.skipCleanup ? 'Remember to run: npm run lint:fix && npm run format' : 'Code has been automatically formatted and cleaned!'}
-
-To get started:
-  cd ${config.projectName}
-  npm run dev
-
-API Documentation: http://localhost:3000/api-docs
-Health Check: http://localhost:3000/health
-
-Available scripts:
-  npm run dev         - Start development server
-  npm start          - Start production server  
-  npm test           - Run tests
-  npm run lint       - Run ESLint
-  npm run lint:fix   - Fix ESLint issues
-  npm run format     - Format with Prettier
-  npm run format:check - Check formatting
-
-Database: ${config.isNoDatabase ? 'None (API only)' : config.db}
-Authentication: ${config.isNoDatabase ? 'Simple token-based' : 'JWT with refresh tokens'}
-Security: Helmet, CORS, Rate limiting
-Monitoring: Health checks, logging
-Docker: Ready for containerization
-`);
-
-      } catch (error) {
-        console.error('Failed to create project:', error.message);
-        process.exit(1);
-      }
-    });
-
-  await program.parseAsync(process.argv);
-}
-
+#!/usr/bin/env node
+
+const { program } = require('commander');
+const inquirer = require('inquirer');
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
+const { execSync } = require('child_process');
+const { runPostGenerationCleanup } = require('./lib/cleanup');
+const { generateProject } = require('./lib/generator');
+
+const pkg = require('./package.json');
+const prompt = inquirer.createPromptModule();
+
+const generateSecret = (length = 64) => crypto.randomBytes(length).toString('hex');
+
+async function main() {
+  program
+    .name('express-genix')
+    .description('Production-grade CLI to generate Express.js applications')
+    .version(pkg.version);
+
+  program
+    .command('init')
+    .description('Initialize a new Express project')
+    .option('--skip-cleanup', 'Skip post-generation cleanup (for debugging)')
+    .option('--skip-install', 'Skip npm install (for CI/testing)')
+    .action(async (options) => {
+      const answers = await prompt([
+        {
+          type: 'input',
+          name: 'projectName',
+          message: 'Project name:',
+          default: 'my-express-app',
+          validate: (input) => {
+            if (!/^[a-zA-Z0-9-_]+$/.test(input)) {
+              return 'Project name can only contain letters, numbers, hyphens, and underscores';
+            }
+            if (input.length > 100) {
+              return 'Project name must be less than 100 characters';
+            }
+            return true;
+          },
+        },
+        {
+          type: 'list',
+          name: 'language',
+          message: 'Language:',
+          choices: [
+            { name: 'JavaScript', value: 'javascript' },
+            { name: 'TypeScript', value: 'typescript' },
+          ],
+        },
+        {
+          type: 'list',
+          name: 'db',
+          message: 'Database:',
+          choices: [
+            { name: 'MongoDB (with Mongoose)', value: 'mongodb' },
+            { name: 'PostgreSQL (with Sequelize)', value: 'postgresql' },
+            { name: 'PostgreSQL (with Prisma)', value: 'prisma' },
+            { name: 'No Database (API without database)', value: 'none' },
+          ],
+        },
+        {
+          type: 'checkbox',
+          name: 'features',
+          message: 'Select additional features:',
+          choices: [
+            { name: 'JWT Authentication', value: 'auth', checked: true },
+            { name: 'Rate Limiting', value: 'rateLimit', checked: true },
+            { name: 'Swagger/OpenAPI Docs', value: 'swagger', checked: true },
+            { name: 'Redis Token Blacklist', value: 'redis' },
+            { name: 'Docker & Docker Compose', value: 'docker', checked: true },
+            { name: 'CI/CD (GitHub Actions)', value: 'cicd' },
+            { name: 'WebSocket (Socket.io)', value: 'websocket' },
+            { name: 'Request ID / Correlation ID', value: 'requestId', checked: true },
+          ],
+          when: (ans) => ans.db !== 'none',
+        },
+        {
+          type: 'checkbox',
+          name: 'features',
+          message: 'Select additional features:',
+          choices: [
+            { name: 'Rate Limiting', value: 'rateLimit', checked: true },
+            { name: 'Swagger/OpenAPI Docs', value: 'swagger', checked: true },
+            { name: 'Docker & Docker Compose', value: 'docker', checked: true },
+            { name: 'CI/CD (GitHub Actions)', value: 'cicd' },
+            { name: 'WebSocket (Socket.io)', value: 'websocket' },
+            { name: 'Request ID / Correlation ID', value: 'requestId', checked: true },
+          ],
+          when: (ans) => ans.db === 'none',
+        },
+        {
+          type: 'list',
+          name: 'logger',
+          message: 'Logging library:',
+          choices: [
+            { name: 'Winston (feature-rich, widely used)', value: 'winston' },
+            { name: 'Pino (fast, low overhead)', value: 'pino' },
+          ],
+        },
+      ]);
+
+      const features = answers.features || [];
+      const config = {
+        projectName: answers.projectName,
+        language: answers.language,
+        db: answers.db,
+        logger: answers.logger,
+        hasDatabase: answers.db !== 'none',
+        isNoDatabase: answers.db === 'none',
+        isPrisma: answers.db === 'prisma',
+        isTypescript: answers.language === 'typescript',
+        hasAuth: features.includes('auth') && answers.db !== 'none',
+        hasRateLimit: features.includes('rateLimit'),
+        hasSwagger: features.includes('swagger'),
+        hasDocker: features.includes('docker'),
+        hasCicd: features.includes('cicd'),
+        hasWebsocket: features.includes('websocket'),
+        hasRequestId: features.includes('requestId'),
+        hasRedis: features.includes('redis') && features.includes('auth') && answers.db !== 'none',
+        jwtSecret: generateSecret(),
+        jwtRefreshSecret: generateSecret(),
+      };
+
+      const projectDir = path.join(process.cwd(), config.projectName);
+
+      if (fs.existsSync(projectDir)) {
+        console.error(`\n❌ Directory "${config.projectName}" already exists!`);
+        process.exit(1);
+      }
+
+      const dbLabel = config.isNoDatabase ? 'no database' : config.db;
+      console.log(`\n🚀 Creating ${config.projectName} (${config.language}, ${dbLabel})...\n`);
+
+      try {
+        await generateProject(config, projectDir, options);
+
+        if (!options.skipCleanup) {
+          await runPostGenerationCleanup(projectDir, config);
+        }
+
+        // Git init + initial commit
+        try {
+          execSync('git init', { cwd: projectDir, stdio: 'pipe' });
+          execSync('git add -A', { cwd: projectDir, stdio: 'pipe' });
+          execSync('git commit -m "Initial commit from express-genix"', {
+            cwd: projectDir,
+            stdio: 'pipe',
+            env: { ...process.env, GIT_COMMITTER_NAME: 'express-genix', GIT_COMMITTER_EMAIL: 'cli@express-genix.dev', GIT_AUTHOR_NAME: 'express-genix', GIT_AUTHOR_EMAIL: 'cli@express-genix.dev' },
+          });
+          console.log('📦 Git repository initialized with initial commit');
+        } catch {
+          // Git not available — skip silently
+        }
+
+        const ext = config.isTypescript ? 'ts' : 'js';
+        console.log(`
+✅ Project ${config.projectName} created successfully!
+
+To get started:
+  cd ${config.projectName}
+  npm run dev
+${config.hasSwagger ? `\nAPI Documentation: http://localhost:3000/api-docs` : ''}
+Health Check: http://localhost:3000/health
+
+Available scripts:
+  npm run dev          Start development server
+  npm start            Start production server
+  npm test             Run tests
+  npm run lint         Run ESLint
+  npm run lint:fix     Fix ESLint issues
+  npm run format       Format with Prettier${config.isTypescript ? '\n  npm run build         Compile TypeScript' : ''}
+
+Configuration:
+  Language:       ${config.isTypescript ? 'TypeScript' : 'JavaScript'}
+  Database:       ${config.isNoDatabase ? 'None' : config.db}
+  Authentication: ${config.hasAuth ? 'JWT with refresh tokens' : 'None'}
+  Logger:         ${config.logger}
+  Features:       ${features.join(', ') || 'base'}
+`);
+
+      } catch (error) {
+        // Rollback: remove partial project directory on failure
+        if (fs.existsSync(projectDir)) {
+          fs.rmSync(projectDir, { recursive: true, force: true });
+          console.error('\n🧹 Rolled back partial project directory.');
+        }
+        console.error(`\n❌ Failed to create project: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  program
+    .command('add <feature>')
+    .description('Add a feature to an existing express-genix project')
+    .action(async (feature) => {
+      const supportedFeatures = ['auth', 'websocket', 'docker', 'cicd', 'prisma'];
+      if (!supportedFeatures.includes(feature)) {
+        console.error(`❌ Unknown feature: "${feature}"`);
+        console.log(`Supported features: ${supportedFeatures.join(', ')}`);
+        process.exit(1);
+      }
+
+      const projectDir = process.cwd();
+      const packageJsonPath = path.join(projectDir, 'package.json');
+
+      if (!fs.existsSync(packageJsonPath)) {
+        console.error('❌ No package.json found. Run this command from your project root.');
+        process.exit(1);
+      }
+
+      console.log(`Adding ${feature} to project...`);
+
+      try {
+        const { addFeature } = require('./lib/features');
+        await addFeature(feature, projectDir);
+        console.log(`✅ ${feature} added successfully!`);
+      } catch (error) {
+        console.error(`❌ Failed to add feature: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  await program.parseAsync(process.argv);
+}
+
 main().catch(console.error);

package/lib/cleanup.js

@@ -1,129 +1,41 @@
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Run post-generation cleanup to ensure zero linting errors
- */
-const runPostGenerationCleanup = async (projectDir) => {
-  console.log('\nRunning post-generation cleanup...');
-  
-  try {
-    // Step 1: Add missing dependencies and format scripts
-    await addMissingDependencies(projectDir);
-    
-    // Step 2: Install Prettier and add to devDependencies
-    await setupPrettier(projectDir);
-    
-    // Step 3: Run eslint --fix automatically
-    await runEslintFix(projectDir);
-    
-    // Step 4: Format code with Prettier
-    await formatWithPrettier(projectDir);
-    
-    // Step 5: Test generated output against linting rules
-    await validateOutput(projectDir);
-    
-    console.log('Post-generation cleanup completed!');
-    
-  } catch (error) {
-    console.warn('Some cleanup steps failed:', error.message);
-    console.log('You can manually run: npm run lint:fix && npm run format');
-  }
-};
-
-const addMissingDependencies = async (projectDir) => {
-  console.log('Adding missing dependencies...');
-  
-  const packageJsonPath = path.join(projectDir, 'package.json');
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-  
-  // Add missing validator dependency (only if not no-database)
-  if (!packageJson.dependencies.validator) {
-    packageJson.dependencies.validator = '^13.11.0';
-  }
-  
-  // Add formatting and linting scripts
-  packageJson.scripts['lint:fix'] = 'eslint . --fix';
-  packageJson.scripts.format = 'prettier --write .';
-  packageJson.scripts['format:check'] = 'prettier --check .';
-  
-  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-};
-
-const setupPrettier = async (projectDir) => {
-  console.log('Installing and configuring Prettier...');
-  
-  // Install Prettier
-  execSync(`cd "${projectDir}" && npm install --save-dev prettier`, { stdio: 'pipe' });
-  
-  // Create Prettier config
-  const prettierConfig = {
-    semi: true,
-    trailingComma: 'es5',
-    singleQuote: true,
-    printWidth: 80,
-    tabWidth: 2,
-    useTabs: false,
-  };
-  
-  fs.writeFileSync(
-    path.join(projectDir, '.prettierrc'),
-    JSON.stringify(prettierConfig, null, 2)
-  );
-  
-  // Install any missing dependencies
-  execSync(`cd "${projectDir}" && npm install`, { stdio: 'pipe' });
-};
-
-const runEslintFix = async (projectDir) => {
-  console.log('Running eslint --fix...');
-  
-  try {
-    execSync(`cd "${projectDir}" && npm run lint:fix`, { stdio: 'pipe' });
-    console.log('ESLint auto-fixes applied');
-  } catch (error) {
-    console.log('Some ESLint issues need manual fixing');
-  }
-};
-
-const formatWithPrettier = async (projectDir) => {
-  console.log('Formatting code with Prettier...');
-  
-  try {
-    execSync(`cd "${projectDir}" && npm run format`, { stdio: 'pipe' });
-    console.log('Code formatted with Prettier');
-  } catch (error) {
-    console.warn('Prettier formatting encountered issues');
-  }
-};
-
-const validateOutput = async (projectDir) => {
-  console.log('Testing generated output against linting rules...');
-  
-  try {
-    execSync(`cd "${projectDir}" && npm run lint`, { 
-      encoding: 'utf8',
-      stdio: 'pipe' 
-    });
-    console.log('All linting checks passed!');
-    return true;
-  } catch (error) {
-    // Count remaining errors
-    const stdout = error.stdout || '';
-    const errorMatches = stdout.match(/(\d+) problems?/);
-    const errorCount = errorMatches ? errorMatches[1] : 'some';
-    
-    console.log(`Validation complete: ${errorCount} issues remaining`);
-    
-    if (parseInt(errorCount) < 20) {
-      console.log('Great improvement! Most issues have been resolved.');
-    }
-    
-    return false;
-  }
-};
-
-module.exports = {
-  runPostGenerationCleanup,
-};
+const { execSync } = require('child_process');
+
+const runPostGenerationCleanup = async (projectDir) => {
+  console.log('\n🔧 Running post-generation cleanup...');
+
+  try {
+    // Step 1: Run eslint --fix
+    try {
+      execSync(`cd "${projectDir}" && npx eslint . --fix`, { stdio: 'pipe' });
+      console.log('✅ ESLint auto-fixes applied');
+    } catch {
+      console.log('⚠️  Some ESLint issues may need manual fixing');
+    }
+
+    // Step 2: Format with Prettier
+    try {
+      execSync(`cd "${projectDir}" && npx prettier --write .`, { stdio: 'pipe' });
+      console.log('✅ Code formatted with Prettier');
+    } catch {
+      console.warn('⚠️  Prettier formatting encountered issues');
+    }
+
+    // Step 3: Validate
+    try {
+      execSync(`cd "${projectDir}" && npx eslint .`, { encoding: 'utf8', stdio: 'pipe' });
+      console.log('✅ All linting checks passed');
+    } catch (error) {
+      const stdout = error.stdout || '';
+      const match = stdout.match(/(\d+) problems?/);
+      const count = match ? match[1] : 'some';
+      console.log(`⚠️  ${count} lint issues remaining (run "npm run lint:fix" to resolve)`);
+    }
+
+    console.log('✅ Post-generation cleanup completed\n');
+  } catch (error) {
+    console.warn('⚠️  Some cleanup steps failed:', error.message);
+    console.log('You can manually run: npm run lint:fix && npm run format');
+  }
+};
+
+module.exports = { runPostGenerationCleanup };