@starodubenko/fsd-gen 1.3.0-0 → 1.4.1-0

package/README.md

@@ -84,6 +84,11 @@ export default {
 - **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
 
 

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
@@ -25,5 +46,5 @@ export declare function identifyTokens(content: string, variations: ReturnType<t
 /**
  * Resolves the absolute source root path
  */
-export declare function resolveSourceRoot(presetDir: string, globalRoot?: string, layerRoot?: string): string;
+export declare function resolveSourceRoot(presetDir: string, globalRoot?: string | string[], layerRoot?: string): string;
 //# sourceMappingURL=analyzeHelpers.d.ts.map

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,GAAG,MAAM,EAAE,EAAE,SAAS,GAAE,MAAW,GAAG,MAAM,CASnH"}

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;
 }
 /**
@@ -62,7 +152,10 @@ export function identifyTokens(content, variations) {
 export function resolveSourceRoot(presetDir, globalRoot, layerRoot = '') {
     let basePath = presetDir;
     if (globalRoot) {
-        basePath = resolve(presetDir, globalRoot);
+        // Handle array if user accidentally passed one
+        const root = Array.isArray(globalRoot) ? String(globalRoot[0]) : String(globalRoot);
+        basePath = resolve(presetDir, root);
     }
-    return resolve(basePath, layerRoot);
+    // layerRoot should already be normalized to string by normalizeLayers, but we cast just in case
+    return resolve(basePath, String(layerRoot));
 }

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,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"}
+{"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,CAiE9F;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

@@ -47,18 +47,24 @@ export async function loadReverseEnvironment(presetDir) {
  */
 export function normalizeLayers(sourceConfig) {
     const result = [];
-    if (sourceConfig.layers) {
+    // Helper to ensure we have a string root
+    const toS = (v) => String(v);
+    if (sourceConfig.layers && Array.isArray(sourceConfig.layers)) {
         for (const layer of sourceConfig.layers) {
-            const roots = Array.isArray(layer.root) ? layer.root : [layer.root];
+            if (!layer || !layer.root)
+                continue;
+            // Flatten deeply nested arrays explicitly
+            const roots = (Array.isArray(layer.root) ? layer.root : [layer.root]).flat(Infinity);
             if (roots.length === 1) {
-                result.push({ root: roots[0], targetLayer: layer.targetLayer });
+                result.push({ root: toS(roots[0]), targetLayer: layer.targetLayer });
             }
-            else {
-                const basenames = roots.map(r => basename(r));
+            else if (roots.length > 1) {
+                const basenames = roots.map(r => basename(toS(r)));
                 const nameCount = new Map();
                 const nameIndices = new Map();
                 basenames.forEach(name => { nameCount.set(name, (nameCount.get(name) || 0) + 1); });
-                roots.forEach((root, index) => {
+                roots.forEach((rawRoot, index) => {
+                    const root = toS(rawRoot);
                     const name = basenames[index];
                     const count = nameCount.get(name) || 1;
                     if (count > 1) {
@@ -75,17 +81,19 @@ export function normalizeLayers(sourceConfig) {
         }
     }
     else if (sourceConfig.root) {
-        const roots = Array.isArray(sourceConfig.root) ? sourceConfig.root : [sourceConfig.root];
+        // Flatten deeply nested arrays explicitly
+        const roots = (Array.isArray(sourceConfig.root) ? sourceConfig.root : [sourceConfig.root]).flat(Infinity);
         const targetLayer = sourceConfig.targetLayer || 'entity';
         if (roots.length === 1) {
-            result.push({ root: roots[0], targetLayer });
+            result.push({ root: toS(roots[0]), targetLayer });
         }
-        else {
-            const basenames = roots.map(r => basename(r));
+        else if (roots.length > 1) {
+            const basenames = roots.map(r => basename(toS(r)));
             const nameCount = new Map();
             const nameIndices = new Map();
             basenames.forEach(name => { nameCount.set(name, (nameCount.get(name) || 0) + 1); });
-            roots.forEach((root, index) => {
+            roots.forEach((rawRoot, index) => {
+                const root = toS(rawRoot);
                 const name = basenames[index];
                 const count = nameCount.get(name) || 1;
                 if (count > 1) {

package/package.json

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