@tstdl/base 0.93.25 → 0.93.27

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

package/injector/injector.js

@@ -31,6 +31,9 @@ export class Injector {
     #addDisposeHandler;
     id = _id++;
     name;
+    get parent() {
+        return this.#parent;
+    }
     get disposed() {
         return this.#disposableStack.disposed;
     }
@@ -147,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)) {
@@ -272,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.');
@@ -304,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;

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/orm/server/repository.js

@@ -173,8 +173,10 @@ let EntityRepository = class EntityRepository extends Transactional {
                 .exhaustive()
             : isSimilar(query, searchExpression);
         const distanceColumn = distance(query, searchExpression).as(searchDistanceColumn);
+        const score = sql `1 - ${distance(query, searchExpression)}`.as(searchScoreColumn);
         const selection = fromEntries(this.#columnDefinitions.map((column) => [column.name, this.resolveTargetColumn(column)]));
         selection[searchDistanceColumn] = distanceColumn;
+        selection[searchScoreColumn] = score;
         const whereClause = isDefined(filter)
             ? and(this.convertQuery(filter), trigramClause)
             : trigramClause;
@@ -190,7 +192,6 @@ let EntityRepository = class EntityRepository extends Transactional {
             dbQuery = dbQuery.limit(options.limit);
         }
         const orderByExpressions = [];
-        const score = sql `1 - ${distanceColumn}`;
         if (isDefined(options.order)) {
             const order = isFunction(options.order) ? options.order({ score }) : options.order;
             orderByExpressions.push(...this.convertOrderBy(order));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.25",
+  "version": "0.93.27",
   "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);

package/test/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "e703ecc5-9f40-4ecb-848d-c1f3663d484c",
+  "id": "cfbaaee3-4960-412e-83b7-0f58ea61969d",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",

package/test/drizzle/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1761843226770,
-      "tag": "0000_nervous_iron_monger",
+      "when": 1761929933695,
+      "tag": "0000_sturdy_patch",
       "breakpoints": true
     }
   ]

package/test1.js

@@ -1,9 +1,8 @@
 import './polyfills.js';
 import { Application, provideInitializer, provideModule, provideSignalHandler } from './application/index.js';
 import { migrateAuditSchema } from './audit/index.js';
-import { AuthenticationService } from './authentication/server/authentication.service.js';
 import { configureAuthenticationServer } from './authentication/server/module.js';
-import { inject, injectAsync, Injector, runInInjectionContext } from './injector/index.js';
+import { inject, Injector, runInInjectionContext } from './injector/index.js';
 import { configurePostgresKeyValueStore, migratePostgresKeyValueStoreSchema } from './key-value-store/postgres/module.js';
 import { configurePostgresLock, migratePostgresLockSchema } from './lock/postgres/index.js';
 import { PrettyPrintLogFormatter, provideConsoleLogTransport } from './logger/index.js';
@@ -51,16 +50,19 @@ async function bootstrap() {
 }
 async function main(_cancellationSignal) {
     const repository = injectRepository(Test);
-    const authService = await injectAsync(AuthenticationService);
     if (await repository.count() == 0) {
         await repository.insertMany(testData);
     }
     const result = await repository.search({
         query: {
-            $parade: {
-                all: null,
+            $trigram: {
+                fields: ['title'],
+                query: 'lorem ipsum dolor sit amet',
             },
         },
+        distinct: ['title'],
+        order: (x) => ['title', x.score],
+        limit: 10,
     });
     console.log(result);
 }