@tstdl/base 0.93.20 → 0.93.22

package/application/application.js

@@ -29,7 +29,7 @@ let Application = Application_1 = class Application {
     #shutdownPromise = new DeferredPromise();
     #shutdownToken = inject(CancellationSignal, undefined, { optional: true })?.createChild() ?? new CancellationToken();
     static create(name, providers = []) {
-        const injector = new Injector(`${name}Injector`);
+        const injector = new Injector(`${name}ApplicationInjector`);
         injector.register(APPLICATION_INSTANCE_ID, { useValue: crypto.randomUUID() });
         injector.register(APPLICATION_NAME, { useValue: name });
         for (const providersItem of providers.flat()) {

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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(AuditModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], 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: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(AuthenticationModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], AuthenticationService);

package/authentication/server/module.d.ts

@@ -15,7 +15,7 @@ export declare class AuthenticationModuleConfig {
     /**
      * Options for {@link AuthenticationService}.
      */
-    serviceOptions?: AuthenticationServiceOptions | Provider<AuthenticationServiceOptions>;
+    serviceOptions: AuthenticationServiceOptions | Provider<AuthenticationServiceOptions>;
     /**
      * Override default {@link AuthenticationService}.
      */

package/authentication/server/module.js

@@ -33,12 +33,7 @@ export class AuthenticationModuleConfig {
  */
 export function configureAuthenticationServer(config) {
     Injector.register(AuthenticationModuleConfig, { useValue: config });
-    if (isDefined(config.serviceOptions)) {
-        Injector.register(AuthenticationServiceOptions, isProvider(config.serviceOptions) ? config.serviceOptions : { useValue: config.serviceOptions });
-    }
-    else {
-        throw new Error('Either serviceOptions or serviceOptionsToken must be provided.');
-    }
+    Injector.register(AuthenticationServiceOptions, isProvider(config.serviceOptions) ? config.serviceOptions : { useValue: config.serviceOptions });
     if (isDefined(config.authenticationService)) {
         Injector.registerSingleton(AuthenticationService, { useToken: config.authenticationService });
     }

package/document-management/api/document-management.api.d.ts

@@ -179,7 +179,6 @@ export declare const documentManagementApiDefinition: {
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
                 description?: string | null | undefined;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 label?: string | undefined;
                 metadata?: Partial<{
@@ -233,7 +232,6 @@ export declare const documentManagementApiDefinition: {
             method: "PATCH";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | undefined;
                 comment?: string | null | undefined;
@@ -581,7 +579,6 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
                 description?: string | null | undefined;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 label?: string | undefined;
                 metadata?: Partial<{
@@ -635,7 +632,6 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             method: "PATCH";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | undefined;
                 comment?: string | null | undefined;

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: 2 }));
+export const documentManagementDatabaseConfigFactoryProvider = factoryProvider((_, context) => context.resolve(DocumentManagementConfiguration).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }));
 export const documentManagementDatabaseConfigProvider = provide(DatabaseConfig, documentManagementDatabaseConfigFactoryProvider);
 export function DocumentManagementSingleton() {
     return Singleton({ providers: [documentManagementDatabaseConfigProvider] });

package/document-management/service-models/document.service-model.d.ts

@@ -97,7 +97,6 @@ export declare const createDocumentRequestsTemplateParametersSchema: import("../
 export declare const updateDocumentRequestsTemplateParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/index.js").IsPrimaryKey<import("../../orm/index.js").HasDefault<import("../../orm/index.js").Uuid>>;
     description?: string | null | undefined;
-    readonly __entityMeta__?: import("../../orm/index.js").EntityMeta | undefined;
     tenantId?: string | null | undefined;
     label?: string | undefined;
     metadata?: Partial<{
@@ -127,7 +126,6 @@ export declare const createDocumentRequestTemplateParametersSchema: import("../.
 }>;
 export declare const updateDocumentRequestTemplateParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/index.js").IsPrimaryKey<import("../../orm/index.js").HasDefault<import("../../orm/index.js").Uuid>>;
-    readonly __entityMeta__?: import("../../orm/index.js").EntityMeta | undefined;
     tenantId?: string | null | undefined;
     typeId?: import("../../orm/index.js").Uuid | undefined;
     comment?: string | null | undefined;

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 | number;
+    skipSelf?: boolean;
     onlySelf?: boolean;
 };
 export type ResolveManyArrayItem<T, A> = [token: InjectionToken<T, A>, argument?: ResolveArgument<T, A>, options?: InjectOptions<T, A>];

package/injector/injector.js

@@ -145,9 +145,8 @@ export class Injector {
                 this.register(globalRegistration.token, globalRegistration.provider, globalRegistration.options);
             }
         }
-        const skipLevels = Number(options?.skipSelf ?? 0);
-        if (skipLevels > 0) {
-            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: skipLevels - 1 });
+        if (options?.skipSelf == true) {
+            return this.#parent?.tryGetRegistration(token, { ...options, skipSelf: false });
         }
         const ownRegistration = this.#registrations.get(token);
         if (isDefined(ownRegistration)) {
@@ -271,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;
@@ -287,6 +292,9 @@ export class Injector {
             const singleRegistration = isArray(registration) ? registration[0] : registration;
             return this._resolveRegistration(singleRegistration, argument, options, context, chain);
         }
+        if ((options.onlySelf != true) && isNotNull(this.#parent)) {
+            return this.#parent._resolve(token, argument, options, context, chain);
+        }
         if (options.optional == true) {
             return undefined;
         }
@@ -294,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 });
@@ -306,16 +320,14 @@ 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 registration = this.tryGetRegistration(token, options);
+        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)) {
-            parentValues.push(...this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain));
+        if ((options.onlySelf != true) && isNotNull(this.#parent)) {
+            parentValues.push(...this.#parent._resolveAll(token, argument, options, context, chain));
         }
         const allValues = [...ownValues, ...parentValues];
         if ((allValues.length == 0) && (options.optional != true)) {
@@ -346,7 +358,7 @@ export class Injector {
         }
         // A new scope is only needed if we are instantiating a class, running a factory, or if the registration explicitly defines scoped providers.
         const needsNewScope = isClassProvider(provider) || isFactoryProvider(provider) || (providers.length > 0);
-        const injector = needsNewScope ? this.fork('ResolutionInjector') : this;
+        const injector = needsNewScope ? this.fork(`[${getTokenName(token)}]ResolutionInjector`) : this;
         for (const nestedProvider of providers) {
             injector.registerSingleton(nestedProvider.provide, nestedProvider, { multi: nestedProvider.multi });
         }

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 | number;
+    skipSelf?: boolean;
     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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresKeyValueStoreModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], 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: 2 }) },
+            { provide: DatabaseConfig, useFactory: (_, context) => context.resolve(PostgresLockModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) },
         ],
     })
 ], PostgresLockProvider);

package/logger/manager.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Singleton } from '../injector/decorators.js';
 import { inject, injectAll } from '../injector/inject.js';
-import { isDefined } from '../utils/type-guards.js';
+import { isArray, isDefined } from '../utils/type-guards.js';
 import { LogLevel } from './level.js';
 import { DEFAULT_LOG_LEVEL } from './tokens.js';
 import { LogTransport } from './transport.js';
@@ -41,7 +41,7 @@ let LogManager = class LogManager {
      * @param level The log level to set
      */
     setModuleLevel(module, level) {
-        const moduleString = Array.isArray(module) ? module.join('.') : module;
+        const moduleString = isArray(module) ? module.join('.') : module;
         if (this.#moduleLevelRules.get(moduleString) === level) {
             return;
         }
@@ -58,7 +58,7 @@ let LogManager = class LogManager {
         if (!isDefined(module) || (module.length == 0)) {
             return this.#defaultLevel;
         }
-        const path = Array.isArray(module) ? module.join('.') : module;
+        const path = isArray(module) ? module.join('.') : module;
         const cachedLevel = this.#moduleLevelCache.get(path);
         if (isDefined(cachedLevel)) {
             return cachedLevel;

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: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], MailService);

package/orm/data-types/bytea.d.ts

@@ -1,18 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `bytea` columns.
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: Uint8Array;
-    driverData: Uint8Array;
-};
 /**
  * Custom Drizzle type for PostgreSQL `bytea` columns.
  * Maps between `Uint8Array` in JavaScript and `bytea` in the database.
  */
-export declare const bytea: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const bytea: import("./common.js").CustomTypeBuilder<{
+    data: Uint8Array;
+    driverData: Uint8Array;
+}>;

package/orm/data-types/bytea.js

@@ -2,12 +2,12 @@
  * @module
  * Defines a custom Drizzle type for handling PostgreSQL `bytea` columns.
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `bytea` columns.
  * Maps between `Uint8Array` in JavaScript and `bytea` in the database.
  */
-export const bytea = customType({
+export const bytea = createCustomType({
     dataType() {
         return 'bytea';
     },

package/orm/data-types/common.d.ts

@@ -0,0 +1,18 @@
+import { type ConvertCustomConfig, type CustomTypeParams, type CustomTypeValues, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
+/**
+ * A generic type for a custom Drizzle column builder function.
+ * This provides the overloads for creating a column with or without a specific database name.
+ * @template TConfig The configuration object for the custom type, containing `data` and `driverData` types.
+ */
+export type CustomTypeBuilder<TConfig extends Partial<CustomTypeValues>> = {
+    (): PgCustomColumnBuilder<ConvertCustomConfig<'', TConfig>>;
+    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, TConfig>>;
+};
+/**
+ * Factory function to create a custom Drizzle type with the standard builder overloads.
+ * This reduces boilerplate by wrapping `drizzle-orm/pg-core#customType` and applying a common type cast.
+ * @template TConfig The configuration object for the custom type.
+ * @param params The parameters for the custom type, including `dataType`, `toDriver`, and `fromDriver`.
+ * @returns A custom type builder function.
+ */
+export declare function createCustomType<TConfig extends CustomTypeValues>(params: CustomTypeParams<TConfig>): CustomTypeBuilder<TConfig>;

package/orm/data-types/common.js

@@ -0,0 +1,11 @@
+import { customType, } from 'drizzle-orm/pg-core';
+/**
+ * Factory function to create a custom Drizzle type with the standard builder overloads.
+ * This reduces boilerplate by wrapping `drizzle-orm/pg-core#customType` and applying a common type cast.
+ * @template TConfig The configuration object for the custom type.
+ * @param params The parameters for the custom type, including `dataType`, `toDriver`, and `fromDriver`.
+ * @returns A custom type builder function.
+ */
+export function createCustomType(params) {
+    return customType(params);
+}

package/orm/data-types/index.d.ts

@@ -3,6 +3,7 @@
  * Exports custom Drizzle data types for PostgreSQL.
  */
 export * from './bytea.js';
+export * from './common.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
 export * from './tsvector.js';

package/orm/data-types/index.js

@@ -3,6 +3,7 @@
  * Exports custom Drizzle data types for PostgreSQL.
  */
 export * from './bytea.js';
+export * from './common.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
 export * from './tsvector.js';

package/orm/data-types/numeric-date.d.ts

@@ -1,19 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `date` columns
- * using numeric representation (YYYYMMDD).
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: number;
-    driverData: string;
-};
 /**
  * Custom Drizzle type for PostgreSQL `date` columns, storing dates as numeric values (YYYYMMDD).
  * Converts between JavaScript `number` (YYYYMMDD) and database `date` (ISO string).
  */
-export declare const numericDate: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const numericDate: import("./common.js").CustomTypeBuilder<{
+    data: number;
+    driverData: string;
+}>;

package/orm/data-types/numeric-date.js

@@ -3,13 +3,13 @@
  * Defines a custom Drizzle type for handling PostgreSQL `date` columns
  * using numeric representation (YYYYMMDD).
  */
-import { customType } from 'drizzle-orm/pg-core';
 import { dateToNumericDate, numericDateToDateObject } from '../../utils/date-time.js';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `date` columns, storing dates as numeric values (YYYYMMDD).
  * Converts between JavaScript `number` (YYYYMMDD) and database `date` (ISO string).
  */
-export const numericDate = customType({
+export const numericDate = createCustomType({
     dataType() {
         return 'date';
     },

package/orm/data-types/timestamp.d.ts

@@ -1,19 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `timestamp with time zone` columns
- * using numeric representation (Unix timestamp in milliseconds).
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: number;
-    driverData: string;
-};
 /**
  * Custom Drizzle type for PostgreSQL `timestamp with time zone` columns, storing timestamps as numeric values (Unix timestamp in milliseconds).
  * Converts between JavaScript `number` (milliseconds since epoch) and database `timestamp with time zone` (ISO string).
  */
-export declare const timestamp: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const timestamp: import("./common.js").CustomTypeBuilder<{
+    data: number;
+    driverData: string;
+}>;

package/orm/data-types/timestamp.js

@@ -3,12 +3,12 @@
  * Defines a custom Drizzle type for handling PostgreSQL `timestamp with time zone` columns
  * using numeric representation (Unix timestamp in milliseconds).
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `timestamp with time zone` columns, storing timestamps as numeric values (Unix timestamp in milliseconds).
  * Converts between JavaScript `number` (milliseconds since epoch) and database `timestamp with time zone` (ISO string).
  */
-export const timestamp = customType({
+export const timestamp = createCustomType({
     dataType() {
         return 'timestamp with time zone';
     },

package/orm/data-types/tsvector.d.ts

@@ -1,16 +1,6 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `tsvector` columns.
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: unknown;
-};
 /**
  * Custom Drizzle type for PostgreSQL `tsvector` columns.
  */
-export declare const tsvector: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const tsvector: import("./common.js").CustomTypeBuilder<{
+    data: unknown;
+}>;

package/orm/data-types/tsvector.js

@@ -2,11 +2,11 @@
  * @module
  * Defines a custom Drizzle type for handling PostgreSQL `tsvector` columns.
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `tsvector` columns.
  */
-export const tsvector = customType({
+export const tsvector = createCustomType({
     dataType() {
         return 'tsvector';
     },

package/orm/decorators.d.ts

@@ -3,29 +3,30 @@
  * Defines decorators for ORM entities and columns, used to configure database schema mapping.
  */
 import type { SQL } from 'drizzle-orm';
+import type { ExtraConfigColumn } from 'drizzle-orm/pg-core';
 import type { LiteralUnion } from 'type-fest';
 import { type SpecificCreateDecoratorOptions } from '../reflection/index.js';
 import type { AbstractConstructor, Record, TypedOmit } from '../types/index.js';
 import type { ValueOrProvider } from '../utils/value-or-provider.js';
 import type { AnyEntity, BaseEntity, Entity, EntityType } from './entity.js';
 import type { Query } from './query.js';
-import type { TargetColumnPaths } from './repository.types.js';
-import type { PgTableFromType } from './server/types.js';
-type IndexMethod = LiteralUnion<'hash' | 'btree' | 'gist' | 'spgist' | 'gin' | 'brin' | 'hnsw' | 'ivfflat', string>;
+import type { TargetColumnPath } from './repository.types.js';
+import type { ExtraConfigColumnsFromType } from './server/types.js';
+type IndexMethod = LiteralUnion<'hash' | 'btree' | 'gist' | 'spgist' | 'gin' | 'brin' | 'hnsw' | 'ivfflat' | 'bm25', string>;
 type NamingStrategy = 'abbreviated-table';
-type Column<T> = Extract<keyof T, string>;
-type Columns<T> = [Column<T>, ...Column<T>[]];
-export type SqlBuilder<T extends BaseEntity = any, R = SQL> = (table: PgTableFromType<EntityType<T>>) => R;
+type Column<T extends BaseEntity> = TargetColumnPath<T>;
+type Columns<T extends BaseEntity> = [Column<T>, ...Column<T>[]];
+export type SqlBuilder<T extends BaseEntity = any, R = SQL> = (table: ExtraConfigColumnsFromType<EntityType<T>>) => R;
 /**
  * Builder function type for creating SQL check constraints.
  * @param table The Drizzle table object.
  */
-export type CheckBuilder<T extends BaseEntity = any> = SqlBuilder<T>;
+export type CheckBuilder<T extends BaseEntity = BaseEntity> = SqlBuilder<T>;
 /**
  * Builder function type for creating partial index WHERE clauses.
  * @param table The Drizzle table object.
  */
-export type WhereBuilder<T extends BaseEntity = any> = SqlBuilder<T, Query<T>>;
+export type WhereBuilder<T extends BaseEntity = BaseEntity> = SqlBuilder<T, Query<T>>;
 /**
  * Reflection data stored for ORM table decorators.
  */
@@ -36,7 +37,6 @@ export type OrmTableReflectionData = {
     compundPrimaryKeyNaming?: NamingStrategy;
     unique?: UniqueReflectionData[];
     index?: IndexReflectionData[];
-    fullTextSearch?: FullTextSearchReflectionData[];
     checks?: CheckReflectionData[];
     foreignKeys?: ForeignKeyReflectionData[];
 };
@@ -57,7 +57,7 @@ export type OrmColumnReflectionData = {
     };
     references?: {
         target: () => EntityType;
-        targetColumn?: TargetColumnPaths<any>;
+        targetColumn?: TargetColumnPath<any>;
     }[];
     encrypted?: boolean;
     expirationField?: {
@@ -81,7 +81,7 @@ export type UniqueReflectionData = {
  * @template T The entity type.
  */
 export type IndexReflectionData<T extends BaseEntity = any> = {
-    columns?: (string | [string, 'asc' | 'desc'])[];
+    columns?: ValueOrProvider<(TargetColumnPath<T> | [TargetColumnPath<T>, 'asc' | 'desc'] | SQL | ExtraConfigColumn)[], ExtraConfigColumnsFromType<EntityType<T>>>;
     order?: 'asc' | 'desc';
     options?: {
         name?: string;
@@ -89,48 +89,11 @@ export type IndexReflectionData<T extends BaseEntity = any> = {
         using?: IndexMethod;
         unique?: boolean;
         where?: WhereBuilder<T>;
+        with?: Record<string, number | string | boolean | SQL>;
+        concurrently?: boolean;
         nulls?: 'first' | 'last';
     };
 };
-export type FullTextSearchFeature = 'vector' | 'trigram';
-export type FullTextSearchReflectionData<T extends BaseEntity = BaseEntity> = {
-    name: string;
-    /**
-     * Columns or SQL expression to use as the text source.
-     */
-    source?: ValueOrProvider<TargetColumnPaths<T>[] | SQL<string>, PgTableFromType<EntityType<T>>>;
-    parade?: {};
-    /**
-     * Configuration for vector search (tsvector).
-     */
-    vector?: {
-        /**
-         * Raw SQL or builder function for generating the tsvector source.
-         */
-        rawVectorSource?: ValueOrProvider<SQL, PgTableFromType<EntityType<T>>>;
-        /**
-         * Language configuration, used for stemming, stop-words, etc.
-         * Can be a string (e.g., 'simple', 'english') or a SQL expression / builder.
-         * Not applicable if `rawVectorSource` is provided.
-         */
-        language?: string | SQL | SqlBuilder<T>;
-        /**
-         * Weights for columns in source.
-         * Keys are column names, values are 'A', 'B', 'C', or 'D'.
-         * Not applicable if `rawVectorSource` is provided.
-         */
-        weights?: Partial<Record<TargetColumnPaths<T>, 'A' | 'B' | 'C' | 'D'>>;
-    };
-    /**
-     * Configuration for trigram search (pg_trgm).
-     */
-    trigram?: {
-        /**
-         * Similarity threshold between 0 and 1 for trigram matching.
-         */
-        threshold?: number;
-    };
-};
 type CheckReflectionData = {
     name: string;
     builder: CheckBuilder;
@@ -140,8 +103,8 @@ type CheckReflectionData = {
 };
 export type ForeignKeyReflectionData = {
     target: () => EntityType;
-    columns: TargetColumnPaths<any>[];
-    foreignColumns: TargetColumnPaths<any>[];
+    columns: TargetColumnPath<any>[];
+    foreignColumns: TargetColumnPath<any>[];
     options?: {
         name?: string;
         naming?: NamingStrategy;
@@ -179,7 +142,7 @@ export declare function PrimaryKeyProperty(): PropertyDecorator;
  * @param type A function returning the referenced entity type.
  */
 export declare function References(target: () => EntityType): PropertyDecorator;
-export declare function References<T extends AnyEntity>(target: () => EntityType<T>, targetColumn?: TargetColumnPaths<T>): PropertyDecorator;
+export declare function References<T extends AnyEntity>(target: () => EntityType<T>, targetColumn?: TargetColumnPath<T>): PropertyDecorator;
 /**
  * Define a table check constraint.
  * @template T The entity type.
@@ -247,7 +210,6 @@ export declare function Index<T extends BaseEntity = any>(options?: IndexReflect
  * @param options Additional index options.
  */
 export declare function Index<T extends BaseEntity = any>(columns: Columns<T>, options?: IndexReflectionData<T>['options']): ClassDecorator;
-export declare function FullTextSearch<T extends BaseEntity>(name: string, options: TypedOmit<FullTextSearchReflectionData<T>, 'name'>): 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.