@tstdl/base 0.93.29 → 0.93.31

package/orm/query/parade.d.ts

@@ -112,7 +112,7 @@ export type ParadeSpecialQueryObject<T extends BaseEntity = BaseEntity> = {
     empty?: null;
     moreLikeThis?: {
         keyValue?: any;
-        document?: Record<TargetColumnPath<T>, any>;
+        document?: Record<TargetColumnPath<T>>;
         fields?: readonly TargetColumnPath<T>[];
         minDocFrequency?: number;
         maxDocFrequency?: number;

package/orm/schemas/index.d.ts

@@ -1,5 +1,6 @@
 export * from './json.js';
 export * from './numeric-date.js';
+export * from './numeric.js';
 export * from './timestamp.js';
 export * from './tsvector.js';
 export * from './uuid.js';

package/orm/schemas/index.js

@@ -1,5 +1,6 @@
 export * from './json.js';
 export * from './numeric-date.js';
+export * from './numeric.js';
 export * from './timestamp.js';
 export * from './tsvector.js';
 export * from './uuid.js';

package/orm/schemas/numeric.d.ts

@@ -0,0 +1,17 @@
+import { NumberSchema, type NumberSchemaOptions, type SchemaDecoratorOptions, type SchemaPropertyDecorator } from '../../schema/index.js';
+import type { TypedOmit } from '../../types/types.js';
+export type NumericSchemaOptions = NumberSchemaOptions & {
+    precision?: number;
+    scale?: number;
+    mode?: 'string' | 'number' | 'bigint';
+};
+export declare class NumericSchema extends NumberSchema {
+    readonly name = "Numeric";
+    readonly precision: number | null;
+    readonly scale: number | null;
+    readonly mode: 'string' | 'number' | 'bigint' | null;
+    constructor(options?: NumericSchemaOptions);
+}
+export declare function numeric(precision: number, scale: number, options?: TypedOmit<NumericSchemaOptions, 'precision' | 'scale'>): NumericSchema;
+export declare function numeric(options?: NumericSchemaOptions): NumericSchema;
+export declare function NumericProperty(options?: NumericSchemaOptions & SchemaDecoratorOptions): SchemaPropertyDecorator;

package/orm/schemas/numeric.js

@@ -0,0 +1,23 @@
+import { NumberSchema, Property } from '../../schema/index.js';
+import { isObject } from '../../utils/type-guards.js';
+export class NumericSchema extends NumberSchema {
+    name = 'Numeric';
+    precision;
+    scale;
+    mode;
+    constructor(options) {
+        super(options);
+        this.precision = options?.precision ?? null;
+        this.scale = options?.scale ?? null;
+        this.mode = options?.mode ?? null;
+    }
+}
+export function numeric(precisionOrOptions, scale, options) {
+    if (isObject(precisionOrOptions)) {
+        return new NumericSchema(precisionOrOptions);
+    }
+    return new NumericSchema({ precision: precisionOrOptions, scale, ...options });
+}
+export function NumericProperty(options) {
+    return Property(numeric(options), options);
+}

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

@@ -1,6 +1,6 @@
 import { sql, SQL } from 'drizzle-orm';
 import { toCamelCase, toSnakeCase } from 'drizzle-orm/casing';
-import { boolean, check, doublePrecision, foreignKey, index, integer, jsonb, pgSchema, primaryKey, text, unique, uniqueIndex, uuid } from 'drizzle-orm/pg-core';
+import { boolean, check, doublePrecision, foreignKey, index, integer, jsonb, numeric, pgSchema, primaryKey, text, unique, uniqueIndex, uuid } from 'drizzle-orm/pg-core';
 import { match, P } from 'ts-pattern';
 import { MultiKeyMap } from '../../../data-structures/multi-key-map.js';
 import { tryGetEnumName } from '../../../enumeration/enumeration.js';
@@ -17,11 +17,7 @@ import { fromEntries, mapObjectKeysToSnakeCase, objectEntries } from '../../../u
 import { assertDefined, assertDefinedPass, isArray, isDefined, isNotNull, isNotNullOrUndefined, isNull, isString, isUndefined } from '../../../utils/type-guards.js';
 import { resolveValueOrProvider } from '../../../utils/value-or-provider.js';
 import { bytea, numericDate, timestamp, tsvector } from '../../data-types/index.js';
-import { JsonSchema } from '../../schemas/json.js';
-import { NumericDateSchema } from '../../schemas/numeric-date.js';
-import { TimestampSchema } from '../../schemas/timestamp.js';
-import { TsVectorSchema } from '../../schemas/tsvector.js';
-import { UuidSchema } from '../../schemas/uuid.js';
+import { JsonSchema, NumericDateSchema, NumericSchema, TimestampSchema, TsVectorSchema, UuidSchema } from '../../schemas/index.js';
 import { decryptBytes, encryptBytes } from '../encryption.js';
 import { convertQuery, resolveTargetColumn, resolveTargetColumns } from '../query-converter.js';
 const getDbSchema = memoizeSingle(pgSchema);
@@ -315,6 +311,7 @@ function getPostgresBaseColumn(columnName, dbSchema, schema, reflectionData, con
     })
         .with(P.instanceOf(TimestampSchema), () => timestamp(columnName))
         .with(P.instanceOf(NumericDateSchema), () => numericDate(columnName))
+        .with(P.instanceOf(NumericSchema), (n) => numeric(columnName, { precision: n.precision ?? undefined, scale: n.scale ?? undefined, mode: n.mode ?? 'number' }))
         .with(P.instanceOf(NumberSchema), (s) => (s.integer ? integer(columnName) : doublePrecision(columnName)))
         .with(P.instanceOf(StringSchema), () => text(columnName))
         .with(P.instanceOf(BooleanSchema), () => boolean(columnName))

package/orm/server/query-converter.js

@@ -1,5 +1,4 @@
 import { and, Column, eq, gt, gte, inArray, isNotNull, isNull, isSQLWrapper, lt, lte, ne, not, notInArray, or, SQL, sql } from 'drizzle-orm';
-import { PgColumn } from 'drizzle-orm/pg-core';
 import { match } from 'ts-pattern';
 import { NotSupportedError } from '../../errors/not-supported.error.js';
 import { hasOwnProperty, mapObject, mapObjectKeysToSnakeCase, objectEntries } from '../../utils/object/object.js';
@@ -371,7 +370,7 @@ function convertParadeSpecialQuery(query, table, columnDefinitionsMap) {
         return jsonbBuildObject({
             ...properties,
             fields: fieldsArraySql,
-            document: documentJson
+            document: documentJson,
         });
     })
         .exhaustive();

package/orm/types.d.ts

@@ -5,7 +5,7 @@
  * like primary keys and default values. It also re-exports common decorators and schemas.
  */
 import type { $Type, HasDefault as DrizzleHasDefault, IsPrimaryKey as DrizzleIsPrimaryKey } from 'drizzle-orm';
-import type { boolean, doublePrecision, integer, jsonb, PgColumnBuilder, PgColumnBuilderBase, PgEnumColumnBuilderInitial, text, uuid } from 'drizzle-orm/pg-core';
+import type { boolean, doublePrecision, integer, jsonb, numeric, PgColumnBuilder, PgColumnBuilderBase, PgEnumColumnBuilderInitial, text, uuid } from 'drizzle-orm/pg-core';
 import type { AbstractConstructor, EnumerationObject, EnumerationValue, GetTagMetadata, HasTag, ObjectLiteral, Tagged, UnionToTuple, UnwrapTagged } from '../types/index.js';
 import type { bytea, numericDate, timestamp } from './data-types/index.js';
 /** Tag identifier for column type information. */
@@ -64,21 +64,16 @@ export type Json<T> = Tagged<T, ColumnTypeTag, $Type<ReturnType<typeof jsonb>, T
  * @template T - The enumeration object type.
  */
 export type Enum<T extends string | number> = Tagged<T, ColumnTypeTag, EnumColumn<T>>;
-/** Tagged type representing a `text` column. */
 export type Text<T extends string = string> = Tagged<string, ColumnTypeTag, ReturnType<typeof text<string, TextTuple<T>>>>;
-/** Tagged type representing a `uuid` column. Stores the UUID as a string. */
 export type Uuid = Tagged<string, ColumnTypeTag, ReturnType<typeof uuid>>;
-/** Tagged type representing an `integer` column. */
 export type Integer = Tagged<number, ColumnTypeTag, ReturnType<typeof integer>>;
-/** Tagged type representing a `double precision` column. */
 export type DoublePrecision = Tagged<number, ColumnTypeTag, ReturnType<typeof doublePrecision>>;
-/** Tagged type representing a `boolean` column. */
 export type Boolean = Tagged<number, ColumnTypeTag, ReturnType<typeof boolean>>;
-/** Tagged type representing a custom `numericDate` column (stores date as number YYYYMMDD). */
+export type Numeric<T extends number | string | bigint = number> = Tagged<T, ColumnTypeTag, ReturnType<typeof numeric<T extends number ? 'number' : T extends string ? 'string' : 'bigint'>>>;
+/** Tagged type representing a custom `numericDate` column (stores date as number - days since epoch). */
 export type NumericDate = Tagged<number, ColumnTypeTag, ReturnType<typeof numericDate>>;
 /** Tagged type representing a `timestamp` column (stores timestamp as number - milliseconds since epoch). */
 export type Timestamp = Tagged<number, ColumnTypeTag, ReturnType<typeof timestamp>>;
-/** Tagged type representing a `bytea` (byte array) column. */
 export type Bytea = Tagged<Uint8Array, ColumnTypeTag, ReturnType<typeof bytea>>;
 /**
  * Tagged type representing an encrypted column.

package/package.json

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

package/test/test.model.js

@@ -38,7 +38,7 @@ __decorate([
 Test = __decorate([
     ParadeExpressionIndex('foo', () => sql `'foo'`),
     ParadeCompoundIndex('search_text', (table) => [table.title, 'content', 'tags']),
-    ParadeIndex({ columns: ['language'], mutableSegmentRows: 12 })
+    ParadeIndex({ columns: ['language'] })
 ], Test);
 export { Test };
 export const testData = [
@@ -132,7 +132,6 @@ export const testData = [
         tags: ['testing', 'database', 'automation', 'best practices'],
         language: 'english',
     },
-    // --- Cooking Posts (16-25) ---
     {
         title: 'The Perfect Weeknight Pasta Recipe',
         content: 'A quick and delicious pasta recipe that you can make in under 30 minutes. Perfect for a busy weeknight. This recipe uses fresh tomatoes and basil.',
@@ -193,7 +192,6 @@ export const testData = [
         tags: ['smoothie', 'recipe', 'breakfast', 'healthy'],
         language: 'english',
     },
-    // --- Travel Posts (26-35) ---
     {
         title: 'A Backpacker\'s Guide to Southeast Asia',
         content: 'Explore the wonders of Southeast Asia on a budget. This guide covers top destinations, packing tips, and how to travel safely and affordably.',
@@ -254,7 +252,6 @@ export const testData = [
         tags: ['solo travel', 'travel tips', 'adventure'],
         language: 'english',
     },
-    // --- Science & Lifestyle Posts (36-45) ---
     {
         title: 'The Mysteries of Black Holes Explained',
         content: 'What are black holes and how do they form? This article provides a simple explanation of one of the universe\'s most fascinating phenomena.',
@@ -315,7 +312,6 @@ export const testData = [
         tags: ['fitness', 'health', 'wellness', 'exercise'],
         language: 'english',
     },
-    // --- Multi-Language Posts (46-50) ---
     {
         title: 'Einführung in die Volltextsuche mit PostgreSQL',
         content: 'Dieser Leitfaden erklärt die Grundlagen der Volltextsuche in einer PostgreSQL Datenbank. Wir behandeln Konfiguration und Abfragen.',

package/test1.js

@@ -10,6 +10,7 @@ import { configureOrm, injectRepository } from './orm/server/index.js';
 import { configurePostgresQueue, migratePostgresQueueSchema } from './queue/postgres/index.js';
 import { migrateTestSchema } from './test/module.js';
 import { Test, testData } from './test/test.model.js';
+import { timedBenchmarkAsync } from './utils/benchmark.js';
 import * as configParser from './utils/config-parser.js';
 const config = {
     database: {
@@ -53,18 +54,20 @@ async function main(_cancellationSignal) {
     if (await repository.count() == 0) {
         await repository.insertMany(testData);
     }
-    const result = await repository.loadManyByQuery({
-        title: { $parade: { match: { value: 'quick fox', distance: 2 } } },
+    let result;
+    const benchmarkResult = await timedBenchmarkAsync(1000, async () => {
+        result = await repository.search({
+            query: {
+                $parade: { fields: ['content'], query: 'vitamins' },
+            },
+            highlight: { source: 'content', includePositions: true },
+            score: true,
+        });
     });
-    const result2 = await repository.search({
-        query: {
-            $parade: { fields: ['content'], query: 'vibrant city' },
-        },
-        highlight: { source: 'content', includePositions: true },
-    });
-    for (const item of result2) {
+    for (const item of result) {
         console.log(item);
     }
+    console.log('Benchmark result:', benchmarkResult);
 }
 Application.run('Test', [
     provideInitializer(bootstrap),