@tstdl/base 0.93.26 → 0.93.28

package/orm/decorators.d.ts

@@ -202,14 +202,14 @@ export declare function Unique<T extends AnyEntity>(columns: Columns<T>, options
  * @param name Optional name for the index.
  * @param options Additional index options (e.g., method, uniqueness, conditions).
  */
-export declare function Index<T extends BaseEntity = any>(options?: IndexReflectionData<T>['options']): PropertyDecorator;
+export declare function Index<T extends BaseEntity = BaseEntity>(options?: IndexReflectionData<T>['options']): PropertyDecorator;
 /**
  * Define a composite index on multiple columns.
  * @template T The entity type.
  * @param columns An array of property names (or tuples with direction) included in the index.
  * @param options Additional index options.
  */
-export declare function Index<T extends BaseEntity = any>(columns: Columns<T>, options?: IndexReflectionData<T>['options']): ClassDecorator;
+export declare function Index<T extends BaseEntity>(columns: NonNullable<IndexReflectionData<T>['columns']>, options?: IndexReflectionData<T>['options']): ClassDecorator;
 /**
  * Automatically expire records after a certain time to live (TTL) based on the createTimestamp metadata. Requires extension of {@link Entity} instead of {@link BaseEntity}.
  * @param ttl Time To Live in milliseconds.

package/orm/decorators.js

@@ -1,7 +1,7 @@
 import { createClassDecorator, createDecorator, createPropertyDecorator } from '../reflection/index.js';
 import { Property } from '../schema/index.js';
 import { filterUndefinedObjectProperties, objectEntries, propertyNameOf } from '../utils/object/index.js';
-import { isArray, isString, isUndefined } from '../utils/type-guards.js';
+import { isArray, isFunction, isString, isUndefined } from '../utils/type-guards.js';
 /**
  * Merges ORM reflection data into the target's metadata.
  * @param metadata The metadata object for the class or property.
@@ -122,7 +122,7 @@ export function Unique(columnsOrOptions, options) {
     return createColumnDecorator({ unique: { options: columnsOrOptions } });
 }
 export function Index(columnsOrOptions, options) {
-    if (isArray(columnsOrOptions)) {
+    if (isArray(columnsOrOptions) || isFunction(columnsOrOptions)) {
         return createTableDecorator({ index: [{ columns: columnsOrOptions, options }] });
     }
     return createColumnDecorator({ index: { options: columnsOrOptions } });

package/orm/server/drizzle/schema-converter.js

@@ -73,7 +73,6 @@ export function _getDrizzleTableFromType(type, fallbackSchemaName) {
             return column;
         });
         const indexFn = (data.options?.unique == true) ? uniqueIndex : index;
-        console.log({ name: data.options?.name ?? getIndexName(tableName, columns, { naming: data.options?.naming }) });
         let builder = indexFn(data.options?.name ?? getIndexName(tableName, columns, { naming: data.options?.naming })).using(data.options?.using ?? 'btree', ...columns);
         if (isDefined(data.options?.where)) {
             const query = convertQuery(data.options.where(table), table, columnDefinitionsMap);

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.26",
+  "version": "0.93.28",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

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);
 }