express-genix 1.1.4 → 2.0.0

package/lib/generator.js

@@ -1,205 +1,287 @@
-const fs = require('fs');
-const path = require('path');
-const ejs = require('ejs');
-const { execSync } = require('child_process');
-
-/**
- * Generate project files from templates
- */
-const generateProject = async (config, projectDir) => {
-  // Create directory structure
-  createDirectoryStructure(projectDir, config);
-  
-  // Generate files from templates
-  await generateFiles(config, projectDir);
-  
-  // Install dependencies
-  installDependencies(projectDir);
-};
-
-const createDirectoryStructure = (projectDir, config) => {
-  const dirs = [
-    'src',
-    'src/config',
-    'src/controllers',
-    'src/middleware',
-    'src/routes',
-    'src/services',
-    'src/utils',
-    'tests',
-  ];
-
-  // Only create models directory if using database
-  if (config.hasDatabase) {
-    dirs.push('src/models');
-  }
-
-  fs.mkdirSync(projectDir);
-  dirs.forEach(dir => {
-    fs.mkdirSync(path.join(projectDir, dir), { recursive: true });
-  });
-};
-
-const generateFiles = async (config, projectDir) => {
-  const templatesDir = path.join(__dirname, '../templates');
-  
-  // Core files (always generated)
-  const coreFiles = [
-    { template: 'core/package.json.ejs', output: 'package.json' },
-    { template: 'core/app.js.ejs', output: 'src/app.js' },
-    { template: 'core/server.js.ejs', output: 'src/server.js' },
-    { template: 'core/env.ejs', output: '.env' },
-    { template: 'core/gitignore.ejs', output: '.gitignore' },
-    { template: 'core/eslintrc.json.ejs', output: '.eslintrc.json' },
-    { template: 'core/Dockerfile.ejs', output: 'Dockerfile' },
-    { template: 'core/docker-compose.yml.ejs', output: 'docker-compose.yml' },
-    { template: 'core/healthcheck.js.ejs', output: 'healthcheck.js' },
-    { template: 'core/jest.config.js.ejs', output: 'jest.config.js' },
-    { template: 'core/README.md.ejs', output: 'README.md' },
-  ];
-
-  // Config files
-  const configFiles = [
-    { template: 'config/swagger.json.ejs', output: 'src/config/swagger.json' },
-  ];
-
-  // Add database config if needed
-  if (config.hasDatabase) {
-    if (config.db === 'mongodb') {
-      configFiles.push({ template: 'config/database.mongo.js.ejs', output: 'src/config/database.js' });
-    } else if (config.db === 'postgresql') {
-      configFiles.push({ template: 'config/database.postgres.js.ejs', output: 'src/config/database.js' });
-    }
-  }
-
-  // Controller files
-  const controllerFiles = [
-    { template: 'routes/index.js.ejs', output: 'src/routes/index.js' },
-  ];
-
-  // Add auth/user controllers and routes if database is used
-  if (config.hasDatabase) {
-    controllerFiles.push(
-      { template: 'controllers/authController.js.ejs', output: 'src/controllers/authController.js' },
-      { template: 'controllers/userController.js.ejs', output: 'src/controllers/userController.js' },
-      { template: 'routes/authRoutes.js.ejs', output: 'src/routes/authRoutes.js' },
-      { template: 'routes/userRoutes.js.ejs', output: 'src/routes/userRoutes.js' },
-    );
-  } else {
-    // For no-database setup, add example controller/routes
-    controllerFiles.push(
-      { template: 'controllers/exampleController.js.ejs', output: 'src/controllers/exampleController.js' },
-      { template: 'routes/exampleRoutes.js.ejs', output: 'src/routes/exampleRoutes.js' },
-    );
-  }
-
-  // Middleware files
-  const middlewareFiles = [
-    { template: 'middleware/errorHandler.js.ejs', output: 'src/middleware/errorHandler.js' },
-  ];
-
-  if (config.hasDatabase) {
-    middlewareFiles.push(
-      { template: 'middleware/auth.js.ejs', output: 'src/middleware/auth.js' },
-      { template: 'middleware/validation.js.ejs', output: 'src/middleware/validation.js' },
-    );
-  }
-
-  // Model files (only if using database)
-  const modelFiles = [];
-  if (config.hasDatabase) {
-    if (config.db === 'mongodb') {
-      modelFiles.push(
-        { template: 'models/User.mongo.js.ejs', output: 'src/models/User.js' },
-        { template: 'models/index.mongo.js.ejs', output: 'src/models/index.js' },
-      );
-    } else if (config.db === 'postgresql') {
-      modelFiles.push(
-        { template: 'models/User.postgres.js.ejs', output: 'src/models/User.js' },
-        { template: 'models/index.postgres.js.ejs', output: 'src/models/index.js' },
-      );
-    }
-  }
-
-  // Service files
-  const serviceFiles = [];
-  if (config.hasDatabase) {
-    serviceFiles.push(
-      { template: 'services/authService.js.ejs', output: 'src/services/authService.js' },
-      { template: `services/userService.${config.db === 'mongodb' ? 'mongodb' : 'postgresql'}.js.ejs`, output: 'src/services/userService.js' },
-    );
-  } else {
-    serviceFiles.push(
-      { template: 'services/exampleService.js.ejs', output: 'src/services/exampleService.js' },
-    );
-  }
-
-  // Utility files
-  const utilFiles = [
-    { template: 'utils/errors.js.ejs', output: 'src/utils/errors.js' },
-    { template: 'utils/logger.js.ejs', output: 'src/utils/logger.js' },
-  ];
-
-  if (config.hasDatabase) {
-    utilFiles.push({ template: 'utils/validators.js.ejs', output: 'src/utils/validators.js' });
-  }
-
-  // Test files
-  const testFiles = [
-    { template: 'tests/setup.js.ejs', output: 'tests/setup.js' },
-  ];
-
-  if (config.hasDatabase) {
-    testFiles.push(
-      { template: 'tests/auth.test.js.ejs', output: 'tests/auth.test.js' },
-      { template: 'tests/users.test.js.ejs', output: 'tests/users.test.js' },
-    );
-  } else {
-    testFiles.push(
-      { template: 'tests/example.test.js.ejs', output: 'tests/example.test.js' },
-    );
-  }
-
-  // Combine all files
-  const allFiles = [
-    ...coreFiles,
-    ...configFiles,
-    ...controllerFiles,
-    ...middlewareFiles,
-    ...modelFiles,
-    ...serviceFiles,
-    ...utilFiles,
-    ...testFiles,
-  ];
-
-  // Generate each file
-  for (const file of allFiles) {
-    const templatePath = path.join(templatesDir, file.template);
-    const outputPath = path.join(projectDir, file.output);
-    
-    try {
-      const template = fs.readFileSync(templatePath, 'utf8');
-      const content = ejs.render(template, config);
-      
-      // Ensure directory exists
-      fs.mkdirSync(path.dirname(outputPath), { recursive: true });
-      fs.writeFileSync(outputPath, content);
-    } catch (error) {
-      console.warn(`Warning: Could not generate ${file.output}:`, error.message);
-    }
-  }
-};
-
-const installDependencies = (projectDir) => {
-  try {
-    execSync(`cd "${projectDir}" && npm install`, { stdio: 'inherit' });
-  } catch (error) {
-    console.error('Failed to install dependencies:', error.message);
-    console.log('Try running "npm install" manually in the project directory');
-    throw error;
-  }
-};
-
-module.exports = {
-  generateProject,
+const fs = require('fs');
+const path = require('path');
+const ejs = require('ejs');
+const { execSync } = require('child_process');
+
+const generateProject = async (config, projectDir, options = {}) => {
+  createDirectoryStructure(projectDir, config);
+  await generateFiles(config, projectDir);
+
+  if (!options.skipInstall) {
+    installDependencies(projectDir);
+  }
+
+  // Run Prisma generate if selected
+  if (config.isPrisma && !options.skipInstall) {
+    try {
+      execSync('npx prisma generate', { cwd: projectDir, stdio: 'pipe' });
+    } catch {
+      console.warn('⚠️  Prisma generate skipped — run "npx prisma generate" manually');
+    }
+  }
+};
+
+const createDirectoryStructure = (projectDir, config) => {
+  const dirs = [
+    'src',
+    'src/config',
+    'src/controllers',
+    'src/middleware',
+    'src/routes',
+    'src/services',
+    'src/utils',
+    'tests',
+  ];
+
+  if (config.hasDatabase && !config.isPrisma) {
+    dirs.push('src/models');
+  }
+
+  if (config.isPrisma) {
+    dirs.push('prisma');
+  }
+
+  if (config.db === 'postgresql') {
+    dirs.push('migrations', 'seeders');
+  }
+
+  if (config.hasCicd) {
+    dirs.push('.github', '.github/workflows');
+  }
+
+  fs.mkdirSync(projectDir);
+  dirs.forEach((dir) => {
+    fs.mkdirSync(path.join(projectDir, dir), { recursive: true });
+  });
+};
+
+const generateFiles = async (config, projectDir) => {
+  const templatesDir = path.join(__dirname, '../templates');
+  const ext = config.isTypescript ? 'ts' : 'js';
+
+  // Core files (always generated)
+  const coreFiles = [
+    { template: 'core/package.json.ejs', output: 'package.json' },
+    { template: 'core/app.js.ejs', output: `src/app.${ext}` },
+    { template: 'core/server.js.ejs', output: `src/server.${ext}` },
+    { template: 'core/env.ejs', output: '.env' },
+    { template: 'core/env.example.ejs', output: '.env.example' },
+    { template: 'core/gitignore.ejs', output: '.gitignore' },
+    { template: 'core/eslintrc.json.ejs', output: '.eslintrc.json' },
+    { template: 'core/prettierrc.json.ejs', output: '.prettierrc' },
+    { template: 'core/healthcheck.js.ejs', output: 'healthcheck.js' },
+    { template: 'core/jest.config.js.ejs', output: 'jest.config.js' },
+    { template: 'core/README.md.ejs', output: 'README.md' },
+  ];
+
+  if (config.isTypescript) {
+    coreFiles.push({ template: 'core/tsconfig.json.ejs', output: 'tsconfig.json' });
+  }
+
+  if (config.hasDocker) {
+    coreFiles.push(
+      { template: 'core/Dockerfile.ejs', output: 'Dockerfile' },
+      { template: 'core/docker-compose.yml.ejs', output: 'docker-compose.yml' },
+      { template: 'core/dockerignore.ejs', output: '.dockerignore' }
+    );
+  }
+
+  if (config.hasCicd) {
+    coreFiles.push({ template: 'cicd/github-actions.yml.ejs', output: '.github/workflows/ci.yml' });
+  }
+
+  if (config.db === 'postgresql') {
+    coreFiles.push(
+      { template: 'migrations/sequelizerc.ejs', output: '.sequelizerc' },
+      { template: 'migrations/create-users.js.ejs', output: 'migrations/20240101000000-create-users.js' },
+      { template: 'migrations/seed-users.js.ejs', output: 'seeders/20240101000000-demo-users.js' }
+    );
+  }
+
+  // Config files
+  const configFiles = [];
+
+  if (config.hasSwagger) {
+    configFiles.push({ template: 'config/swagger.js.ejs', output: `src/config/swagger.${ext}` });
+  }
+
+  if (config.hasDatabase && !config.isPrisma) {
+    if (config.db === 'mongodb') {
+      configFiles.push({ template: 'config/database.mongo.js.ejs', output: `src/config/database.${ext}` });
+    } else if (config.db === 'postgresql') {
+      configFiles.push({ template: 'config/database.postgres.js.ejs', output: `src/config/database.${ext}` });
+    }
+  }
+
+  if (config.isPrisma) {
+    configFiles.push(
+      { template: 'config/database.prisma.js.ejs', output: `src/config/database.${ext}` },
+      { template: 'config/schema.prisma.ejs', output: 'prisma/schema.prisma' }
+    );
+  }
+
+  if (config.hasWebsocket) {
+    configFiles.push({ template: 'config/websocket.js.ejs', output: `src/config/websocket.${ext}` });
+  }
+
+  if (config.hasRedis) {
+    configFiles.push({ template: 'config/redis.js.ejs', output: `src/config/redis.${ext}` });
+  }
+
+  // Route files
+  const routeFiles = [
+    { template: 'routes/index.js.ejs', output: `src/routes/index.${ext}` },
+  ];
+
+  // Controller, service, model files
+  const controllerFiles = [];
+  const serviceFiles = [];
+  const modelFiles = [];
+
+  if (config.hasAuth) {
+    controllerFiles.push(
+      { template: 'controllers/authController.js.ejs', output: `src/controllers/authController.${ext}` },
+      { template: 'controllers/userController.js.ejs', output: `src/controllers/userController.${ext}` }
+    );
+    routeFiles.push(
+      { template: 'routes/authRoutes.js.ejs', output: `src/routes/authRoutes.${ext}` },
+      { template: 'routes/userRoutes.js.ejs', output: `src/routes/userRoutes.${ext}` }
+    );
+    serviceFiles.push(
+      { template: 'services/authService.js.ejs', output: `src/services/authService.${ext}` }
+    );
+
+    if (config.isPrisma) {
+      serviceFiles.push({ template: 'services/userService.prisma.js.ejs', output: `src/services/userService.${ext}` });
+    } else if (config.db === 'mongodb') {
+      serviceFiles.push({ template: 'services/userService.mongodb.js.ejs', output: `src/services/userService.${ext}` });
+      modelFiles.push(
+        { template: 'models/User.mongo.js.ejs', output: `src/models/User.${ext}` },
+        { template: 'models/index.mongo.js.ejs', output: `src/models/index.${ext}` }
+      );
+    } else if (config.db === 'postgresql') {
+      serviceFiles.push({ template: 'services/userService.postgres.js.ejs', output: `src/services/userService.${ext}` });
+      modelFiles.push(
+        { template: 'models/User.postgres.js.ejs', output: `src/models/User.${ext}` },
+        { template: 'models/index.postgres.js.ejs', output: `src/models/index.${ext}` }
+      );
+    }
+  } else {
+    controllerFiles.push(
+      { template: 'controllers/exampleController.js.ejs', output: `src/controllers/exampleController.${ext}` }
+    );
+    routeFiles.push(
+      { template: 'routes/exampleRoutes.js.ejs', output: `src/routes/exampleRoutes.${ext}` }
+    );
+    serviceFiles.push(
+      { template: 'services/exampleService.js.ejs', output: `src/services/exampleService.${ext}` }
+    );
+  }
+
+  // Middleware files
+  const middlewareFiles = [
+    { template: 'middleware/errorHandler.js.ejs', output: `src/middleware/errorHandler.${ext}` },
+  ];
+
+  if (config.hasAuth) {
+    middlewareFiles.push(
+      { template: 'middleware/auth.js.ejs', output: `src/middleware/auth.${ext}` },
+      { template: 'middleware/validation.js.ejs', output: `src/middleware/validation.${ext}` }
+    );
+  }
+
+  if (config.hasRequestId) {
+    middlewareFiles.push(
+      { template: 'middleware/requestId.js.ejs', output: `src/middleware/requestId.${ext}` }
+    );
+  }
+
+  if (config.hasRedis) {
+    middlewareFiles.push(
+      { template: 'middleware/cache.js.ejs', output: `src/middleware/cache.${ext}` }
+    );
+  }
+
+  // Utility files
+  const utilFiles = [
+    { template: 'utils/errors.js.ejs', output: `src/utils/errors.${ext}` },
+    { template: 'utils/logger.js.ejs', output: `src/utils/logger.${ext}` },
+    { template: 'utils/response.js.ejs', output: `src/utils/response.${ext}` },
+  ];
+
+  if (config.hasAuth) {
+    utilFiles.push({ template: 'utils/validators.js.ejs', output: `src/utils/validators.${ext}` });
+  }
+
+  if (config.hasDatabase || config.hasAuth) {
+    utilFiles.push({ template: 'utils/envValidator.js.ejs', output: `src/utils/envValidator.${ext}` });
+  }
+
+  // Test files
+  const testFiles = [
+    { template: 'tests/setup.js.ejs', output: 'tests/setup.js' },
+  ];
+
+  if (config.hasAuth) {
+    testFiles.push(
+      { template: 'tests/auth.test.js.ejs', output: 'tests/auth.test.js' },
+      { template: 'tests/users.test.js.ejs', output: 'tests/users.test.js' }
+    );
+  } else {
+    testFiles.push(
+      { template: 'tests/example.test.js.ejs', output: 'tests/example.test.js' }
+    );
+  }
+
+  const allFiles = [
+    ...coreFiles,
+    ...configFiles,
+    ...routeFiles,
+    ...controllerFiles,
+    ...middlewareFiles,
+    ...modelFiles,
+    ...serviceFiles,
+    ...utilFiles,
+    ...testFiles,
+  ];
+
+  const errors = [];
+
+  for (const file of allFiles) {
+    const templatePath = path.join(templatesDir, file.template);
+    const outputPath = path.join(projectDir, file.output);
+
+    if (!fs.existsSync(templatePath)) {
+      errors.push(`Template not found: ${file.template}`);
+      continue;
+    }
+
+    try {
+      const template = fs.readFileSync(templatePath, 'utf8');
+      const content = ejs.render(template, config);
+      fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+      fs.writeFileSync(outputPath, content);
+    } catch (error) {
+      errors.push(`${file.output}: ${error.message}`);
+    }
+  }
+
+  if (errors.length > 0) {
+    throw new Error(`Failed to generate files:\n  ${errors.join('\n  ')}`);
+  }
+};
+
+const installDependencies = (projectDir) => {
+  try {
+    console.log('📦 Installing dependencies...');
+    execSync(`cd "${projectDir}" && npm install`, { stdio: 'inherit' });
+  } catch (error) {
+    console.error('Failed to install dependencies:', error.message);
+    console.log('Try running "npm install" manually in the project directory');
+    throw error;
+  }
+};
+
+module.exports = {
+  generateProject,
 };

package/lib/utils.js

@@ -1,92 +1,44 @@
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Ensure directory exists, create if it doesn't
- */
-const ensureDirectoryExists = (dirPath) => {
-  if (!fs.existsSync(dirPath)) {
-    fs.mkdirSync(dirPath, { recursive: true });
-  }
-};
-
-/**
- * Check if file exists
- */
-const fileExists = (filePath) => {
-  return fs.existsSync(filePath);
-};
-
-/**
- * Read file safely with error handling
- */
-const readFileSafe = (filePath, encoding = 'utf8') => {
-  try {
-    return fs.readFileSync(filePath, encoding);
-  } catch (error) {
-    console.warn(`Warning: Could not read file ${filePath}:`, error.message);
-    return null;
-  }
-};
-
-/**
- * Write file safely with error handling
- */
-const writeFileSafe = (filePath, content) => {
-  try {
-    // Ensure directory exists
-    ensureDirectoryExists(path.dirname(filePath));
-    fs.writeFileSync(filePath, content);
-    return true;
-  } catch (error) {
-    console.error(`Error writing file ${filePath}:`, error.message);
-    return false;
-  }
-};
-
-/**
- * Get template file path
- */
-const getTemplatePath = (templateName) => {
-  return path.join(__dirname, '../templates', templateName);
-};
-
-/**
- * Validate project name
- */
-const validateProjectName = (name) => {
-  if (!name || name.trim().length === 0) {
-    return 'Project name cannot be empty';
-  }
-  
-  if (!/^[a-zA-Z0-9-_]+$/.test(name)) {
-    return 'Project name can only contain letters, numbers, hyphens, and underscores';
-  }
-  
-  if (name.length > 100) {
-    return 'Project name must be less than 100 characters';
-  }
-  
-  return null; // Valid
-};
-
-/**
- * Format console output with colors (if supported)
- */
-const formatOutput = {
-  success: (text) => `✅ ${text}`,
-  error: (text) => `❌ ${text}`,
-  warning: (text) => `⚠️  ${text}`,
-  info: (text) => `ℹ️  ${text}`,
-  progress: (text) => `🔄 ${text}`,
-};
-
-module.exports = {
-  ensureDirectoryExists,
-  fileExists,
-  readFileSafe,
-  writeFileSafe,
-  getTemplatePath,
-  validateProjectName,
-  formatOutput,
+const path = require('path');
+
+/**
+ * Validate project name
+ */
+const validateProjectName = (name) => {
+  if (!name || name.trim().length === 0) {
+    return 'Project name cannot be empty';
+  }
+  
+  if (!/^[a-zA-Z0-9-_]+$/.test(name)) {
+    return 'Project name can only contain letters, numbers, hyphens, and underscores';
+  }
+  
+  if (name.length > 100) {
+    return 'Project name must be less than 100 characters';
+  }
+  
+  return null; // Valid
+};
+
+/**
+ * Get template file path
+ */
+const getTemplatePath = (templateName) => {
+  return path.join(__dirname, '../templates', templateName);
+};
+
+/**
+ * Format console output with colors (if supported)
+ */
+const formatOutput = {
+  success: (text) => `✅ ${text}`,
+  error: (text) => `❌ ${text}`,
+  warning: (text) => `⚠️  ${text}`,
+  info: (text) => `ℹ️  ${text}`,
+  progress: (text) => `🔄 ${text}`,
+};
+
+module.exports = {
+  validateProjectName,
+  getTemplatePath,
+  formatOutput,
 };