servcraft 0.4.6 → 0.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "servcraft",
-  "version": "0.4.6",
+  "version": "0.4.9",
   "description": "A modular, production-ready Node.js backend framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli/commands/add-module.ts

@@ -681,7 +681,13 @@ async function findServercraftModules(): Promise<string | null> {
 /**
  * Helper: Generate module files - copies from servcraft package modules
  */
-async function generateModuleFiles(moduleName: string, moduleDir: string): Promise<void> {
+async function generateModuleFiles(
+  moduleName: string,
+  moduleDir: string,
+  language: 'typescript' | 'javascript' = 'typescript',
+  moduleSystem: 'esm' | 'commonjs' = 'esm',
+  fileExtension: 'js' | 'cjs' | 'ts' = 'ts'
+): Promise<void> {
   // Map module names to their directory names in servcraft
   const moduleNameMap: Record<string, string> = {
     users: 'user',
@@ -701,7 +707,8 @@ async function generateModuleFiles(moduleName: string, moduleDir: string): Promi
 
     if (await fileExists(sourceModuleDir)) {
       // Copy from servcraft package
-      await copyModuleFromSource(sourceModuleDir, moduleDir);
+      const jsExt = language === 'javascript' ? (fileExtension as 'js' | 'cjs') : 'js';
+      await copyModuleFromSource(sourceModuleDir, moduleDir, language, moduleSystem, jsExt);
       return;
     }
   }
@@ -731,21 +738,119 @@ async function generateModuleFiles(moduleName: string, moduleDir: string): Promi
   }
 }
 
+/**
+ * Helper: Convert ESM syntax to CommonJS
+ */
+function convertESMtoCommonJS(content: string): string {
+  return (
+    content
+      // Convert export class/function/const/let/var
+      .replace(/^export\s+class\s+/gm, 'class ')
+      .replace(/^export\s+function\s+/gm, 'function ')
+      .replace(/^export\s+const\s+/gm, 'const ')
+      .replace(/^export\s+let\s+/gm, 'let ')
+      .replace(/^export\s+var\s+/gm, 'var ')
+      // Convert named imports: import { a, b } from 'module'
+      .replace(
+        /import\s*\{\s*([^}]+)\s*\}\s*from\s*['"]([^'"]+)['"]/g,
+        "const { $1 } = require('$2')"
+      )
+      // Convert default imports: import name from 'module'
+      .replace(/import\s+(\w+)\s+from\s*['"]([^'"]+)['"]/g, "const $1 = require('$2')")
+      // Convert mixed imports: import name, { a, b } from 'module'
+      .replace(
+        /import\s+(\w+)\s*,\s*\{\s*([^}]+)\s*\}\s*from\s*['"]([^'"]+)['"]/g,
+        "const $1 = require('$3');\nconst { $2 } = require('$3')"
+      )
+      // Add module.exports at the end for classes and main exports
+      .replace(/^(class\s+(\w+)\s+\{[\s\S]*?\n\})/gm, '$1\nmodule.exports.$2 = $2;')
+      // Handle export { ... }
+      .replace(/export\s*\{\s*([^}]+)\s*\}/g, (match, exports) => {
+        const items = exports
+          .split(',')
+          .map((item: string) => item.trim())
+          .filter(Boolean);
+        return items.map((item: string) => `module.exports.${item} = ${item};`).join('\n');
+      })
+  );
+}
+
 /**
  * Helper: Copy module from source directory
  */
-async function copyModuleFromSource(sourceDir: string, targetDir: string): Promise<void> {
+async function copyModuleFromSource(
+  sourceDir: string,
+  targetDir: string,
+  language: 'typescript' | 'javascript' = 'typescript',
+  moduleSystem: 'esm' | 'commonjs' = 'esm',
+  fileExtension: 'js' | 'cjs' = 'js'
+): Promise<void> {
   const entries = await fs.readdir(sourceDir, { withFileTypes: true });
 
   for (const entry of entries) {
     const sourcePath = path.join(sourceDir, entry.name);
-    const targetPath = path.join(targetDir, entry.name);
+    let targetPath = path.join(targetDir, entry.name);
 
     if (entry.isDirectory()) {
       await fs.mkdir(targetPath, { recursive: true });
-      await copyModuleFromSource(sourcePath, targetPath);
+      await copyModuleFromSource(sourcePath, targetPath, language, moduleSystem, fileExtension);
     } else {
-      await fs.copyFile(sourcePath, targetPath);
+      // Convert file extension if generating JavaScript
+      if (language === 'javascript' && entry.name.endsWith('.ts')) {
+        const ext = `.${fileExtension}`;
+        targetPath = targetPath.replace(/\.ts$/, ext);
+
+        // Read, convert, and write the file
+        let content = await fs.readFile(sourcePath, 'utf-8');
+
+        // Basic TypeScript to JavaScript conversion
+        // Apply replacements multiple times to catch nested patterns
+        for (let i = 0; i < 3; i++) {
+          content = content
+            // Remove import type statements
+            .replace(/import\s+type\s+\{[^}]+\}\s+from\s+['"][^'"]+['"];?\s*\n/g, '')
+            // Remove type imports from regular imports
+            .replace(/import\s+\{([^}]+)\}\s+from/g, (match, imports) => {
+              const filtered = imports
+                .split(',')
+                .map((imp: string) => imp.trim())
+                .filter((imp: string) => !imp.startsWith('type '))
+                .join(', ');
+              return filtered ? `import {${filtered}} from` : '';
+            })
+            // Update import paths
+            .replace(/from\s+['"](.+?)\.js['"]/g, `from '$1${ext}'`)
+            // Remove 'private', 'public', 'protected', 'readonly' keywords
+            .replace(/\b(private|public|protected|readonly)\s+/g, '')
+            // Remove type annotations from function parameters and variables (multiple passes)
+            .replace(
+              /:\s*[A-Z]\w+(<[^>]+>)?(\[\])?(\s*[|&]\s*[A-Z]\w+(<[^>]+>)?(\[\])?)*(?=[,)\s=\n])/g,
+              ''
+            )
+            .replace(/(\w+)\s*:\s*[^,)=\n]+([,)])/g, '$1$2')
+            .replace(/(\w+)\s*:\s*[^=\n{]+(\s*=)/g, '$1$2')
+            // Remove return type annotations
+            .replace(/\)\s*:\s*[^{=\n]+\s*([{=])/g, ') $1')
+            // Remove interface and type definitions
+            .replace(/^export\s+(interface|type)\s+[^;]+;?\s*$/gm, '')
+            .replace(/^(interface|type)\s+[^;]+;?\s*$/gm, '')
+            // Remove type assertions (as Type)
+            .replace(/\s+as\s+\w+/g, '')
+            // Remove generic type parameters
+            .replace(/<[A-Z][\w,\s<>[\]|&]*>/g, '');
+        }
+        // Final cleanup
+        content = content.replace(/^\s*\n/gm, '');
+
+        // Convert to CommonJS if needed
+        if (moduleSystem === 'commonjs') {
+          content = convertESMtoCommonJS(content);
+        }
+
+        await fs.writeFile(targetPath, content, 'utf-8');
+      } else {
+        await fs.copyFile(sourcePath, targetPath);
+      }
     }
   }
 }
@@ -926,3 +1031,6 @@ async function performSmartMerge(
 
   InteractivePrompt.showMergeSummary(stats);
 }
+
+// Export helper functions for use in other commands
+export { generateModuleFiles, EnvManager, TemplateManager };

package/src/cli/commands/init.ts

@@ -7,11 +7,13 @@ import chalk from 'chalk';
 import { execSync } from 'child_process';
 import { ensureDir, writeFile, error, warn } from '../utils/helpers.js';
 import { DryRunManager } from '../utils/dry-run.js';
+import { generateModuleFiles } from './add-module.js';
 
 interface InitOptions {
   name: string;
   language: 'typescript' | 'javascript';
   moduleSystem: 'esm' | 'commonjs';
+  fileExtension: 'js' | 'cjs' | 'ts';
   database: 'postgresql' | 'mysql' | 'sqlite' | 'mongodb' | 'none';
   orm: 'prisma' | 'mongoose' | 'none';
   validator: 'zod' | 'joi' | 'yup';
@@ -54,26 +56,25 @@ export const initCommand = new Command('init')
       console.log(chalk.cyan('│') + '                                       ' + chalk.cyan('│'));
       console.log(
         chalk.cyan('│') +
-          '     ' +
           chalk.bold.white('🚀 Servcraft') +
           chalk.gray(' - Project Generator') +
-          '     ' +
+          '  ' +
           chalk.cyan('│')
       );
       console.log(
         chalk.cyan('│') +
-          '        ' +
+          '   ' +
           chalk.gray('by ') +
           chalk.blue('Yao Logan') +
           chalk.gray(' (@Le-Sourcier)') +
-          '       ' +
+          '   ' +
           chalk.cyan('│')
       );
       console.log(
         chalk.cyan('│') +
-          '           ' +
+          '      ' +
           chalk.bgBlue.white(' in/yao-logan ') +
-          '           ' +
+          '       ' +
           chalk.cyan('│')
       );
       console.log(chalk.cyan('│') + '                                       ' + chalk.cyan('│'));
@@ -84,17 +85,28 @@ export const initCommand = new Command('init')
 
       if (cmdOptions?.yes) {
         const db = (cmdOptions.db as InitOptions['database']) || 'postgresql';
+        const language = cmdOptions.javascript ? 'javascript' : 'typescript';
+        const moduleSystem = cmdOptions.commonjs ? 'commonjs' : 'esm';
+
+        // Determine file extension based on language and module system
+        let fileExtension: 'js' | 'cjs' | 'ts' = 'ts';
+        if (language === 'javascript') {
+          fileExtension = moduleSystem === 'commonjs' ? 'cjs' : 'js';
+        }
+
         options = {
           name: name || 'my-servcraft-app',
-          language: cmdOptions.javascript ? 'javascript' : 'typescript',
-          moduleSystem: cmdOptions.commonjs ? 'commonjs' : 'esm',
+          language,
+          moduleSystem,
+          fileExtension,
           database: db,
           orm: db === 'mongodb' ? 'mongoose' : db === 'none' ? 'none' : 'prisma',
           validator: 'zod',
           features: ['auth', 'users', 'email'],
         };
       } else {
-        const answers = await inquirer.prompt([
+        // Step 1: Basic project info and language
+        const basicAnswers = await inquirer.prompt([
           {
             type: 'input',
             name: 'name',
@@ -117,16 +129,48 @@ export const initCommand = new Command('init')
             ],
             default: 'typescript',
           },
-          {
-            type: 'list',
-            name: 'moduleSystem',
-            message: '📦 Select module system:',
-            choices: [
-              { name: '✨ ESM (import/export) - Recommended', value: 'esm' },
-              { name: '   CommonJS (require/module.exports)', value: 'commonjs' },
-            ],
-            default: 'esm',
-          },
+        ]);
+
+        // Step 2: Module system and file extension (only for JavaScript)
+        let moduleSystem: 'esm' | 'commonjs' = 'esm';
+        let fileExtension: 'js' | 'cjs' | 'ts' = 'ts';
+
+        if (basicAnswers.language === 'javascript') {
+          const jsConfigAnswers = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'moduleSystem',
+              message: '📦 Select module syntax:',
+              choices: [
+                { name: '✨ ESM (import/export)', value: 'esm' },
+                { name: '   CommonJS (require/module.exports)', value: 'commonjs' },
+              ],
+              default: 'esm',
+            },
+            {
+              type: 'list',
+              name: 'fileExtension',
+              message: '📄 Select file extension:',
+              choices: (answers: { moduleSystem: string }) => {
+                if (answers.moduleSystem === 'esm') {
+                  return [{ name: '✨ .js (standard for ESM)', value: 'js' }];
+                } else {
+                  return [
+                    { name: '✨ .cjs (explicit CommonJS)', value: 'cjs' },
+                    { name: '   .js (CommonJS in .js)', value: 'js' },
+                  ];
+                }
+              },
+              default: (answers: { moduleSystem: string }) =>
+                answers.moduleSystem === 'esm' ? 'js' : 'cjs',
+            },
+          ]);
+          moduleSystem = jsConfigAnswers.moduleSystem;
+          fileExtension = jsConfigAnswers.fileExtension;
+        }
+
+        // Step 3: Database, validator, and features
+        const restAnswers = await inquirer.prompt([
           {
             type: 'list',
             name: 'database',
@@ -161,11 +205,19 @@ export const initCommand = new Command('init')
               { name: 'Email Service', value: 'email', checked: true },
               { name: 'Audit Logs', value: 'audit', checked: false },
               { name: 'File Upload', value: 'upload', checked: false },
-              { name: 'Redis Cache', value: 'redis', checked: false },
+              { name: 'Redis Cache', value: 'cache', checked: false },
             ],
           },
         ]);
 
+        // Combine all answers
+        const answers = {
+          ...basicAnswers,
+          moduleSystem,
+          fileExtension,
+          ...restAnswers,
+        };
+
         // Auto-determine ORM based on database choice
         const db = answers.database as InitOptions['database'];
         options = {
@@ -305,6 +357,30 @@ export const initCommand = new Command('init')
 
         spinner.succeed('Project files generated!');
 
+        // Install selected feature modules
+        if (options.features && options.features.length > 0 && !cmdOptions?.dryRun) {
+          const moduleSpinner = ora('Installing selected modules...').start();
+
+          try {
+            for (const feature of options.features) {
+              moduleSpinner.text = `Installing ${feature} module...`;
+              const moduleDir = path.join(projectDir, 'src/modules', feature);
+              await ensureDir(moduleDir);
+              await generateModuleFiles(
+                feature,
+                moduleDir,
+                options.language,
+                options.moduleSystem,
+                options.fileExtension
+              );
+            }
+            moduleSpinner.succeed(`${options.features.length} module(s) installed!`);
+          } catch (err) {
+            moduleSpinner.fail('Failed to install some modules');
+            warn(`  Error: ${err instanceof Error ? err.message : 'Unknown error'}`);
+          }
+        }
+
         // Install dependencies (skip in dry-run mode)
         if (!cmdOptions?.dryRun) {
           const installSpinner = ora('Installing dependencies...').start();