@tsed/di 8.28.2 → 8.28.5

package/lib/esm/common/domain/Container.js

@@ -68,13 +68,17 @@ export class Container extends Map {
      * @returns {[TokenProvider , Provider<any>][]}
      */
     getProviders(type) {
-        const types = [].concat(type).map(String);
-        return [...this].reduce((providers, [_, provider]) => {
-            if (types.includes(String(provider.type)) || !type) {
-                return [...providers, provider];
+        if (!type) {
+            return [...this.values()];
+        }
+        const types = new Set([].concat(type).map(String));
+        const providers = [];
+        for (const [, provider] of this) {
+            if (types.has(String(provider.type))) {
+                providers.push(provider);
             }
-            return providers;
-        }, []);
+        }
+        return providers;
     }
     addProviders(container) {
         container.forEach((provider) => {

package/lib/esm/common/services/InjectorService.js

@@ -91,10 +91,11 @@ export class InjectorService extends Container {
      * @returns The resolved provider instance
      */
     get(token, options) {
-        if (!this.has(token)) {
+        const instance = this.#cache.get(token);
+        if (instance === undefined) {
             return this.resolve(token, options);
         }
-        return this.#cache.get(token);
+        return instance;
     }
     /**
      * Return all instances of providers matching the specified type.
@@ -427,37 +428,39 @@ export class InjectorService extends Container {
         return instance;
     }
     resolveImportsProviders() {
-        this.settings.imports = this.settings.imports
-            ?.filter((meta) => isObject(meta) && "token" in meta && meta.token !== InjectorService)
-            .map((meta) => {
-            if (isObject(meta) && "token" in meta) {
-                const { token, ...props } = meta;
-                const provider = this.ensureProvider(token, true);
-                if (provider) {
-                    provider.useValue = undefined;
-                    provider.useAsyncFactory = undefined;
-                    provider.useFactory = undefined;
-                    if ("useClass" in props) {
-                        provider.useClass = props.useClass;
-                        return;
-                    }
-                    if ("useFactory" in props) {
-                        provider.useFactory = props.useFactory;
-                        return;
-                    }
-                    if ("useAsyncFactory" in props) {
-                        provider.useAsyncFactory = props.useAsyncFactory;
-                        return;
-                    }
-                    if ("use" in props) {
-                        provider.useValue = props.use;
-                        return;
-                    }
-                }
+        const imports = this.settings.imports;
+        if (!imports) {
+            return;
+        }
+        const resolvedImports = [];
+        for (const meta of imports) {
+            if (!isObject(meta) || !("token" in meta) || meta.token === InjectorService) {
+                continue;
+            }
+            const { token, ...props } = meta;
+            const provider = this.ensureProvider(token, true);
+            provider.useValue = undefined;
+            provider.useAsyncFactory = undefined;
+            provider.useFactory = undefined;
+            if ("useClass" in props) {
+                provider.useClass = props.useClass;
+                continue;
+            }
+            if ("useFactory" in props) {
+                provider.useFactory = props.useFactory;
+                continue;
             }
-            return meta;
-        })
-            .filter(Boolean);
+            if ("useAsyncFactory" in props) {
+                provider.useAsyncFactory = props.useAsyncFactory;
+                continue;
+            }
+            if ("use" in props) {
+                provider.useValue = props.use;
+                continue;
+            }
+            resolvedImports.push(meta);
+        }
+        this.settings.imports = resolvedImports;
     }
     /**
      * Create options to invoke a provider or class.

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.28.2",
+  "version": "8.28.5",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -29,11 +29,11 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.28.2",
-    "@tsed/core": "8.28.2",
-    "@tsed/hooks": "8.28.2",
+    "@tsed/barrels": "8.28.5",
+    "@tsed/core": "8.28.5",
+    "@tsed/hooks": "8.28.5",
     "@tsed/logger": "^8.0.0",
-    "@tsed/typescript": "8.28.2",
+    "@tsed/typescript": "8.28.5",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "6.0.2",