speedrun-cli 2.6.6 → 2.6.8

package/bin/cli.js

@@ -189,21 +189,6 @@ program
           console.log(chalk.cyan('🏗️  Base CRUD: src/common/base/ — see CRUD_README.md'));
         }
         console.log(chalk.magenta('\nHappy coding! 🎉\n'));
-
-        // Post-setup module generation hook
-        if (projectOptions.baseCrud) {
-          const inquirer = require('inquirer');
-          const { generateNow } = await inquirer.prompt([{
-            type: 'confirm',
-            name: 'generateNow',
-            message: 'Do you want to generate your first CRUD module now?',
-            default: true
-          }]);
-          
-          if (generateNow) {
-            await generateModule(undefined, targetDir, projectOptions.orm);
-          }
-        }
       }
 
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speedrun-cli",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "CLI tool to scaffold a production-ready NestJS authentication system with JWT, refresh tokens, and RBAC",
   "keywords": [
     "nestjs",

package/src/moduleGenerator.js

@@ -141,7 +141,7 @@ class TypeOrm${pascalName}Repository implements IBaseRepository<${pascalName}Ent
 export class ${pascalName}Service extends BaseService<${pascalName}Entity, ${createDtoName}, ${updateDtoName}> {
   private readonly repository: TypeOrm${pascalName}Repository;
 
-  constructor(@InjectRepository(Object) private readonly repo: Repository<${pascalName}Entity>) {
+  constructor(@InjectRepository(Object /* Replace with your Entity class, e.g. ${pascalName}Entity */) private readonly repo: Repository<${pascalName}Entity>) {
     super();
     this.repository = new TypeOrm${pascalName}Repository(this.repo);
   }
@@ -259,7 +259,7 @@ class Drizzle${pascalName}Repository implements IBaseRepository<${pascalName}Ent
 export class ${pascalName}Service extends BaseService<${pascalName}Entity, ${createDtoName}, ${updateDtoName}> {
   private readonly repository: Drizzle${pascalName}Repository;
 
-  constructor(@Inject('DB_CONNECTION') private readonly db: any) {
+  constructor(@Inject('DRIZZLE') private readonly db: any) {
     super();
     this.repository = new Drizzle${pascalName}Repository(this.db);
   }
@@ -395,26 +395,23 @@ async function registerInAppModule(targetDir, pascalName, kebabName) {
     }
 
     let content = await fs.readFile(appModulePath, 'utf8');
-
     const moduleImport = `import { ${pascalName}Module } from './modules/${kebabName}/${kebabName}.module';`;
     
-    // Skip if already imported
-    if (content.includes(moduleImport) || content.includes(`${pascalName}Module`)) {
+    // Prevent duplicate registration — use exact module name match
+    if (content.includes(moduleImport) || new RegExp(`\\b${pascalName}Module\\b`).test(content)) {
       return true;
     }
 
-    // 1. Add import statement at top
+    // 1. Tambahkan baris import di paling atas file
     content = `${moduleImport}\n` + content;
 
-    // 2. Inject ${pascalName}Module into imports array
-    const importsArrayRegex = /(imports\s*:\s*\[)([^\]]*)/s;
-    if (importsArrayRegex.test(content)) {
-      content = content.replace(importsArrayRegex, (match, p1, p2) => {
-        const trimmedP2 = p2.trim();
-        const separator = trimmedP2 ? (trimmedP2.endsWith(',') ? '\n    ' : ',\n    ') : '\n    ';
-        return `${p1}${p2}${separator}${pascalName}Module,`;
-      });
-
+    // 2. Inject ${pascalName}Module tepat di dalam decorator @Module({ imports: [ ... ] })
+    const importsKeywordIndex = content.indexOf('imports: [');
+    
+    if (importsKeywordIndex !== -1) {
+      const insertPosition = importsKeywordIndex + 'imports: ['.length;
+      content = content.slice(0, insertPosition) + `\n    ${pascalName}Module,` + content.slice(insertPosition);
+      
       await fs.writeFile(appModulePath, content, 'utf8');
       console.log(chalk.green(`✨ Automatically registered ${pascalName}Module in src/app.module.ts`));
       return true;

package/src/postSetup.js

@@ -10,6 +10,12 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { ORM_OPTIONS, DATABASE_OPTIONS } = require('./constants');
 const { generateJWTSecret, getRunPrefix } = require('./utils');
+// Lazy-loaded to avoid circular deps: moduleGenerator requires constants/utils
+let _generateModule;
+function getGenerateModule() {
+  if (!_generateModule) _generateModule = require('./moduleGenerator').generateModule;
+  return _generateModule;
+}
 
 /**
  * Handles interactive post-setup configuration
@@ -30,7 +36,7 @@ async function handlePostSetup(targetDir, appName, options) {
   const { continueSetup } = await inquirer.prompt([{
     type: 'confirm',
     name: 'continueSetup',
-    message: 'Would you like to complete the setup now? (JWT secrets, database, etc.)',
+    message: 'Would you like to complete the setup now? (JWT secrets, database, CRUD)',
     default: true,
   }]);
 
@@ -38,13 +44,16 @@ async function handlePostSetup(targetDir, appName, options) {
     return false;
   }
 
-  // Configure JWT secrets and database URL
+  // Step 1: Configure JWT secrets and database URL
   await configureEnvironment(targetDir, database);
 
-  // ORM-specific database setup
+  // Step 2: ORM-specific database setup (Schema/Migration → Seed)
   await setupDatabase(targetDir, orm, packageManager);
 
-  // Optionally start dev server
+  // Step 3: CRUD module generation (always offered when setup is accepted)
+  await promptCrudGeneration(targetDir, orm);
+
+  // Step 4: Optionally start dev server
   await promptDevServer(targetDir, packageManager);
 
   return true;
@@ -272,6 +281,30 @@ function printCredentials() {
   console.log(chalk.white('      Password: Admin@123\n'));
 }
 
+/**
+ * Prompts user to generate their first CRUD module
+ */
+async function promptCrudGeneration(targetDir, orm) {
+  const { generateNow } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'generateNow',
+    message: 'Do you want to generate your first CRUD module now?',
+    default: true,
+  }]);
+
+  if (!generateNow) {
+    console.log(chalk.gray('\n   Skipping CRUD generation. Run `speedrun-cli generate <name>` anytime.\n'));
+    return;
+  }
+
+  try {
+    await getGenerateModule()(undefined, targetDir, orm);
+  } catch (err) {
+    console.warn(chalk.yellow(`\n   ⚠️  CRUD generation failed: ${err.message}`));
+    console.warn(chalk.gray('   Run `speedrun-cli generate <name>` manually inside your project.\n'));
+  }
+}
+
 /**
  * Prompts user to start dev server
  */
@@ -339,6 +372,10 @@ function printManualInstructions(appName, options) {
     commands.forEach((cmd) => console.log(chalk.gray(`   npm run ${cmd}`)));
   }
   
+  console.log(chalk.cyan('\n   # Generate your first CRUD module:'));
+  console.log(chalk.gray('   speedrun-cli generate <module-name>'));
+  console.log(chalk.gray('   # e.g. speedrun-cli generate orders'));
+
   console.log(chalk.cyan('\n   # Start development server:'));
   console.log(chalk.gray('   npm run start:dev'));