@starodubenko/fsd-gen 0.1.0 → 1.0.0-0

package/dist/lib/jsx/renderer.js

@@ -0,0 +1,24 @@
+import { Fragment } from './jsx-runtime.js';
+export function render(node) {
+    if (node === null || node === undefined || typeof node === 'boolean') {
+        return '';
+    }
+    if (typeof node === 'string' || typeof node === 'number') {
+        return String(node);
+    }
+    if (Array.isArray(node)) {
+        return node.map(render).join('');
+    }
+    if (node.type) {
+        const vnode = node;
+        if (vnode.type === Fragment) {
+            return render(vnode.props.children);
+        }
+        if (typeof vnode.type === 'function') {
+            return render(vnode.type(vnode.props));
+        }
+        // Handle undefined type or other cases if necessary
+        return '';
+    }
+    return '';
+}

package/dist/lib/preset/actionExecution.d.ts

@@ -1,4 +1,4 @@
-import { PresetAction, PresetComponentAction, PresetFileAction, FsdGenConfig } from '../../config/types.js';
+import { PresetAction, PresetComponentAction, PresetFileAction, FsdGenConfig, TemplateContext } from '../../config/types.js';
 /**
  * Prepare variables for an action by merging global and action-specific variables
  */
@@ -19,7 +19,7 @@ export declare function executeStylesAction(action: any, variables: Record<strin
 /**
  * Load a file template from the templates directory
  */
-export declare function loadFileTemplate(templatePath: string, customTemplatesDir?: string): Promise<string>;
+export declare function loadFileTemplate(templatePath: string, customTemplatesDir?: string): Promise<string | ((context: TemplateContext) => string)>;
 /**
  * Execute a file action (create a file from template)
  */

package/dist/lib/preset/actionExecution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actionExecution.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/actionExecution.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAK5G;;GAEG;AACH,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,GAAG,EAAE,iEAAiE;AAC9E,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAClC,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,gBAAgB,EACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAChC,OAAO,EAAE,YAAY,EAAE,EACvB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAqBf"}
+{"version":3,"file":"actionExecution.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/actionExecution.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7H;;GAEG;AACH,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,GAAG,EAAE,iEAAiE;AAC9E,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAClC,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,CAAC,CAiC1D;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,gBAAgB,EACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAChC,OAAO,EAAE,YAAY,EAAE,EACvB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAqBf"}

package/dist/lib/preset/actionExecution.js

@@ -7,6 +7,7 @@
 import { join, resolve, dirname, basename } from 'path';
 import { writeFile, mkdir, readFile } from 'fs/promises';
 import { fileURLToPath } from 'url';
+import { createJiti } from 'jiti';
 import { updateBarrel } from '../barrels/updateBarrels.js';
 import { ACTION_TYPES, FILE_EXTENSIONS } from '../constants.js';
 import { generateComponent, generateHook, generateStyles } from '../generators/generate.js';
@@ -14,6 +15,7 @@ import { resolveFsdPaths } from '../naming/resolvePaths.js';
 import { processTemplate } from '../templates/templateLoader.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const jiti = createJiti(__filename);
 /**
  * Prepare variables for an action by merging global and action-specific variables
  */
@@ -36,7 +38,11 @@ export async function executeComponentAction(action, variables, config) {
         ...variables,
         componentName,
         sliceName,
-        layer: action.layer,
+        template: {
+            componentName,
+            sliceName,
+            layer: action.layer,
+        },
     };
     await generateComponent(paths, context, action.template, config.templatesDir);
 }
@@ -52,7 +58,11 @@ variables, config) {
         ...variables,
         componentName,
         sliceName,
-        layer: action.layer,
+        template: {
+            componentName,
+            sliceName,
+            layer: action.layer,
+        },
     };
     await generateHook(paths, context, action.template, config.templatesDir);
 }
@@ -67,7 +77,11 @@ export async function executeStylesAction(action, variables, config) {
         ...variables,
         componentName,
         sliceName,
-        layer: action.layer,
+        template: {
+            componentName,
+            sliceName,
+            layer: action.layer,
+        },
     };
     await generateStyles(paths, context, action.template, config.templatesDir);
 }
@@ -83,6 +97,19 @@ export async function loadFileTemplate(templatePath, customTemplatesDir) {
     pathsToCheck.push(join(internalTemplatesDir, templatePath));
     for (const p of pathsToCheck) {
         try {
+            // Try loading as a module first if it's a TS/JS file
+            if (p.endsWith('.ts') || p.endsWith('.tsx') || p.endsWith('.js')) {
+                try {
+                    const module = await jiti.import(p);
+                    if (typeof module.default === 'function') {
+                        console.log(`Loaded file template (module) from: ${p}`);
+                        return module.default;
+                    }
+                }
+                catch {
+                    // Not a module or failed to load, fall back to string read
+                }
+            }
             const content = await readFile(p, 'utf-8');
             console.log(`Loaded file template from: ${p}`);
             return content;
@@ -100,8 +127,16 @@ export async function executeFileAction(action, variables, config) {
     const targetPath = join(process.cwd(), config.rootDir, processTemplate(action.path, variables));
     await mkdir(dirname(targetPath), { recursive: true });
     if (action.template) {
+        const context = {
+            ...variables,
+            template: {
+                componentName: variables.componentName,
+                sliceName: variables.sliceName || '',
+                layer: typeof variables.layer === 'string' ? variables.layer : '',
+            },
+        };
         const content = await loadFileTemplate(action.template, config.templatesDir);
-        const processed = processTemplate(content, variables);
+        const processed = processTemplate(content, context);
         await writeFile(targetPath, processed);
         console.log(`Created ${targetPath}`);
         // Update barrel for the file (only for TypeScript files)

package/dist/lib/preset/actionExecution.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=actionExecution.spec.d.ts.map

package/dist/lib/preset/actionExecution.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actionExecution.spec.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/actionExecution.spec.ts"],"names":[],"mappings":""}

package/dist/lib/preset/actionExecution.spec.js

@@ -0,0 +1,178 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeComponentAction, executeHookAction, executeStylesAction, executeFileAction } from './actionExecution';
+import { ACTION_TYPES, FSD_LAYERS } from '../constants';
+import * as generateModule from '../generators/generate';
+import * as templateLoader from '../templates/templateLoader';
+import * as resolvePaths from '../naming/resolvePaths';
+// Mock dependencies
+vi.mock('../generators/generate');
+vi.mock('../templates/templateLoader');
+vi.mock('../naming/resolvePaths');
+describe('actionExecution', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Setup default mocks
+        vi.spyOn(templateLoader, 'processTemplate').mockImplementation((tmpl) => tmpl);
+        vi.spyOn(resolvePaths, 'resolveFsdPaths').mockReturnValue({
+            layerPath: '/mock/entities',
+            slicePath: '/mock/entities/User',
+            uiPath: '/mock/entities/User/ui',
+            componentPath: '/mock/entities/User/ui/UserCard'
+        });
+    });
+    describe('executeComponentAction', () => {
+        it('should pass a complete GeneratorContext to generateComponent', async () => {
+            const config = { rootDir: 'src', templatesDir: '.templates' };
+            const action = {
+                type: ACTION_TYPES.COMPONENT,
+                layer: FSD_LAYERS.ENTITY,
+                slice: 'User',
+                name: 'UserCard',
+                template: 'user-card.tsx'
+            };
+            // Mimic variables object populated by createPresetHelpers + globalVars
+            const variables = {
+                base: {
+                    baseName: 'User',
+                    name: 'User',
+                },
+                layer: {
+                    entity: {
+                        importPath: '@entities/User',
+                        apiPath: '@entities/User/ui',
+                    },
+                    features: {
+                        slice: 'ManageUser',
+                        importPath: '@features/ManageUser',
+                    },
+                    widget: {
+                        slice: 'UserTable',
+                        importPath: '@widgets/UserTable',
+                    },
+                    page: {
+                        slice: 'UserPage',
+                        importPath: '@pages/UserPage',
+                    },
+                },
+                extraGlobal: 'something'
+            };
+            await executeComponentAction(action, variables, config);
+            // Assert generateComponent was called
+            expect(generateModule.generateComponent).toHaveBeenCalled();
+            // Capture the context passed to generateComponent
+            const callArgs = vi.mocked(generateModule.generateComponent).mock.calls[0];
+            const context = callArgs[1];
+            // Verify template keys
+            expect(context.template.componentName).toBe('UserCard');
+            expect(context.template.sliceName).toBe('User');
+            expect(context.template.layer).toBe(FSD_LAYERS.ENTITY);
+            // Verify keys from PresetHelpers (passed in via variables)
+            expect(context.base.name).toBe('User');
+            expect(context.layer.entity.apiPath).toBe('@entities/User/ui');
+            // Verify it retains other variables
+            expect(context).toHaveProperty('extraGlobal', 'something');
+        });
+    });
+    // Shared variables for all tests
+    const commonVariables = {
+        base: {
+            baseName: 'User',
+            name: 'User',
+        },
+        layer: {
+            entity: {
+                importPath: '@entities/User',
+                apiPath: '@entities/User/ui',
+            },
+            features: {
+                slice: 'ManageUser',
+                importPath: '@features/ManageUser',
+            },
+            widget: {
+                slice: 'UserTable',
+                importPath: '@widgets/UserTable',
+            },
+            page: {
+                slice: 'UserPage',
+                importPath: '@pages/UserPage',
+            },
+        },
+        extraGlobal: 'something'
+    };
+    const commonConfig = { rootDir: 'src', templatesDir: '.templates' };
+    describe('executeHookAction', () => {
+        it('should pass a complete GeneratorContext to generateHook', async () => {
+            const action = {
+                type: ACTION_TYPES.HOOK,
+                layer: FSD_LAYERS.ENTITY,
+                slice: 'User',
+                name: 'useUser',
+                template: 'use-user.ts'
+            };
+            await executeHookAction(action, commonVariables, commonConfig);
+            expect(generateModule.generateHook).toHaveBeenCalled();
+            const callArgs = vi.mocked(generateModule.generateHook).mock.calls[0];
+            const context = callArgs[1];
+            // Verify template keys
+            expect(context.template.componentName).toBe('useUser');
+            expect(context.template.sliceName).toBe('User');
+            expect(context.template.layer).toBe(FSD_LAYERS.ENTITY);
+            // Verify keys from PresetHelpers
+            expect(context.base.name).toBe('User');
+            expect(context.layer.entity.apiPath).toBe('@entities/User/ui');
+        });
+    });
+    describe('executeStylesAction', () => {
+        it('should pass a complete GeneratorContext to generateStyles', async () => {
+            const action = {
+                type: ACTION_TYPES.STYLES,
+                layer: FSD_LAYERS.ENTITY,
+                slice: 'User',
+                name: 'UserCard',
+                template: 'user-card.module.css'
+            };
+            await executeStylesAction(action, commonVariables, commonConfig);
+            expect(generateModule.generateStyles).toHaveBeenCalled();
+            const callArgs = vi.mocked(generateModule.generateStyles).mock.calls[0];
+            const context = callArgs[1];
+            // Verify template keys (name falls back to slice if not provided, but here we provide it)
+            expect(context.template.componentName).toBe('UserCard');
+            expect(context.template.sliceName).toBe('User');
+            expect(context.template.layer).toBe(FSD_LAYERS.ENTITY);
+            // Verify keys from PresetHelpers
+            expect(context.base.name).toBe('User');
+        });
+    });
+    describe('executeFileAction', () => {
+        it('should pass a complete GeneratorContext to template processing', async () => {
+            const action = {
+                type: ACTION_TYPES.FILE,
+                path: 'model/types.ts',
+                template: 'types.ts'
+            };
+            // loadFileTemplate mock to return a string template
+            vi.spyOn(require('./actionExecution'), 'loadFileTemplate').mockResolvedValue('template content');
+            // Mock mkDir and writeFile to avoid FS errors
+            const fsMock = await import('fs/promises');
+            vi.spyOn(fsMock, 'mkdir').mockResolvedValue(undefined);
+            vi.spyOn(fsMock, 'writeFile').mockResolvedValue(undefined);
+            // executeFileAction uses processTemplate to resolve the path AND the content
+            // We want to capture the context used when processing the CONTENT
+            // The first call is for path resolution, second for content
+            await executeFileAction(action, { ...commonVariables, componentName: 'User', sliceName: 'User' }, commonConfig);
+            expect(templateLoader.processTemplate).toHaveBeenCalledTimes(2);
+            // The second call to processTemplate should receive the context
+            const contentCallArgs = vi.mocked(templateLoader.processTemplate).mock.calls[1];
+            const context = contentCallArgs[1];
+            // Verify template keys
+            expect(context.template).toBeDefined();
+            expect(context.template.componentName).toBe('User');
+            expect(context.template.sliceName).toBe('User');
+            // Layer might be empty string for generic files if not provided in variables
+            expect(context.template.layer).toBeDefined();
+            // Verify keys from PresetHelpers
+            expect(context.base.name).toBe('User');
+            expect(context.layer.entity.apiPath).toBe('@entities/User/ui');
+        });
+    });
+});

package/dist/lib/preset/presetDiscovery.d.ts

@@ -19,15 +19,21 @@ export declare function createEntityApiActions(apiDir: string, entityName: strin
 /**
  * Create component actions for feature buttons
  */
-export declare function createFeatureButtonActions(buttonsDir: string, entityName: string, presetName: string, conventions: ConventionConfig): Promise<PresetAction[]>;
 /**
- * Create component action for widget table
+ * Create component actions for feature sub-components (grouped by directory)
+ */
+export declare function createFeatureActions(featureDir: string, entityName: string, presetName: string, conventions: ConventionConfig): Promise<PresetAction[]>;
+/**
+ * Create component action for widget
+ */
+export declare function createWidgetAction(entityName: string, presetName: string, conventions: ConventionConfig, templateDir: string): PresetComponentAction;
+/**
+ * Create component action for page
  */
-export declare function createWidgetTableAction(entityName: string, presetName: string, conventions: ConventionConfig): PresetComponentAction;
 /**
  * Create component action for page
  */
-export declare function createPageAction(entityName: string, presetName: string, conventions: ConventionConfig): PresetComponentAction;
+export declare function createPageAction(entityName: string, presetName: string, conventions: ConventionConfig, templateDir: string): PresetComponentAction;
 /**
  * Create component action for shared
  */

package/dist/lib/preset/presetDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presetDiscovery.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/presetDiscovery.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAYhH;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW5F;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,gBAAgB,CASlB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,qBAAqB,CAQvB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAuBzB;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC5C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,GAC9B,OAAO,CAAC,YAAY,EAAE,CAAC,CAoBzB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,GAC9B,qBAAqB,CAUvB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC5B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,GAC9B,qBAAqB,CAUvB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,qBAAqB,CAUvB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACnC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,GAAE,gBAAqB,GACnC,OAAO,CAAC,YAAY,EAAE,CAAC,CAqDzB"}
+{"version":3,"file":"presetDiscovery.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/presetDiscovery.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAYhH;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW5F;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,gBAAgB,CASlB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,qBAAqB,CAQvB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAuBzB;AAED;;GAEG;AACH;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,GAC9B,OAAO,CAAC,YAAY,EAAE,CAAC,CAoBzB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,EAC7B,WAAW,EAAE,MAAM,GACpB,qBAAqB,CAUvB;AAED;;GAEG;AACH;;GAEG;AACH,wBAAgB,gBAAgB,CAC5B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,gBAAgB,EAC7B,WAAW,EAAE,MAAM,GACpB,qBAAqB,CAUvB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,qBAAqB,CAUvB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACnC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,GAAE,gBAAqB,GACnC,OAAO,CAAC,YAAY,EAAE,CAAC,CAuDzB"}

package/dist/lib/preset/presetDiscovery.js

@@ -11,7 +11,7 @@
  * Converts the file system structure of a preset into a list of executable generator actions.
  */
 import { readdir, stat } from 'fs/promises';
-import { join } from 'path';
+import { join, basename } from 'path';
 import { LAYER_PLURALS, FSD_LAYERS, FSD_SEGMENTS, FILE_EXTENSIONS, PRESET_DIRS, API_HOOK_PREFIXES, API_OPERATIONS, ACTION_TYPES } from '../constants.js';
 /**
  * Scan a layer directory for entries
@@ -79,49 +79,55 @@ export async function createEntityApiActions(apiDir, entityName, presetName) {
 /**
  * Create component actions for feature buttons
  */
-export async function createFeatureButtonActions(buttonsDir, entityName, presetName, conventions) {
+/**
+ * Create component actions for feature sub-components (grouped by directory)
+ */
+export async function createFeatureActions(featureDir, entityName, presetName, conventions) {
     const actions = [];
     const featurePrefix = conventions.featureSlicePrefix ?? 'Manage';
-    const buttonEntries = await readdir(buttonsDir, { withFileTypes: true });
-    for (const buttonEntry of buttonEntries) {
-        if (buttonEntry.isDirectory()) {
-            const buttonType = buttonEntry.name; // create, edit, delete
-            const capitalizedType = buttonType.charAt(0).toUpperCase() + buttonType.slice(1);
+    const featureEntries = await readdir(featureDir, { withFileTypes: true });
+    for (const featureEntry of featureEntries) {
+        if (featureEntry.isDirectory()) {
+            const featureName = featureEntry.name;
+            const capitalizedName = featureName.charAt(0).toUpperCase() + featureName.slice(1);
             actions.push({
                 type: ACTION_TYPES.COMPONENT,
                 layer: FSD_LAYERS.FEATURE,
                 slice: `${featurePrefix}${entityName}`,
-                name: `${capitalizedType}${entityName}Button`,
-                template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.FEATURE}/${PRESET_DIRS.BUTTONS}/${buttonEntry.name}`
+                name: `${capitalizedName}${entityName}`,
+                template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.FEATURE}/${basename(featureDir)}/${featureEntry.name}`
             });
         }
     }
     return actions;
 }
 /**
- * Create component action for widget table
+ * Create component action for widget
  */
-export function createWidgetTableAction(entityName, presetName, conventions) {
+export function createWidgetAction(entityName, presetName, conventions, templateDir) {
     const widgetSuffix = conventions.widgetSliceSuffix ?? 'Table';
     return {
         type: ACTION_TYPES.COMPONENT,
         layer: FSD_LAYERS.WIDGET,
         slice: `${entityName}${widgetSuffix}`,
         name: `${entityName}${widgetSuffix}`,
-        template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.WIDGET}/${PRESET_DIRS.TABLE}`
+        template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.WIDGET}/${templateDir}`
     };
 }
 /**
  * Create component action for page
  */
-export function createPageAction(entityName, presetName, conventions) {
+/**
+ * Create component action for page
+ */
+export function createPageAction(entityName, presetName, conventions, templateDir) {
     const pageSuffix = conventions.pageSliceSuffix ?? 'Page';
     return {
         type: ACTION_TYPES.COMPONENT,
         layer: FSD_LAYERS.PAGE,
         slice: `${entityName}${pageSuffix}`,
         name: `${entityName}${pageSuffix}`,
-        template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.PAGE}/${FSD_LAYERS.PAGE}`
+        template: `${PRESET_DIRS.ROOT}/${presetName}/${FSD_LAYERS.PAGE}/${templateDir}`
     };
 }
 /**
@@ -166,17 +172,19 @@ export async function discoverTemplates(presetDir, presetName, entityName, conve
                     }
                 }
                 // Feature layer
-                else if (layer === FSD_LAYERS.FEATURE && entry.name === PRESET_DIRS.BUTTONS) {
-                    const buttonActions = await createFeatureButtonActions(fullPath, entityName, presetName, conventions);
-                    actions.push(...buttonActions);
+                // Feature layer
+                else if (layer === FSD_LAYERS.FEATURE) {
+                    // Treat any directory in feature layer as a potential specific feature group
+                    const featureActions = await createFeatureActions(fullPath, entityName, presetName, conventions);
+                    actions.push(...featureActions);
                 }
                 // Widget layer
-                else if (layer === FSD_LAYERS.WIDGET && entry.name === PRESET_DIRS.TABLE) {
-                    actions.push(createWidgetTableAction(entityName, presetName, conventions));
+                else if (layer === FSD_LAYERS.WIDGET) {
+                    actions.push(createWidgetAction(entityName, presetName, conventions, entry.name));
                 }
                 // Page layer
-                else if (layer === FSD_LAYERS.PAGE && entry.name === FSD_LAYERS.PAGE) {
-                    actions.push(createPageAction(entityName, presetName, conventions));
+                else if (layer === FSD_LAYERS.PAGE) {
+                    actions.push(createPageAction(entityName, presetName, conventions, entry.name));
                 }
                 // Shared layer
                 else if (layer === FSD_LAYERS.SHARED) {

package/dist/lib/preset/presetLoading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presetLoading.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/presetLoading.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErG;;;GAGG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,cAAc,GAAG,IAAI,CAAC,CAanG;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAUpF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,GAAG,cAAc,EACrC,IAAI,EAAE,gBAAgB,GACvB,YAAY,CAKd;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgB9B"}
+{"version":3,"file":"presetLoading.d.ts","sourceRoot":"","sources":["../../../src/lib/preset/presetLoading.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErG;;;GAGG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,cAAc,GAAG,IAAI,CAAC,CAcnG;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAUpF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,GAAG,cAAc,EACrC,IAAI,EAAE,gBAAgB,GACvB,YAAY,CAKd;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,YAAY,GACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgB9B"}

package/dist/lib/preset/presetLoading.js

@@ -20,7 +20,8 @@ export async function loadPresetTs(presetDir) {
         const imported = await jiti.import(presetTsPath, { default: true });
         return imported.default || imported;
     }
-    catch {
+    catch (error) {
+        console.error(`Failed to load preset content from ${presetTsPath}:`, error);
         return null;
     }
 }

package/dist/lib/templates/templateLoader.d.ts

@@ -1,3 +1,4 @@
+import { TemplateContext } from '../../config/types.js';
 /**
  * Resolve the list of directories to search for templates
  * Custom directory is checked first, then internal templates
@@ -10,22 +11,23 @@ export declare function resolveTemplateDirs(customTemplatesDir?: string): string
 export declare function findTemplateDir(layer: string, type: string, searchDirs: string[]): Promise<string | null>;
 /**
  * Read the component template file
+ * Supports .tsx, .ts, .js for dynamic templates, falls back to static string reading
  */
-export declare function readComponentTemplate(templateDir: string): Promise<string>;
+export declare function readComponentTemplate(templateDir: string): Promise<string | ((context: TemplateContext) => string)>;
 /**
  * Read the styles template file (optional)
  * @returns The styles content or empty string if not found
  */
-export declare function readStylesTemplate(templateDir: string): Promise<string>;
+export declare function readStylesTemplate(templateDir: string): Promise<string | ((context: TemplateContext) => string)>;
 /**
  * Load a template for a given layer and type
  * Orchestrates finding and reading template files
  */
 export declare function loadTemplate(layer: string, type?: string, customTemplatesDir?: string): Promise<{
-    component: string;
-    styles: string;
+    component: string | ((context: TemplateContext) => string);
+    styles: string | ((context: TemplateContext) => string);
 }>;
-export declare function processTemplate(content: string, variables: Record<string, any>): string;
+export declare function processTemplate(content: string | ((context: TemplateContext) => string), variables: Record<string, any> | TemplateContext): string;
 export declare function listPresets(customTemplatesDir?: string): Promise<string[]>;
 export declare function resolvePresetDir(presetName: string, customTemplatesDir?: string): Promise<string | null>;
 //# sourceMappingURL=templateLoader.d.ts.map

package/dist/lib/templates/templateLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templateLoader.d.ts","sourceRoot":"","sources":["../../../src/lib/templates/templateLoader.ts"],"names":[],"mappings":"AAcA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAQzE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACjC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGhF;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAC9B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAAa,EACnB,kBAAkB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAchD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAEvF;AAED,wBAAsB,WAAW,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBhF;AAED,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiB9G"}
+{"version":3,"file":"templateLoader.d.ts","sourceRoot":"","sources":["../../../src/lib/templates/templateLoader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOxD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAQzE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACjC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,CAAC,CAuBzH;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,CAAC,CA0BtH;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAC9B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAAa,EACnB,kBAAkB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,CAAA;CAAE,CAAC,CAclI;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,eAAe,GAAG,MAAM,CAKlJ;AAED,wBAAsB,WAAW,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBhF;AAED,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiB9G"}

package/dist/lib/templates/templateLoader.js

@@ -1,15 +1,11 @@
-/**
- * Template loading and processing.
- *
- * Responsible for finding, reading, and processing template files. Handles variable
- * substitution in template content and resolves template paths based on layers and types.
- */
 import { readFile, readdir, stat } from 'fs/promises';
-import { join, dirname } from 'path';
+import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
+import { createJiti } from 'jiti';
 import { TEMPLATE_FILES, PRESET_DIRS } from '../constants.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const jiti = createJiti(__filename);
 /**
  * Resolve the list of directories to search for templates
  * Custom directory is checked first, then internal templates
@@ -42,8 +38,28 @@ export async function findTemplateDir(layer, type, searchDirs) {
 }
 /**
  * Read the component template file
+ * Supports .tsx, .ts, .js for dynamic templates, falls back to static string reading
  */
 export async function readComponentTemplate(templateDir) {
+    // Try to find dynamic template files
+    const extensions = ['.tsx', '.ts', '.js'];
+    const baseName = TEMPLATE_FILES.COMPONENT.replace('.tsx', ''); // Removing extension if present in constant to try different ones
+    // Check for Component.tsx, Component.ts, Component.js that are modules
+    for (const ext of extensions) {
+        try {
+            const modulePath = resolve(templateDir, `Component${ext}`);
+            await stat(modulePath);
+            // Found a module file, load it with jiti
+            const module = await jiti.import(modulePath);
+            if (typeof module.default === 'function') {
+                return module.default;
+            }
+        }
+        catch {
+            // Continue
+        }
+    }
+    // Fallback to reading as text (original behavior)
     const componentPath = join(templateDir, TEMPLATE_FILES.COMPONENT);
     return await readFile(componentPath, 'utf-8');
 }
@@ -52,6 +68,24 @@ export async function readComponentTemplate(templateDir) {
  * @returns The styles content or empty string if not found
  */
 export async function readStylesTemplate(templateDir) {
+    // Try to find dynamic template files
+    const extensions = ['.ts', '.js'];
+    // Check for Component.styles.ts, Component.styles.js
+    for (const ext of extensions) {
+        try {
+            // Adjust this if TEMPLATE_FILES.STYLES differs
+            const modulePath = join(templateDir, `Component.styles${ext}`);
+            await stat(modulePath);
+            // Found a module file, load it with jiti
+            const module = await jiti.import(modulePath);
+            if (typeof module.default === 'function') {
+                return module.default;
+            }
+        }
+        catch {
+            // Continue
+        }
+    }
     const stylesPath = join(templateDir, TEMPLATE_FILES.STYLES);
     try {
         return await readFile(stylesPath, 'utf-8');
@@ -77,6 +111,9 @@ export async function loadTemplate(layer, type = 'ui', customTemplatesDir) {
     return { component, styles };
 }
 export function processTemplate(content, variables) {
+    if (typeof content === 'function') {
+        return content(variables);
+    }
     return content.replace(/\{\s*\{\s*(\w+)\s*\}\s*\}/g, (_, key) => String(variables[key] ?? ''));
 }
 export async function listPresets(customTemplatesDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@starodubenko/fsd-gen",
-  "version": "0.1.0",
+  "version": "1.0.0-0",
   "description": "A powerful CLI tool for scaffolding Feature-Sliced Design (FSD) components, slices, and layers.",
   "type": "module",
   "main": "./dist/index.js",
@@ -19,7 +19,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/rodionstarodubenko/fsd-generator.git"
+    "url": "git+https://github.com/Starodubenko/fsd-generator.git"
   },
   "keywords": [
     "fsd",