@tstdl/base 0.93.24 → 0.93.26

package/audit/auditor.js

@@ -233,7 +233,7 @@ Auditor = Auditor_1 = __decorate([
     Injectable({
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'audit' } }),
-            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(AuditModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(AuditModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) },
         ],
     })
 ], Auditor);

package/authentication/server/authentication.service.js

@@ -630,7 +630,7 @@ AuthenticationService = AuthenticationService_1 = __decorate([
     Singleton({
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'authentication' } }),
-            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(AuthenticationModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(AuthenticationModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) }),
         ],
     })
 ], AuthenticationService);

package/document-management/server/services/singleton.js

@@ -3,7 +3,7 @@ import { provide } from '../../../injector/injector.js';
 import { factoryProvider } from '../../../injector/provider.js';
 import { DatabaseConfig } from '../../../orm/server/index.js';
 import { DocumentManagementConfiguration } from '../module.js';
-export const documentManagementDatabaseConfigFactoryProvider = factoryProvider((_, context) => context.resolve(DocumentManagementConfiguration).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }));
+export const documentManagementDatabaseConfigFactoryProvider = factoryProvider((_, context) => context.resolve(DocumentManagementConfiguration).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }));
 export const documentManagementDatabaseConfigProvider = provide(DatabaseConfig, documentManagementDatabaseConfigFactoryProvider);
 export function DocumentManagementSingleton() {
     return Singleton({ providers: [documentManagementDatabaseConfigProvider] });

package/injector/injector.d.ts

@@ -22,7 +22,7 @@ export type Registration<T = any, A = any> = GlobalRegistration<T, A> & {
     resolutions: Map<any, T>;
 };
 export type GetRegistrationOptions = {
-    skipSelf?: boolean;
+    skipSelf?: boolean | number;
     onlySelf?: boolean;
 };
 export type ResolveManyArrayItem<T, A> = [token: InjectionToken<T, A>, argument?: ResolveArgument<T, A>, options?: InjectOptions<T, A>];
@@ -38,7 +38,7 @@ export declare class Injector implements AsyncDisposable {
     #private;
     readonly id: number;
     readonly name: string;
-    readonly nameWithId: string;
+    get parent(): Injector | null;
     get disposed(): boolean;
     constructor(name: string, parent?: Injector | null);
     /**

package/injector/injector.js

@@ -31,13 +31,14 @@ export class Injector {
     #addDisposeHandler;
     id = _id++;
     name;
-    nameWithId;
+    get parent() {
+        return this.#parent;
+    }
     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 });
@@ -149,8 +150,9 @@ export class Injector {
                 this.register(globalRegistration.token, globalRegistration.provider, globalRegistration.options);
             }
         }
-        if (options?.skipSelf == true) {
-            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
+        const skipSelf = Number(options?.skipSelf ?? 0);
+        if (skipSelf > 0) {
+            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: skipSelf - 1 });
         }
         const ownRegistration = this.#registrations.get(token);
         if (isDefined(ownRegistration)) {
@@ -274,11 +276,12 @@ export class Injector {
     }
     _resolve(token, argument, options, context, chain) {
         this.assertNotDisposed();
-        if (options.skipSelf == true) {
+        const skipSelf = Number(options.skipSelf ?? 0);
+        if (skipSelf > 0) {
             if (isNull(this.#parent) && (options.optional != true)) {
                 throw new ResolveError(`No parent injector available.`, chain);
             }
-            return this.#parent?._resolve(token, argument, { ...options, skipSelf: false }, context, chain);
+            return this.#parent?._resolve(token, argument, { ...options, skipSelf: skipSelf - 1 }, context, chain);
         }
         if (isDefined(options.forwardRef) && (options.forwardRef != false)) {
             assert(options.optional != true, 'ForwardRef does not support optional without resolveAll/injectAll as undefined is not forwardable.');
@@ -306,11 +309,12 @@ export class Injector {
     }
     _resolveAll(token, argument, options, context, chain) {
         this.assertNotDisposed();
-        if (options.skipSelf == true) {
+        const skipSelf = Number(options.skipSelf ?? 0);
+        if (skipSelf > 0) {
             if (isNull(this.#parent) && (options.optional != true)) {
                 throw new ResolveError(`No parent injector available.`, chain);
             }
-            return this.#parent?._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain) ?? [];
+            return this.#parent?._resolveAll(token, argument, { ...options, skipSelf: skipSelf - 1 }, context, chain) ?? [];
         }
         if (isDefined(options.forwardRef) && (options.forwardRef != false)) {
             const forwardToken = isFunction(options.forwardRef) ? options.forwardRef() : token;
@@ -322,22 +326,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 +362,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/injector/types.d.ts

@@ -26,7 +26,7 @@ export type ArgumentProvider<T = unknown, D extends Record = Record> = (context:
 export type ForwardRefInjectionToken<T = any, A = any> = Exclude<InjectionToken<T, A>, Function> | (() => InjectionToken<T, A>);
 export type ResolveOptions<T, A> = {
     optional?: boolean;
-    skipSelf?: boolean;
+    skipSelf?: boolean | number;
     onlySelf?: boolean;
     /** If defined, resolve the token using ForwardRef strategy instead of resolving the token directly can be used to circumvent circular dependency problems */
     forwardRef?: boolean | ForwardRefInjectionToken<T, A>;

package/key-value-store/postgres/key-value-store.service.js

@@ -57,7 +57,7 @@ PostgresKeyValueStore = __decorate([
     Singleton({
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'key_value_store' } }),
-            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresKeyValueStoreModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresKeyValueStoreModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) },
         ],
     })
 ], PostgresKeyValueStore);

package/lock/postgres/provider.js

@@ -21,7 +21,7 @@ PostgresLockProvider = __decorate([
     Singleton({
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'lock' } }),
-            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresLockModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresLockModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) },
         ],
     })
 ], PostgresLockProvider);

package/mail/mail.service.js

@@ -60,7 +60,7 @@ MailService = __decorate([
     Singleton({
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'mail' } }),
-            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) }),
         ],
     })
 ], MailService);

package/package.json

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

package/queue/postgres/queue.js

@@ -157,7 +157,7 @@ PostgresQueue = __decorate([
         argumentIdentityProvider: JSON.stringify,
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'queue' } }),
-            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresQueueModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresQueueModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) }),
         ],
     })
 ], PostgresQueue);