@notjustcoders/ioc-arise 1.0.5 → 1.0.8

package/dist/generator/modular/class-sorter.d.ts

@@ -0,0 +1,17 @@
+import { ClassInfo } from '../../types';
+/**
+ * Utility class for sorting classes by their dependencies within modules.
+ * Handles topological sorting to ensure proper instantiation order.
+ */
+export declare class ClassSorter {
+    /**
+     * Sorts classes by their dependencies to ensure proper instantiation order.
+     * Only considers dependencies that are within the same module and are singletons.
+     *
+     * @param classes - Classes to sort
+     * @param allModuleClasses - All classes in the module for dependency lookup
+     * @returns Sorted array of ClassInfo objects
+     */
+    static sortClassesByDependencies(classes: ClassInfo[], allModuleClasses: ClassInfo[]): ClassInfo[];
+}
+//# sourceMappingURL=class-sorter.d.ts.map

package/dist/generator/modular/class-sorter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"class-sorter.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/class-sorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,WAAW;IACtB;;;;;;;OAOG;IACH,MAAM,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAyBnG"}

package/dist/generator/modular/class-sorter.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassSorter = void 0;
+const topological_sorter_1 = require("../../utils/topological-sorter");
+/**
+ * Utility class for sorting classes by their dependencies within modules.
+ * Handles topological sorting to ensure proper instantiation order.
+ */
+class ClassSorter {
+    /**
+     * Sorts classes by their dependencies to ensure proper instantiation order.
+     * Only considers dependencies that are within the same module and are singletons.
+     *
+     * @param classes - Classes to sort
+     * @param allModuleClasses - All classes in the module for dependency lookup
+     * @returns Sorted array of ClassInfo objects
+     */
+    static sortClassesByDependencies(classes, allModuleClasses) {
+        // Build dependency graph for classes within the module
+        const dependencyGraph = new Map();
+        for (const classInfo of classes) {
+            const dependencies = [];
+            // Only include dependencies that are within the same module and are singletons
+            for (const dep of classInfo.dependencies) {
+                const depClass = allModuleClasses.find(c => c.interfaceName === dep && c.scope !== 'transient');
+                if (depClass && classes.includes(depClass)) {
+                    dependencies.push(depClass.name);
+                }
+            }
+            dependencyGraph.set(classInfo.name, dependencies);
+        }
+        // Use TopologicalSorter to sort the classes
+        const sortResult = topological_sorter_1.TopologicalSorter.sort(dependencyGraph);
+        // Map sorted class names back to ClassInfo objects
+        const classMap = new Map(classes.map(c => [c.name, c]));
+        return sortResult.sorted.map(className => classMap.get(className)).filter(Boolean);
+    }
+}
+exports.ClassSorter = ClassSorter;
+//# sourceMappingURL=class-sorter.js.map

package/dist/generator/modular/class-sorter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"class-sorter.js","sourceRoot":"","sources":["../../../src/generator/modular/class-sorter.ts"],"names":[],"mappings":";;;AACA,uEAAmE;AAEnE;;;GAGG;AACH,MAAa,WAAW;IACtB;;;;;;;OAOG;IACH,MAAM,CAAC,yBAAyB,CAAC,OAAoB,EAAE,gBAA6B;QAClF,uDAAuD;QACvD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAoB,CAAC;QAEpD,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;YAChC,MAAM,YAAY,GAAa,EAAE,CAAC;YAElC,+EAA+E;YAC/E,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC;gBAChG,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC3C,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC;QAED,4CAA4C;QAC5C,MAAM,UAAU,GAAG,sCAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE3D,mDAAmD;QACnD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtF,CAAC;CACF;AAlCD,kCAkCC"}

package/dist/generator/modular/container-aggregator.d.ts

@@ -0,0 +1,11 @@
+export declare class ContainerAggregator {
+    /**
+     * Generates the aggregated container code.
+     */
+    generateAggregatedContainer(sortedModules: string[]): string;
+    /**
+     * Generates the type export for the container.
+     */
+    generateModularTypeExport(): string;
+}
+//# sourceMappingURL=container-aggregator.d.ts.map

package/dist/generator/modular/container-aggregator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"container-aggregator.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/container-aggregator.ts"],"names":[],"mappings":"AAKA,qBAAa,mBAAmB;IAC9B;;OAEG;IACH,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5D;;OAEG;IACH,yBAAyB,IAAI,MAAM;CAGpC"}

package/dist/generator/modular/container-aggregator.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContainerAggregator = void 0;
+/**
+ * Responsible for aggregating module containers into a single container.
+ */
+const shared_1 = require("../shared");
+class ContainerAggregator {
+    /**
+     * Generates the aggregated container code.
+     */
+    generateAggregatedContainer(sortedModules) {
+        return shared_1.InstantiationUtils.generateAggregatedContainer(sortedModules);
+    }
+    /**
+     * Generates the type export for the container.
+     */
+    generateModularTypeExport() {
+        return shared_1.InstantiationUtils.generateModularContainerTypeExport();
+    }
+}
+exports.ContainerAggregator = ContainerAggregator;
+//# sourceMappingURL=container-aggregator.js.map

package/dist/generator/modular/container-aggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"container-aggregator.js","sourceRoot":"","sources":["../../../src/generator/modular/container-aggregator.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,sCAA+C;AAE/C,MAAa,mBAAmB;IAC9B;;OAEG;IACH,2BAA2B,CAAC,aAAuB;QACjD,OAAO,2BAAkB,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,yBAAyB;QACvB,OAAO,2BAAkB,CAAC,kCAAkC,EAAE,CAAC;IACjE,CAAC;CACF;AAdD,kDAcC"}

package/dist/generator/modular/index.d.ts

@@ -0,0 +1,5 @@
+export * from './module-container-function-generator';
+export * from './module-instantiation-generator';
+export * from './container-aggregator';
+export * from './modular-container-generator';
+//# sourceMappingURL=index.d.ts.map

package/dist/generator/modular/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC"}

package/dist/generator/modular/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./module-container-function-generator"), exports);
+__exportStar(require("./module-instantiation-generator"), exports);
+__exportStar(require("./container-aggregator"), exports);
+__exportStar(require("./modular-container-generator"), exports);
+//# sourceMappingURL=index.js.map

package/dist/generator/modular/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generator/modular/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,mEAAiD;AACjD,yDAAuC;AACvC,gEAA8C"}

package/dist/generator/modular/modular-container-code-generator.d.ts

@@ -0,0 +1,65 @@
+import { ClassInfo } from '../../types';
+import { DependencyResolver } from '../dependency-resolver';
+/**
+ * Generates the complete modular container code.
+ * Orchestrates the generation of module functions, aggregated container, and type exports.
+ */
+export declare class ModularContainerCodeGenerator {
+    private camelCase;
+    private moduleContainerFunctionGenerator;
+    private moduleExportGenerator;
+    constructor(dependencyResolver: DependencyResolver, camelCase: (str: string) => string);
+    /**
+     * Generates the complete modular container code.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated container code
+     */
+    generateContainerCode(moduleGroupedClasses: Map<string, ClassInfo[]>): string;
+    /**
+     * Generates the aggregated container that combines all modules.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @param allModuleClasses - All classes across all modules
+     * @returns Generated aggregated container code
+     */
+    private generateAggregatedContainer;
+    /**
+     * Generates module instantiations for the aggregated container.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @param allModuleClasses - All classes across all modules
+     * @returns Generated module instantiation code
+     */
+    private generateModuleInstantiations;
+    /**
+     * Generates container properties that expose all module instances.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated container properties code
+     */
+    private generateContainerProperties;
+    /**
+     * Generates the modular type export for TypeScript support.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated type export code
+     */
+    private generateModularTypeExport;
+    /**
+     * Gets all classes from all modules.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Array of all classes
+     */
+    private getAllModuleClasses;
+    /**
+     * Gets external dependencies for a module.
+     *
+     * @param moduleClasses - Classes in the module
+     * @param allModuleClasses - All classes across all modules
+     * @returns Set of external dependency class names
+     */
+    private getModuleExternalDependencies;
+}
+//# sourceMappingURL=modular-container-code-generator.d.ts.map

package/dist/generator/modular/modular-container-code-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modular-container-code-generator.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/modular-container-code-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;GAGG;AACH,qBAAa,6BAA6B;IAMtC,OAAO,CAAC,SAAS;IALnB,OAAO,CAAC,gCAAgC,CAAmC;IAC3E,OAAO,CAAC,qBAAqB,CAAwB;gBAGnD,kBAAkB,EAAE,kBAAkB,EAC9B,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM;IAS5C;;;;;OAKG;IACH,qBAAqB,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,MAAM;IAyB7E;;;;;;OAMG;IACH,OAAO,CAAC,2BAA2B;IAoBnC;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA0CpC;;;;;OAKG;IACH,OAAO,CAAC,2BAA2B;IAcnC;;;;;OAKG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;CAoBtC"}

package/dist/generator/modular/modular-container-code-generator.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModularContainerCodeGenerator = void 0;
+const module_container_function_generator_1 = require("./module-container-function-generator");
+const module_export_generator_1 = require("./module-export-generator");
+/**
+ * Generates the complete modular container code.
+ * Orchestrates the generation of module functions, aggregated container, and type exports.
+ */
+class ModularContainerCodeGenerator {
+    constructor(dependencyResolver, camelCase) {
+        this.camelCase = camelCase;
+        this.moduleContainerFunctionGenerator = new module_container_function_generator_1.ModuleContainerFunctionGenerator(dependencyResolver, camelCase);
+        this.moduleExportGenerator = new module_export_generator_1.ModuleExportGenerator(camelCase);
+    }
+    /**
+     * Generates the complete modular container code.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated container code
+     */
+    generateContainerCode(moduleGroupedClasses) {
+        const allModuleClasses = this.getAllModuleClasses(moduleGroupedClasses);
+        const parts = [];
+        // Generate individual module functions
+        for (const [moduleName, classes] of moduleGroupedClasses) {
+            const moduleFunction = this.moduleContainerFunctionGenerator.generateModuleFunction(moduleName, classes, allModuleClasses);
+            parts.push(moduleFunction);
+        }
+        // Generate aggregated container
+        const aggregatedContainer = this.generateAggregatedContainer(moduleGroupedClasses, allModuleClasses);
+        parts.push(aggregatedContainer);
+        // Generate modular type export
+        const typeExport = this.generateModularTypeExport(moduleGroupedClasses);
+        parts.push(typeExport);
+        return parts.join('\n\n');
+    }
+    /**
+     * Generates the aggregated container that combines all modules.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @param allModuleClasses - All classes across all modules
+     * @returns Generated aggregated container code
+     */
+    generateAggregatedContainer(moduleGroupedClasses, allModuleClasses) {
+        const moduleInstantiations = this.generateModuleInstantiations(moduleGroupedClasses, allModuleClasses);
+        const containerProperties = this.generateContainerProperties(moduleGroupedClasses);
+        return `function createContainer() {\n` +
+            `${moduleInstantiations}\n\n` +
+            `  return {\n` +
+            `${containerProperties}\n` +
+            `  };\n` +
+            `}\n\n` +
+            `export const container = createContainer();`;
+    }
+    /**
+     * Generates module instantiations for the aggregated container.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @param allModuleClasses - All classes across all modules
+     * @returns Generated module instantiation code
+     */
+    generateModuleInstantiations(moduleGroupedClasses, allModuleClasses) {
+        const moduleNames = Array.from(moduleGroupedClasses.keys());
+        const instantiations = [];
+        // First pass: create modules without dependencies
+        const modulesWithoutDeps = moduleNames.filter(moduleName => {
+            const classes = moduleGroupedClasses.get(moduleName);
+            const externalDeps = this.getModuleExternalDependencies(classes, allModuleClasses);
+            return externalDeps.size === 0;
+        });
+        for (const moduleName of modulesWithoutDeps) {
+            const classes = moduleGroupedClasses.get(moduleName);
+            const instantiation = this.moduleExportGenerator.generateModuleInstantiation(moduleName, classes, allModuleClasses);
+            instantiations.push(instantiation);
+        }
+        // Second pass: create modules with dependencies
+        const modulesWithDeps = moduleNames.filter(moduleName => !modulesWithoutDeps.includes(moduleName));
+        for (const moduleName of modulesWithDeps) {
+            const classes = moduleGroupedClasses.get(moduleName);
+            const instantiation = this.moduleExportGenerator.generateModuleInstantiation(moduleName, classes, allModuleClasses);
+            instantiations.push(instantiation);
+        }
+        return instantiations.join('\n');
+    }
+    /**
+     * Generates container properties that expose all module instances.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated container properties code
+     */
+    generateContainerProperties(moduleGroupedClasses) {
+        const properties = [];
+        for (const [moduleName, classes] of moduleGroupedClasses) {
+            for (const classInfo of classes) {
+                const propertyName = this.camelCase(classInfo.name);
+                const moduleProperty = this.camelCase(moduleName);
+                properties.push(`    get ${propertyName}() { return ${moduleProperty}Module.${propertyName}; }`);
+            }
+        }
+        return properties.join(',\n');
+    }
+    /**
+     * Generates the modular type export for TypeScript support.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Generated type export code
+     */
+    generateModularTypeExport(moduleGroupedClasses) {
+        const typeProperties = [];
+        for (const [, classes] of moduleGroupedClasses) {
+            for (const classInfo of classes) {
+                const propertyName = this.camelCase(classInfo.name);
+                const interfaceName = classInfo.interfaceName || classInfo.name;
+                typeProperties.push(`  ${propertyName}: ${interfaceName};`);
+            }
+        }
+        return `export type ModularContainer = {\n${typeProperties.join('\n')}\n};`;
+    }
+    /**
+     * Gets all classes from all modules.
+     *
+     * @param moduleGroupedClasses - Map of module names to their classes
+     * @returns Array of all classes
+     */
+    getAllModuleClasses(moduleGroupedClasses) {
+        const allClasses = [];
+        for (const classes of moduleGroupedClasses.values()) {
+            allClasses.push(...classes);
+        }
+        return allClasses;
+    }
+    /**
+     * Gets external dependencies for a module.
+     *
+     * @param moduleClasses - Classes in the module
+     * @param allModuleClasses - All classes across all modules
+     * @returns Set of external dependency class names
+     */
+    getModuleExternalDependencies(moduleClasses, allModuleClasses) {
+        const externalDeps = new Set();
+        const currentModuleInterfaces = new Set(moduleClasses.map(c => c.interfaceName));
+        for (const classInfo of moduleClasses) {
+            for (const dep of classInfo.dependencies) {
+                if (!currentModuleInterfaces.has(dep)) {
+                    const externalClass = allModuleClasses.find(c => c.interfaceName === dep);
+                    if (externalClass) {
+                        externalDeps.add(externalClass.name);
+                    }
+                }
+            }
+        }
+        return externalDeps;
+    }
+}
+exports.ModularContainerCodeGenerator = ModularContainerCodeGenerator;
+//# sourceMappingURL=modular-container-code-generator.js.map

package/dist/generator/modular/modular-container-code-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modular-container-code-generator.js","sourceRoot":"","sources":["../../../src/generator/modular/modular-container-code-generator.ts"],"names":[],"mappings":";;;AACA,+FAAyF;AACzF,uEAAkE;AAGlE;;;GAGG;AACH,MAAa,6BAA6B;IAIxC,YACE,kBAAsC,EAC9B,SAAkC;QAAlC,cAAS,GAAT,SAAS,CAAyB;QAE1C,IAAI,CAAC,gCAAgC,GAAG,IAAI,sEAAgC,CAC1E,kBAAkB,EAClB,SAAS,CACV,CAAC;QACF,IAAI,CAAC,qBAAqB,GAAG,IAAI,+CAAqB,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,oBAA8C;QAClE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;QACxE,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,uCAAuC;QACvC,KAAK,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,oBAAoB,EAAE,CAAC;YACzD,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,CAAC,sBAAsB,CACjF,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7B,CAAC;QAED,gCAAgC;QAChC,MAAM,mBAAmB,GAAG,IAAI,CAAC,2BAA2B,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;QACrG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEhC,+BAA+B;QAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;QACxE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;OAMG;IACK,2BAA2B,CACjC,oBAA8C,EAC9C,gBAA6B;QAE7B,MAAM,oBAAoB,GAAG,IAAI,CAAC,4BAA4B,CAC5D,oBAAoB,EACpB,gBAAgB,CACjB,CAAC;QAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAEnF,OAAO,gCAAgC;YAChC,GAAG,oBAAoB,MAAM;YAC7B,cAAc;YACd,GAAG,mBAAmB,IAAI;YAC1B,QAAQ;YACR,OAAO;YACP,6CAA6C,CAAC;IACvD,CAAC;IAED;;;;;;OAMG;IACK,4BAA4B,CAClC,oBAA8C,EAC9C,gBAA6B;QAE7B,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,kDAAkD;QAClD,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YACzD,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACtD,MAAM,YAAY,GAAG,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACnF,OAAO,YAAY,CAAC,IAAI,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACtD,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAC1E,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB,CAAC;YACF,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAED,gDAAgD;QAChD,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtD,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CACzC,CAAC;QAEF,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACtD,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAC1E,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB,CAAC;YACF,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACK,2BAA2B,CAAC,oBAA8C;QAChF,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,KAAK,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,oBAAoB,EAAE,CAAC;YACzD,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACpD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gBAClD,UAAU,CAAC,IAAI,CAAC,WAAW,YAAY,eAAe,cAAc,UAAU,YAAY,KAAK,CAAC,CAAC;YACnG,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACK,yBAAyB,CAAC,oBAA8C;QAC9E,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,oBAAoB,EAAE,CAAC;YAC/C,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,IAAI,CAAC;gBAChE,cAAc,CAAC,IAAI,CAAC,KAAK,YAAY,KAAK,aAAa,GAAG,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAED,OAAO,qCAAqC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACK,mBAAmB,CAAC,oBAA8C;QACxE,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,KAAK,MAAM,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,EAAE,CAAC;YACpD,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;;OAMG;IACK,6BAA6B,CACnC,aAA0B,EAC1B,gBAA6B;QAE7B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QAEjF,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;YACtC,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;gBACzC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,GAAG,CAAC,CAAC;oBAC1E,IAAI,aAAa,EAAE,CAAC;wBAClB,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACvC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AA3MD,sEA2MC"}

package/dist/generator/modular/modular-container-generator.d.ts

@@ -0,0 +1,24 @@
+import { ModuleDependencyResolver } from '../../analyser/module-dependency-resolver';
+import { ClassInfo } from '../../types';
+import { ImportGenerator } from '../import-generator';
+import { BaseContainerGenerator } from '../base-container-generator';
+import { FileWriter } from '../file-writer';
+import { ModuleContainerFunctionGenerator } from './module-container-function-generator';
+import { ModuleInstantiationGenerator } from './module-instantiation-generator';
+import { ContainerAggregator } from './container-aggregator';
+/**
+ * Generator for modular container structure.
+ * Handles module-based dependency injection with inter-module dependencies.
+ */
+export declare class ModularContainerGenerator extends BaseContainerGenerator {
+    private moduleGroupedClasses;
+    private moduleDependencyResolver;
+    private moduleContainerFunctionGenerator;
+    private moduleInstantiationGenerator;
+    private containerAggregator;
+    constructor(fileWriter: FileWriter, moduleGroupedClasses: Map<string, ClassInfo[]>, moduleDependencyResolver: ModuleDependencyResolver, importGenerator: ImportGenerator, moduleContainerFunctionGenerator: ModuleContainerFunctionGenerator, moduleInstantiationGenerator: ModuleInstantiationGenerator, containerAggregator: ContainerAggregator);
+    generate(): void;
+    protected generateContainerCode(sortedModules?: string[], moduleDependencies?: Map<string, Set<string>>): string;
+    private generateModuleContainers;
+}
+//# sourceMappingURL=modular-container-generator.d.ts.map

package/dist/generator/modular/modular-container-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modular-container-generator.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/modular-container-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,sBAAsB;IACnE,OAAO,CAAC,oBAAoB,CAA2B;IACvD,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,gCAAgC,CAAmC;IAC3E,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,mBAAmB,CAAsB;gBAG/C,UAAU,EAAE,UAAU,EACtB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC9C,wBAAwB,EAAE,wBAAwB,EAClD,eAAe,EAAE,eAAe,EAChC,gCAAgC,EAAE,gCAAgC,EAClE,4BAA4B,EAAE,4BAA4B,EAC1D,mBAAmB,EAAE,mBAAmB;IAU1C,QAAQ,IAAI,IAAI;IAqBhB,SAAS,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM;IAehH,OAAO,CAAC,wBAAwB;CAUjC"}

package/dist/generator/modular/modular-container-generator.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModularContainerGenerator = void 0;
+const dependency_resolver_1 = require("../../analyser/dependency-resolver");
+const base_container_generator_1 = require("../base-container-generator");
+/**
+ * Generator for modular container structure.
+ * Handles module-based dependency injection with inter-module dependencies.
+ */
+class ModularContainerGenerator extends base_container_generator_1.BaseContainerGenerator {
+    constructor(fileWriter, moduleGroupedClasses, moduleDependencyResolver, importGenerator, moduleContainerFunctionGenerator, moduleInstantiationGenerator, containerAggregator) {
+        super(fileWriter, importGenerator);
+        this.moduleGroupedClasses = moduleGroupedClasses;
+        this.moduleDependencyResolver = moduleDependencyResolver;
+        this.moduleContainerFunctionGenerator = moduleContainerFunctionGenerator;
+        this.moduleInstantiationGenerator = moduleInstantiationGenerator;
+        this.containerAggregator = containerAggregator;
+    }
+    generate() {
+        // First, check for module-level cycles
+        const moduleResult = this.moduleDependencyResolver.resolve();
+        if (moduleResult.cycles.length > 0) {
+            throw new Error(`Circular dependencies detected between modules: ${JSON.stringify(moduleResult.cycles)}`);
+        }
+        // Then resolve class-level dependencies within each module
+        const allClasses = Array.from(this.moduleGroupedClasses.values()).flat();
+        const dependencyResolver = new dependency_resolver_1.DependencyResolver(allClasses);
+        const sortResult = dependencyResolver.resolve();
+        if (sortResult.cycles.length > 0) {
+            throw new Error(`Circular dependencies detected within classes: ${JSON.stringify(sortResult.cycles)}`);
+        }
+        const containerCode = this.generateContainerCode(moduleResult.sortedModules, moduleResult.moduleDependencies);
+        this.writeContainer(containerCode);
+    }
+    generateContainerCode(sortedModules, moduleDependencies) {
+        if (!sortedModules || !moduleDependencies) {
+            const moduleResult = this.moduleDependencyResolver.resolve();
+            sortedModules = moduleResult.sortedModules;
+            moduleDependencies = moduleResult.moduleDependencies;
+        }
+        const imports = this.importGenerator.generateImports();
+        const moduleContainers = this.generateModuleContainers(sortedModules, moduleDependencies);
+        const aggregatedContainer = this.containerAggregator.generateAggregatedContainer(sortedModules);
+        const typeExport = this.containerAggregator.generateModularTypeExport();
+        return `${imports}\n\n${moduleContainers}\n\n${aggregatedContainer}\n\n${typeExport}\n`;
+    }
+    generateModuleContainers(sortedModules, moduleDependencies) {
+        const moduleContainerFunctions = this.moduleContainerFunctionGenerator.generateModuleContainerFunctions(sortedModules, moduleDependencies);
+        const moduleInstantiations = this.moduleInstantiationGenerator.generateModuleInstantiations(sortedModules, moduleDependencies);
+        return moduleContainerFunctions.join('\n\n') + '\n\n' + moduleInstantiations.join('\n');
+    }
+}
+exports.ModularContainerGenerator = ModularContainerGenerator;
+//# sourceMappingURL=modular-container-generator.js.map

package/dist/generator/modular/modular-container-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modular-container-generator.js","sourceRoot":"","sources":["../../../src/generator/modular/modular-container-generator.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AAIxE,0EAAqE;AAMrE;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,iDAAsB;IAOnE,YACE,UAAsB,EACtB,oBAA8C,EAC9C,wBAAkD,EAClD,eAAgC,EAChC,gCAAkE,EAClE,4BAA0D,EAC1D,mBAAwC;QAExC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,IAAI,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;QACzE,IAAI,CAAC,4BAA4B,GAAG,4BAA4B,CAAC;QACjE,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;IAED,QAAQ;QACN,uCAAuC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC;QAE7D,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,mDAAmD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5G,CAAC;QAED,2DAA2D;QAC3D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACzE,MAAM,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAEhD,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzG,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;QAC9G,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IAES,qBAAqB,CAAC,aAAwB,EAAE,kBAA6C;QACrG,IAAI,CAAC,aAAa,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC;YAC7D,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;YAC3C,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;QACvD,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QAC1F,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAC;QAChG,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;QAExE,OAAO,GAAG,OAAO,OAAO,gBAAgB,OAAO,mBAAmB,OAAO,UAAU,IAAI,CAAC;IAC1F,CAAC;IAEO,wBAAwB,CAAC,aAAuB,EAAE,kBAA4C;QACpG,MAAM,wBAAwB,GAAG,IAAI,CAAC,gCAAgC,CAAC,gCAAgC,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QAC3I,MAAM,oBAAoB,GAAG,IAAI,CAAC,4BAA4B,CAAC,4BAA4B,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QAE/H,OAAO,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1F,CAAC;CAKF;AAtED,8DAsEC"}

package/dist/generator/modular/module-container-function-generator.d.ts

@@ -0,0 +1,24 @@
+import { ClassInfo } from '../../types';
+import { ModuleFunctionSignatureGenerator } from './module-function-signature-generator';
+import { ModuleDependencyResolver } from './module-dependency-resolver';
+import { ModuleFunctionBodyGenerator } from './module-function-body-generator';
+/**
+ * Coordinates the generation of module container functions.
+ * Delegates specific responsibilities to specialized generators.
+ */
+export declare class ModuleContainerFunctionGenerator {
+    private moduleGroupedClasses;
+    private signatureGenerator;
+    private dependencyResolver;
+    private bodyGenerator;
+    constructor(moduleGroupedClasses: Map<string, ClassInfo[]>, signatureGenerator: ModuleFunctionSignatureGenerator, dependencyResolver: ModuleDependencyResolver, bodyGenerator: ModuleFunctionBodyGenerator);
+    /**
+     * Generates container functions for all modules.
+     */
+    generateModuleContainerFunctions(sortedModules: string[], moduleDependencies: Map<string, Set<string>>): string[];
+    /**
+     * Creates a container function for a specific module.
+     */
+    private createModuleContainerFunction;
+}
+//# sourceMappingURL=module-container-function-generator.d.ts.map

package/dist/generator/modular/module-container-function-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-container-function-generator.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/module-container-function-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E;;;GAGG;AACH,qBAAa,gCAAgC;IAC3C,OAAO,CAAC,oBAAoB,CAA2B;IACvD,OAAO,CAAC,kBAAkB,CAAmC;IAC7D,OAAO,CAAC,kBAAkB,CAA2B;IACrD,OAAO,CAAC,aAAa,CAA8B;gBAGjD,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC9C,kBAAkB,EAAE,gCAAgC,EACpD,kBAAkB,EAAE,wBAAwB,EAC5C,aAAa,EAAE,2BAA2B;IAQ5C;;OAEG;IACH,gCAAgC,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE;IAcjH;;OAEG;IACH,OAAO,CAAC,6BAA6B;CAYtC"}

package/dist/generator/modular/module-container-function-generator.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleContainerFunctionGenerator = void 0;
+/**
+ * Coordinates the generation of module container functions.
+ * Delegates specific responsibilities to specialized generators.
+ */
+class ModuleContainerFunctionGenerator {
+    constructor(moduleGroupedClasses, signatureGenerator, dependencyResolver, bodyGenerator) {
+        this.moduleGroupedClasses = moduleGroupedClasses;
+        this.signatureGenerator = signatureGenerator;
+        this.dependencyResolver = dependencyResolver;
+        this.bodyGenerator = bodyGenerator;
+    }
+    /**
+     * Generates container functions for all modules.
+     */
+    generateModuleContainerFunctions(sortedModules, moduleDependencies) {
+        const moduleContainerFunctions = [];
+        for (const moduleName of sortedModules) {
+            const moduleClasses = this.moduleGroupedClasses.get(moduleName);
+            if (!moduleClasses)
+                continue;
+            const moduleContainerFunction = this.createModuleContainerFunction(moduleName, moduleClasses, moduleDependencies);
+            moduleContainerFunctions.push(moduleContainerFunction);
+        }
+        return moduleContainerFunctions;
+    }
+    /**
+     * Creates a container function for a specific module.
+     */
+    createModuleContainerFunction(moduleName, moduleClasses, moduleDependencies) {
+        const moduleFunctionName = `create${moduleName}Container`;
+        const moduleDeps = moduleDependencies.get(moduleName) || new Set();
+        const functionParams = this.signatureGenerator.generateFunctionParameters(moduleDeps);
+        const functionSignature = this.signatureGenerator.createFunctionSignature(moduleFunctionName, functionParams);
+        const functionBody = this.bodyGenerator.generateModuleFunctionBody(moduleClasses, moduleDeps);
+        return `${functionSignature} {\n${functionBody}\n}`;
+    }
+}
+exports.ModuleContainerFunctionGenerator = ModuleContainerFunctionGenerator;
+//# sourceMappingURL=module-container-function-generator.js.map

package/dist/generator/modular/module-container-function-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-container-function-generator.js","sourceRoot":"","sources":["../../../src/generator/modular/module-container-function-generator.ts"],"names":[],"mappings":";;;AAKA;;;GAGG;AACH,MAAa,gCAAgC;IAM3C,YACE,oBAA8C,EAC9C,kBAAoD,EACpD,kBAA4C,EAC5C,aAA0C;QAE1C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,gCAAgC,CAAC,aAAuB,EAAE,kBAA4C;QACpG,MAAM,wBAAwB,GAAa,EAAE,CAAC;QAE9C,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChE,IAAI,CAAC,aAAa;gBAAE,SAAS;YAE7B,MAAM,uBAAuB,GAAG,IAAI,CAAC,6BAA6B,CAAC,UAAU,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC;YAClH,wBAAwB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,6BAA6B,CAAC,UAAkB,EAAE,aAA0B,EAAE,kBAA4C;QAChI,MAAM,kBAAkB,GAAG,SAAS,UAAU,WAAW,CAAC;QAC1D,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAEnE,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;QACtF,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAC9G,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAE9F,OAAO,GAAG,iBAAiB,OAAO,YAAY,KAAK,CAAC;IACtD,CAAC;CAGF;AAlDD,4EAkDC"}

package/dist/generator/modular/module-dependency-resolver.d.ts

@@ -0,0 +1,22 @@
+import { ClassInfo } from '../../types';
+/**
+ * Responsible for resolving dependencies within and across modules.
+ * Handles both internal module dependencies and external module dependencies.
+ */
+export declare class ModuleDependencyResolver {
+    private moduleGroupedClasses;
+    constructor(moduleGroupedClasses: Map<string, ClassInfo[]>);
+    /**
+     * Builds constructor arguments for a class.
+     */
+    buildConstructorArguments(classInfo: ClassInfo, moduleClasses: ClassInfo[], moduleDeps: Set<string>): string[];
+    /**
+     * Resolves a dependency argument.
+     */
+    private resolveDependencyArgument;
+    /**
+     * Finds a dependency from an external module.
+     */
+    private findExternalModuleDependency;
+}
+//# sourceMappingURL=module-dependency-resolver.d.ts.map

package/dist/generator/modular/module-dependency-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-dependency-resolver.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/module-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;gBAE3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAI1D;;OAEG;IACH,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE;IAa9G;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAWjC;;OAEG;IACH,OAAO,CAAC,4BAA4B;CAerC"}

package/dist/generator/modular/module-dependency-resolver.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleDependencyResolver = void 0;
+const shared_1 = require("../shared");
+/**
+ * Responsible for resolving dependencies within and across modules.
+ * Handles both internal module dependencies and external module dependencies.
+ */
+class ModuleDependencyResolver {
+    constructor(moduleGroupedClasses) {
+        this.moduleGroupedClasses = moduleGroupedClasses;
+    }
+    /**
+     * Builds constructor arguments for a class.
+     */
+    buildConstructorArguments(classInfo, moduleClasses, moduleDeps) {
+        const constructorArgs = [];
+        for (const dep of classInfo.dependencies) {
+            const arg = this.resolveDependencyArgument(dep, moduleClasses, moduleDeps);
+            if (arg) {
+                constructorArgs.push(arg);
+            }
+        }
+        return constructorArgs;
+    }
+    /**
+     * Resolves a dependency argument.
+     */
+    resolveDependencyArgument(dependency, moduleClasses, moduleDeps) {
+        // Check if dependency is from another module
+        const externalModuleArg = this.findExternalModuleDependency(dependency, moduleDeps);
+        if (externalModuleArg) {
+            return externalModuleArg;
+        }
+        // Check if dependency is from the same module
+        return shared_1.InstantiationUtils.resolveBasicDependency(dependency, moduleClasses);
+    }
+    /**
+     * Finds a dependency from an external module.
+     */
+    findExternalModuleDependency(dependency, moduleDeps) {
+        for (const depModule of moduleDeps) {
+            const depModuleClasses = this.moduleGroupedClasses.get(depModule);
+            if (depModuleClasses) {
+                const depClass = depModuleClasses.find(c => c.interfaceName === dependency);
+                if (depClass) {
+                    const depModuleVarName = shared_1.InstantiationUtils.toCamelCase(depModule) + 'Container';
+                    return `${depModuleVarName}.${dependency}`;
+                }
+            }
+        }
+        return null;
+    }
+}
+exports.ModuleDependencyResolver = ModuleDependencyResolver;
+//# sourceMappingURL=module-dependency-resolver.js.map