@currentjs/gen 0.3.2 → 0.5.0

package/dist/commands/generateAll.js

@@ -38,89 +38,64 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const cliUtils_1 = require("../utils/cliUtils");
 const yaml_1 = require("yaml");
-const domainModelGenerator_1 = require("../generators/domainModelGenerator");
-const validationGenerator_1 = require("../generators/validationGenerator");
-const serviceGenerator_1 = require("../generators/serviceGenerator");
-const controllerGenerator_1 = require("../generators/controllerGenerator");
-const storeGenerator_1 = require("../generators/storeGenerator");
-const templateGenerator_1 = require("../generators/templateGenerator");
 const generationRegistry_1 = require("../utils/generationRegistry");
 const colors_1 = require("../utils/colors");
 const constants_1 = require("../utils/constants");
+const configTypes_1 = require("../types/configTypes");
+const commandUtils_1 = require("../utils/commandUtils");
+const diResolver_1 = require("../utils/diResolver");
+const appTemplates_1 = require("../generators/templates/appTemplates");
 async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const appYamlPath = (0, cliUtils_1.resolveYamlPath)(yamlPathArg);
     (0, generationRegistry_1.initGenerationRegistry)(process.cwd());
-    const raw = fs.readFileSync(appYamlPath, 'utf8');
-    const appConfig = (0, yaml_1.parse)(raw);
-    const modulesList = ((_a = appConfig === null || appConfig === void 0 ? void 0 : appConfig.modules) !== null && _a !== void 0 ? _a : []).map(m => (typeof m === 'string' ? m : m.module));
-    const providersConfig = appConfig === null || appConfig === void 0 ? void 0 : appConfig.providers;
-    const databaseProviderName = appConfig === null || appConfig === void 0 ? void 0 : appConfig.database;
-    const shouldIncludeModule = (moduleYamlRel) => {
-        if (!moduleName || moduleName === '*')
-            return true;
-        const moduleNameLc = moduleName.toLowerCase();
-        const relNormalized = moduleYamlRel.replace(/\\/g, '/').toLowerCase();
-        if (relNormalized.endsWith(`/${moduleNameLc}.yaml`))
-            return true;
-        const moduleYamlPath = path.isAbsolute(moduleYamlRel)
-            ? moduleYamlRel
-            : path.resolve(process.cwd(), moduleYamlRel);
-        const dirName = path.basename(path.dirname(moduleYamlPath)).toLowerCase();
-        if (dirName === moduleNameLc)
-            return true;
-        // Allow passing a path fragment
-        if (relNormalized.includes(`/${moduleNameLc}/`) || relNormalized.endsWith(`/${moduleNameLc}`))
-            return true;
-        return false;
-    };
-    const filteredModules = modulesList.filter(shouldIncludeModule);
-    if (filteredModules.length === 0) {
+    const appConfig = (0, commandUtils_1.loadAppConfig)(appYamlPath);
+    const moduleEntries = (0, commandUtils_1.getModuleEntries)(appConfig);
+    const providersConfig = appConfig.providers;
+    const defaultDatabaseKey = (_a = appConfig.config) === null || _a === void 0 ? void 0 : _a.database;
+    const filteredEntries = moduleEntries.filter(entry => (0, commandUtils_1.shouldIncludeModule)(entry.path, moduleName) || (moduleName && entry.name === moduleName));
+    if (filteredEntries.length === 0) {
         // eslint-disable-next-line no-console
         console.warn(colors_1.colors.yellow(`No modules matched: ${moduleName}`));
         return;
     }
-    const domainGen = new domainModelGenerator_1.DomainModelGenerator();
-    const valGen = new validationGenerator_1.ValidationGenerator();
-    const svcGen = new serviceGenerator_1.ServiceGenerator();
-    const ctrlGen = new controllerGenerator_1.ControllerGenerator();
-    const storeGen = new storeGenerator_1.StoreGenerator();
-    const tplGen = new templateGenerator_1.TemplateGenerator();
-    const initsBySrcDir = new Map();
-    const moduleConfigByFolder = new Map(); // Cache module configs by folder name
-    // Run modules sequentially to avoid overlapping interactive prompts
-    for (const moduleYamlRel of filteredModules) {
-        const moduleYamlPath = path.isAbsolute(moduleYamlRel)
-            ? moduleYamlRel
-            : path.resolve(process.cwd(), moduleYamlRel);
+    const { domainGen, dtoGen, useCaseGen, serviceGen, controllerGen, templateGen, storeGen } = (0, commandUtils_1.createGenerators)();
+    const moduleScansBySrcDir = new Map();
+    // Process each module: generate files and collect module dirs for DI scanning
+    for (const entry of filteredEntries) {
+        const moduleYamlPath = path.isAbsolute(entry.path)
+            ? entry.path
+            : path.resolve(process.cwd(), entry.path);
         if (!fs.existsSync(moduleYamlPath)) {
             // eslint-disable-next-line no-console
             console.warn(colors_1.colors.yellow(`Module YAML not found: ${moduleYamlPath}`));
             continue;
         }
-        const moduleDir = path.dirname(moduleYamlPath);
-        const moduleFolderName = path.basename(moduleDir);
-        // Parse and cache module config for dependency detection
         const moduleYamlContent = fs.readFileSync(moduleYamlPath, 'utf8');
         const moduleConfig = (0, yaml_1.parse)(moduleYamlContent);
-        moduleConfigByFolder.set(moduleFolderName, moduleConfig);
-        // Output folders inside module structure
-        const domainOut = path.join(moduleDir, 'domain', 'entities');
-        const appOut = path.join(moduleDir, 'application');
-        const infraOut = path.join(moduleDir, 'infrastructure');
-        fs.mkdirSync(domainOut, { recursive: true });
-        fs.mkdirSync(appOut, { recursive: true });
-        fs.mkdirSync(infraOut, { recursive: true });
-        // Domain entities
+        if (!(0, configTypes_1.isValidModuleConfig)(moduleConfig)) {
+            // eslint-disable-next-line no-console
+            console.warn(colors_1.colors.yellow(`Skipping ${moduleYamlPath}: not in expected format (missing domain/useCases)`));
+            continue;
+        }
+        const moduleDir = path.dirname(moduleYamlPath);
+        // eslint-disable-next-line no-console
+        console.log(colors_1.colors.blue(`\nGenerating module: ${path.basename(moduleDir)}`));
+        // eslint-disable-next-line no-await-in-loop
+        await domainGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        // eslint-disable-next-line no-await-in-loop
+        await dtoGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        // eslint-disable-next-line no-await-in-loop
+        await useCaseGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        // eslint-disable-next-line no-await-in-loop
+        await serviceGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        // eslint-disable-next-line no-await-in-loop
+        await storeGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
         // eslint-disable-next-line no-await-in-loop
-        await domainGen.generateAndSaveFiles(moduleYamlPath, domainOut, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
-        // Generate and save via per-generator write logic
+        await controllerGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
         // eslint-disable-next-line no-await-in-loop
-        await valGen.generateAndSaveFiles(moduleYamlPath, appOut, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
-        await svcGen.generateAndSaveFiles(moduleYamlPath, appOut, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
-        const generatedControllers = await ctrlGen.generateAndSaveFiles(moduleYamlPath, infraOut, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
-        await tplGen.generateAndSaveFiles(moduleYamlPath, undefined, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
-        // Find nearest ancestor containing src/app.ts and collect controller inits for a single write later
+        await templateGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        // Find srcDir by probing upward for app.ts
         let probeDir = moduleDir;
         let srcDir = null;
         for (let i = 0; i < 6; i += 1) {
@@ -136,149 +111,46 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
         }
         if (!srcDir)
             continue;
-        const list = (_b = initsBySrcDir.get(srcDir)) !== null && _b !== void 0 ? _b : [];
-        // First, add entries for all models in this module (even without controllers)
-        // This ensures dependency stores are initialized
-        if (moduleConfig && moduleConfig.models) {
-            const m = moduleYamlPath.match(/modules\/([^/]+)\//);
-            const moduleFolder = m ? m[1] : path.basename(moduleDir);
-            for (const model of moduleConfig.models) {
-                const entityName = model.name;
-                const entityVar = entityName.charAt(0).toLowerCase() + entityName.slice(1);
-                // Check if we already have an entry for this entity
-                if (list.find(x => x.entityName === entityName)) {
-                    continue; // Skip if already added via controller
-                }
-                const storeImportPath = `${constants_1.PATH_PATTERNS.MODULES_RELATIVE}${moduleFolder}/${constants_1.PATH_PATTERNS.INFRASTRUCTURE}/${constants_1.PATH_PATTERNS.STORES}/${entityName}${constants_1.GENERATOR_SUFFIXES.STORE}`;
-                const serviceImportPath = `${constants_1.PATH_PATTERNS.MODULES_RELATIVE}${moduleFolder}/${constants_1.PATH_PATTERNS.APPLICATION}/${constants_1.PATH_PATTERNS.SERVICES}/${entityName}${constants_1.GENERATOR_SUFFIXES.SERVICE}`;
-                // Detect dependencies
-                const storeDeps = [];
-                const serviceDeps = [];
-                if (model.fields) {
-                    model.fields.forEach((field) => {
-                        const isRelationship = moduleConfig.models.some((m) => m.name === field.type);
-                        if (isRelationship) {
-                            storeDeps.push(field.type);
-                            serviceDeps.push(field.type);
-                        }
-                    });
-                }
-                // Add a minimal init entry (no controller, just for dependency resolution)
-                const init = {
-                    ctrlName: '', // No controller
-                    entityName,
-                    entityVar,
-                    importController: '',
-                    importStore: `import { ${entityName}Store } from '${storeImportPath}';`,
-                    importService: `import { ${entityName}Service } from '${serviceImportPath}';`,
-                    importAuth: undefined,
-                    wiring: [],
-                    registration: '',
-                    storeDependencies: storeDeps,
-                    serviceDependencies: serviceDeps
-                };
-                list.push(init);
-            }
-        }
-        // Then process controllers
-        for (const filePath of generatedControllers) {
-            const rel = path
-                .relative(srcDir, filePath)
-                .replace(/\\/g, '/')
-                .replace(/\.ts$/, '');
-            const ctrlName = path.basename(rel);
-            const importPath = rel.startsWith('.') ? rel : `./${rel}`;
-            const baseEntityName = ctrlName.endsWith('ApiController')
-                ? ctrlName.slice(0, -'ApiController'.length)
-                : ctrlName.endsWith('WebController')
-                    ? ctrlName.slice(0, -'WebController'.length)
-                    : ctrlName.replace('Controller', '');
-            const entityName = baseEntityName;
-            const entityVar = entityName.charAt(0).toLowerCase() + entityName.slice(1);
-            const m = rel.match(/modules\/([^/]+)\/infrastructure\/controllers\//);
-            const moduleFolder = m ? m[1] : undefined;
-            if (!moduleFolder)
-                continue;
-            const storeImportPath = `${constants_1.PATH_PATTERNS.MODULES_RELATIVE}${moduleFolder}/${constants_1.PATH_PATTERNS.INFRASTRUCTURE}/${constants_1.PATH_PATTERNS.STORES}/${entityName}${constants_1.GENERATOR_SUFFIXES.STORE}`;
-            const serviceImportPath = `${constants_1.PATH_PATTERNS.MODULES_RELATIVE}${moduleFolder}/${constants_1.PATH_PATTERNS.APPLICATION}/${constants_1.PATH_PATTERNS.SERVICES}/${entityName}${constants_1.GENERATOR_SUFFIXES.SERVICE}`;
-            // Look up the correct module config for this controller
-            const controllerModuleConfig = moduleConfigByFolder.get(moduleFolder);
-            // Detect store and service dependencies from module config
-            const storeDeps = [];
-            const serviceDeps = [];
-            if (controllerModuleConfig && controllerModuleConfig.models) {
-                const model = controllerModuleConfig.models.find((m) => m.name === entityName);
-                if (model && model.fields) {
-                    model.fields.forEach((field) => {
-                        // Check if this field is a relationship (type is another model name)
-                        const isRelationship = controllerModuleConfig.models.some((m) => m.name === field.type);
-                        if (isRelationship) {
-                            storeDeps.push(field.type);
-                            serviceDeps.push(field.type);
-                        }
-                    });
-                }
-            }
-            // Check if we already have a base entry for this entity (from all models)
-            const existingEntry = list.find(x => x.entityName === entityName && !x.ctrlName);
-            if (existingEntry) {
-                // Update existing entry to add controller info
-                existingEntry.ctrlName = ctrlName;
-                existingEntry.importController = `import { ${ctrlName} } from '${importPath}';`;
-                existingEntry.registration = `new ${ctrlName}(${entityVar}Service)`;
-                // Keep the dependencies we already detected
-            }
-            else {
-                // Create new entry with controller
-                const init = {
-                    ctrlName,
-                    entityName,
-                    entityVar,
-                    importController: `import { ${ctrlName} } from '${importPath}';`,
-                    importStore: `import { ${entityName}Store } from '${storeImportPath}';`,
-                    importService: `import { ${entityName}Service } from '${serviceImportPath}';`,
-                    importAuth: undefined,
-                    wiring: [],
-                    registration: `new ${ctrlName}(${entityVar}Service)`,
-                    storeDependencies: storeDeps,
-                    serviceDependencies: serviceDeps
-                };
-                if (!list.find((x) => x.ctrlName === init.ctrlName)) {
-                    list.push(init);
-                }
-            }
-        }
-        initsBySrcDir.set(srcDir, list);
-        await storeGen.generateAndSaveFiles(moduleYamlPath, infraOut, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skip) });
+        const scans = (_b = moduleScansBySrcDir.get(srcDir)) !== null && _b !== void 0 ? _b : [];
+        scans.push({ moduleDir, databaseKey: entry.database });
+        moduleScansBySrcDir.set(srcDir, scans);
     }
-    // Single write per app: inject imports and rewrite block between markers
-    let isIProviderImported = false;
-    for (const [srcDir, controllerInits] of initsBySrcDir.entries()) {
+    // Update app.ts files with DI-based wiring
+    for (const [srcDir, moduleScans] of moduleScansBySrcDir.entries()) {
         try {
             const appTsPath = path.join(srcDir, constants_1.COMMON_FILES.APP_TS);
             if (!fs.existsSync(appTsPath))
                 continue;
+            // Ensure system.ts exists (for existing apps created before this feature)
+            const systemTsPath = path.join(srcDir, 'system.ts');
+            if (!fs.existsSync(systemTsPath)) {
+                fs.writeFileSync(systemTsPath, appTemplates_1.systemTsTemplate, 'utf8');
+                // eslint-disable-next-line no-console
+                console.log(colors_1.colors.green(`Created ${systemTsPath}`));
+            }
             let appTs = fs.readFileSync(appTsPath, 'utf8');
-            // Build providers import and initialization from app.yaml providers section
+            // --- Scan all modules for @Injectable and @Controller classes ---
+            const allClasses = [];
+            for (const scan of moduleScans) {
+                const classes = (0, diResolver_1.scanModuleClasses)(scan.moduleDir);
+                allClasses.push(...classes);
+            }
+            // --- Build provider info ---
             const importLines = [];
             const providerInitLines = [];
             const providersArrayEntries = [];
+            let isIProviderImported = false;
             if (providersConfig && Object.keys(providersConfig).length > 0) {
                 for (const [provName, mod] of Object.entries(providersConfig)) {
                     if (!mod)
                         continue;
-                    // Assume default import name from module spec after last '/'
-                    const baseName = mod.split('/').pop() || 'provider';
-                    const className = baseName
-                        .replace(/^[^a-zA-Z_]*/g, '')
-                        .split(/[-_]/)
-                        .map(s => s.charAt(0).toUpperCase() + s.slice(1))
-                        .join('');
-                    importLines.push(`import { ${className}${!isIProviderImported ? ', IProvider, ISqlProvider' : ''} } from '${mod}';`);
+                    const resolved = (0, diResolver_1.resolveProviderImport)(mod, srcDir);
+                    if (!appTs.includes(`from '${resolved.importPath}'`)) {
+                        importLines.push(`import { ${resolved.className}${!isIProviderImported ? ', IProvider, ISqlProvider' : ''} } from '${resolved.importPath}';`);
+                    }
                     if (!isIProviderImported)
                         isIProviderImported = true;
-                    // Read provider configuration from env by name, parse JSON if possible, pass as is
-                    providerInitLines.push(`  ${provName}: new ${className}((() => {
+                    providerInitLines.push(`  ${provName}: new ${resolved.className}((() => {
     const raw = process.env.${provName.toUpperCase()} || '';
     try { return raw ? JSON.parse(raw) : undefined; } catch { return raw; }
   })())`);
@@ -286,42 +158,62 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
                 }
             }
             else {
-                // Fallback to MySQL provider if no providers configured
-                importLines.push(`import { ProviderMysql, ISqlProvider } from '@currentjs/provider-mysql';`);
+                if (!appTs.includes("from '@currentjs/provider-mysql'")) {
+                    importLines.push(`import { ProviderMysql, IProvider, ISqlProvider } from '@currentjs/provider-mysql';`);
+                }
                 providerInitLines.push(`  mysql: new ProviderMysql((() => {
     const raw = process.env.MYSQL || '';
     try { return raw ? JSON.parse(raw) : undefined; } catch { return raw; }
   })())`);
                 providersArrayEntries.push('mysql');
             }
-            const ensureDbLine = `const providers: Record<string, IProvider> = {\n${providerInitLines.join(',\n')}\n};\nconst db = providers['${databaseProviderName || providersArrayEntries[0]}'] as ISqlProvider;`;
-            // Ensure router import for server (app template already imports templating)
-            if (!appTs.includes("from '@currentjs/router'")) {
-                importLines.push(`import { createWebServer, createStaticServer } from '@currentjs/router';`);
-            }
-            for (const il of importLines) {
-                if (!appTs.includes(il)) {
-                    appTs = il + '\n' + appTs;
+            // Resolve database keys to provider variable names
+            const providerKeysSet = new Set(providersArrayEntries);
+            const allDatabaseKeys = [...new Set(moduleScans.map(s => s.databaseKey))];
+            const dbVarByKey = {};
+            const dbLines = [`const providers: Record<string, IProvider> = {\n${providerInitLines.join(',\n')}\n};`];
+            const emittedProviderKeys = new Set();
+            for (const key of allDatabaseKeys) {
+                const resolvedKey = providerKeysSet.has(key)
+                    ? key
+                    : (defaultDatabaseKey && providerKeysSet.has(defaultDatabaseKey) ? defaultDatabaseKey : providersArrayEntries[0]);
+                if (!providerKeysSet.has(key)) {
+                    // eslint-disable-next-line no-console
+                    console.warn(colors_1.colors.yellow(`Module uses database '${key}' which is not in providers; using '${resolvedKey}'`));
                 }
-            }
-            // Ensure MySQL provider import exists
-            if (!appTs.includes("from '@currentjs/provider-mysql'")) {
-                importLines.push(`import { ProviderMysql } from '@currentjs/provider-mysql';`);
-            }
-            for (const init of controllerInits) {
-                const maybe = [init.importStore, init.importService];
-                // Only add controller import if entity has a controller
-                if (init.importController && init.importController.trim() !== '') {
-                    maybe.push(init.importController);
+                const varName = 'db' + (resolvedKey.charAt(0).toUpperCase() + resolvedKey.slice(1));
+                dbVarByKey[key] = varName;
+                if (!emittedProviderKeys.has(resolvedKey)) {
+                    emittedProviderKeys.add(resolvedKey);
+                    dbLines.push(`const ${varName} = providers['${resolvedKey}'] as ISqlProvider;`);
                 }
-                if (init.importAuth)
-                    maybe.push(init.importAuth);
-                for (const line of maybe) {
-                    if (line && line.trim() !== '' && !appTs.includes(line) && !importLines.includes(line)) {
-                        importLines.push(line);
+            }
+            // --- Build DI instantiation order ---
+            const providerVarByType = new Map();
+            providerVarByType.set('ISqlProvider', (_c = dbVarByKey[allDatabaseKeys[0]]) !== null && _c !== void 0 ? _c : 'dbMysql');
+            // Per-class provider var: map each class to its module's database variable
+            const classProviderVar = new Map();
+            for (const scan of moduleScans) {
+                const dbVar = (_d = dbVarByKey[scan.databaseKey]) !== null && _d !== void 0 ? _d : dbVarByKey[Object.keys(dbVarByKey)[0]];
+                const classes = allClasses.filter(c => c.filePath.startsWith(scan.moduleDir + path.sep));
+                for (const cls of classes) {
+                    const hasProviderParam = cls.constructorParams.some(p => providerVarByType.has(p.type));
+                    if (hasProviderParam) {
+                        classProviderVar.set(cls.className, dbVar);
                     }
                 }
             }
+            const steps = (0, diResolver_1.buildInstantiationOrder)(allClasses, providerVarByType, classProviderVar, srcDir);
+            // --- Generate import lines for all discovered classes ---
+            for (const step of steps) {
+                const importLine = `import { ${step.className} } from '${step.importPath}';`;
+                if (!appTs.includes(importLine) && !importLines.includes(importLine)) {
+                    importLines.push(importLine);
+                }
+            }
+            if (!appTs.includes("from '@currentjs/router'")) {
+                importLines.push(`import { createWebServer } from '@currentjs/router';`);
+            }
             if (importLines.length) {
                 const existingImports = new Set();
                 const importRegex = /^import[^;]+;$/gm;
@@ -331,63 +223,27 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
                 if (toAdd.length)
                     appTs = toAdd.join('\n') + '\n' + appTs;
             }
-            // Compose fresh block content with dependency-aware ordering
+            // --- Build wiring block ---
             const wiringLines = [];
-            // DB placeholder once
-            wiringLines.push(ensureDbLine);
-            // Deduplicate by entityName
-            const uniqueInits = Array.from(new Map(controllerInits.map(init => [init.entityName, init])).values());
-            // Sort entities by dependencies (entities with no deps first)
-            const sorted = [];
-            const processed = new Set();
-            const addEntity = (init) => {
-                if (processed.has(init.entityName))
-                    return;
-                // Process dependencies first
-                if (init.storeDependencies) {
-                    for (const depName of init.storeDependencies) {
-                        const depInit = uniqueInits.find(i => i.entityName === depName);
-                        if (depInit && !processed.has(depName)) {
-                            addEntity(depInit);
-                        }
-                    }
-                }
-                sorted.push(init);
-                processed.add(init.entityName);
-            };
-            uniqueInits.forEach(init => addEntity(init));
-            // Generate wiring for stores and services
-            for (const init of sorted) {
-                const entityVar = init.entityVar;
-                const entityName = init.entityName;
-                // Build store constructor parameters
-                const storeParams = ['db'];
-                if (init.storeDependencies && init.storeDependencies.length > 0) {
-                    init.storeDependencies.forEach(depName => {
-                        const depVar = depName.charAt(0).toLowerCase() + depName.slice(1);
-                        storeParams.push(`${depVar}Store`);
-                    });
-                }
-                // Build service constructor parameters
-                const serviceParams = [`${entityVar}Store`];
-                if (init.serviceDependencies && init.serviceDependencies.length > 0) {
-                    init.serviceDependencies.forEach(depName => {
-                        const depVar = depName.charAt(0).toLowerCase() + depName.slice(1);
-                        serviceParams.push(`${depVar}Store`);
-                    });
-                }
-                wiringLines.push(`const ${entityVar}Store = new ${entityName}Store(${storeParams.join(', ')});`);
-                wiringLines.push(`const ${entityVar}Service = new ${entityName}Service(${serviceParams.join(', ')});`);
+            wiringLines.push(dbLines.join('\n'));
+            const nonControllers = steps.filter(s => !s.isController);
+            const controllers = steps.filter(s => s.isController);
+            for (const step of nonControllers) {
+                const args = step.constructorArgs.length > 0 ? step.constructorArgs.join(', ') : '';
+                wiringLines.push(`const ${step.varName} = new ${step.className}(${args});`);
             }
-            // Only include registrations for entities with controllers
-            const registrations = controllerInits
-                .filter(i => i.registration && i.registration.trim() !== '')
-                .map(i => i.registration);
             wiringLines.push('const controllers = [');
-            if (registrations.length > 0) {
-                wiringLines.push(`  ${registrations.join(',\n  ')}`);
+            if (controllers.length > 0) {
+                const registrations = controllers
+                    .map(s => {
+                    const args = s.constructorArgs.length > 0 ? s.constructorArgs.join(', ') : '';
+                    return `  new ${s.className}(${args}),`;
+                })
+                    .join('\n');
+                wiringLines.push(registrations);
             }
             wiringLines.push('];');
+            // Replace content between markers
             const startMarker = constants_1.GENERATOR_MARKERS.CONTROLLERS_START;
             const endMarker = constants_1.GENERATOR_MARKERS.CONTROLLERS_END;
             const startIdx = appTs.indexOf(startMarker);
@@ -398,35 +254,29 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
                 const block = '\n' + wiringLines.join('\n') + '\n';
                 appTs = before + block + after;
             }
-            // Ensure the createWebServer call includes renderer in options
-            // Case 1: createWebServer(controllers, { ... })
-            const withOptionsRegex = /createWebServer\(\s*controllers\s*,\s*\{([\s\S]*?)\}\s*\)/m;
-            if (withOptionsRegex.test(appTs)) {
-                appTs = appTs.replace(withOptionsRegex, (full, inner) => {
-                    if (/\brenderer\b\s*:/.test(inner))
-                        return full; // already present
-                    const trimmed = inner.trim();
-                    const prefix = trimmed.length ? inner.replace(trimmed, '') : '';
-                    const suffix = inner.endsWith(trimmed) ? '' : inner.slice(inner.indexOf(trimmed) + trimmed.length);
-                    const sep = trimmed.length ? ', ' : '';
-                    return full.replace(inner, `${prefix}${trimmed}${sep}renderer` + `: renderer${suffix}`);
-                });
-            }
-            else {
-                // Case 2: createWebServer(controllers)
-                const noOptionsRegex = /createWebServer\(\s*controllers\s*\)/m;
-                if (noOptionsRegex.test(appTs)) {
-                    appTs = appTs.replace(noOptionsRegex, 'createWebServer(controllers, { renderer })');
+            // Deduplicate import lines across the entire file
+            const lines = appTs.split('\n');
+            const seenImports = new Set();
+            const deduped = lines.filter(line => {
+                const trimmed = line.trim();
+                if (/^import\s+/.test(trimmed) && trimmed.endsWith(';')) {
+                    if (seenImports.has(trimmed))
+                        return false;
+                    seenImports.add(trimmed);
                 }
-            }
+                return true;
+            });
+            appTs = deduped.join('\n');
             fs.writeFileSync(appTsPath, appTs, 'utf8');
+            // eslint-disable-next-line no-console
+            console.log(colors_1.colors.green(`Updated ${appTsPath}`));
         }
         catch (e) {
             // eslint-disable-next-line no-console
-            console.warn(colors_1.colors.yellow(`Could not update app.ts with controllers: ${e instanceof Error ? e.message : String(e)}`));
+            console.warn(colors_1.colors.yellow(`Could not update app.ts: ${e instanceof Error ? e.message : String(e)}`));
         }
     }
-    // Run npm run build
+    // Run build
     (0, cliUtils_1.runCommand)('npm run build', {
         infoMessage: '\nBuilding...',
         successMessage: '[v] Build completed successfully',

package/dist/commands/migrateCommit.js

@@ -51,12 +51,13 @@ function collectModelsFromYaml(yamlPath) {
         allModels.push(...config.models);
         sources.push(`app.yaml (${config.models.length} model(s))`);
     }
-    // Check if it's an app YAML (has modules as array of paths)
-    if (config.modules && Array.isArray(config.modules)) {
+    // App YAML: modules as Record<string, { path }> — resolve path and read module YAML for .models
+    if (config.modules && typeof config.modules === 'object' && !Array.isArray(config.modules)) {
         let moduleCount = 0;
-        config.modules.forEach(moduleRef => {
-            // Handle both string and object format
-            const modulePath = typeof moduleRef === 'string' ? moduleRef : moduleRef.module;
+        for (const entry of Object.values(config.modules)) {
+            const modulePath = entry.path;
+            if (!modulePath)
+                continue;
             const moduleYamlPath = path.isAbsolute(modulePath)
                 ? modulePath
                 : path.resolve(projectRoot, modulePath);
@@ -68,20 +69,7 @@ function collectModelsFromYaml(yamlPath) {
                     moduleCount++;
                 }
             }
-        });
-        if (moduleCount > 0) {
-            sources.push(`app.yaml modules section (${moduleCount} module(s))`);
         }
-    }
-    // Check if modules is an object (legacy format with models embedded)
-    else if (config.modules && typeof config.modules === 'object' && !Array.isArray(config.modules)) {
-        let moduleCount = 0;
-        Object.values(config.modules).forEach(moduleConfig => {
-            if (moduleConfig.models) {
-                allModels.push(...moduleConfig.models);
-                moduleCount++;
-            }
-        });
         if (moduleCount > 0) {
             sources.push(`app.yaml modules section (${moduleCount} module(s))`);
         }

package/dist/commands/migratePush.d.ts

@@ -0,0 +1 @@
+export declare function handleMigratePush(yamlPath?: string): Promise<void>;