@kanjijs/config 0.2.0-beta.15 → 0.2.0-beta.16

package/dist/core/src/di/module-compiler.d.ts

@@ -8,4 +8,5 @@ export declare class ModuleCompiler {
     private processProviders;
     private validate;
     private checkDependencies;
+    private registerProviders;
 }

package/dist/index.js

@@ -1531,12 +1531,14 @@ class KanjijsIoC {
       KanjijsIoC.providers.set(target, provider);
     }
     if (!provider) {
-      throw new Error(`Provider not found for token: ${typeof target === "function" ? target.name : String(target)}`);
+      const targetName2 = typeof target === "function" ? target.name ?? "anonymous" : String(target);
+      throw new Error(`Provider not found for token: ${targetName2}`);
     }
     if (provider.instance) {
       return provider.instance;
     }
-    console.log(`[DI] Creating NEW instance for ${typeof target === "function" ? target.name : String(target)}`);
+    const targetName = typeof target === "function" ? target.name ?? "anonymous" : String(target);
+    console.log(`[DI] Creating NEW instance for ${targetName}`);
     if (provider.useValue !== undefined) {
       provider.instance = provider.useValue;
     } else if (provider.useClass) {
@@ -1565,7 +1567,8 @@ class Container {
   resolve(token) {
     const provider = this.providers.get(token);
     if (!provider) {
-      throw new Error(`[DI] Provider not found for token: ${typeof token === "function" ? token.name : String(token)}`);
+      const tokenName = typeof token === "function" ? token.name ?? "anonymous" : String(token);
+      throw new Error(`[DI] Provider not found for token: ${tokenName}`);
     }
     if (provider.instance) {
       return provider.instance;
@@ -1597,12 +1600,11 @@ class ModuleCompiler {
     this.scan(rootModule);
     this.validate();
     const container = new Container;
-    for (const node of this.nodes.values()) {
-      for (const [token, provider] of node.providers) {
-        const { provide: _provide, ...definition } = provider;
-        container.register(token, definition);
-      }
+    const rootNode = this.nodes.get(rootModule);
+    if (!rootNode) {
+      return container;
     }
+    this.registerProviders(rootNode, container, new Set);
     return container;
   }
   scan(target) {
@@ -1689,16 +1691,28 @@ class ModuleCompiler {
         return overrideToken || paramType;
       });
     } else if ("useFactory" in provider) {
-      targetName = typeof provider.provide === "function" ? provider.provide.name : String(provider.provide);
+      targetName = typeof provider.provide === "function" ? provider.provide.name ?? "anonymous" : String(provider.provide);
       dependencies = provider.inject || [];
     }
     for (const dep of dependencies) {
       if (!visibleTokens.has(dep)) {
-        const depName = typeof dep === "function" ? dep.name : String(dep);
+        const depName = typeof dep === "function" ? dep.name ?? "anonymous" : String(dep);
         throw new Error(`[Kanjijs] strict-di-error: Provider '${targetName}' in Module '${moduleName}' ` + `depends on '${depName}', but it is not visible. ` + `Make sure it is imported and exported by the source module.`);
       }
     }
   }
+  registerProviders(node, container, visited) {
+    if (visited.has(node))
+      return;
+    visited.add(node);
+    for (const imp of node.imports) {
+      this.registerProviders(imp, container, visited);
+    }
+    for (const [token, provider] of node.providers) {
+      const { provide: _provide, ...definition } = provider;
+      container.register(token, definition);
+    }
+  }
 }
 
 // ../core/src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/config",
-  "version": "0.2.0-beta.15",
+  "version": "0.2.0-beta.16",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "bun build src/index.ts --outdir dist --target bun && tsc --emitDeclarationOnly --declaration --outDir dist"
   },
   "dependencies": {
-    "@kanjijs/core": "^0.2.0-beta.15",
+    "@kanjijs/core": "^0.2.0-beta.16",
     "dotenv": "^16.4.1",
     "zod": "^3.22.4"
   },