@kanjijs/testing 0.2.0-beta.15 → 0.2.0-beta.17

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

@@ -1174,12 +1174,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) {
@@ -1208,7 +1210,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;
@@ -1240,12 +1243,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) {
@@ -1332,16 +1334,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/exceptions/http.exception.ts
 class HttpException extends Error {
@@ -3444,19 +3458,8 @@ class TestingModuleBuilder {
   }
   async compile() {
     KanjijsIoC.clear();
-    const providers = this.metadata.providers || [];
-    for (const [token, value] of this.overrides) {
-      const index = providers.findIndex((p) => {
-        return p === token || typeof p === "object" && "provide" in p && p.provide === token;
-      });
-      const mockProvider = { provide: token, useValue: value };
-      if (index > -1) {
-        providers[index] = mockProvider;
-      } else {
-        providers.push(mockProvider);
-      }
-    }
-    this.metadata.providers = providers;
+    this.metadata.providers = this.applyOverridesToProviders(this.metadata.providers);
+    this.applyOverridesToImports(this.metadata.imports || [], new Set);
 
     class TestModule {
     }
@@ -3474,6 +3477,38 @@ class TestingModuleBuilder {
       }
     };
   }
+  applyOverridesToImports(imports, visited) {
+    for (const imp of imports) {
+      const moduleClass = "module" in imp ? imp.module : imp;
+      if (visited.has(moduleClass))
+        continue;
+      visited.add(moduleClass);
+      const meta = MetadataStorage.getModule(moduleClass);
+      if (meta) {
+        meta.providers = this.applyOverridesToProviders(meta.providers);
+      }
+      if ("module" in imp) {
+        imp.providers = this.applyOverridesToProviders(imp.providers);
+      }
+      const nextImports = [...meta?.imports || [], ..."module" in imp ? imp.imports || [] : []];
+      this.applyOverridesToImports(nextImports, visited);
+    }
+  }
+  applyOverridesToProviders(providers) {
+    const list = providers ? [...providers] : [];
+    for (const [token, value] of this.overrides) {
+      const index = list.findIndex((p) => {
+        return p === token || typeof p === "object" && "provide" in p && p.provide === token;
+      });
+      const mockProvider = { provide: token, useValue: value };
+      if (index > -1) {
+        list[index] = mockProvider;
+      } else {
+        list.push(mockProvider);
+      }
+    }
+    return list;
+  }
 }
 export {
   TestingModuleBuilder,

package/dist/testing/src/index.d.ts

@@ -14,4 +14,6 @@ export declare class TestingModuleBuilder {
         get: <T>(token: Token<T>) => T;
         close: () => void;
     }>;
+    private applyOverridesToImports;
+    private applyOverridesToProviders;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/testing",
-  "version": "0.2.0-beta.15",
+  "version": "0.2.0-beta.17",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "build": "bun build src/index.ts --outdir dist --target bun && tsc --emitDeclarationOnly --declaration --outDir dist"
   },
   "dependencies": {
-    "@kanjijs/core": "^0.2.0-beta.15",
-    "@kanjijs/platform-hono": "^0.2.0-beta.15",
+    "@kanjijs/core": "^0.2.0-beta.17",
+    "@kanjijs/platform-hono": "^0.2.0-beta.17",
     "hono": "^4.0.0"
   }
 }