@tstdl/base 0.93.24 → 0.93.25

package/injector/injector.d.ts

@@ -38,7 +38,6 @@ export declare class Injector implements AsyncDisposable {
     #private;
     readonly id: number;
     readonly name: string;
-    readonly nameWithId: string;
     get disposed(): boolean;
     constructor(name: string, parent?: Injector | null);
     /**

package/injector/injector.js

@@ -31,13 +31,11 @@ export class Injector {
     #addDisposeHandler;
     id = _id++;
     name;
-    nameWithId;
     get disposed() {
         return this.#disposableStack.disposed;
     }
     constructor(name, parent = null) {
         this.name = name;
-        this.nameWithId = `${name}#${this.id}`;
         this.#parent = parent;
         this.register(Injector, { useValue: this });
         this.register(CancellationSignal, { useValue: this.#disposeToken.signal });
@@ -322,22 +320,18 @@ export class Injector {
         if (isUndefined(token)) {
             throw new ResolveError('Token is undefined. This might be due to a circular dependency. Consider using an alias or forwardRef.', chain);
         }
-        const ownValues = [];
-        const parentValues = [];
-        const registration = this.tryGetRegistration(token, options);
+        const registration = this.tryGetRegistration(token);
         if (isDefined(registration)) {
             const registrations = isArray(registration) ? registration : [registration];
-            const resolved = registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
-            ownValues.push(...resolved);
+            return registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
         }
         if ((options.onlySelf != true) && isNotNull(this.#parent)) {
-            parentValues.push(...this.#parent._resolveAll(token, argument, options, context, chain));
+            return this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain);
         }
-        const allValues = [...ownValues, ...parentValues];
-        if ((allValues.length == 0) && (options.optional != true)) {
-            throw new ResolveError(`No provider for ${getTokenName(token)} registered.`, chain);
+        if (options.optional == true) {
+            return [];
         }
-        return allValues;
+        throw new ResolveError(`No provider for ${getTokenName(token)} registered.`, chain);
     }
     _resolveRegistration(registration, argument, options, context, chain) {
         checkOverflow(chain, context);
@@ -362,7 +356,7 @@ export class Injector {
         }
         // A new scope is only needed if we are instantiating a class, running a factory, or if the registration explicitly defines scoped providers.
         const needsNewScope = isClassProvider(provider) || isFactoryProvider(provider) || (providers.length > 0);
-        const injector = needsNewScope ? this.fork(`[${getTokenName(token)}]ResolutionInjector`) : this;
+        const injector = needsNewScope ? this.fork(`[${getTokenName(token)}]Injector`) : this;
         for (const nestedProvider of providers) {
             injector.registerSingleton(nestedProvider.provide, nestedProvider, { multi: nestedProvider.multi });
         }

package/injector/resolve-chain.js

@@ -1,6 +1,5 @@
 import { reflectionRegistry } from '../reflection/index.js';
 import { assertDefinedPass, isDefined } from '../utils/type-guards.js';
-import { start } from 'repl';
 import { getTokenName } from './token.js';
 export class ResolveChain {
     nodes;
@@ -42,13 +41,13 @@ export class ResolveChain {
         if (chain.length < this.length) {
             chainString += '\n       [...]';
         }
-        const longestInjectorName = Math.max(...chain.nodes.map((node) => (node.type == 'ellipsis') ? 0 : node.injector.nameWithId.length));
+        const longestInjectorName = Math.max(...chain.nodes.map((node) => (node.type == 'ellipsis') ? 0 : `${node.injector.name}#${node.injector.id}`.length));
         for (const node of chain.nodes) {
             if (node.type == 'ellipsis') {
                 chainString += `\n    ${'[...]'.padStart(longestInjectorName)}`;
                 continue;
             }
-            const paddedInjectorName = node.injector.name.padStart(longestInjectorName);
+            const paddedInjectorName = `${node.injector.name}#${node.injector.id}`.padStart(longestInjectorName);
             const tokenName = getTokenName(node.token);
             const forwardRefPrefix = node.forwardRef ? 'ForwardRef::' : '';
             switch (node.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.24",
+  "version": "0.93.25",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"