@team-codeme/crud-forge 1.0.1 → 1.0.2

package/README.md

@@ -9,7 +9,7 @@
                                       |___/                  
                   Developed by TeamCodeMe
                   Official Website: https://crudforge.teamcodeme.com/
-                  Documentation: https://crudforge-cli-doc.vercel.app
+                  Documentation: https://docs-crudforgecli.teamcodeme.com/
 ```
 
 ![CRUDForge poster](https://lh3.googleusercontent.com/kTtVlTPXl9b8qEU7VXoz8u6eRtiAXjcnLIMVPlWnsJKUEI5Xx_EbjiAcH1afwmV-1sho3l_JPjNphGAC5Oszr1rA0V2uvdBs9mhLkK8Z=s960)
@@ -17,7 +17,7 @@
 <div align="center">
 
 [![Official Website](https://img.shields.io/badge/Official%20Website-crudforge.teamcodeme.com-blue?style=for-the-badge&logo=googlechrome&logoColor=white)](https://crudforge.teamcodeme.com/)
-[![Documentation](https://img.shields.io/badge/Documentation-crudforge--cli--doc.vercel.app-success?style=for-the-badge&logo=vercel&logoColor=white)](https://crudforge-cli-doc.vercel.app)
+[![Documentation](https://img.shields.io/badge/Documentation-docs--crudforgecli.teamcodeme.com-success?style=for-the-badge&logo=vercel&logoColor=white)](https://docs-crudforgecli.teamcodeme.com/)
 [![npm version](https://img.shields.io/npm/v/@team-codeme/crud-forge?style=for-the-badge&color=cb3837&logo=npm)](https://www.npmjs.com/package/@team-codeme/crud-forge)
 
 </div>
@@ -25,10 +25,10 @@
 CRUDForge CLI is a high-performance, developer-configurable Angular Material CRUD code generator. It maps JDL (JHipster Domain Language) or GDL schemas directly into high-fidelity standalone Angular 17+ components, types, services, and routes.
 
 - 🌐 **Official Website:** [https://crudforge.teamcodeme.com/](https://crudforge.teamcodeme.com/)
-- 📖 **Documentation:** [https://crudforge-cli-doc.vercel.app](https://crudforge-cli-doc.vercel.app)
+- 📖 **Documentation:** [https://docs-crudforgecli.teamcodeme.com/](https://docs-crudforgecli.teamcodeme.com/)
 - 🏢 **Organization:** [@team-codeme](https://www.npmjs.com/org/team-codeme)
 
-**Product docs (deployable Starlight site):** Available live at [crudforge-cli-doc.vercel.app](https://crudforge-cli-doc.vercel.app) (source in sibling repo [`crud-fordge-doc`](../crud-fordge-doc)) — splash uses the same poster; Features / Customization galleries with screenshots. Capture shots: `npm run e2e:serve` then `cd ../crud-fordge-doc && npm run shots:capture` (IAM: `e2e:serve:iam` + `shots:capture:iam`).
+**Product docs (deployable Starlight site):** Available live at [docs-crudforgecli.teamcodeme.com](https://docs-crudforgecli.teamcodeme.com/) (source in sibling repo [`crud-fordge-doc`](../crud-fordge-doc)) — splash uses the same poster; Features / Customization galleries with screenshots. Capture shots: `npm run e2e:serve` then `cd ../crud-fordge-doc && npm run shots:capture` (IAM: `e2e:serve:iam` + `shots:capture:iam`).
 
 ---
 

package/Todo.md

@@ -204,4 +204,4 @@ PMB still copies some of these into every entity `shared/`. Generate them **once
 
 
 
-generated fuse has 404 for user management. 
+generated fuse has 404 for user management. — **addressed in generator (ISSUE-001)**: route registration now preserves IAM `user-management`/`no-access` when entity routes are rewritten (including `fuse.cleanLayout`). Verify by regenerating an IAM-enabled Fuse fixture and opening `/admin/user-management`. 

package/cli.js

@@ -19,6 +19,7 @@ const argv = yargs
         .positional('jdlFile', { describe: 'JDL/GDL file (defaults to input.file in project config)', type: 'string' })
         .positional('outputFolder', { describe: 'Target output folder for the Angular files', type: 'string' })
         .option('microservice', { alias: 'm', describe: 'Name of the microservice for URL paths', type: 'string' })
+        .option('service', { alias: 's', describe: 'Target only the specified service from input.sources', type: 'string' })
         .option('preferences', { alias: 'p', describe: 'Path to custom crudforge config', type: 'string' })
         .option('json', { type: 'boolean', default: false, describe: 'JSON outcome/diagnostics on stdout; progress on stderr' })
         .option('dry-run', { alias: 'd', describe: 'Preview modifications without writing', type: 'boolean', default: false })

package/issues/README.md

@@ -0,0 +1,17 @@
+# Issues — CRUDForge Generator
+
+This directory holds issues reported by developers, categorized by status:
+
+- `issues/open/` — open / triaged issues awaiting fix
+- `issues/closed/` — resolved issues (moved here once fixed)
+- `issues/templates/` — issue report templates
+
+## Issue Report Template
+
+Copy `issues/templates/issue.md` into `issues/open/` with a descriptive filename (e.g. `issue-001-fix-name.md`), fill in the fields, and link to any related PR/commit when resolved.
+
+## Workflow
+
+1. Developer submits an issue → create file in `issues/open/`
+2. Maintainer triages → adds labels/priority in the front matter
+3. Fix implemented → link PR/commit, move file to `issues/closed/`

package/issues/closed/ISSUE-001-fuse-user-management-404.md

@@ -0,0 +1,44 @@
+---
+id: ISSUE-001
+title: Generated Fuse app returns 404 for /admin/user-management
+status: resolved
+priority: high
+reported-by: developer
+reported-date: 2026-11-08
+component: generator
+labels:
+  - bug
+  - iam
+  - routes
+related-pr:
+related-commit:
+---
+
+## Description
+
+When generating a Fuse app with Keycloak/IAM enabled (especially with `fuse.cleanLayout: true`), navigating to `/admin/user-management` can resolve to the SPA 404 route.
+
+## Root Cause
+
+1. `applyAuthPack` registers the IAM route (`path: 'user-management'` → `@/app/core/user-management/user-management.routes`) in `src/app/domains/admin/routes.ts`.
+2. Entity route registration in `src/generator/index.js` later rewrites admin routes:
+   - `fuse.cleanLayout: true` rebuilt the full `children` array and omitted the previously registered IAM route.
+   - The non-cleanLayout path replaced the `// cforge-routes-start/end` block with entity routes only, which can drop IAM routes inserted into that block.
+3. `patchLandingAndNoAccess` also injects `no-access`, which could be lost by the same rewrite.
+
+## Expected Behavior
+
+`/admin/user-management` (and IAM child routes) remain reachable after entity route registration, regardless of `fuse.cleanLayout`.
+
+## Fix
+
+- `src/generator/index.js`
+  - When rewriting routes, capture the existing `user-management` and `no-access` route objects before regeneration.
+  - Re-inject those routes into the generated entity route block (`cforge-routes-start/end`) so they survive both cleanLayout and non-cleanLayout rewrites.
+  - Avoid mutating the same `content` variable across cleanLayout branches.
+
+## Verification
+
+- `node --check src/generator/index.js`
+- `node --check src/generator/auth-pack.js`
+- Pending: regenerate an IAM-enabled Fuse fixture (`e2e:prepare:iam` / project workflow) and confirm `/admin/user-management` loads UserListComponent.

package/issues/closed/ISSUE-002-list-UI-issues.md

@@ -0,0 +1,99 @@
+---
+id: ISSUE-002
+title: List UI Issues (Row Pinning, Page Size Reset, Search Clearing)
+status: resolved
+priority: medium
+reported-by: developer
+reported-date: 2026-11-09
+component: templates
+labels:
+  - bug
+  - ui
+  - list
+  - pagination
+  - search
+related-pr:
+related-commit:
+---
+
+# List UI Issues
+
+This document records three UI/UX issues identified and resolved in generated entity list presentation components.
+
+---
+
+## Issue 1: Record Pinning Position & Restoration on Unpin
+
+### Description
+When a record row is pinned in the list/table view, it should immediately be pinned at the top of the table. When unpinning the record, it should return to its original place in the list rather than remaining displaced or at an arbitrary position.
+
+### Expected Behavior
+1. Clicking the pin icon on any row pins the record and immediately shifts it to the top of the current display table/cards.
+2. Clicking the pin icon again unpins the record and returns it to its original position within the current page's dataset.
+3. If multiple records are pinned, they remain grouped at the top, and all unpinned records preserve their original server/query order.
+
+### Root Cause
+1. `BaseListComponent.togglePin()` modified `this.pinnedIds` in place and called `cdr.markForCheck()`, but did not re-sort or re-assign `this.dataSource.data`.
+2. `sortRowsForDisplay()` used a simple `.sort()` comparison that returned `0` when both elements shared the same pinned state (`leftPinned === rightPinned`). Because JavaScript array sort is not guaranteed to restore previous indices when returning `0`, and because the original unsorted array was not preserved as a baseline, unpinning did not return the row to its original index.
+
+### Fix
+- In `BaseListComponent` (`src/templates/angular/shared/base/base-list.component.ts.ejs`):
+  - Added `dataSource?: any` and `protected rawRows: T[] = []` to preserve the pristine dataset baseline.
+  - Rewrote `sortRowsForDisplay(rows)` into a stable two-bucket partition (`pinned` and `unpinned`), preserving exact baseline order.
+  - Updated `togglePin(element)` to re-sort `dataSource.data` from `this.rawRows` baseline immediately on pin/unpin toggles.
+- In `ListComponent` (`src/templates/angular/entity/components/presentation/list/_entity_-list.component.ts.ejs`):
+  - Preserved incoming query results in `this.rawRows = res.body ?? []` alongside `dataSource.data`.
+
+---
+
+## Issue 2: Pagination Page Size Reset on Page Navigation
+
+### Description
+When a user increases the pagination page size (e.g. from 10 to 25, 50, or 100), navigates away to another page/entity, and returns, the page size remained set to the previously increased value rather than resetting to the default page size of 10.
+
+### Expected Behavior
+- While interacting on the current list view, the user can change page size and paginate through records with that size.
+- When the user navigates away to another screen and later returns to the list view, the page size must reset to default (`10`) by default.
+
+### Root Cause
+- In `ngOnInit()`, the component loaded `savedPageSize` from `localStorage` under `storageKeyPageSize` (`${entityNameKebab}-page-size`) and set `this.itemsPerPage = Number(savedPageSize)`.
+- In `loadData()`, any change in `this.paginator.pageSize` was being persisted into `localStorage`. This caused the increased size to persist indefinitely across navigations.
+
+### Fix
+- In `ListComponent` (`src/templates/angular/entity/components/presentation/list/_entity_-list.component.ts.ejs`):
+  - Removed `localStorage.getItem(this.storageKeyPageSize)` restoration from `ngOnInit()`, so the component consistently starts with default `itemsPerPage = 10`.
+  - Removed `localStorage.setItem(this.storageKeyPageSize, ...)` in `loadData()`, updating `this.itemsPerPage` in-memory only during interaction on the active screen.
+
+---
+
+## Issue 3: Search Bar Clearing on Search Preference Change
+
+### Description
+When a search term is entered in the search bar and the user changes the search preference (the `searchBy` column dropdown, e.g. from "Fish Type Name" to "Fish Type Code"), the search bar retained the previous search term rather than clearing it.
+
+### Expected Behavior
+When a search term is typed and the user selects a different search preference/field from the dropdown, the search bar input should be cleared automatically, and the filter should be reset.
+
+### Root Cause
+- In `ActionsComponent.onSearchByChange(value)`, the component emitted `{ searchBy: value, searchTerm: this.searchTerm }`, preserving the existing `searchTerm`.
+- In `ListComponent.handleSearchChanged(event)`, the incoming `searchTerm` was accepted directly without checking whether `event.searchBy !== this.searchBy`.
+
+### Fix
+- In `ActionsComponent` (`src/templates/angular/entity/components/interaction/actions/_entity_-actions.component.ts.ejs`):
+  - Updated `onSearchByChange(value)` to set `this.searchTerm = ''` and emit `{ searchBy: value, searchTerm: '' }`.
+- In `ListComponent` (`src/templates/angular/entity/components/presentation/list/_entity_-list.component.ts.ejs`):
+  - Updated `handleSearchChanged(event)` to detect when `event.searchBy !== this.searchBy` and reset `this.searchTerm = ''`, updating `localStorage` and calling `applySearchFilters()`.
+
+---
+
+## Verification
+
+- Added unit test regressions in `test/list-state.js` verifying:
+  - Row pinning immediately moves rows to the top, grouping multiple pinned rows while preserving unpinned order.
+  - Row unpinning immediately returns items to their original baseline indices.
+  - Page size defaults to 10 on initialization, ignores stale localStorage entries, and updates in-memory without persisting across navigations.
+  - Changing searchBy in `ActionsComponent` clears `searchTerm` and emits empty query.
+  - Changing searchBy in `ListComponent.handleSearchChanged()` clears `searchTerm` and resets active filters.
+- `npm run test:ui-state` passed.
+- `npm test` passed.
+

package/issues/closed/ISSUE-003-list-UI-issues.md

@@ -0,0 +1,70 @@
+---
+id: ISSUE-003
+title: List UI Issues (Async Rows Blank until Pointer Move & Disappearing Header)
+status: resolved
+priority: high
+reported-by: developer
+reported-date: 2026-11-13
+component: templates
+labels:
+  - bug
+  - ui
+  - list
+  - change-detection
+  - responsive
+related-pr:
+related-commit:
+---
+
+# List UI Issues
+
+This document records two UI issues identified and resolved across the IAM user management screen and generated entity list presentation components.
+
+---
+
+## Issue A: Loaded rows stay hidden until the pointer moves
+
+### Description
+On lists such as `/admin/user-management` and generated entity screens, data has loaded from the API but the table rows stay blank/hidden until the mouse moves or hovers over the browser window.
+
+### Expected Behavior
+Once asynchronous data fetch finishes, rows immediately render into the table without requiring user interaction or pointer movement.
+
+### Root Cause
+1. `UserListComponent` lacked `ChangeDetectorRef` and `ChangeDetectionStrategy.OnPush`. In addition, its `tableRows` was implemented as a computed getter (`get tableRows()`). Angular did not evaluate the getter or mark the view dirty after async HTTP callbacks until a DOM event (e.g. mouse move) triggered Zone.js change detection.
+2. In `BaseListComponent`, `observeListWidth()` callback ran asynchronously inside a native `ResizeObserver`, which executed outside of Angular's Zone.js without re-entering the zone or running change detection.
+3. In `_entity_-list.component.ts.ejs`, setting `this.isLoading = true` and `isLoading = false` did not always trigger immediate view re-checks under OnPush when async observable subscriptions completed.
+
+### Fix
+- In `UserListComponent` (`src/templates/angular/iam/user-list.component.ts.ejs`):
+  - Injected `ChangeDetectorRef` and enabled `changeDetection: ChangeDetectionStrategy.OnPush`.
+  - Added explicit `this.cdr.markForCheck()` calls in `load()` on API success/error, `onSortChange()`, `setViewMode()`, `togglePin()`, and `setFlagColor()`.
+  - Added host class `cforge-iam-list` for styling containment.
+- In `BaseListComponent` (`src/templates/angular/shared/base/base-list.component.ts.ejs`):
+  - Injected `NgZone` and wrapped the `observeListWidth()` ResizeObserver callback in `this.ngZone.run()` to guarantee observer ticks trigger change detection inside Angular's zone.
+- In `_entity_-list.component.ts.ejs` (`src/templates/angular/entity/components/presentation/list/_entity_-list.component.ts.ejs`):
+  - Injected `ChangeDetectorRef` and called `this.cdr.markForCheck()` on load start and upon data arrival.
+
+---
+
+## Issue B: The page heading disappears at some window widths
+
+### Description
+The page heading/title was visible at small screen sizes and large desktop widths, but completely vanished at intermediate widths (e.g. tablet / medium viewports between 768px and 1279px) while the action toolbar remained visible.
+
+### Expected Behavior
+The page heading, subtitle, and breadcrumb remain visible at all viewport widths, wrapping gracefully alongside or above the actions toolbar.
+
+### Root Cause
+1. In `_entity_-actions.component.ts.ejs`, the actions component host was styled with `:host { @apply block w-full xl:w-auto; }`. On viewports between `md` (768px) and `xl` (1280px), `w-full` forced the actions component to request 100% width inside the flex header container.
+2. In `_entity_-list.component.html.ejs` and `user-list.component.html.ejs`, the header container was styled with `flex flex-col md:flex-row md:items-center justify-between` without `flex-wrap`. Combined with the actions bar occupying 100% width, `<div class="min-w-0 flex-1">` holding the heading was compressed down to 0 width.
+3. In `user-list.component.html.ejs`, the container used an invalid Tailwind utility class `pb-22`.
+
+### Fix
+- In `_entity_-actions.component.ts.ejs`:
+  - Changed host class styling from `block w-full xl:w-auto` to `block w-full sm:w-auto md:shrink-0`.
+- In `_entity_-list.component.html.ejs` and `user-list.component.html.ejs`:
+  - Updated header container classes to `flex flex-col sm:flex-row sm:items-center sm:justify-between sm:flex-wrap gap-4`.
+  - Added `shrink-0` to the title wrapper container so it cannot be shrunk to 0 width.
+  - Replaced invalid `pb-22` with valid Tailwind class `pb-20`.
+

package/issues/closed/ISSUE-004-re-generator-issue.md

@@ -0,0 +1,110 @@
+---
+id: ISSUE-004
+title: Generator Isolation, Safe Merging, and Preservation during Regeneration
+status: resolved
+priority: high
+reported-by: developer
+reported-date: 2026-11-13
+component: generator
+labels:
+  - bug
+  - generator
+  - multi-source
+  - overwrite-policy
+  - routing
+  - navigation
+  - access-control
+related-pr:
+related-commit:
+---
+
+# Generator Issue Report: Service Isolation, Unintended File Overwrites, and Destructive Generation
+
+## 1. Overview
+
+During incremental generation targeting a newly added schema (`GDL/proc.gdl`), running `crudforge generate` (both with global configuration and direct positional file arguments) previously produced side-effects across preexisting services, shared folders, and global application infrastructure:
+1. Re-parsed and re-generated all microservice modules rather than isolating execution.
+2. Overwrote existing files and wiped out un-bracketed modifications under `--overwrite-policy merge`.
+3. Created malformed nested directory structures (`micro-functions/micro-functions`).
+4. Stripped existing routes and navigation links from `routes.ts` and `navigation.ts`.
+5. Emptied preexisting service registrations from the screen catalog CSV and TS registry.
+6. Overwrote shared styles and components.
+
+---
+
+## 2. Issues and Resolutions
+
+### Issue 1: Lack of Schema / Service Isolation
+* **Description**: Running `crudforge generate` iterated through all schemas under `input.sources` in `config/crudforge.config.yml`, re-generating all services even when targeting a specific service.
+* **Root Cause**: The CLI generate command lacked service filtering support.
+* **Fix**:
+  - Added `-s, --service <name>` option to `cli.js`.
+  - In `src/commands/generate.js`, filtered `inputSources` based on `--service` flag matching service name or microservice ID.
+  - When a positional schema file is passed, matched it against configured sources in `config.input.sources`.
+
+---
+
+### Issue 2: Destructive Overwrite Under `--overwrite-policy merge`
+* **Description**: Under `--overwrite-policy merge`, files without zone markers (such as services, enums, and components) were completely replaced with fresh boilerplate, wiping out developer customizations.
+* **Root Cause**: `mergeContent()` in `src/utils/merger.js` only checked for custom code block markers (`// cforge-custom-code-start`). When `oldZones` was empty, it returned raw `newContent`, making `merge` act like `overwrite`.
+* **Fix**:
+  - In `src/utils/merger.js`, updated `mergeContent()` so that if `oldZones` is empty (`Object.keys(oldZones).length === 0`), it returns `oldContent`, protecting existing code from unintended overwrites.
+
+---
+
+### Issue 3: Pathing Anomaly with Positional File Argument (`micro-functions/micro-functions`)
+* **Description**: Running `crudforge generate GDL/proc.gdl` created a double-nested path `src/app/domains/admin/modules/apps/micro-functions/micro-functions/`.
+* **Root Cause**: In `src/commands/generate.js`, synthetic input sources defaulted `name` and `folder` to `'micro-functions'`, which `serviceFolder()` in `entity-layout.js` then prefixed with `micro-functions/`, producing `micro-functions/micro-functions`.
+* **Fix**:
+  - In `src/commands/generate.js`, derived service name from `options.microservice || options.service || config.api?.microservice || fileBase`.
+  - In `src/generator/entity-layout.js`, ensured that when `folderName` or `module` equals `'micro-functions'`, it does not double-nest the folder.
+
+---
+
+### Issue 4: Global Route Truncation Under `cleanLayout: true`
+* **Description**: In `src/app/domains/admin/routes.ts`, preexisting routes for other services were deleted, leaving only the routes processed in the current run.
+* **Root Cause**: The generator replaced the children array with routes built solely from the current run's `entities` array.
+* **Fix**:
+  - In `src/generator/index.js`, extracted existing entity routes from `routes.ts` (between `// cforge-routes-start` and `// cforge-routes-end` markers), merged them with the active run's entities by route path, and used bracket-depth balancing to replace the children block while preserving all existing service routes and IAM routes.
+  - Set `{ bypassMerge: true }` on `routes.ts` writes so the programmatically merged content is written directly.
+
+---
+
+### Issue 5: Navigation Item Purging Under `cleanLayout: true`
+* **Description**: In `src/app/domains/admin/layout/data/navigation.ts`, preexisting service navigation groups were purged.
+* **Root Cause**: `NAVIGATION` array content was replaced with items derived only from current `entities`.
+* **Fix**:
+  - In `src/generator/index.js`, parsed existing top-level navigation groups from `navigation.ts` using balanced curly-brace tracking, preserving preexisting service groups and IAM navigation while updating or adding current run groups.
+  - Set `{ bypassMerge: true }` on `navigation.ts` writes.
+
+---
+
+### Issue 6: Screen Catalog & Access Control Purge
+* **Description**: In `public/assets/screen-components.csv` and `shared/screen-catalog.ts`, screen entries for preexisting services were removed.
+* **Root Cause**: `generateIamModule()` in `src/generator/auth-pack.js` generated the catalog from scratch based only on the current run's `entities`.
+* **Fix**:
+  - In `src/generator/auth-pack.js`, parsed existing rows from `screen-components.csv`, retained screens from other services, deduplicated by `screenId`, and generated the merged CSV.
+  - Derived `finalScreens` from the merged CSV rows and updated `locals.managedScreens` so `shared/screen-catalog.ts` retains all screens across all services.
+  - Set `{ bypassMerge: true }` for CSV and screen catalog outputs.
+
+---
+
+### Issue 7: Shared Folder Modifications & Starter Pack Overwriting
+* **Description**: Shared styles (`shared/styles/list-styles.css`), shared validators, and base entity configurations were rewritten during generation, disregarding changes made in those files.
+* **Root Cause**:
+  1. `fs.copySync(starterPackPath, outputDir)` ran on every generation pass without `{ overwrite: false }`, overwriting existing scaffolded files with pristine starter pack files.
+  2. Under `--overwrite-policy merge`, files without zone markers were overwritten due to Issue 2.
+* **Fix**:
+  - In `src/generator/index.js`, added `{ overwrite: false }` to `fs.copySync(starterPackPath, outputDir, { filter: filterFn, overwrite: false })`.
+  - Together with the `merger.js` protection, custom changes to shared styles, validators, and components are preserved under `merge`.
+
+---
+
+## 3. Verification
+
+A dedicated regression test suite was added in `test/regeneration-isolation.js` and integrated into `npm test`:
+- Validates merger preservation of un-bracketed developer code when no zones exist.
+- Validates that `serviceFolder` does not create `micro-functions/micro-functions` nesting.
+- Validates multi-pass incremental generation preserving routes, navigation, and CSV screen catalog across services.
+- Verified with `npm test`, `npm run test:ui-state`, `npm run test:auth`, and `npm run test:field-preferences`.
+

package/issues/templates/issue.md

@@ -0,0 +1,50 @@
+---
+id: ISSUE-000
+title: Replace with short issue title
+status: open | triaged | in-progress | resolved
+priority: high | medium | low
+reported-by: developer name or handle
+reported-date: YYYY-MM-DD
+component: generator | cli | parser | validator | templates | docs
+labels:
+  - bug
+  - enhancement
+related-pr: PR number or link
+related-commit: commit sha or link
+---
+
+## Description
+
+Brief description of the issue.
+
+## Steps to Reproduce
+
+1.
+2.
+3.
+
+## Expected Behavior
+
+What should happen.
+
+## Actual Behavior
+
+What actually happens.
+
+## Environment
+
+- Node version:
+- OS:
+- CRUDForge version:
+
+## Additional Context
+
+Screenshots, logs, or config snippets.
+
+## Fix
+
+Summary of the fix applied and files changed.
+
+## Verification
+
+How the fix was verified (tests run, manual check).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-codeme/crud-forge",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A modern, configurable JDL/GDL-to-Angular code generator supporting Angular 17+ standalone architecture, centralized developer preferences, and strict type safety.",
   "main": "src/index.js",
   "bin": {
@@ -13,10 +13,10 @@
   "homepage": "https://crudforge.teamcodeme.com/",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/FayyazAbdulla/crudforge-cli.git"
+    "url": "git+https://github.com/teamcodemelk/crudforge-cli.git"
   },
   "scripts": {
-    "test": "node test/verify.js && node test/micro-functions-layout.js && node test/project-workflow.js && node test/pmb-preset.js && node test/quality-features.js",
+    "test": "node test/verify.js && node test/micro-functions-layout.js && node test/project-workflow.js && node test/pmb-preset.js && node test/quality-features.js && node test/regeneration-isolation.js",
     "test:field-preferences": "node test/field-preferences.js",
     "e2e:prepare:field-profile": "node scripts/e2e-prepare-field-profile.js",
     "test:ui-state": "node test/list-state.js",

package/src/commands/generate.js

@@ -21,24 +21,40 @@ async function generateCommand(jdlFile, outputFolder, options = {}) {
 
   // CLI positional file overrides config; otherwise use input.sources[] or input.file.
   let inputSources;
+  const configuredSources = Array.isArray(config.input?.sources) && config.input.sources.length > 0
+    ? resolveInputSources(config, projectRoot)
+    : [];
+
   if (jdlFile) {
     const resolved = path.resolve(cwd, jdlFile);
-    if (!fs.existsSync(resolved) || !fs.statSync(resolved).isFile()) {
-      throw new Error(`Input file not found: "${resolved}".`);
+    const matchedSource = configuredSources.find((s) =>
+      s.file === resolved ||
+      path.resolve(projectRoot, s.file) === resolved ||
+      s.name.toLowerCase() === jdlFile.toLowerCase() ||
+      (s.microservice && s.microservice.toLowerCase() === jdlFile.toLowerCase())
+    );
+
+    if (matchedSource) {
+      inputSources = [matchedSource];
+    } else {
+      if (!fs.existsSync(resolved) || !fs.statSync(resolved).isFile()) {
+        throw new Error(`Input file not found: "${resolved}".`);
+      }
+      if (!/\.(gdl|jdl)$/i.test(resolved)) throw new Error(`Unsupported schema "${resolved}". Use .gdl or .jdl.`);
+      const type = path.extname(resolved).slice(1).toLowerCase();
+      const fileBase = path.basename(resolved, path.extname(resolved));
+      const serviceName = options.microservice || options.service || config.api?.microservice || fileBase;
+      const folder = String(config.fuse?.folderType || '').trim() || serviceName;
+      inputSources = [
+        {
+          name: serviceName,
+          file: resolved,
+          type,
+          microservice: serviceName,
+          folder,
+        },
+      ];
     }
-    if (!/\.(gdl|jdl)$/i.test(resolved)) throw new Error(`Unsupported schema "${resolved}". Use .gdl or .jdl.`);
-    const type = path.extname(resolved).slice(1).toLowerCase();
-    const folder =
-      String(config.fuse?.folderType || '').trim() || (type === 'gdl' ? 'micro-functions' : 'microservice');
-    inputSources = [
-      {
-        name: folder,
-        file: resolved,
-        type,
-        microservice: String(config.api?.microservice || '').trim(),
-        folder,
-      },
-    ];
   } else {
     inputSources = resolveInputSources(config, projectRoot);
     if (!inputSources.length) {
@@ -48,6 +64,21 @@ async function generateCommand(jdlFile, outputFolder, options = {}) {
     }
   }
 
+  if (options.service) {
+    const target = String(options.service).trim().toLowerCase();
+    const filtered = inputSources.filter((s) =>
+      s.name.toLowerCase() === target ||
+      (s.microservice && s.microservice.toLowerCase() === target) ||
+      path.basename(s.file, path.extname(s.file)).toLowerCase() === target
+    );
+    if (!filtered.length) {
+      throw new Error(
+        `Service "${options.service}" not found in input sources. Available sources: ${inputSources.map((s) => s.name).join(', ')}`
+      );
+    }
+    inputSources = filtered;
+  }
+
   for (const source of inputSources) {
     if (!fs.existsSync(source.file) || !fs.statSync(source.file).isFile()) {
       throw new Error(