@tstdl/base 0.93.19 → 0.93.21

package/document-management/server/services/singleton.d.ts

@@ -1,4 +1,3 @@
-import type { ProvidersItem } from '../../../injector/injector.js';
 export declare const documentManagementDatabaseConfigFactoryProvider: import("../../../injector/provider.js").FactoryProvider<unknown, unknown, import("../../../types/types.js").Record>;
-export declare const documentManagementDatabaseConfigProvider: ProvidersItem;
+export declare const documentManagementDatabaseConfigProvider: import("../../../injector/injector.js").ProvidersItem<unknown, unknown, import("../../../types/types.js").Record>;
 export declare function DocumentManagementSingleton(): ClassDecorator;

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

@@ -1,12 +1,10 @@
 import { Singleton } from '../../../injector/decorators.js';
+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 documentManagementDatabaseConfigProvider = {
-    provide: DatabaseConfig,
-    ...documentManagementDatabaseConfigFactoryProvider,
-};
+export const documentManagementDatabaseConfigProvider = provide(DatabaseConfig, documentManagementDatabaseConfigFactoryProvider);
 export function DocumentManagementSingleton() {
     return Singleton({ providers: [documentManagementDatabaseConfigProvider] });
 }

package/injector/injector.js

@@ -145,14 +145,15 @@ export class Injector {
                 this.register(globalRegistration.token, globalRegistration.provider, globalRegistration.options);
             }
         }
-        if (options?.skipSelf != true) {
-            const ownRegistration = this.#registrations.get(token);
-            if (isDefined(ownRegistration)) {
-                return ownRegistration;
-            }
+        if (options?.skipSelf == true) {
+            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
+        }
+        const ownRegistration = this.#registrations.get(token);
+        if (isDefined(ownRegistration)) {
+            return ownRegistration;
         }
         if (options?.onlySelf != true) {
-            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
+            return this.#parent?.tryGetRegistration(token, options);
         }
         return undefined;
     }
@@ -269,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;
@@ -280,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;
         }
@@ -292,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 });
@@ -304,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/package.json

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