@notjustcoders/ioc-arise 1.1.28 → 1.1.30

package/dist/commands/generate.js

@@ -14,22 +14,22 @@ const IoCError_1 = require("../errors/IoCError");
 const moduleResolver_1 = require("../utils/moduleResolver");
 const tsConfigPathsResolver_1 = require("../utils/tsConfigPathsResolver");
 const logger_1 = require("../utils/logger");
-exports.generateCommand = new commander_1.Command('generate')
-    .description('Generate IoC container from TypeScript classes')
-    .option('-s, --source <dir>', 'Source directory to scan')
-    .option('-o, --output <file>', 'Output file path')
-    .option('-i, --interface <pattern>', 'Interface name pattern to match (regex)')
-    .option('-e, --exclude <patterns...>', 'Exclude patterns for files')
-    .option('--factory-pattern <pattern>', 'Factory function name pattern to match (regex). Default: functions with @factory JSDoc comment')
-    .option('--value-pattern <pattern>', 'Value name pattern to match (regex). Default: values with @value JSDoc comment')
-    .option('--check-cycles', 'Only check for circular dependencies without generating')
-    .option('--verbose', 'Enable verbose logging')
+exports.generateCommand = new commander_1.Command("generate")
+    .description("Generate IoC container from TypeScript classes")
+    .option("-s, --source <dir>", "Source directory to scan")
+    .option("-o, --output <file>", "Output file path")
+    .option("-i, --interface <pattern>", "Interface name pattern to match (regex)")
+    .option("-e, --exclude <patterns...>", "Exclude patterns for files")
+    .option("--factory-pattern <pattern>", "Factory function name pattern to match (regex). Default: functions with @factory JSDoc comment")
+    .option("--value-pattern <pattern>", "Value name pattern to match (regex). Default: values with @value JSDoc comment")
+    .option("--check-cycles", "Only check for circular dependencies without generating")
+    .option("--verbose", "Enable verbose logging")
     .action(async (options) => {
     try {
         // Initialize logger
         logger_1.Logger.initialize({ verbose: options.verbose ?? false });
         // Initialize config manager with the source directory
-        const initialSourceDir = (0, path_1.resolve)(options.source || '.');
+        const initialSourceDir = (0, path_1.resolve)(options.source || ".");
         const configManager = new configManager_1.ConfigManager(initialSourceDir);
         // Validate config if present
         if (configManager.hasConfigFile()) {
@@ -47,7 +47,8 @@ exports.generateCommand = new commander_1.Command('generate')
         }
         // Initialize module resolver if modules are configured
         let moduleResolver = null;
-        if (mergedOptions.modules && Object.keys(mergedOptions.modules).length > 0) {
+        if (mergedOptions.modules &&
+            Object.keys(mergedOptions.modules).length > 0) {
             moduleResolver = new moduleResolver_1.ModuleResolver(mergedOptions.modules, sourceDir);
             if (mergedOptions.verbose) {
                 logger_1.Logger.info(`Module support enabled with ${Object.keys(mergedOptions.modules).length} modules`);
@@ -65,20 +66,22 @@ exports.generateCommand = new commander_1.Command('generate')
                 logger_1.Logger.info(`Interface pattern: ${mergedOptions.interface}`);
             }
         }
-        logger_1.Logger.custom('🚀', 'Starting analysis...', logger_1.Logger.getColors().cyan + logger_1.Logger.getColors().bright);
+        logger_1.Logger.custom("🚀", "Starting analysis...", logger_1.Logger.getColors().cyan + logger_1.Logger.getColors().bright);
         // Analyze the project (including factories)
         const { classes, factories, values } = await (0, analyser_1.analyzeProjectWithFactories)(sourceDir, {
             sourceDir,
             interfacePattern: mergedOptions.interface,
             excludePatterns: mergedOptions.exclude,
             factoryPattern: mergedOptions.factoryPattern,
-            valuePattern: mergedOptions.valuePattern
+            valuePattern: mergedOptions.valuePattern,
         });
         // Check if we have anything to generate
-        if (classes.length === 0 && (!factories || factories.length === 0) && (!values || values.length === 0)) {
+        if (classes.length === 0 &&
+            (!factories || factories.length === 0) &&
+            (!values || values.length === 0)) {
             const error = errorFactory_1.ErrorFactory.noClassesFound(mergedOptions.interface || 'interfaces with "implements" keyword');
             logger_1.Logger.error(IoCError_1.ErrorUtils.formatForConsole(error));
-            logger_1.Logger.error('No classes, factories, or values found to generate a container.');
+            logger_1.Logger.error("No classes, factories, or values found to generate a container.");
             process.exit(1);
             return;
         }
@@ -91,7 +94,8 @@ exports.generateCommand = new commander_1.Command('generate')
                 moduleGroupedClasses = moduleResolver.groupClassesByModule(classes);
             }
             if (factories && factories.length > 0) {
-                moduleGroupedFactories = moduleResolver.groupFactoriesByModule(factories);
+                moduleGroupedFactories =
+                    moduleResolver.groupFactoriesByModule(factories);
             }
             if (values && values.length > 0) {
                 moduleGroupedValues = moduleResolver.groupValuesByModule(values);
@@ -99,7 +103,7 @@ exports.generateCommand = new commander_1.Command('generate')
         }
         else {
             if (classes.length > 0) {
-                moduleGroupedClasses = new Map([['CoreModule', classes]]);
+                moduleGroupedClasses = new Map([["CoreModule", classes]]);
             }
         }
         // Print structured analysis summary
@@ -111,65 +115,67 @@ exports.generateCommand = new commander_1.Command('generate')
         if (cycles.length > 0) {
             const firstCycle = cycles[0];
             if (firstCycle && firstCycle.length > 0) {
-                const className = firstCycle[0] || 'unknown';
+                const className = firstCycle[0] || "unknown";
                 const error = errorFactory_1.ErrorFactory.circularDependency(className, firstCycle);
                 logger_1.Logger.error(IoCError_1.ErrorUtils.formatForConsole(error));
                 if (cycles.length > 1) {
-                    logger_1.Logger.log('\n   Additional cycles:');
+                    logger_1.Logger.log("\n   Additional cycles:");
                     cycles.slice(1).forEach((cycle, index) => {
-                        logger_1.Logger.log(`   ${index + 2}. ${cycle.join(' → ')}`);
+                        logger_1.Logger.log(`   ${index + 2}. ${cycle.join(" → ")}`);
                     });
                 }
             }
             else {
-                logger_1.Logger.error('Circular dependencies detected but cycle information is incomplete');
+                logger_1.Logger.error("Circular dependencies detected but cycle information is incomplete");
             }
             process.exit(1);
         }
         // Check for circular dependencies between modules
-        if (moduleGroupedClasses && moduleGroupedClasses.size > 1 && classes.length > 0) {
+        if (moduleGroupedClasses &&
+            moduleGroupedClasses.size > 1 &&
+            classes.length > 0) {
             const moduleCycles = circular_dependency_detector_1.CircularDependencyDetector.detectModuleCycles(moduleGroupedClasses);
             if (moduleCycles.length > 0) {
-                logger_1.Logger.error('Circular dependencies detected between modules:');
+                logger_1.Logger.error("Circular dependencies detected between modules:");
                 moduleCycles.forEach((cycle, index) => {
                     if (cycle.length > 0) {
                         // The cycle already includes the starting node at the end from TopologicalSorter
-                        const cycleDisplay = cycle.join(' → ');
+                        const cycleDisplay = cycle.join(" → ");
                         logger_1.Logger.log(`   ${index + 1}. ${cycleDisplay}`);
                     }
                 });
-                logger_1.Logger.log('\n   Module dependencies must form a directed acyclic graph (DAG).');
-                logger_1.Logger.log('   Consider refactoring to break the circular dependency or merging the modules.');
+                logger_1.Logger.log("\n   Module dependencies must form a directed acyclic graph (DAG).");
+                logger_1.Logger.log("   Consider refactoring to break the circular dependency or merging the modules.");
                 process.exit(1);
             }
         }
         if (mergedOptions.checkCycles) {
-            logger_1.Logger.success('No circular dependencies found (classes or modules).');
+            logger_1.Logger.success("No circular dependencies found (classes or modules).");
             process.exit(0);
             return;
         }
         // Generate container file
-        logger_1.Logger.custom('🚀', 'Generating container...', logger_1.Logger.getColors().cyan + logger_1.Logger.getColors().bright);
+        logger_1.Logger.custom("🚀", "Generating container...", logger_1.Logger.getColors().cyan + logger_1.Logger.getColors().bright);
         const pathsResolver = new tsConfigPathsResolver_1.TsConfigPathsResolver(sourceDir);
         generator_1.IoCContainerGenerator.generate(classes, outputPath, moduleGroupedClasses, factories, values, moduleGroupedFactories, moduleGroupedValues, pathsResolver, moduleResolver !== null);
         const statParts = [];
         if (classes.length > 0)
-            statParts.push(`${classes.length} class${classes.length !== 1 ? 'es' : ''}`);
+            statParts.push(`${classes.length} class${classes.length !== 1 ? "es" : ""}`);
         if (factories && factories.length > 0)
-            statParts.push(`${factories.length} factor${factories.length !== 1 ? 'ies' : 'y'}`);
+            statParts.push(`${factories.length} factor${factories.length !== 1 ? "ies" : "y"}`);
         if (values && values.length > 0)
-            statParts.push(`${values.length} value${values.length !== 1 ? 's' : ''}`);
+            statParts.push(`${values.length} value${values.length !== 1 ? "s" : ""}`);
         if (moduleResolver) {
             const moduleCount = new Set([
                 ...(moduleGroupedClasses?.keys() ?? []),
                 ...(moduleGroupedFactories?.keys() ?? []),
                 ...(moduleGroupedValues?.keys() ?? []),
             ]).size;
-            statParts.unshift(`${moduleCount} module${moduleCount !== 1 ? 's' : ''}`);
+            statParts.unshift(`${moduleCount} module${moduleCount !== 1 ? "s" : ""}`);
         }
-        logger_1.Logger.success('Container generated successfully!');
+        logger_1.Logger.success("Container generated successfully!");
         logger_1.Logger.log(logger_1.Logger.colorizeText(`   📁 ${outputPath}`, logger_1.Logger.getColors().gray));
-        logger_1.Logger.log(logger_1.Logger.colorizeText(`   ${statParts.join(' · ')}`, logger_1.Logger.getColors().gray));
+        logger_1.Logger.log(logger_1.Logger.colorizeText(`   ${statParts.join(" · ")}`, logger_1.Logger.getColors().gray));
         process.exit(0);
     }
     catch (error) {
@@ -188,33 +194,48 @@ function printAnalysisSummary(isModular, moduleGroupedClasses, moduleGroupedFact
     const printClass = (cls, indent) => {
         const name = logger_1.Logger.colorizeText(`${indent}🏗️  ${cls.name}`, c.white);
         if (cls.interfaceName) {
-            logger_1.Logger.log(name + logger_1.Logger.colorizeText(' ──implements──▶ ', c.gray) + logger_1.Logger.colorizeText(cls.interfaceName, c.green));
+            logger_1.Logger.log(name +
+                logger_1.Logger.colorizeText(" ──implements──▶ ", c.gray) +
+                logger_1.Logger.colorizeText(cls.interfaceName, c.green));
         }
         else if (cls.abstractClassName) {
-            logger_1.Logger.log(name + logger_1.Logger.colorizeText(' ──extends──▶ ', c.gray) + logger_1.Logger.colorizeText(cls.abstractClassName, c.green));
+            logger_1.Logger.log(name +
+                logger_1.Logger.colorizeText(" ──extends──▶ ", c.gray) +
+                logger_1.Logger.colorizeText(cls.abstractClassName, c.green));
         }
         else {
             logger_1.Logger.log(name);
         }
+        if (cls.dependencies.length > 0) {
+            const deps = cls.dependencies.map((d) => d.name).join(", ");
+            logger_1.Logger.log(logger_1.Logger.colorizeText(`${indent}   deps: `, c.gray) +
+                logger_1.Logger.colorizeText(deps, c.yellow));
+        }
     };
     const printFactory = (factory, indent) => {
         if (factory.instanceFactoryFor) {
             logger_1.Logger.log(logger_1.Logger.colorizeText(`${indent}🔌 ${factory.name}()`, c.white) +
-                logger_1.Logger.colorizeText(' ──returns──▶ ', c.gray) +
+                logger_1.Logger.colorizeText(" ──returns──▶ ", c.gray) +
                 logger_1.Logger.colorizeText(factory.instanceFactoryFor, c.green));
         }
         else {
             const token = factory.token || factory.name;
             logger_1.Logger.log(logger_1.Logger.colorizeText(`${indent}🏭 ${factory.name}()`, c.white) +
-                logger_1.Logger.colorizeText(' ──factory──▶ ', c.gray) +
+                logger_1.Logger.colorizeText(" ──factory──▶ ", c.gray) +
                 logger_1.Logger.colorizeText(`'${token}'`, c.magenta));
         }
+        if (factory.dependencies.length > 0) {
+            const deps = factory.dependencies.map((d) => d.name).join(", ");
+            logger_1.Logger.log(logger_1.Logger.colorizeText(`${indent}   deps: `, c.gray) +
+                logger_1.Logger.colorizeText(deps, c.yellow));
+        }
     };
     const printValue = (value, indent) => {
         const label = value.interfaceName || value.token || value.name;
         logger_1.Logger.log(logger_1.Logger.colorizeText(`${indent}💎 ${value.name}`, c.white) +
-            logger_1.Logger.colorizeText(' ──value──▶ ', c.gray) +
+            logger_1.Logger.colorizeText(" ──value──▶ ", c.gray) +
             logger_1.Logger.colorizeText(label, c.green));
+        // ValueInfo has no dependencies field, so nothing to print
     };
     if (isModular) {
         const allModuleNames = new Set([
@@ -224,26 +245,26 @@ function printAnalysisSummary(isModular, moduleGroupedClasses, moduleGroupedFact
         ]);
         for (const moduleName of allModuleNames) {
             logger_1.Logger.log(logger_1.Logger.colorizeText(`📦 ${moduleName}`, c.cyan + c.bright));
-            for (const cls of (moduleGroupedClasses?.get(moduleName) ?? [])) {
-                printClass(cls, '   ');
+            for (const cls of moduleGroupedClasses?.get(moduleName) ?? []) {
+                printClass(cls, "   ");
             }
-            for (const factory of (moduleGroupedFactories?.get(moduleName) ?? [])) {
-                printFactory(factory, '   ');
+            for (const factory of moduleGroupedFactories?.get(moduleName) ?? []) {
+                printFactory(factory, "   ");
             }
-            for (const value of (moduleGroupedValues?.get(moduleName) ?? [])) {
-                printValue(value, '   ');
+            for (const value of moduleGroupedValues?.get(moduleName) ?? []) {
+                printValue(value, "   ");
             }
         }
     }
     else {
         for (const cls of classes) {
-            printClass(cls, '   ');
+            printClass(cls, "   ");
         }
-        for (const factory of (factories ?? [])) {
-            printFactory(factory, '   ');
+        for (const factory of factories ?? []) {
+            printFactory(factory, "   ");
         }
-        for (const value of (values ?? [])) {
-            printValue(value, '   ');
+        for (const value of values ?? []) {
+            printValue(value, "   ");
         }
     }
 }

package/dist/commands/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"ioc-container-generator.d.ts","sourceRoot":"","sources":["../../src/generator/ioc-container-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAK7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,qBAAa,qBAAqB;IAC9B;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CACX,OAAO,EAAE,SAAS,EAAE,EACpB,UAAU,EAAE,MAAM,EAClB,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC/C,SAAS,CAAC,EAAE,WAAW,EAAE,EACzB,MAAM,CAAC,EAAE,SAAS,EAAE,EACpB,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,EACnD,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC9C,aAAa,CAAC,EAAE,qBAAqB,EACrC,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI;IA4BP,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAsE/B,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA4EnC,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAkDjC,OAAO,CAAC,MAAM,CAAC,kCAAkC;IAiCjD,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAW/C,OAAO,CAAC,MAAM,CAAC,yBAAyB;IA0BxC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsClC,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAgBxC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAY3C,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAwC1C,OAAO,CAAC,MAAM,CAAC,eAAe;IAoF9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAoBrC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IA+CpC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IA2D3C,OAAO,CAAC,MAAM,CAAC,0BAA0B;CAsB5C"}
+{"version":3,"file":"ioc-container-generator.d.ts","sourceRoot":"","sources":["../../src/generator/ioc-container-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAK7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,qBAAa,qBAAqB;IAC9B;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CACX,OAAO,EAAE,SAAS,EAAE,EACpB,UAAU,EAAE,MAAM,EAClB,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC/C,SAAS,CAAC,EAAE,WAAW,EAAE,EACzB,MAAM,CAAC,EAAE,SAAS,EAAE,EACpB,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,EACnD,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAC9C,aAAa,CAAC,EAAE,qBAAqB,EACrC,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI;IA4BP,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAwE/B,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA8EnC,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAmDjC,OAAO,CAAC,MAAM,CAAC,kCAAkC;IAiCjD,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAW/C,OAAO,CAAC,MAAM,CAAC,yBAAyB;IA0BxC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAuElC,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiBxC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAY3C,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAwC1C,OAAO,CAAC,MAAM,CAAC,eAAe;IA4F9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAoBrC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IA+CpC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IA2D3C,OAAO,CAAC,MAAM,CAAC,0BAA0B;CAsB5C"}

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

@@ -47,12 +47,15 @@ class IoCContainerGenerator {
                 interfaceNames.add(cls.interfaceName);
             }
         });
-        // Also add interface names from instance factories so their dependencies resolve correctly
+        // Also add interface names from instance factories and factory tokens
         if (factories) {
             factories.forEach(factory => {
                 if (factory.instanceFactoryFor) {
                     interfaceNames.add(factory.instanceFactoryFor);
                 }
+                const token = factory.token || factory.name;
+                if (token)
+                    interfaceNames.add(token);
             });
         }
         // Add value tokens — values are always registered as string tokens, so any dependency
@@ -75,7 +78,7 @@ class IoCContainerGenerator {
                 }
             });
         });
-        const imports = this.generateImports(classes, outputPath, factories, values);
+        const imports = this.generateImports(classes, outputPath, factories, values, classes, interfaceNames, abstractClassNames);
         const classRegistrations = this.generateRegistrations(classes, interfaceNames, '', abstractClassNames);
         const factoryRegistrations = factories && factories.length > 0
             ? this.generateFactoryRegistrations(factories, interfaceNames, '', abstractClassNames)
@@ -117,13 +120,16 @@ ${allRegistrations}
                 interfaceNames.add(cls.interfaceName);
             }
         });
-        // Also add interface names from instance factories
+        // Also add interface names from instance factories and factory tokens
         if (moduleGroupedFactories) {
             moduleGroupedFactories.forEach(moduleFactories => {
                 moduleFactories.forEach(factory => {
                     if (factory.instanceFactoryFor) {
                         interfaceNames.add(factory.instanceFactoryFor);
                     }
+                    const token = factory.token || factory.name;
+                    if (token)
+                        interfaceNames.add(token);
                 });
             });
         }
@@ -152,7 +158,7 @@ ${allRegistrations}
             const moduleValues = moduleGroupedValues?.get(moduleName);
             const moduleFilename = `${moduleName.charAt(0).toLowerCase() + moduleName.slice(1)}.module.ts`;
             const moduleFilePath = (0, path_1.join)(modulesDir, moduleFilename);
-            const moduleCode = this.generateModuleFile(moduleName, classes, interfaceNames, moduleFilePath, moduleFactories, moduleValues);
+            const moduleCode = this.generateModuleFile(moduleName, classes, interfaceNames, moduleFilePath, moduleFactories, moduleValues, allClasses);
             (0, fs_1.writeFileSync)(moduleFilePath, moduleCode);
             // Add import for main container file
             const moduleVarName = moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
@@ -164,8 +170,7 @@ ${allRegistrations}
         const mainContainerCode = this.generateMainContainerFile(allModuleNames, moduleImports, dtsFilename);
         (0, fs_1.writeFileSync)(outputPath, mainContainerCode);
     }
-    static generateModuleFile(moduleName, classes, interfaceNames, moduleFilePath, factories, values) {
-        const imports = this.generateImports(classes, moduleFilePath, factories, values);
+    static generateModuleFile(moduleName, classes, interfaceNames, moduleFilePath, factories, values, allClasses = []) {
         // Collect abstract class names that are dependencies
         const abstractClassNames = new Set();
         classes.forEach(cls => {
@@ -177,6 +182,7 @@ ${allRegistrations}
                 }
             });
         });
+        const imports = this.generateImports(classes, moduleFilePath, factories, values, allClasses, interfaceNames, abstractClassNames);
         const classRegistrations = this.generateModuleRegistrations(classes, interfaceNames, abstractClassNames);
         const factoryRegistrations = factories && factories.length > 0
             ? this.generateModuleFactoryRegistrations(factories, interfaceNames, abstractClassNames)
@@ -258,7 +264,7 @@ export const container = new Container<ContainerRegistry>();
 ${moduleInstantiations}
 `;
     }
-    static generateModularCode(moduleGroupedClasses, outputPath) {
+    static generateModularCode(moduleGroupedClasses, outputPath, factories, values) {
         const allClasses = Array.from(moduleGroupedClasses.values()).flat();
         // Collect all interface names
         const interfaceNames = new Set();
@@ -267,8 +273,38 @@ ${moduleInstantiations}
                 interfaceNames.add(cls.interfaceName);
             }
         });
-        const imports = this.generateImports(allClasses, outputPath);
-        const moduleDefinitions = this.generateModuleDefinitions(moduleGroupedClasses, interfaceNames);
+        // Also add factory tokens
+        if (factories) {
+            factories.forEach(factory => {
+                if (factory.instanceFactoryFor) {
+                    interfaceNames.add(factory.instanceFactoryFor);
+                }
+                const token = factory.token || factory.name;
+                if (token)
+                    interfaceNames.add(token);
+            });
+        }
+        // Add value tokens
+        if (values) {
+            values.forEach(value => {
+                const token = value.token || value.interfaceName || value.name;
+                if (token)
+                    interfaceNames.add(token);
+            });
+        }
+        // Collect abstract class names from dependencies
+        const abstractClassNames = new Set();
+        allClasses.forEach(cls => {
+            cls.dependencies.forEach(dep => {
+                const isInCurrentClasses = allClasses.some(c => c.name === dep.name);
+                const looksLikeAbstractClass = dep.name.startsWith('Abstract') || dep.name.includes('Abstract');
+                if (!isInCurrentClasses && looksLikeAbstractClass) {
+                    abstractClassNames.add(dep.name);
+                }
+            });
+        });
+        const imports = this.generateImports(allClasses, outputPath, undefined, undefined, allClasses, interfaceNames, abstractClassNames);
+        const moduleDefinitions = this.generateModuleDefinitions(moduleGroupedClasses, interfaceNames, abstractClassNames);
         const moduleInstantiations = this.generateModuleInstantiations(moduleGroupedClasses);
         const filename = outputPath.split('/').pop()?.replace(/\.ts$/, '') || 'container.gen';
         const dtsFilename = outputPath.split('/').pop()?.replace(/\.ts$/, '.d') || 'container.gen.d';
@@ -287,10 +323,10 @@ export const container = new Container<ContainerRegistry>();
 ${moduleInstantiations}
 `;
     }
-    static generateModuleDefinitions(moduleGroupedClasses, interfaceNames) {
+    static generateModuleDefinitions(moduleGroupedClasses, interfaceNames, abstractClassNames = new Set()) {
         const modules = [];
         for (const [moduleName, classes] of moduleGroupedClasses.entries()) {
-            const registrations = this.generateModuleRegistrations(classes, interfaceNames);
+            const registrations = this.generateModuleRegistrations(classes, interfaceNames, abstractClassNames);
             modules.push(`const ${moduleName.charAt(0).toLowerCase() + moduleName.slice(1)} = new ContainerModule()
 ${registrations};`);
         }
@@ -334,14 +370,14 @@ ${registrations};`);
             return `  .register(${token}, { useClass: ${cls.name}${dependencies}, lifecycle: ${lifecycle} })`;
         }).join('\n');
     }
-    static generateImports(classes, outputPath, factories, values) {
+    static generateImports(classes, outputPath, factories, values, allProjectClasses = [], interfaceNames = new Set(), abstractClassNames = new Set()) {
         const outputDir = (0, path_1.dirname)(outputPath);
         const importStatements = [];
         const importMap = new Map();
-        // Collect class imports
-        classes.forEach(cls => {
-            // Calculate relative path from output file to class file
-            let relativePath = (0, path_1.relative)(outputDir, cls.filePath);
+        // Helper to add an import to the map
+        const addImportToMap = (filePath, name) => {
+            // Calculate relative path from output file to file
+            let relativePath = (0, path_1.relative)(outputDir, filePath);
             // Remove extension (.ts)
             relativePath = relativePath.replace(/\.ts$/, '');
             // Add ./ if it doesn't start with . or /
@@ -353,46 +389,50 @@ ${registrations};`);
             if (!importMap.has(relativePath)) {
                 importMap.set(relativePath, new Set());
             }
-            importMap.get(relativePath).add(cls.name);
+            importMap.get(relativePath).add(name);
+        };
+        // Collect class imports
+        classes.forEach(cls => {
+            addImportToMap(cls.filePath, cls.name);
         });
         // Collect factory imports
         if (factories) {
             factories.forEach(factory => {
-                // Calculate relative path from output file to factory file
-                let relativePath = (0, path_1.relative)(outputDir, factory.filePath);
-                // Remove extension (.ts)
-                relativePath = relativePath.replace(/\.ts$/, '');
-                // Add ./ if it doesn't start with . or /
-                if (!relativePath.startsWith('.')) {
-                    relativePath = `./${relativePath}`;
-                }
-                // Use forward slashes for imports
-                relativePath = relativePath.replace(/\\/g, '/');
-                if (!importMap.has(relativePath)) {
-                    importMap.set(relativePath, new Set());
-                }
-                importMap.get(relativePath).add(factory.name);
+                addImportToMap(factory.filePath, factory.name);
             });
         }
         // Collect value imports
         if (values) {
             values.forEach(value => {
-                // Calculate relative path from output file to value file
-                let relativePath = (0, path_1.relative)(outputDir, value.filePath);
-                // Remove extension (.ts)
-                relativePath = relativePath.replace(/\.ts$/, '');
-                // Add ./ if it doesn't start with . or /
-                if (!relativePath.startsWith('.')) {
-                    relativePath = `./${relativePath}`;
+                addImportToMap(value.filePath, value.name);
+            });
+        }
+        // Collect dependencies that need class token imports
+        // (those not registered as string tokens via interfaces or abstract classes)
+        const allEntities = [...classes, ...(factories || [])];
+        const registeredNamesInModule = new Set([
+            ...classes.map(c => c.name),
+            ...(factories?.map(f => f.name) ?? []),
+            ...(values?.map(v => v.name) ?? [])
+        ]);
+        allEntities.forEach(entity => {
+            entity.dependencies.forEach(dep => {
+                // Skip if it's already registered in this module, or if it's a string token
+                // (registered via interfaces, abstract classes, factories or values)
+                if (registeredNamesInModule.has(dep.name) ||
+                    interfaceNames.has(dep.name) ||
+                    abstractClassNames.has(dep.name)) {
+                    return;
                 }
-                // Use forward slashes for imports
-                relativePath = relativePath.replace(/\\/g, '/');
-                if (!importMap.has(relativePath)) {
-                    importMap.set(relativePath, new Set());
+                // If it's a project class, import it using its actual file path
+                const depClass = allProjectClasses.find(c => c.name === dep.name);
+                if (depClass) {
+                    addImportToMap(depClass.filePath, depClass.name);
                 }
-                importMap.get(relativePath).add(value.name);
+                // Note: If not found in project classes, it might be an external dependency.
+                // For now we don't handle external class token imports as we don't have their absolute paths.
             });
-        }
+        });
         // Generate import statements
         for (const [importPath, names] of importMap.entries()) {
             const namesArray = Array.from(names).sort();