@tstdl/base 0.93.18 → 0.93.19

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: true }) }),
         ],
     })
 ], AuthenticationService);

package/injector/injector.js

@@ -152,7 +152,7 @@ export class Injector {
             }
         }
         if (options?.onlySelf != true) {
-            return this.#parent?.tryGetRegistration(token);
+            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
         }
         return undefined;
     }
@@ -280,14 +280,11 @@ 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 = (options.skipSelf == true) ? undefined : this.tryGetRegistration(token);
+        const registration = this.tryGetRegistration(token, options);
         if (isDefined(registration)) {
             const singleRegistration = isArray(registration) ? registration[0] : registration;
             return this._resolveRegistration(singleRegistration, argument, options, context, chain);
         }
-        if (isNotNull(this.#parent) && (options.onlySelf != true)) {
-            return this.#parent._resolve(token, argument, { ...options, skipSelf: false }, context, chain);
-        }
         if (options.optional == true) {
             return undefined;
         }
@@ -305,18 +302,24 @@ 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 = (options.skipSelf == true) ? undefined : this.tryGetRegistration(token);
-        if (isDefined(registration)) {
-            const registrations = isArray(registration) ? registration : [registration];
-            return registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
+        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);
+            }
         }
         if (isNotNull(this.#parent) && (options.onlySelf != true)) {
-            return this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain);
+            parentValues.push(...this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain));
         }
-        if (options.optional == true) {
-            return [];
+        const allValues = [...ownValues, ...parentValues];
+        if ((allValues.length == 0) && (options.optional != true)) {
+            throw new ResolveError(`No provider for ${getTokenName(token)} registered.`, chain);
         }
-        throw new ResolveError(`No provider for ${getTokenName(token)} registered.`, chain);
+        return allValues;
     }
     _resolveRegistration(registration, argument, options, context, chain) {
         checkOverflow(chain, context);

package/mail/module.js

@@ -31,6 +31,6 @@ export async function migrateMailSchema() {
     await migrate(database, {
         migrationsSchema: 'mail',
         migrationsTable: '_migrations',
-        migrationsFolder: import.meta.resolve('./drizzle').replace('file://', '')
+        migrationsFolder: import.meta.resolve('./drizzle').replace('file://', ''),
     });
 }

package/package.json

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