@tstdl/base 0.93.20 → 0.93.21

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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(AuditModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], 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: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(AuthenticationModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], 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: 2 }));
+export const documentManagementDatabaseConfigFactoryProvider = factoryProvider((_, context) => context.resolve(DocumentManagementConfiguration).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }));
 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 | number;
+    skipSelf?: boolean;
     onlySelf?: boolean;
 };
 export type ResolveManyArrayItem<T, A> = [token: InjectionToken<T, A>, argument?: ResolveArgument<T, A>, options?: InjectOptions<T, A>];

package/injector/injector.js

@@ -145,9 +145,8 @@ export class Injector {
                 this.register(globalRegistration.token, globalRegistration.provider, globalRegistration.options);
             }
         }
-        const skipLevels = Number(options?.skipSelf ?? 0);
-        if (skipLevels > 0) {
-            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: skipLevels - 1 });
+        if (options?.skipSelf == true) {
+            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
         }
         const ownRegistration = this.#registrations.get(token);
         if (isDefined(ownRegistration)) {
@@ -271,6 +270,12 @@ export class Injector {
     }
     _resolve(token, argument, options, context, chain) {
         this.assertNotDisposed();
+        if (options.skipSelf == true) {
+            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);
+        }
         if (isDefined(options.forwardRef) && (options.forwardRef != false)) {
             assert(options.optional != true, 'ForwardRef does not support optional without resolveAll/injectAll as undefined is not forwardable.');
             const forwardToken = isFunction(options.forwardRef) ? options.forwardRef() : token;
@@ -282,11 +287,14 @@ 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 registration = this.tryGetRegistration(token, options);
-        if (isDefined(registration)) {
-            const singleRegistration = isArray(registration) ? registration[0] : registration;
+        const ownRegistration = this.tryGetRegistration(token, { ...options, skipSelf: false, onlySelf: true });
+        if (isDefined(ownRegistration)) {
+            const singleRegistration = isArray(ownRegistration) ? ownRegistration[0] : ownRegistration;
             return this._resolveRegistration(singleRegistration, argument, options, context, chain);
         }
+        if ((options.onlySelf != true) && isNotNull(this.#parent)) {
+            return this.#parent._resolve(token, argument, { ...options, skipSelf: false }, context, chain);
+        }
         if (options.optional == true) {
             return undefined;
         }
@@ -294,6 +302,12 @@ export class Injector {
     }
     _resolveAll(token, argument, options, context, chain) {
         this.assertNotDisposed();
+        if (options.skipSelf == true) {
+            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) ?? [];
+        }
         if (isDefined(options.forwardRef) && (options.forwardRef != false)) {
             const forwardToken = isFunction(options.forwardRef) ? options.forwardRef() : token;
             const forwardRef = ForwardRef.create({ typeHint: options.forwardRefTypeHint ?? isFunction(forwardToken) ? forwardToken : undefined });
@@ -306,15 +320,13 @@ export class Injector {
         }
         const ownValues = [];
         const parentValues = [];
-        if (options.skipSelf != true) {
-            const registration = this.tryGetRegistration(token, { onlySelf: true });
-            if (isDefined(registration)) {
-                const registrations = isArray(registration) ? registration : [registration];
-                const resolved = registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
-                ownValues.push(...resolved);
-            }
+        const ownRegistration = this.tryGetRegistration(token, { ...options, skipSelf: false, onlySelf: true });
+        if (isDefined(ownRegistration)) {
+            const registrations = isArray(ownRegistration) ? ownRegistration : [ownRegistration];
+            const resolved = registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
+            ownValues.push(...resolved);
         }
-        if (isNotNull(this.#parent) && (options.onlySelf != true)) {
+        if ((options.onlySelf != true) && isNotNull(this.#parent)) {
             parentValues.push(...this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain));
         }
         const allValues = [...ownValues, ...parentValues];

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 | number;
+    skipSelf?: boolean;
     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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresKeyValueStoreModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], 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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresLockModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], 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: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], MailService);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.20",
+  "version": "0.93.21",
   "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: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresQueueModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], PostgresQueue);