nodejs-quickstart-structure 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,4 +1,30 @@
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+ 
+## [2.1.0] - 2026-04-20
+
+### Added
+- **Pluggable JWT Authentication**: Introduced a robust, production-ready authentication system.
+  - Supports **Access & Refresh Token Rotation** for enhanced security.
+  - Integrated **Token Revocation (Blacklisting)** via Redis or Memory Cache.
+  - Secure logout flows and theft detection for refresh tokens.
+  - Seamless integration with both REST and GraphQL protocols across all architectures.
+- **VitePress Documentation Upgrade**: Detailed [Authentication Blueprint](https://paudang.github.io/nodejs-quickstart-structure/blueprints/authentication) and cross-feature documentation updates.
+- **Security Hardening**: Resolved moderate vulnerabilities in `vite` and `vitepress` by implementing version overrides and dependency upgrades (VitePress v1.6.4+).
+- **Interactive README 2.0**: Completely redesigned the project landing page with a "Choose Your Journey" dual-workflow (Web UI vs CLI) and visual action previews.
+
+---
+
+## [2.0.1] - 2026-04-07
+
+### Added
+- **Universal CI/CD Support (Phase 8)**: Expanded the generator's CI/CD capabilities to include out-of-the-box support for **Bitbucket Pipelines** and **CircleCI**.
+- **Modernized Pipe & Orb Integration**: 
+  - Bitbucket templates now utilize official Atlassian Pipes for automated Snyk security scans and SonarCloud analysis.
+  - CircleCI configurations (v2.1) are optimized with official Orbs (`circleci/node`, `snyk/snyk`) for advanced dependency caching and security execution.
+- **Project Blueprints (CI/CD Guide)**: Launched a comprehensive "CI/CD Setup Guide" in the VitePress documentation, providing step-by-step configuration workflows for all 5 supported platforms (GitHub, GitLab, Jenkins, Bitbucket, CircleCI).
+- **CLI Ecosystem Sync**: Updated the interactive prompts and command-line flags to seamlessly integrate the new CI/CD choices while maintaining 100% backward compatibility.
+- **Enterprise Readness Documentation**: Updated the generated `README.md` templates to officially include Bitbucket and CircleCI in the supported feature set.
+
 
 ## [2.0.0] - 2026-04-02
 

package/README.md

@@ -1,6 +1,7 @@
 # Node.js Quickstart Generator
 
 [![npm version](https://img.shields.io/npm/v/nodejs-quickstart-structure.svg?style=flat-square)](https://www.npmjs.com/package/nodejs-quickstart-structure)
+![Total Clones](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=total%20clones&query=total_clones&url=https%3A%2F%2Fraw.githubusercontent.com%2Fpaudang%2Fnodejs-quickstart-structure%2Foutput%2Ftotal_stats.json&style=flat-square)
 [![npm total downloads](https://img.shields.io/npm/dt/nodejs-quickstart-structure?style=flat-square&color=emerald&label=Downloads)](https://www.npmjs.com/package/nodejs-quickstart-structure)
 [![npm monthly downloads](https://img.shields.io/npm/dm/nodejs-quickstart-structure.svg?style=flat-square)](https://www.npmjs.com/package/nodejs-quickstart-structure)
 [![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg?style=flat-square)](https://opensource.org/licenses/ISC)
@@ -9,57 +10,44 @@
 | **Metric** | **Insight** |
 | :--- | :--- |
 | 🔥 **4,000+** | Downloads on npm |
-| 🚀 **1,200+** | Recent GitHub Clones |
+| 🚀 **1,500+** | Recent GitHub Clones |
 | 🌍 **Trusted by** | Devs from **Google**, **Viblo**, and global tech teams |
 
 ---
 
-A powerful CLI tool to scaffold production-ready Node.js microservices with built-in best practices. Choose between **MVC** or **Clean Architecture**, **JavaScript** or **TypeScript**, and your preferred tech stack in seconds.
-
-🎯 **[Try the Next-Gen Web UI Configurator!](https://paudang.github.io/nodejs-quickstart-structure/)**
-*Generate your exact architecture in the browser with real-time folder simulation.*
-
-![Demo](docs/demo.gif)
-
----
-
-## 🆕 What's New in v2.0.0
-
-The v2.0.0 release is a major leap forward, turning the generator into a **Community Standard** for Node.js development:
-
-- **Next-Gen Web UI Configurator**: A modern, browser-based visual project simulator. Click your stack and copy the generated zero-prompt CLI command instantly! [Try it here](https://paudang.github.io/nodejs-quickstart-structure/).
-- **🦾 AI-Native Foundation**: Built-in `.cursorrules` and Agent skills optimized for **Cursor** & AI coding assistants.
-- **🏗️ Enterprise Clean Architecture**: High-fidelity structure for professional Microservices (TS/JS).
-- **🛡️ Hardened Security**: Integrated Snyk & SonarCloud logic in the core templates.
-- **⚡ Zero-Prompt Workflow**: Generate projects with a single CLI command—no more answering prompts manually.
-
----
+A powerful ecosystem to scaffold production-ready Node.js microservices with built-in best practices. Choose between **MVC** or **Clean Architecture**, **JavaScript** or **TypeScript**, and your preferred tech stack in seconds.
 
 ## 📌 Table of Contents
 
-- [🚀 Quick Start](#-quick-start)
+- [🚀 Quick Start](#-choose-your-journey)
+- [🆕 What's New](#-whats-new-in-v21-the-authentication-release)
 - [✨ Key Features](#-key-features)
 - [🛡️ Professional Standards](#-professional-standards)
-- [🧩 1,680+ Project Combinations](#-1680-project-combinations)
+- [🧩 5,280+ Project Combinations](#-5280-project-combinations)
 - [⚙️ Configuration Options](#-configuration-options)
 - [🏗️ Generated Project Structure](#-generated-project-structure)
 - [📖 Documentation](#-documentation)
 - [🗺️ Support & Roadmap](#️-roadmap--support)
 
----
+## 🚀 Choose Your Journey
+ 
+| **Path A: Next-Gen Web UI** (Recommended ⭐️) | **Path B: Interactive CLI** |
+| :--- | :--- |
+| <a href="https://paudang.github.io/nodejs-quickstart-structure/#configurator"><img src="docs/public/v2-preview.png" width="100%" alt="UI Preview"></a> | <img src="docs/demo.gif" width="100%" alt="CLI Demo"> |
+| [Try Visual Configurator →](https://paudang.github.io/nodejs-quickstart-structure/#configurator) | [See CLI Commands ↓](#-path-b-interactive-cli) |
+| ✨ **Visual Preview**: Real-time folder simulation. | ⚡ **Fast & Direct**: Quickly scaffold in terminal. |
+| 🛠️ **Zero-Prompt**: Paste a tailored command. | 🦾 **AI-Ready**: Generates `.cursorrules`. |
 
-## 🚀 Quick Start
+---
 
-Generate your professional Node.js project in seconds without installing anything globally:
+### 🦾 Path B: Interactive CLI
+**Scaffold your project directly from your terminal in seconds.**
 
 ```bash
 npx nodejs-quickstart-structure@latest init
 ```
 
-### Installation (Optional)
-
-If you prefer to install it globally:
-
+*Or install globally:*
 ```bash
 npm install -g nodejs-quickstart-structure
 # Then run:
@@ -68,6 +56,20 @@ nodejs-quickstart init
 
 ---
 
+## 🆕 What's New in v2.1 (The Authentication Release)
+ 
+ The v2.1.0 release is a major leap forward, turning the generator into a **Community Standard**:
+ 
+- **🔐 Pluggable JWT Authentication**: Production-ready access & refresh token patterns with automatic PM2/Environment configuration.
+- **🦾 AI-Native Foundation**: Built-in `.cursorrules` optimized for **Cursor** & AI agents—projects are "Born to be Autonomously Coded."
+- **🖼️ Next-Gen Web UI**: A browser-based visual project simulator with real-time folder previews.
+- **🏗️ Enterprise Clean Architecture**: High-fidelity structure for professional Microservices (TS/JS).
+- **🛡️ Hardened Security**: Integrated Snyk & SonarCloud logic in core templates.
+- **⚡ Zero-Prompt Workflow**: Generate projects with a single CLI command.
+
+---
+
+
 ## ✨ Key Features
 
 - **Interactive CLI**: Smooth, guided configuration process.
@@ -76,6 +78,7 @@ nodejs-quickstart init
 - **Database Ready**: Pre-configured for **MySQL**, **PostgreSQL**, or **MongoDB**.
 - **Communication Patterns**: Supports **REST**, **GraphQL** (Apollo), and **Kafka** (Event-driven).
 - **Multi-layer Caching**: Integrated **Redis** or built-in **Memory Cache**.
+- **Pluggable Authentication**: Built-in **JWT** support (Refresh/Access tokens).
 - **AI-Native Optimized**: specifically designed for **Cursor** and AI agents, including built-in `.cursorrules` and Agent Skill prompts. 🚀
 
 ---
@@ -88,20 +91,20 @@ We don't just generate boilerplate; we generate **production-ready** foundations
 - **🛡️ Enterprise Security**: Integrated **Snyk (SCA)**, **SonarCloud (SAST)**, `Helmet`, `HPP`, and Rate-Limiting.
 - **🚨 Robust Error Handling**: Centralized global error middleware with custom error classes (`ApiError`, `NotFoundError`, etc.) — consistent across REST & GraphQL.
 - **🧪 Testing Excellence**: Integrated `Jest` and `Supertest` with **>80% Unit Test coverage** out of the box.
-- **🔄 DevOps & CI/CD**: Optimized **Multi-Stage Dockerfiles**, health checks, infrastructure retry logic, and workflows for **GitHub Actions**, **Jenkins**, and **GitLab CI**.
+- **🔄 DevOps & CI/CD**: Optimized **Multi-Stage Dockerfiles**, health checks, infrastructure retry logic, and workflows for **GitHub Actions**, **Jenkins**, **GitLab CI**, **CircleCI**, and **Bitbucket Pipelines**.
 - **🚀 Scalable Deployment**: Integrated **PM2 Ecosystem** config for zero-downtime reloads.
 
 ---
 
-## 🧩 1,680+ Project Combinations
+## 🧩 5,280+ Project Combinations
 
 The CLI supports a massive number of configurations to fit your exact needs:
 
-- **240 Core Combinations**:
-  - **MVC Architecture**: 180 variants (Languages × View Engines × Databases × Communication Patterns × Caching)
-  - **Clean Architecture**: 60 variants (Languages × Databases × Communication Patterns × Caching)
-- **1,680+ Total Scenarios**:
-  - Every combination can be generated across 3 CI/CD providers.
+- **480 Core Combinations**:
+  - **MVC Architecture**: 360 variants (Languages × View Engines × Databases × Communication Patterns × Caching × Auth)
+  - **Clean Architecture**: 120 variants (Languages × Databases × Communication Patterns × Caching × Auth)
+- **5,280+ Total Scenarios**:
+  - Every combination can be generated across 5 CI/CD providers.
   - Optional **Enterprise-Grade Security Hardening** doubles the scenarios.
   - Every single scenario is verified to be compatible with our **80% Coverage Threshold** policy.
 
@@ -117,8 +120,9 @@ The CLI will guide you through:
 5. **Database**: `MySQL` | `PostgreSQL` | `MongoDB`
 6. **Communication**: `REST` | `GraphQL` | `Kafka`
 7. **Caching**: `None` | `Redis` | `Memory Cache`
-8. **CI/CD**: `GitHub Actions` | `Jenkins` | `GitLab CI`
-9. **Security**: (Optional) Snyk & SonarCloud Hardening
+8. **Auth**: `None` | `JWT`
+9. **CI/CD**: `GitHub Actions` | `Jenkins` | `GitLab CI` | `CircleCI` | `Bitbucket Pipelines`
+10. **Security**: (Optional) Snyk & SonarCloud Hardening
 
 ---
 
@@ -146,7 +150,7 @@ Depending on your choices, the structure adapts. Here is a **TypeScript + Clean
 
 ## 📖 Documentation
 
-For full guides, architecture deep-dives, and feature references, visit our **[Official Documentation Site](https://paudang.github.io/nodejs-quickstart-structure/)**.
+For full guides, architecture deep-dives, and feature references, visit our **[Official Documentation Site](https://paudang.github.io/nodejs-quickstart-structure/guide/getting-started.html)**.
 
 ---
 

package/bin/index.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
     .name('nodejs-quickstart')
-    .description('🚀 CLI to scaffold production-ready Node.js microservices.\n\nGenerates projects with:\n- MVC or Clean Architecture\n- REST or Kafka\n- MySQL, PostgreSQL, or MongoDB\n- Docker, Flyway & Mongoose support')
+    .description('🚀 CLI to scaffold production-ready Node.js microservices.\n\nGenerates projects with:\n- MVC or Clean Architecture\n- REST, GraphQL or Kafka\n- MySQL, PostgreSQL, or MongoDB\n- Auth (None, JWT)\n- Docker, Flyway & Mongoose support')
     .version(pkg.version, '-v, --version', 'Output the current version')
     .addHelpText('after', `\n${chalk.yellow('Example:')}\n  $ nodejs-quickstart init   ${chalk.gray('# Start the interactive setup')}\n`);
 
@@ -29,10 +29,13 @@ program
     .option('-d, --database <database>', 'Database (MySQL, PostgreSQL)')
     .option('--db-name <name>', 'Database name')
     .option('-c, --communication <communication>', 'Communication (REST APIs, GraphQL, Kafka)')
-    .option('--ci-provider <provider>', 'CI/CD Provider (None, GitHub Actions, Jenkins, GitLab CI)')
+    .option('--ci-provider <provider>', 'CI/CD Provider (None, GitHub Actions, Jenkins, GitLab CI, Bitbucket Pipelines, CircleCI)')
     .option('--include-security', 'Include Enterprise Security Hardening')
     .option('--no-include-security', 'Exclude Enterprise Security Hardening')
-    .option('--caching <type>', 'Caching Layer (None/Redis)')
+    .option('--caching <type>', 'Caching Layer (None/Redis/Memory Cache)')
+    .option('--auth <modes...>', 'Authentication Modes (None, JWT)')
+    .option('--advanced-options', 'Enable Advanced Options')
+    .option('--no-advanced-options', 'Disable Advanced Options')
     .action(async (options) => {
         // Fix for Commander camelCase conversion
         if (options.ciProvider) {

package/lib/generator.js

@@ -10,6 +10,8 @@ import { setupCaching } from './modules/caching-setup.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+import { setupAuth } from './modules/auth-setup.js';
+
 export const generateProject = async (config) => {
     // 0. Normalize configuration with defaults
     config = {
@@ -20,9 +22,11 @@ export const generateProject = async (config) => {
         communication: 'REST APIs',
         database: 'None',
         includeSecurity: false,
+        auth: ['None'],
         ...config
     };
 
+
     const { projectName, architecture, language } = config;
     const targetDir = path.resolve(process.cwd(), projectName);
     const templatesDir = path.join(__dirname, '../templates');
@@ -62,14 +66,15 @@ export const generateProject = async (config) => {
     await renderDockerfile(templatesDir, targetDir, config);
 
     // 10. Database Setup (Migrations, Config, Models)
-    // Note: logic for detailed view copying is also handled nicely if we ensure setupDatabase checks correctly,
-    // or we can move strict view logic to setupViews. 
-    // In strict refactor, database-setup handles the content that was in the DB block.
     await setupDatabase(templatesDir, targetDir, config);
 
+    // 10.1 Auth Setup
+    await setupAuth(templatesDir, targetDir, config);
+
     // 10a. Caching Setup
     await setupCaching(templatesDir, targetDir, config);
 
+
     // 11. View Engine Public Assets (MVC)
     await setupViews(templatesDir, targetDir, config);
     // Copy src/views (MVC)
@@ -106,7 +111,8 @@ export const generateProject = async (config) => {
       Architecture: ${architecture}
       Language: ${language}
       Database: ${config.database}
-      Communication: ${config.communication}${config.caching && config.caching === 'Redis' ? `\n      Caching: ${config.caching}` : ''}
+      Communication: ${config.communication}${config.caching && config.caching !== 'None' ? `\n      Caching: ${config.caching}` : ''}
+      Authentication: ${config.auth.join(', ')}
 
       ----------------------------------------------------
       ✨  High-Quality Standards Applied:

package/lib/modules/app-setup.js

@@ -104,9 +104,21 @@ export const renderDynamicComponents = async (templatePath, targetDir, config) =
             await fs.ensureDir(path.join(targetDir, 'tests/unit/controllers'));
             const content = ejs.render(await fs.readFile(userControllerSpecTemplate, 'utf-8'), { ...config });
             await fs.writeFile(userControllerSpecPath, content);
-            await fs.remove(path.join(targetDir, 'src/controllers', `${userControllerSpecName}.ejs`));
+            await fs.remove(path.join(targetDir, 'tests/unit/controllers', `${userControllerSpecName}.ejs`));
+        }
+
+        // MVC Routes
+        const routeName = language === 'TypeScript' ? 'api.ts' : 'api.js';
+        const routePath = path.join(targetDir, 'src/routes', routeName);
+        const routeTemplate = path.join(templatePath, 'src/routes', `${routeName}.ejs`);
+
+        if (await fs.pathExists(routeTemplate)) {
+            const content = ejs.render(await fs.readFile(routeTemplate, 'utf-8'), { ...config });
+            await fs.writeFile(routePath, content);
+            await fs.remove(path.join(targetDir, 'src/routes', `${routeName}.ejs`));
         }
     }
+
     // Clean Architecture Repo
     else if (architecture === 'Clean Architecture') {
         const repoName = language === 'TypeScript' ? 'UserRepository.ts' : 'UserRepository.js';
@@ -151,7 +163,36 @@ export const renderDynamicComponents = async (templatePath, targetDir, config) =
             await fs.writeFile(controllerSpecPath, content);
             await fs.remove(path.join(targetDir, 'src/interfaces/controllers', `${controllerSpecName}.ejs`));
         }
+
+        // CA Routes
+        const routeName = language === 'TypeScript' ? 'userRoutes.ts' : 'api.js';
+        const routePath = path.join(targetDir, 'src/interfaces/routes', routeName);
+        const routeTemplate = path.join(templatePath, 'src/interfaces/routes', `${routeName}.ejs`);
+
+        if (await fs.pathExists(routeTemplate)) {
+            const content = ejs.render(await fs.readFile(routeTemplate, 'utf-8'), { ...config });
+            await fs.writeFile(routePath, content);
+            await fs.remove(path.join(targetDir, 'src/interfaces/routes', `${routeName}.ejs`));
+        }
+
+        // --- Render All Use Cases ---
+        const useCaseDir = path.join(targetDir, 'src/usecases');
+        if (await fs.pathExists(useCaseDir)) {
+            const useCaseFiles = await fs.readdir(useCaseDir);
+            for (const file of useCaseFiles) {
+                if (file.endsWith('.ejs')) {
+                    const templatePathObj = path.join(useCaseDir, file);
+                    const destPathObj = path.join(useCaseDir, file.replace('.ejs', ''));
+                    
+                    const template = await fs.readFile(templatePathObj, 'utf-8');
+                    const content = ejs.render(template, { ...config });
+                    await fs.writeFile(destPathObj, content);
+                    await fs.remove(templatePathObj);
+                }
+            }
+        }
     }
+
     // Render Server (Clean Arch JS only)
     if (architecture === 'Clean Architecture' && language === 'JavaScript') {
         const serverName = 'server.js';
@@ -270,7 +311,7 @@ export const renderDynamicComponents = async (templatePath, targetDir, config) =
                     if (stat.isDirectory()) {
                         await renderEjsDir(srcPath, destPath);
                     } else if (item.endsWith('.ejs')) {
-                        const content = ejs.render(await fs.readFile(srcPath, 'utf-8'), { language, architecture, database, caching });
+                        const content = ejs.render(await fs.readFile(srcPath, 'utf-8'), { ...config });
                         // Remove .ejs extension
                         const finalDestPath = destPath.slice(0, -4);
                         await fs.writeFile(finalDestPath, content);
@@ -310,10 +351,11 @@ export const renderSwaggerConfig = async (templatesDir, targetDir, config) => {
     if (communication === 'REST APIs' || communication === 'Kafka') {
         const swaggerYmlTemplateSource = path.join(templatesDir, 'common', 'swagger.yml.ejs');
         if (await fs.pathExists(swaggerYmlTemplateSource)) {
-            const ymlContent = ejs.render(await fs.readFile(swaggerYmlTemplateSource, 'utf-8'), { projectName });
+            const ymlContent = ejs.render(await fs.readFile(swaggerYmlTemplateSource, 'utf-8'), { ...config });
             await fs.writeFile(path.join(configDir, 'swagger.yml'), ymlContent);
         }
 
+
         if (await fs.pathExists(swaggerTsTemplate)) {
             const content = ejs.render(await fs.readFile(swaggerTsTemplate, 'utf-8'), { communication });
             await fs.writeFile(path.join(targetDir, 'src', 'config', 'swagger.ts'), content);
@@ -347,9 +389,35 @@ export const renderSwaggerConfig = async (templatesDir, targetDir, config) => {
 export const setupViews = async (templatesDir, targetDir, config) => {
     const { architecture, viewEngine } = config;
     if (architecture === 'MVC' && viewEngine && viewEngine !== 'None') {
-        const viewsSource = path.join(templatesDir, 'common', 'views', viewEngine.toLowerCase());
+        const engine = viewEngine.toLowerCase();
+        const viewsSource = path.join(templatesDir, 'common', 'views', engine);
+        const destDir = path.join(targetDir, 'src/views');
+
         if (await fs.pathExists(viewsSource)) {
-            await fs.copy(viewsSource, path.join(targetDir, 'src/views'));
+            await fs.ensureDir(destDir);
+            const items = await fs.readdir(viewsSource);
+            for (const item of items) {
+                // Skip auth views here; they are handled by auth-setup.js
+                if (item.startsWith('login.') || item.startsWith('signup.')) continue;
+                
+                const srcPath = path.join(viewsSource, item);
+                const isTemplate = item.endsWith('.ejs');
+                
+                // Determine target name: remove .ejs only if it's a double extension (e.g., .ejs.ejs or .pug.ejs)
+                // Otherwise keep the original name (e.g., index.ejs should remain index.ejs)
+                let targetName = item;
+                if (item.endsWith('.ejs.ejs') || item.endsWith('.pug.ejs')) {
+                    targetName = item.slice(0, -4);
+                }
+                const destPath = path.join(destDir, targetName);
+                
+                if (isTemplate) {
+                    const content = ejs.render(await fs.readFile(srcPath, 'utf-8'), config);
+                    await fs.writeFile(destPath, content);
+                } else {
+                    await fs.copy(srcPath, destPath);
+                }
+            }
         }
     }
 };
@@ -392,7 +460,9 @@ export const processAllTests = async (targetDir, config) => {
                 const template = await fs.readFile(itemPath, 'utf-8');
                 const content = ejs.render(template, config);
 
-                await fs.writeFile(targetTestPath, content);
+                if (content.trim()) {
+                    await fs.writeFile(targetTestPath, content);
+                }
                 await fs.remove(itemPath);
             }
         }

package/lib/modules/auth-setup.js

@@ -0,0 +1,143 @@
+import fs from 'fs-extra';
+import path from 'path';
+import ejs from 'ejs';
+
+export const setupAuth = async (templatesDir, targetDir, config) => {
+    const { auth, architecture, language, communication, viewEngine } = config;
+    if (!auth || auth.includes('None') || !auth.includes('JWT')) return;
+
+    const langExt = language === 'TypeScript' ? 'ts' : 'js';
+    const authSource = path.join(templatesDir, 'common', 'auth', langExt);
+    const viewsSource = path.join(templatesDir, 'common', 'views');
+
+    // 1. JWT Service
+    await renderAuthComponent(authSource, targetDir, 'services', `jwtService.${langExt}`, config);
+
+    // 2. Auth Middleware
+    await renderAuthComponent(authSource, targetDir, 'middleware', `authMiddleware.${langExt}`, config);
+
+    // 3. Auth Controller (Login only)
+    await renderAuthComponent(authSource, targetDir, 'controllers', `authController.${langExt}`, config);
+
+    // 4. Auth Routes
+    await renderAuthComponent(authSource, targetDir, 'routes', `authRoutes.${langExt}`, config);
+
+    // 5. MVC Views (if applicable)
+    if (architecture === 'MVC' && viewEngine && viewEngine !== 'None') {
+        const engine = viewEngine.toLowerCase();
+        const views = ['login', 'signup'];
+        for (const view of views) {
+            const viewTemplate = path.join(viewsSource, engine, `${view}.${engine}.ejs`);
+            if (await fs.pathExists(viewTemplate)) {
+                const content = ejs.render(await fs.readFile(viewTemplate, 'utf-8'), config);
+                const destPath = path.join(targetDir, 'src', 'views', `${view}.${engine}`);
+                await fs.ensureDir(path.dirname(destPath));
+                await fs.writeFile(destPath, content);
+            }
+        }
+    }
+
+    // 6. Restructuring for Clean Architecture
+    if (architecture === 'Clean Architecture') {
+        await restructureAuthForCleanArch(targetDir, langExt);
+    }
+};
+
+async function renderAuthComponent(authSource, targetDir, subDir, fileName, config) {
+    const templatePath = path.join(authSource, subDir, `${fileName}.ejs`);
+    if (await fs.pathExists(templatePath)) {
+        const content = ejs.render(await fs.readFile(templatePath, 'utf-8'), config);
+        const destPath = path.join(targetDir, 'src', subDir, fileName);
+        await fs.ensureDir(path.dirname(destPath));
+        await fs.writeFile(destPath, content);
+        
+        // Render Spec
+        const specName = fileName.replace(`.${config.language === 'TypeScript' ? 'ts' : 'js'}`, `.spec.${config.language === 'TypeScript' ? 'ts' : 'js'}`);
+        const specTemplate = path.join(authSource, subDir, `${specName}.ejs`);
+        if (await fs.pathExists(specTemplate)) {
+            const specContent = ejs.render(await fs.readFile(specTemplate, 'utf-8'), config);
+            const testDir = path.join(targetDir, 'tests', 'unit', subDir);
+            await fs.ensureDir(testDir);
+            await fs.writeFile(path.join(testDir, specName), specContent);
+        }
+    }
+}
+
+async function restructureAuthForCleanArch(targetDir, ext) {
+    // Services -> Infrastructure/Auth
+    await fs.ensureDir(path.join(targetDir, 'src/infrastructure/auth'));
+    await fs.ensureDir(path.join(targetDir, 'tests/unit/infrastructure/auth'));
+    if (await fs.pathExists(path.join(targetDir, `src/services/jwtService.${ext}`))) {
+        await fs.move(
+            path.join(targetDir, `src/services/jwtService.${ext}`),
+            path.join(targetDir, `src/infrastructure/auth/jwtService.${ext}`),
+            { overwrite: true }
+        );
+        if (await fs.pathExists(path.join(targetDir, `tests/unit/services/jwtService.spec.${ext}`))) {
+            await fs.move(
+                path.join(targetDir, `tests/unit/services/jwtService.spec.${ext}`),
+                path.join(targetDir, `tests/unit/infrastructure/auth/jwtService.spec.${ext}`),
+                { overwrite: true }
+            );
+        }
+    }
+
+    // Controllers -> Interfaces/Controllers/auth
+    await fs.ensureDir(path.join(targetDir, 'src/interfaces/controllers/auth'));
+    await fs.ensureDir(path.join(targetDir, 'tests/unit/interfaces/controllers/auth'));
+    if (await fs.pathExists(path.join(targetDir, `src/controllers/authController.${ext}`))) {
+        await fs.move(
+            path.join(targetDir, `src/controllers/authController.${ext}`),
+            path.join(targetDir, `src/interfaces/controllers/auth/authController.${ext}`),
+            { overwrite: true }
+        );
+        if (await fs.pathExists(path.join(targetDir, `tests/unit/controllers/authController.spec.${ext}`))) {
+            await fs.move(
+                path.join(targetDir, `tests/unit/controllers/authController.spec.${ext}`),
+                path.join(targetDir, `tests/unit/interfaces/controllers/auth/authController.spec.${ext}`),
+                { overwrite: true }
+            );
+        }
+    }
+
+    // Middleware -> Infrastructure/Webserver/Middleware
+    await fs.ensureDir(path.join(targetDir, 'src/infrastructure/webserver/middleware'));
+    await fs.ensureDir(path.join(targetDir, 'tests/unit/infrastructure/webserver/middleware'));
+    if (await fs.pathExists(path.join(targetDir, `src/middleware/authMiddleware.${ext}`))) {
+        await fs.move(
+            path.join(targetDir, `src/middleware/authMiddleware.${ext}`),
+            path.join(targetDir, `src/infrastructure/webserver/middleware/authMiddleware.${ext}`),
+            { overwrite: true }
+        );
+        if (await fs.pathExists(path.join(targetDir, `tests/unit/middleware/authMiddleware.spec.${ext}`))) {
+            await fs.move(
+                path.join(targetDir, `tests/unit/middleware/authMiddleware.spec.${ext}`),
+                path.join(targetDir, `tests/unit/infrastructure/webserver/middleware/authMiddleware.spec.${ext}`),
+                { overwrite: true }
+            );
+        }
+    }
+
+    // Routes -> Interfaces/Routes (No unit tests for routes normally, but move if exists)
+    await fs.ensureDir(path.join(targetDir, 'src/interfaces/routes'));
+    if (await fs.pathExists(path.join(targetDir, `src/routes/authRoutes.${ext}`))) {
+        await fs.move(
+            path.join(targetDir, `src/routes/authRoutes.${ext}`),
+            path.join(targetDir, `src/interfaces/routes/authRoutes.${ext}`),
+            { overwrite: true }
+        );
+    }
+
+    // Cleanup empty dirs in src and tests/unit
+    const dirsToCleanup = [
+        'src/services', 'src/controllers', 'src/middleware', 'src/routes',
+        'tests/unit/services', 'tests/unit/controllers', 'tests/unit/middleware'
+    ];
+    for (const dir of dirsToCleanup) {
+        const fullDir = path.join(targetDir, dir);
+        if (await fs.pathExists(fullDir) && (await fs.readdir(fullDir)).length === 0) {
+            await fs.remove(fullDir);
+        }
+    }
+}
+

package/lib/modules/caching-setup.js

@@ -30,12 +30,14 @@ export const setupCaching = async (templatesDir, targetDir, config) => {
             const useCases = language === 'TypeScript' 
                 ? [
                     { name: 'getAllUsers.ts', src: 'getAllUsers.ts.ejs' },
+                    { name: 'getUserById.ts', src: 'getUserById.ts.ejs' },
                     { name: 'createUser.ts', src: 'createUser.ts.ejs' },
                     { name: 'updateUser.ts', src: 'updateUser.ts.ejs' },
                     { name: 'deleteUser.ts', src: 'deleteUser.ts.ejs' }
                 ]
                 : [
                     { name: 'GetAllUsers.js', src: 'GetAllUsers.js.ejs' },
+                    { name: 'GetUserById.js', src: 'GetUserById.js.ejs' },
                     { name: 'CreateUser.js', src: 'CreateUser.js.ejs' },
                     { name: 'UpdateUser.js', src: 'UpdateUser.js.ejs' },
                     { name: 'DeleteUser.js', src: 'DeleteUser.js.ejs' }
@@ -48,8 +50,13 @@ export const setupCaching = async (templatesDir, targetDir, config) => {
                 const useCaseSource = path.join(templatesDir, 'common', 'caching', 'clean', langExt, uc.src);
                 if (await fs.pathExists(useCaseSource)) {
                     const ucContent = await fs.readFile(useCaseSource, 'utf-8');
-                    const renderedUc = ejs.render(ucContent, { caching });
+                    const renderedUc = ejs.render(ucContent, { ...config });
                     await fs.writeFile(path.join(useCaseTargetDir, uc.name), renderedUc);
+                    // Cleanup the template in target dir
+                    const templateInTarget = path.join(useCaseTargetDir, uc.src);
+                    if (await fs.pathExists(templateInTarget)) {
+                        await fs.remove(templateInTarget);
+                    }
                 }
             }
         }

package/lib/modules/config-files.js

@@ -120,6 +120,16 @@ export const setupCiCd = async (templatesDir, targetDir, config) => {
         const gitlabTemplate = await fs.readFile(path.join(templatesDir, 'common', '.gitlab-ci.yml.ejs'), 'utf-8');
         const gitlabContent = ejs.render(gitlabTemplate, { ...config });
         await fs.writeFile(path.join(targetDir, '.gitlab-ci.yml'), gitlabContent);
+    } else if (ciProvider === 'Bitbucket Pipelines') {
+        const bitbucketTemplate = await fs.readFile(path.join(templatesDir, 'common', 'bitbucket-pipelines.yml.ejs'), 'utf-8');
+        const bitbucketContent = ejs.render(bitbucketTemplate, { ...config });
+        await fs.writeFile(path.join(targetDir, 'bitbucket-pipelines.yml'), bitbucketContent);
+    } else if (ciProvider === 'CircleCI') {
+        const circleCiDir = path.join(targetDir, '.circleci');
+        await fs.ensureDir(circleCiDir);
+        const circleCiTemplate = await fs.readFile(path.join(templatesDir, 'common', '_circleci/config.yml.ejs'), 'utf-8');
+        const circleCiContent = ejs.render(circleCiTemplate, { ...config });
+        await fs.writeFile(path.join(circleCiDir, 'config.yml'), circleCiContent);
     }
 };
 

package/lib/modules/database-setup.js

@@ -19,7 +19,8 @@ export const setupDatabase = async (templatesDir, targetDir, config) => {
         // Create initial migration file with timestamp
         const timestamp = new Date().toISOString().replace(/[-T:.Z]/g, '').slice(0, 14); // YYYYMMDDHHMMSS
         const migrationTemplate = await fs.readFile(path.join(templatesDir, 'common', 'migrations', 'init.js.ejs'), 'utf-8');
-        await fs.writeFile(path.join(targetDir, 'migrations', `${timestamp}-initial-setup.js`), migrationTemplate);
+        const migrationContent = ejs.render(migrationTemplate, { ...config });
+        await fs.writeFile(path.join(targetDir, 'migrations', `${timestamp}-initial-setup.js`), migrationContent);
 
     } else if (database !== 'None') {
         // Flyway for SQL

package/lib/modules/project-setup.js

@@ -28,5 +28,6 @@ export const copyCommonFiles = async (templatesDir, targetDir, language) => {
     
     if (language === 'TypeScript') {
         await fs.copy(path.join(templatesDir, 'common', 'tsconfig.json'), path.join(targetDir, 'tsconfig.json'));
+        await fs.copy(path.join(templatesDir, 'common', 'tsconfig.eslint.json'), path.join(targetDir, 'tsconfig.eslint.json'));
     }
 };