speedrun-cli 2.6.7 → 2.6.9

package/CHANGELOG.md

@@ -5,8 +5,64 @@ All notable changes to create-nestjs-auth will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.6.9] - 2026-08-21
+
+### Fixed
+- **Products module no longer shipped by default** — `src/modules/products/` was incorrectly included in the `base-crud` shared template and therefore copied into every project where `--base-crud` was enabled, even before the user ran `speedrun-cli generate`. The products example files have been moved exclusively into the ORM-specific overlay templates (`base-crud-{orm}`), which are only written during the guided CRUD setup step. The `base-crud` shared layer now only contains the abstract classes (`src/common/base/`) and `CRUD_README.md`.
+- **Seed runs twice on Prisma** — removed the `"prisma": { "seed": "ts-node prisma/seed.ts" }` field from `templates/orm/prisma/package.json`. This field caused Prisma to automatically invoke the seed at the end of every `prisma migrate dev`, while `postSetup.js` also called `npm run prisma:seed` explicitly — resulting in the seed being executed twice and credentials being printed double.
+
+---
+
+## [2.6.8] - 2026-08-21
+
+### Added
+- **Guided CRUD setup step** — `? Do you want to generate your first CRUD module now?` is now part of the main setup flow, positioned after Database (Schema/Migration → Seed) and before Dev server start
+- **`promptCrudGeneration()`** in `postSetup.js` — reusable function that calls `generateModule` with the selected ORM token, and auto-registers the generated module in `src/app.module.ts`
+- **Manual instructions** now include a CRUD generation step (`speedrun-cli generate <name>`) when interactive setup is skipped
+
+### Changed
+- Setup prompt message updated: `"Would you like to complete the setup now? (JWT secrets, database, CRUD)"` to accurately reflect full scope
+- CRUD generation is now **always offered** during guided setup (previously only shown when `--base-crud` flag was set, and appeared _after_ the dev server prompt)
+- Guided setup flow order: **JWT → Database → CRUD → Dev server**
+
+### Fixed
+- **Duplicate CRUD prompt** — removed orphaned CRUD prompt block from `bin/cli.js`; single source of truth is now `postSetup.js`
+- **`registerInAppModule` false positive** — overly broad `includes(${Name}Module)` check replaced with regex word-boundary `\b${Name}Module\b` to prevent partial-name collisions
+- **Drizzle inject token mismatch** — `@Inject('DB_CONNECTION')` corrected to `@Inject('DRIZZLE')` to match the exported token in `database.module.ts`
+- **TypeORM `@InjectRepository(Object)`** — added inline comment guiding users to replace `Object` with their actual entity class
+- Ctrl+C during dev server no longer silently drops the CRUD prompt (prompt now runs _before_ the dev server)
+
+---
+
+## [2.6.0] - 2026-08-18
+
+### Added
+- **Base CRUD Architecture** (`--base-crud` flag) — generates abstract `BaseService<T>` and `BaseController<T>` in `src/common/base/` with full Swagger integration
+- **`BaseService<T>`** — generic CRUD abstraction with `create`, `findAll` (paginated), `findOne`, `update`, `remove` (soft-delete) and automatic `NotFoundException` throwing
+- **`BaseController<T>`** — generic REST controller wiring `BaseService` methods to NestJS route decorators with full `@nestjs/swagger` decorators
+- **Swagger DTO helpers** — `ApiResponseDto<T>`, `PaginatedResponseDto<T>`, `ApiResponseSchema()`, `PaginatedResponseSchema()` utility functions
+- **ORM-specific ProductModule examples** — concrete `ProductsService` + `ProductsModule` templates for all four ORMs (`base-crud-{prisma,typeorm,drizzle,mongoose}`)
+- **`ProductEntity` alias pattern** — each ORM service exports `export type ProductEntity = <OrmType>` so the shared controller imports from a single uniform name
+- **`CRUD_README.md`** — full guide and cheatsheet copied into generated projects when `--base-crud` is enabled
+- **`speedrun-cli generate [module-name]`** (`g` alias) — interactive CRUD module generator:
+  - Full CRUD or Custom Selection (checkbox) for individual operations
+  - ORM auto-detection from `package.json` dependencies
+  - Generates `service`, `controller`, `module`, and `dto/` files
+  - Auto-registers generated module in `src/app.module.ts`
+
+### Changed
+- Generator step 6 split into **6a (shared base-crud)** + **6b (ORM-specific overlay)** for correct template composition
+- `printSuccessHeader` now displays Base CRUD status in success output
+
+### Fixed
+- Prisma template import paths corrected (`../../database/` → `../../prisma/`) to resolve `TS2307` errors
+- Removed direct `@prisma/client` model imports in templates; replaced with local interface stubs to decouple from user schema (`TS2305` fix)
+
+---
+
 ## [2.0.8] - 2025-12-05
 
+
 ### Fixed
 - Fixed template copy failure when CLI is installed globally or via npx (node_modules path check issue)
 - Fixed .gitignore not being included in generated projects (renamed to gitignore for npm compatibility)
@@ -91,6 +147,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 | Version | Date | Description |
 |---------|------|-------------|
+| 2.6.8 | 2026-08-21 | CRUD generation integrated into guided setup flow + bug fixes |
+| 2.6.0 | 2026-08-18 | Base CRUD Architecture, ORM-specific templates, `generate` command |
+| 2.0.8 | 2025-12-05 | Template copy & Prisma migration prompt fixes |
 | 2.0.0 | 2025-12-04 | Multi-ORM and multi-database support |
 | 1.1.0 | 2025-11-17 | Interactive mode and post-setup automation |
 | 1.0.0 | 2025-11-16 | Initial release with Prisma + PostgreSQL |

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.7",
+  "version": "2.6.9",
   "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);
   }
@@ -397,8 +397,8 @@ async function registerInAppModule(targetDir, pascalName, kebabName) {
     let content = await fs.readFile(appModulePath, 'utf8');
     const moduleImport = `import { ${pascalName}Module } from './modules/${kebabName}/${kebabName}.module';`;
     
-    // Cegah duplikasi import
-    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;
     }
 

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'));
   

package/templates/orm/prisma/package.json

@@ -27,9 +27,6 @@
     "prisma:studio": "prisma studio",
     "prisma:reset": "prisma migrate reset --force"
   },
-  "prisma": {
-    "seed": "ts-node prisma/seed.ts"
-  },
   "dependencies": {
     "@nestjs/common": "^11.0.1",
     "@nestjs/config": "^4.0.2",

package/templates/base-crud/src/modules/products/dto/create-product.dto.ts

@@ -1,44 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import {
-  IsString, IsNotEmpty, IsNumber, IsPositive, IsOptional,
-  IsEnum, MinLength, MaxLength, Min, IsInt, Matches,
-} from 'class-validator';
-import { Type } from 'class-transformer';
-
-export enum ProductStatus {
-  ACTIVE = 'ACTIVE',
-  INACTIVE = 'INACTIVE',
-  OUT_OF_STOCK = 'OUT_OF_STOCK',
-  DISCONTINUED = 'DISCONTINUED',
-}
-
-export class CreateProductDto {
-  @ApiProperty({ description: 'Product name', example: 'Wireless Mechanical Keyboard', minLength: 3, maxLength: 150 })
-  @IsString() @IsNotEmpty() @MinLength(3) @MaxLength(150)
-  name: string;
-
-  @ApiPropertyOptional({ description: 'Product description', example: 'Compact TKL layout with RGB', maxLength: 1000 })
-  @IsOptional() @IsString() @MaxLength(1000)
-  description?: string;
-
-  @ApiProperty({ description: 'Unique SKU (uppercase, numbers, hyphens)', example: 'KB-WL-MEC-001', pattern: '^[A-Z0-9-]+$' })
-  @IsString() @IsNotEmpty()
-  @Matches(/^[A-Z0-9-]+$/, { message: 'sku must contain only uppercase letters, numbers, and hyphens' })
-  sku: string;
-
-  @ApiProperty({ description: 'Price in smallest currency unit (cents)', example: 149999, minimum: 0 })
-  @Type(() => Number) @IsNumber() @IsPositive()
-  price: number;
-
-  @ApiProperty({ description: 'Available stock quantity', example: 250, minimum: 0 })
-  @Type(() => Number) @IsInt() @Min(0)
-  stock: number;
-
-  @ApiPropertyOptional({ description: 'Product category', example: 'Peripherals', maxLength: 100 })
-  @IsOptional() @IsString() @MaxLength(100)
-  category?: string;
-
-  @ApiPropertyOptional({ enum: ProductStatus, default: ProductStatus.ACTIVE, example: ProductStatus.ACTIVE })
-  @IsOptional() @IsEnum(ProductStatus)
-  status?: ProductStatus = ProductStatus.ACTIVE;
-}

package/templates/base-crud/src/modules/products/dto/product.dto.ts

@@ -1,38 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { ProductStatus } from './create-product.dto';
-
-/** Product response DTO — shape returned from the API, used by Swagger @ApiExtraModels */
-export class ProductDto {
-  @ApiProperty({ description: 'Product UUID v4', example: '123e4567-e89b-12d3-a456-426614174000', format: 'uuid' })
-  id: string;
-
-  @ApiProperty({ example: 'Wireless Mechanical Keyboard' })
-  name: string;
-
-  @ApiPropertyOptional({ example: 'Compact TKL layout with RGB' })
-  description?: string;
-
-  @ApiProperty({ example: 'KB-WL-MEC-001' })
-  sku: string;
-
-  @ApiProperty({ description: 'Price in cents', example: 149999 })
-  price: number;
-
-  @ApiProperty({ example: 250 })
-  stock: number;
-
-  @ApiPropertyOptional({ example: 'Peripherals' })
-  category?: string;
-
-  @ApiProperty({ enum: ProductStatus, example: ProductStatus.ACTIVE })
-  status: ProductStatus;
-
-  @ApiProperty({ example: '2025-01-01T00:00:00.000Z' })
-  createdAt: Date;
-
-  @ApiProperty({ example: '2025-01-15T08:30:00.000Z' })
-  updatedAt: Date;
-
-  @ApiPropertyOptional({ nullable: true, example: null })
-  deletedAt?: Date | null;
-}

package/templates/base-crud/src/modules/products/dto/update-product.dto.ts

@@ -1,12 +0,0 @@
-import { PartialType } from '@nestjs/swagger';
-import { CreateProductDto } from './create-product.dto';
-
-/**
- * Update Product DTO
- *
- * Uses PartialType from @nestjs/swagger (NOT @nestjs/mapped-types) to:
- *   1. Make all fields optional (PATCH semantics)
- *   2. Preserve @ApiProperty decorators for Swagger schema rendering
- *   3. Keep all class-validator rules active on provided fields
- */
-export class UpdateProductDto extends PartialType(CreateProductDto) {}

package/templates/base-crud/src/modules/products/products.controller.ts

@@ -1,94 +0,0 @@
-import {
-  Controller,
-  Get,
-  Param,
-  Query,
-  ParseUUIDPipe,
-  HttpStatus,
-  Type,
-} from '@nestjs/common';
-import {
-  ApiTags,
-  ApiOperation,
-  ApiResponse,
-  ApiBearerAuth,
-  ApiExtraModels,
-  ApiParam,
-} from '@nestjs/swagger';
-import { BaseController } from '../../common/base/base.controller';
-import {
-  ApiResponseDto,
-  ApiResponseSchema,
-  PaginatedResponseDto,
-  PaginatedResponseSchema,
-  PaginationQueryDto,
-} from '../../common/base';
-import { ProductsService, ProductEntity } from './products.service';
-import { CreateProductDto } from './dto/create-product.dto';
-import { UpdateProductDto } from './dto/update-product.dto';
-import { ProductDto } from './dto/product.dto';
-
-// ─────────────────────────────────────────────────────────────
-// Products Controller
-//
-// Extends BaseController which provides (via ORM-specific service):
-//   POST   /products          → create()
-//   GET    /products          → findAll()
-//   GET    /products/:id      → findOne()
-//   PUT    /products/:id      → update()
-//   DELETE /products/:id      → remove()
-//
-// @ApiExtraModels registers DTOs so Swagger renders
-// generic ApiResponseDto<ProductDto> and PaginatedResponseDto<ProductDto>.
-// ─────────────────────────────────────────────────────────────
-@ApiTags('Products')
-@ApiBearerAuth('bearer')
-@ApiExtraModels(ApiResponseDto, PaginatedResponseDto, ProductDto)
-@Controller('products')
-export class ProductsController extends BaseController<
-  ProductEntity,
-  CreateProductDto,
-  UpdateProductDto
-> {
-  constructor(private readonly productsService: ProductsService) {
-    super(productsService);
-  }
-
-  protected getDtoClass(): Type<ProductEntity> {
-    return ProductDto as unknown as Type<ProductEntity>;
-  }
-
-  // ── Overrides to inject Swagger response schemas ────────────
-
-  @Get()
-  @ApiOperation({ summary: 'Get all products (paginated)' })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Paginated products', schema: PaginatedResponseSchema(ProductDto) })
-  @ApiResponse({ status: HttpStatus.UNAUTHORIZED, description: 'Unauthorized' })
-  override async findAll(@Query() pagination: PaginationQueryDto): Promise<PaginatedResponseDto<ProductEntity>> {
-    return super.findAll(pagination);
-  }
-
-  @Get('by-sku/:sku')
-  @ApiOperation({ summary: 'Get a product by SKU' })
-  @ApiParam({ name: 'sku', example: 'KB-WL-MEC-001', description: 'Unique Stock Keeping Unit' })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Product found by SKU', schema: ApiResponseSchema(ProductDto) })
-  @ApiResponse({ status: HttpStatus.NOT_FOUND, description: 'Product not found' })
-  @ApiResponse({ status: HttpStatus.UNAUTHORIZED, description: 'Unauthorized' })
-  async findBySku(@Param('sku') sku: string): Promise<ApiResponseDto<ProductEntity>> {
-    const data = await this.productsService.findBySku(sku);
-    return { success: true, data, meta: { correlationId: '', timestamp: new Date().toISOString() } };
-  }
-
-  @Get(':id')
-  @ApiOperation({ summary: 'Get a product by UUID' })
-  @ApiParam({ name: 'id', format: 'uuid', example: '123e4567-e89b-12d3-a456-426614174000' })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Product found', schema: ApiResponseSchema(ProductDto) })
-  @ApiResponse({ status: HttpStatus.NOT_FOUND, description: 'Product not found' })
-  @ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'Invalid UUID format' })
-  @ApiResponse({ status: HttpStatus.UNAUTHORIZED, description: 'Unauthorized' })
-  override async findOne(
-    @Param('id', new ParseUUIDPipe({ version: '4', errorHttpStatusCode: HttpStatus.BAD_REQUEST })) id: string,
-  ): Promise<ApiResponseDto<ProductEntity>> {
-    return super.findOne(id);
-  }
-}