@starodubenko/fsd-gen 1.2.1-0 → 1.4.0-0

package/README.md

@@ -45,6 +45,53 @@ Reverse engineer existing code into reusable presets.
 2.  **Analyze**: `fsd-gen reverse:analyze <preset-name>`
 3.  **Build**: `fsd-gen reverse:build <preset-name> [--mode short|ejected]`
 
+#### Configuration Examples
+
+**Single Root:**
+```typescript
+export default {
+  root: 'src/entities/User',
+  targetLayer: 'entity'
+};
+```
+
+**Multiple Roots with Conflict Resolution:**
+```typescript
+export default {
+  root: [
+    'src/entities/User',
+    'src/features/User',  // Auto-resolved as User1
+    'src/widgets/User'    // Auto-resolved as User2
+  ],
+  targetLayer: 'entity'
+};
+```
+
+**Multiple Layers with Array Support:**
+```typescript
+export default {
+  layers: [
+    { root: 'src/entities/User', targetLayer: 'entity' },
+    { 
+      root: ['src/features/Auth', 'src/features/Payment'],
+      targetLayer: 'feature' 
+    }
+  ]
+};
+```
+
+**Features:**
+- **Multi-Root Support**: Analyze multiple directories at once
+- **Automatic Conflict Resolution**: Numeric suffixes (User, User1, User2)
+- **Folder Name Normalization**: `user-action` → `UserAction`, `user_profile` → `UserProfile`
+
+**Plural/Singular Recognition**: Automatically detects both forms of names:
+- Analyzing "User" will also find "Users"
+- Analyzing "Users" will also find "User"
+- Works with common patterns: Category/Categories, Box/Boxes, etc.
+- **TypeScript Config**: Type-safe `preset.config.ts` with enums
+
+
 #### Modes
 -   **short** (default): Generates a thin `preset.ts` that auto-discovers templates at runtime.
 -   **ejected**: Compiles and copies all source files into the preset folder as static templates.

package/dist/lib/reverse/analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/analyze.ts"],"names":[],"mappings":"AAiBA;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBA+GlF"}
+{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/analyze.ts"],"names":[],"mappings":"AAiBA;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAiHlF"}

package/dist/lib/reverse/analyze.js

@@ -26,8 +26,10 @@ export async function analyzeReversePreset(presetName, templatesDir) {
         }
         console.log(`Analyzing source at: ${rootPath} (Layer: ${layer.targetLayer})`);
         // Normalize folder name to PascalCase for better token recognition
+        // Use resolvedName if provided (for conflict resolution), otherwise use basename
         // e.g., "user-action" -> "UserAction"
-        const subjectName = toPascalCase(basename(rootPath));
+        const folderName = layer.resolvedName || basename(rootPath);
+        const subjectName = toPascalCase(folderName);
         const variations = generateVariations(subjectName);
         // Discovery
         project.addSourceFilesAtPaths(join(rootPath, '**', '*.{ts,tsx,css,scss,less,sass}'));
@@ -78,8 +80,8 @@ export async function analyzeReversePreset(presetName, templatesDir) {
     // Generate TypeScript content with enum values
     const filesContent = resultFiles.map(file => {
         const tokensStr = Object.entries(file.tokens)
-            .map(([key, value]) => `        "${key}": ${tokenToEnum(value)}`)
-            .join(',\n');
+            .map(([key, value]) => `"${key}": ${tokenToEnum(value)}`)
+            .join(',\n      ');
         return `    {
         "path": "${file.path}",
         "targetLayer": ${layerToEnum(file.targetLayer)},

package/dist/lib/reverse/analyzeHelpers.d.ts

@@ -9,7 +9,18 @@
  */
 export declare function toPascalCase(str: string): string;
 /**
- * Generates naming variations for a given subject string
+ * Simple pluralization - adds 's' or handles common patterns
+ * Examples: User -> Users, Category -> Categories, Box -> Boxes
+ */
+export declare function pluralize(word: string): string;
+/**
+ * Simple singularization - removes 's' or handles common patterns
+ * Examples: Users -> User, Categories -> Category, Boxes -> Box
+ */
+export declare function singularize(word: string): string;
+/**
+ * Generates naming variations for a given subject string.
+ * Now includes plural and singular forms.
  */
 export declare function generateVariations(subject: string): {
     pascal: string;
@@ -17,6 +28,16 @@ export declare function generateVariations(subject: string): {
     lower: string;
     upper: string;
     kebab: string;
+    plural: string;
+    pluralCamel: string;
+    pluralLower: string;
+    pluralUpper: string;
+    pluralKebab: string;
+    singular: string;
+    singularCamel: string;
+    singularLower: string;
+    singularUpper: string;
+    singularKebab: string;
 };
 /**
  * Identifies potential tokens in content based on variations

package/dist/lib/reverse/analyzeHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/analyzeHelpers.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAahD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM;;;;;;EAUjD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAyBzH;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,GAAG,MAAM,CAMxG"}
+{"version":3,"file":"analyzeHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/analyzeHelpers.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAahD;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiB9C;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoBhD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM;;;;;;;;;;;;;;;;EA4BjD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2DzH;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,GAAG,MAAM,CAMxG"}

package/dist/lib/reverse/analyzeHelpers.js

@@ -22,7 +22,50 @@ export function toPascalCase(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
 /**
- * Generates naming variations for a given subject string
+ * Simple pluralization - adds 's' or handles common patterns
+ * Examples: User -> Users, Category -> Categories, Box -> Boxes
+ */
+export function pluralize(word) {
+    if (!word)
+        return word;
+    // Check for special endings that need 'es' FIRST (like 'ss', 'x', 'ch', 'sh')
+    if (word.endsWith('ss') || word.endsWith('x') || word.endsWith('ch') || word.endsWith('sh')) {
+        return word + 'es'; // Class -> Classes, Box -> Boxes, Batch -> Batches
+    }
+    // Already plural (ends with 's' but not 'ss')
+    if (word.endsWith('s'))
+        return word;
+    // Common patterns
+    if (word.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(word[word.length - 2]?.toLowerCase())) {
+        return word.slice(0, -1) + 'ies'; // Category -> Categories
+    }
+    return word + 's'; // User -> Users
+}
+/**
+ * Simple singularization - removes 's' or handles common patterns
+ * Examples: Users -> User, Categories -> Category, Boxes -> Box
+ */
+export function singularize(word) {
+    if (!word)
+        return word;
+    // Common patterns
+    if (word.endsWith('ies')) {
+        if (word.length > 4) {
+            return word.slice(0, -3) + 'y'; // Categories -> Category
+        }
+        // Short words like 'Ties' -> 'Tie' (remove 's') or handle as special
+    }
+    if (word.endsWith('xes') || word.endsWith('ches') || word.endsWith('shes') || word.endsWith('sses')) {
+        return word.slice(0, -2); // Boxes -> Box, Batches -> Batch
+    }
+    if (word.endsWith('s') && !word.endsWith('ss')) {
+        return word.slice(0, -1); // Users -> User
+    }
+    return word; // Already singular or special case
+}
+/**
+ * Generates naming variations for a given subject string.
+ * Now includes plural and singular forms.
  */
 export function generateVariations(subject) {
     const pascal = subject.charAt(0).toUpperCase() + subject.slice(1);
@@ -31,7 +74,22 @@ export function generateVariations(subject) {
     const upper = subject.toUpperCase();
     // Simple kebab conversion (UserProfile -> user-profile)
     const kebab = camel.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
-    return { pascal, camel, lower, upper, kebab };
+    // Generate plural and singular forms
+    const plural = pluralize(pascal);
+    const singular = singularize(pascal);
+    const pluralCamel = plural.charAt(0).toLowerCase() + plural.slice(1);
+    const pluralLower = plural.toLowerCase();
+    const pluralUpper = plural.toUpperCase();
+    const pluralKebab = pluralCamel.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
+    const singularCamel = singular.charAt(0).toLowerCase() + singular.slice(1);
+    const singularLower = singular.toLowerCase();
+    const singularUpper = singular.toUpperCase();
+    const singularKebab = singularCamel.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
+    return {
+        pascal, camel, lower, upper, kebab,
+        plural, pluralCamel, pluralLower, pluralUpper, pluralKebab,
+        singular, singularCamel, singularLower, singularUpper, singularKebab
+    };
 }
 /**
  * Identifies potential tokens in content based on variations
@@ -54,6 +112,38 @@ export function identifyTokens(content, variations) {
     if (variations.kebab !== variations.camel && content.includes(variations.kebab)) {
         tokens[variations.kebab] = EntityToken.ENTITY_NAME_KEBAB;
     }
+    // Add plural variations if different from original
+    if (variations.plural !== variations.pascal && content.includes(variations.plural)) {
+        tokens[variations.plural] = EntityToken.ENTITY_NAME;
+    }
+    if (variations.pluralCamel !== variations.camel && content.includes(variations.pluralCamel)) {
+        tokens[variations.pluralCamel] = EntityToken.ENTITY_NAME_CAMEL;
+    }
+    if (variations.pluralLower !== variations.lower && content.includes(variations.pluralLower)) {
+        tokens[variations.pluralLower] = EntityToken.ENTITY_NAME_LOWER;
+    }
+    if (variations.pluralUpper !== variations.upper && content.includes(variations.pluralUpper)) {
+        tokens[variations.pluralUpper] = EntityToken.ENTITY_NAME_UPPER;
+    }
+    if (variations.pluralKebab !== variations.kebab && content.includes(variations.pluralKebab)) {
+        tokens[variations.pluralKebab] = EntityToken.ENTITY_NAME_KEBAB;
+    }
+    // Add singular variations if different from original and plural
+    if (variations.singular !== variations.pascal && variations.singular !== variations.plural && content.includes(variations.singular)) {
+        tokens[variations.singular] = EntityToken.ENTITY_NAME;
+    }
+    if (variations.singularCamel !== variations.camel && variations.singularCamel !== variations.pluralCamel && content.includes(variations.singularCamel)) {
+        tokens[variations.singularCamel] = EntityToken.ENTITY_NAME_CAMEL;
+    }
+    if (variations.singularLower !== variations.lower && variations.singularLower !== variations.pluralLower && content.includes(variations.singularLower)) {
+        tokens[variations.singularLower] = EntityToken.ENTITY_NAME_LOWER;
+    }
+    if (variations.singularUpper !== variations.upper && variations.singularUpper !== variations.pluralUpper && content.includes(variations.singularUpper)) {
+        tokens[variations.singularUpper] = EntityToken.ENTITY_NAME_UPPER;
+    }
+    if (variations.singularKebab !== variations.kebab && variations.singularKebab !== variations.pluralKebab && content.includes(variations.singularKebab)) {
+        tokens[variations.singularKebab] = EntityToken.ENTITY_NAME_KEBAB;
+    }
     return tokens;
 }
 /**

package/dist/lib/reverse/buildHelpers.d.ts

@@ -1,4 +1,4 @@
-import { PresetConfig, PresetConfigFile, PresetConfigTokenMap, PresetSourceConfig, PresetSourceItem } from './types.js';
+import { PresetConfig, PresetConfigFile, PresetConfigTokenMap, PresetSourceConfig, NormalizedPresetSourceItem } from './types.js';
 /**
  * Loads the reverse engineering source configuration (preset.source.ts)
  */
@@ -17,7 +17,7 @@ export declare function loadReverseEnvironment(presetDir: string): Promise<{
 /**
  * Normalizes layer definitions from source configuration
  */
-export declare function normalizeLayers(sourceConfig: PresetSourceConfig): PresetSourceItem[];
+export declare function normalizeLayers(sourceConfig: PresetSourceConfig): NormalizedPresetSourceItem[];
 /**
  * Identifies the main entity token (mapping to {{name}} or {{entityName}})
  */
@@ -29,7 +29,7 @@ export declare function applyTokens(content: string, tokens: PresetConfigTokenMa
 /**
  * Guesses naming conventions (prefixes/suffixes) from source roots
  */
-export declare function guessConventions(layers: PresetSourceItem[], entityToken: string): Record<string, string>;
+export declare function guessConventions(layers: NormalizedPresetSourceItem[], entityToken: string): Record<string, string>;
 /**
  * Generates preset.ts content for short mode
  */
@@ -37,5 +37,5 @@ export declare function generateShortPresetContent(helpers: Record<string, strin
 /**
  * Generates preset.ts content for ejected mode
  */
-export declare function generateEjectedPresetContent(presetName: string, files: PresetConfigFile[], layers: PresetSourceItem[], entityToken: string): string;
+export declare function generateEjectedPresetContent(presetName: string, files: PresetConfigFile[], layers: NormalizedPresetSourceItem[], entityToken: string): string;
 //# sourceMappingURL=buildHelpers.d.ts.map

package/dist/lib/reverse/buildHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/buildHelpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAExH;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAUrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAiB/E;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IACrE,YAAY,EAAE,kBAAkB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;CAC9B,CAAC,CAID;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,kBAAkB,GAAG,gBAAgB,EAAE,CAWpF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAcpE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAUjF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BxG;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAiBlF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CACxC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,gBAAgB,EAAE,EACzB,MAAM,EAAE,gBAAgB,EAAE,EAC1B,WAAW,EAAE,MAAM,GACpB,MAAM,CAqCR"}
+{"version":3,"file":"buildHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/buildHelpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,kBAAkB,EAAoB,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAEpJ;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAUrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAiB/E;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IACrE,YAAY,EAAE,kBAAkB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;CAC9B,CAAC,CAID;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,kBAAkB,GAAG,0BAA0B,EAAE,CAoD9F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAcpE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAUjF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,0BAA0B,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BlH;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAiBlF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CACxC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,gBAAgB,EAAE,EACzB,MAAM,EAAE,0BAA0B,EAAE,EACpC,WAAW,EAAE,MAAM,GACpB,MAAM,CAqCR"}

package/dist/lib/reverse/buildHelpers.js

@@ -46,17 +46,61 @@ export async function loadReverseEnvironment(presetDir) {
  * Normalizes layer definitions from source configuration
  */
 export function normalizeLayers(sourceConfig) {
-    const layers = [];
+    const result = [];
     if (sourceConfig.layers) {
-        layers.push(...sourceConfig.layers);
+        for (const layer of sourceConfig.layers) {
+            const roots = Array.isArray(layer.root) ? layer.root : [layer.root];
+            if (roots.length === 1) {
+                result.push({ root: roots[0], targetLayer: layer.targetLayer });
+            }
+            else {
+                const basenames = roots.map(r => basename(r));
+                const nameCount = new Map();
+                const nameIndices = new Map();
+                basenames.forEach(name => { nameCount.set(name, (nameCount.get(name) || 0) + 1); });
+                roots.forEach((root, index) => {
+                    const name = basenames[index];
+                    const count = nameCount.get(name) || 1;
+                    if (count > 1) {
+                        const currentIndex = nameIndices.get(name) || 0;
+                        nameIndices.set(name, currentIndex + 1);
+                        const resolvedName = currentIndex === 0 ? name : `${name}${currentIndex}`;
+                        result.push({ root, targetLayer: layer.targetLayer, resolvedName });
+                    }
+                    else {
+                        result.push({ root, targetLayer: layer.targetLayer });
+                    }
+                });
+            }
+        }
     }
     else if (sourceConfig.root) {
-        layers.push({
-            root: sourceConfig.root,
-            targetLayer: sourceConfig.targetLayer || 'entity'
-        });
+        const roots = Array.isArray(sourceConfig.root) ? sourceConfig.root : [sourceConfig.root];
+        const targetLayer = sourceConfig.targetLayer || 'entity';
+        if (roots.length === 1) {
+            result.push({ root: roots[0], targetLayer });
+        }
+        else {
+            const basenames = roots.map(r => basename(r));
+            const nameCount = new Map();
+            const nameIndices = new Map();
+            basenames.forEach(name => { nameCount.set(name, (nameCount.get(name) || 0) + 1); });
+            roots.forEach((root, index) => {
+                const name = basenames[index];
+                const count = nameCount.get(name) || 1;
+                if (count > 1) {
+                    const currentIndex = nameIndices.get(name) || 0;
+                    nameIndices.set(name, currentIndex + 1);
+                    const resolvedName = currentIndex === 0 ? name : `${name}${currentIndex}`;
+                    result.push({ root, targetLayer, resolvedName });
+                }
+                else {
+                    result.push({ root, targetLayer });
+                }
+            });
+        }
     }
-    return layers;
+    return result;
 }
 /**
  * Identifies the main entity token (mapping to {{name}} or {{entityName}})

package/dist/lib/reverse/buildHelpers_fixed.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Normalizes layer definitions from source configuration.
+ * Handles conflict resolution when multiple roots have the same folder name.
+ */
+export declare function normalizeLayers(sourceConfig: PresetSourceConfig): PresetSourceItem[];
+//# sourceMappingURL=buildHelpers_fixed.d.ts.map

package/dist/lib/reverse/buildHelpers_fixed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildHelpers_fixed.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/buildHelpers_fixed.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,kBAAkB,GAAG,gBAAgB,EAAE,CAwDpF"}

package/dist/lib/reverse/buildHelpers_fixed.js

@@ -0,0 +1,56 @@
+/**
+ * Normalizes layer definitions from source configuration.
+ * Handles conflict resolution when multiple roots have the same folder name.
+ */
+export function normalizeLayers(sourceConfig) {
+    const layers = [];
+    if (sourceConfig.layers) {
+        layers.push(...sourceConfig.layers);
+    }
+    else if (sourceConfig.root) {
+        const roots = Array.isArray(sourceConfig.root) ? sourceConfig.root : [sourceConfig.root];
+        const targetLayer = sourceConfig.targetLayer || 'entity';
+        // If single root, no conflict possible
+        if (roots.length === 1) {
+            layers.push({
+                root: roots[0],
+                targetLayer
+            });
+        }
+        else {
+            // Multiple roots: detect conflicts and append indices
+            const basenames = roots.map(r => basename(r));
+            const nameCount = new Map();
+            const nameIndices = new Map();
+            // Count occurrences of each basename
+            basenames.forEach(name => {
+                nameCount.set(name, (nameCount.get(name) || 0) + 1);
+            });
+            // Create layers with conflict-resolved names
+            roots.forEach((root, index) => {
+                const name = basenames[index];
+                const count = nameCount.get(name) || 1;
+                // If name appears multiple times, set resolvedName
+                if (count > 1) {
+                    const currentIndex = nameIndices.get(name) || 0;
+                    nameIndices.set(name, currentIndex + 1);
+                    // First occurrence keeps original name, subsequent get index suffix
+                    const resolvedName = currentIndex === 0 ? name : `${name}${currentIndex}`;
+                    layers.push({
+                        root,
+                        targetLayer,
+                        resolvedName
+                    });
+                }
+                else {
+                    // No conflict, no need for resolvedName
+                    layers.push({
+                        root,
+                        targetLayer
+                    });
+                }
+            });
+        }
+    }
+    return layers;
+}

package/dist/lib/reverse/buildHelpers_normalizeLayers.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Normalizes layer definitions from source configuration.
+ * Expands layers with array roots and handles conflict resolution.
+ */
+export declare function normalizeLayers(sourceConfig: PresetSourceConfig): PresetSourceItem[];
+//# sourceMappingURL=buildHelpers_normalizeLayers.d.ts.map

package/dist/lib/reverse/buildHelpers_normalizeLayers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildHelpers_normalizeLayers.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/buildHelpers_normalizeLayers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,kBAAkB,GAAG,gBAAgB,EAAE,CA8DpF"}

package/dist/lib/reverse/buildHelpers_normalizeLayers.js

@@ -0,0 +1,65 @@
+/**
+ * Normalizes layer definitions from source configuration.
+ * Expands layers with array roots and handles conflict resolution.
+ */
+export function normalizeLayers(sourceConfig) {
+    const result = [];
+    if (sourceConfig.layers) {
+        // Expand each layer that might have array roots
+        for (const layer of sourceConfig.layers) {
+            const roots = Array.isArray(layer.root) ? layer.root : [layer.root];
+            if (roots.length === 1) {
+                result.push({ root: roots[0], targetLayer: layer.targetLayer });
+            }
+            else {
+                // Multiple roots in this layer: detect conflicts and append indices
+                const basenames = roots.map(r => basename(r));
+                const nameCount = new Map();
+                const nameIndices = new Map();
+                basenames.forEach(name => {
+                    nameCount.set(name, (nameCount.get(name) || 0) + 1);
+                });
+                roots.forEach((root, index) => {
+                    const name = basenames[index];
+                    const count = nameCount.get(name) || 1;
+                    if (count > 1) {
+                        const currentIndex = nameIndices.get(name) || 0;
+                        nameIndices.set(name, currentIndex + 1);
+                        const resolvedName = currentIndex === 0 ? name : `${name}${currentIndex}`;
+                        result.push({ root, targetLayer: layer.targetLayer, resolvedName });
+                    }
+                    else {
+                        result.push({ root, targetLayer: layer.targetLayer });
+                    }
+                });
+            }
+        }
+    }
+    else if (sourceConfig.root) {
+        const roots = Array.isArray(sourceConfig.root) ? sourceConfig.root : [sourceConfig.root];
+        const targetLayer = sourceConfig.targetLayer || 'entity';
+        if (roots.length === 1) {
+            result.push({ root: roots[0], targetLayer });
+        }
+        else {
+            const basenames = roots.map(r => basename(r));
+            const nameCount = new Map();
+            const nameIndices = new Map();
+            basenames.forEach(name => { nameCount.set(name, (nameCount.get(name) || 0) + 1); });
+            roots.forEach((root, index) => {
+                const name = basenames[index];
+                const count = nameCount.get(name) || 1;
+                if (count > 1) {
+                    const currentIndex = nameIndices.get(name) || 0;
+                    nameIndices.set(name, currentIndex + 1);
+                    const resolvedName = currentIndex === 0 ? name : `${name}${currentIndex}`;
+                    result.push({ root, targetLayer, resolvedName });
+                }
+                else {
+                    result.push({ root, targetLayer });
+                }
+            });
+        }
+    }
+    return result;
+}

package/dist/lib/reverse/types.d.ts

@@ -1,7 +1,26 @@
 import { EntityTokenValue, FsdLayerValue } from './constants.js';
 export interface PresetSourceItem {
+    /**
+     * Root directory or array of root directories to analyze.
+     * If array is provided and folder names conflict, indices will be appended.
+     * Example: ['src/entities/User', 'src/features/User'] -> User, User1
+     */
+    root: string | string[];
+    targetLayer: FsdLayerValue;
+    /**
+     * Resolved name for this source (used when multiple roots have conflicting names)
+     * If not set, basename of root is used
+     */
+    resolvedName?: string;
+}
+/**
+ * Normalized version of PresetSourceItem where root is always a string.
+ * This is returned by normalizeLayers() after expanding array roots.
+ */
+export interface NormalizedPresetSourceItem {
     root: string;
     targetLayer: FsdLayerValue;
+    resolvedName?: string;
 }
 export interface PresetSourceConfig {
     /**
@@ -11,10 +30,13 @@ export interface PresetSourceConfig {
     globalRoot?: string;
     mode?: 'short' | 'ejected';
     /**
-     * The root path of the reference code (etalon)
+     * The root path of the reference code (etalon).
+     * Can be a single path or array of paths.
+     * If array is provided and folder names conflict, indices will be appended.
+     * Example: ['src/entities/User', 'src/features/User'] -> User, User1
      * @deprecated Use layers for multiple sources or simpler specific config
      */
-    root?: string;
+    root?: string | string[];
     /**
      * The target layer for the preset (default: 'entity')
      */

package/dist/lib/reverse/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IAC/B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE3B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE;QACN,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;QACvC;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACL;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACjC,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,MAAM,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,GAAG,MAAM,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC;CAEhC;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC7B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/reverse/types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC7B;;;;OAIG;IACH,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,0BAA0B;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IAC/B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE3B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE;QACN,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;QACvC;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACL;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACjC,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,MAAM,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,GAAG,MAAM,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC;CAEhC;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@starodubenko/fsd-gen",
-  "version": "1.2.1-0",
+  "version": "1.4.0-0",
   "description": "A powerful CLI tool for scaffolding Feature-Sliced Design (FSD) components, slices, and layers.",
   "type": "module",
   "main": "./dist/index.js",