@tstdl/base 0.93.15 → 0.93.17

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

@@ -179,6 +179,7 @@ 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<{
@@ -232,6 +233,7 @@ 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;
@@ -579,6 +581,7 @@ 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<{
@@ -632,6 +635,7 @@ 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/service-models/document.service-model.d.ts

@@ -97,6 +97,7 @@ 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<{
@@ -126,6 +127,7 @@ 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.js

@@ -320,8 +320,10 @@ export class Injector {
     }
     _resolveRegistration(registration, argument, options, context, chain) {
         checkOverflow(chain, context);
-        const { token, providers } = registration;
-        const injector = this.fork('ResolutionInjector');
+        const { token, provider, providers } = registration;
+        // 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;
         for (const nestedProvider of providers) {
             injector.registerSingleton(nestedProvider.provide, nestedProvider, { multi: nestedProvider.multi });
         }
@@ -375,7 +377,7 @@ export class Injector {
     }
     _resolveProvider(resolutionTag, registration, resolveArgument, options, context, resolutionContext, injectionContext, chain) {
         try {
-            setResolving(registration.token, context, chain);
+            setResolving(this, registration.token, context, chain);
             const { provider } = registration;
             let result;
             if (isClassProvider(provider)) {
@@ -417,7 +419,7 @@ export class Injector {
             return result.value;
         }
         finally {
-            deleteResolving(registration.token, context);
+            deleteResolving(this, registration.token, context);
         }
     }
     resolveClassInjection(resolutionTag, context, constructor, metadata, resolveArgument, chain) {
@@ -523,7 +525,7 @@ function addRegistration(registrations, registration) {
 function newInternalResolveContext() {
     return {
         resolves: 0,
-        resolving: new Set(),
+        resolving: new FactoryMap(() => new Set()),
         resolutionScopedResolutions: new MultiKeyMap(),
         resolutions: [],
         resolutionContextData: new FactoryMap(() => ({})),
@@ -594,14 +596,15 @@ function resolveArgumentIdentity(registration, resolveArgument, chain) {
     }
     return resolveArgument;
 }
-function setResolving(token, context, chain) {
-    if (context.resolving.has(token)) {
+function setResolving(injector, token, context, chain) {
+    const resolvingSet = context.resolving.get(injector);
+    if (resolvingSet.has(token)) {
         throw new ResolveError('Circular dependency detected. Use forwardRef for circular dependencies between classes.', chain);
     }
-    context.resolving.add(token);
+    resolvingSet.add(token);
 }
-function deleteResolving(token, context) {
-    context.resolving.delete(token);
+function deleteResolving(injector, token, context) {
+    context.resolving.get(injector).delete(token);
 }
 function throwOnPromise(value, type, chain) {
     if (isPromise(value)) {

package/mail/mail.service.js

@@ -61,7 +61,7 @@ MailService = __decorate([
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'mail' } }),
             provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
-        ]
+        ],
     })
 ], MailService);
 export { MailService };

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

@@ -5,3 +5,4 @@
 export * from './bytea.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
+export * from './tsvector.js';

package/orm/data-types/index.js

@@ -5,3 +5,4 @@
 export * from './bytea.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
+export * from './tsvector.js';

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

@@ -0,0 +1,16 @@
+/**
+ * @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 {};

package/orm/data-types/tsvector.js

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

package/orm/decorators.d.ts

@@ -6,7 +6,8 @@ import type { SQL } from 'drizzle-orm';
 import type { LiteralUnion } from 'type-fest';
 import { type SpecificCreateDecoratorOptions } from '../reflection/index.js';
 import type { AbstractConstructor, Record, TypedOmit } from '../types/index.js';
-import type { AnyEntity, Entity, EntityType, EntityWithoutMetadata } from './entity.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';
@@ -14,16 +15,17 @@ type IndexMethod = LiteralUnion<'hash' | 'btree' | 'gist' | 'spgist' | 'gin' | '
 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;
 /**
  * Builder function type for creating SQL check constraints.
  * @param table The Drizzle table object.
  */
-export type CheckBuilder<T extends Entity = any> = (table: PgTableFromType<EntityType<T>>) => SQL;
+export type CheckBuilder<T extends BaseEntity = any> = SqlBuilder<T>;
 /**
  * Builder function type for creating partial index WHERE clauses.
  * @param table The Drizzle table object.
  */
-export type WhereBuilder<T extends Entity | EntityWithoutMetadata = any> = (table: PgTableFromType<EntityType<T>>) => Query<T>;
+export type WhereBuilder<T extends BaseEntity = any> = SqlBuilder<T, Query<T>>;
 /**
  * Reflection data stored for ORM table decorators.
  */
@@ -34,6 +36,7 @@ export type OrmTableReflectionData = {
     compundPrimaryKeyNaming?: NamingStrategy;
     unique?: UniqueReflectionData[];
     index?: IndexReflectionData[];
+    fullTextSearch?: FullTextSearchReflectionData[];
     checks?: CheckReflectionData[];
     foreignKeys?: ForeignKeyReflectionData[];
 };
@@ -77,8 +80,8 @@ export type UniqueReflectionData = {
  * Reflection data for index definitions.
  * @template T The entity type.
  */
-export type IndexReflectionData<T extends Entity | EntityWithoutMetadata = any> = {
-    columns?: (string | [string, 'asc' | 'desc'] | SQL)[];
+export type IndexReflectionData<T extends BaseEntity = any> = {
+    columns?: (string | [string, 'asc' | 'desc'])[];
     order?: 'asc' | 'desc';
     options?: {
         name?: string;
@@ -87,22 +90,45 @@ export type IndexReflectionData<T extends Entity | EntityWithoutMetadata = any>
         unique?: boolean;
         where?: WhereBuilder<T>;
         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?: {
         /**
-         * For full-text search indexes (e.g., GIN), specifies the text search configuration language (e.g., 'english').
-         * Can also be a SQL object for dynamic configuration.
+         * Raw SQL or builder function for generating the tsvector source.
          */
-        language?: string | SQL;
+        rawVectorSource?: ValueOrProvider<SQL, PgTableFromType<EntityType<T>>>;
         /**
-         * For multi-column full-text search indexes, specifies how to create the tsvector.
-         * - 'concat': (Default) Concatenate columns into a single tsvector.
-         * - 'separate': Create a separate tsvector for each column, useful for indexing columns with different languages or weights.
+         * 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.
          */
-        vectors?: 'concat' | 'separate';
+        language?: string | SQL | SqlBuilder<T>;
         /**
-         * For multi-column full-text search indexes, specifies weights for columns.
+         * 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.
          */
-        weights?: Partial<Record<TargetColumnPaths<any>, 'A' | 'B' | 'C' | 'D'>>;
+        threshold?: number;
     };
 };
 type CheckReflectionData = {
@@ -121,10 +147,6 @@ export type ForeignKeyReflectionData = {
         naming?: NamingStrategy;
     };
 };
-export type GinIndexOptions<T extends Entity | EntityWithoutMetadata = any> = TypedOmit<NonNullable<IndexReflectionData<T>['options']>, 'using' | 'weights'> & {
-    weights?: Partial<Record<TargetColumnPaths<any>, 'A' | 'B' | 'C' | 'D'>>;
-    language?: string | SQL;
-};
 /**
  * Factory function to create a class decorator for ORM table configuration.
  * Merges provided data with existing ORM reflection data on the class metadata.
@@ -217,27 +239,17 @@ 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 Entity | EntityWithoutMetadata = any>(options?: IndexReflectionData<T>['options']): PropertyDecorator;
+export declare function Index<T extends BaseEntity = any>(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 Entity | EntityWithoutMetadata = any>(columns: Columns<T>, options?: IndexReflectionData<T>['options']): ClassDecorator;
-/**
- * Defines a GIN index on a single column, often for full-text search.
- * @param options GIN index options. For full-text search, `language` is required.
- */
-export declare function GinIndex<T extends Entity | EntityWithoutMetadata = any>(options: GinIndexOptions<T>): PropertyDecorator;
-/**
- * Defines a composite GIN index on multiple columns, often for full-text search.
- * @param columnsOrSql The columns to include in the index.
- * @param options GIN index options. For full-text search, providing a `language` is highly recommended.
- */
-export declare function GinIndex<T extends Entity | EntityWithoutMetadata = any>(columnsOrSql: (Column<T> | SQL)[], options?: GinIndexOptions<T>): ClassDecorator;
+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 EntityWithoutMetadata}.
+ * 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.
  * @param mode Whether to delete soft or hard.
  */

package/orm/decorators.js

@@ -137,14 +137,11 @@ export function Index(columnsOrOptions, options) {
     }
     return createColumnDecorator({ index: { options: columnsOrOptions } });
 }
-export function GinIndex(columnsOrSqlOrOptions, options) {
-    if (isArray(columnsOrSqlOrOptions)) {
-        return createTableDecorator({ index: [{ columns: columnsOrSqlOrOptions, options: { ...options, using: 'gin' } }] });
-    }
-    return createColumnDecorator({ index: { options: { ...columnsOrSqlOrOptions, using: 'gin' } } });
+export function FullTextSearch(name, options) {
+    return createTableDecorator({ fullTextSearch: [{ name, ...options }] });
 }
 /**
- * Automatically expire records after a certain time to live (TTL) based on the createTimestamp metadata. Requires extension of {@link Entity} instead of {@link EntityWithoutMetadata}.
+ * 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.
  * @param mode Whether to delete soft or hard.
  */

package/orm/entity.d.ts

@@ -1,13 +1,15 @@
-import type { Type } from '../types/index.js';
+import type { Record, Type } from '../types/index.js';
 import type { Embedded, HasDefault, IsPrimaryKey, Json, Timestamp, Uuid } from './types.js';
 /**
  * Represents the type (constructor) of an entity, potentially holding an entity name.
  * @template T - The entity class type.
  */
-export interface EntityType<T extends Entity | EntityWithoutMetadata = Entity | EntityWithoutMetadata> extends Type<T> {
+export interface EntityType<T extends BaseEntity = BaseEntity | Entity> extends Type<T> {
     readonly entityName?: string;
 }
-export type AnyEntity = Entity | EntityWithoutMetadata;
+export type AnyEntity = BaseEntity | Entity;
+export type EntityMeta = Record<string>;
+export declare const entityMeta: "__entityMeta__";
 /**
  * Base class for extensible metadata attributes associated with an entity.
  * Allows storing arbitrary key-value pairs.
@@ -26,23 +28,28 @@ export declare abstract class EntityMetadata {
     attributes: HasDefault<Json<EntityMetadataAttributes>>;
 }
 /**
- * Abstract base class for entities that include standard metadata.
- * Provides a default `id` (UUID primary key) and an `metadata` field.
+ * Abstract base class for entities that do *not* include the standard metadata fields.
+ * Provides only a default `id` (UUID primary key). Useful for simpler tables or join tables.
  */
-export declare abstract class Entity {
+export declare abstract class BaseEntity<TMeta extends EntityMeta = EntityMeta> {
     id: IsPrimaryKey<HasDefault<Uuid>>;
-    metadata: Embedded<EntityMetadata>;
+    readonly [entityMeta]?: TMeta;
 }
 /**
- * Abstract base class for entities that do *not* include the standard metadata fields.
- * Provides only a default `id` (UUID primary key). Useful for simpler tables or join tables.
+ * Abstract base class for entities that include standard metadata.
+ * Provides a default `id` (UUID primary key) and an `metadata` field.
  */
-export declare abstract class EntityWithoutMetadata {
-    id: IsPrimaryKey<HasDefault<Uuid>>;
+export declare abstract class Entity<TMeta extends EntityMeta = EntityMeta> extends BaseEntity<TMeta> {
+    metadata: Embedded<EntityMetadata>;
 }
-export declare abstract class TenantEntity extends Entity {
+export declare abstract class TenantEntity<TMeta extends EntityMeta = EntityMeta> extends Entity<TMeta> {
     tenantId: Uuid;
 }
-export declare abstract class TenantEntityWithoutMetadata extends EntityWithoutMetadata {
+export declare abstract class TenantBaseEntity<TMeta extends EntityMeta = EntityMeta> extends BaseEntity<TMeta> {
     tenantId: Uuid;
 }
+export { 
+/**
+ * @deprecated Use BaseEntity instead.
+ */
+BaseEntity as EntityWithoutMetadata, };

package/orm/entity.js

@@ -14,6 +14,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { Defaulted, Integer } from '../schema/index.js';
 import { EmbeddedProperty, PrimaryKeyProperty } from './decorators.js';
 import { JsonProperty, TimestampProperty, UuidProperty } from './schemas/index.js';
+export const entityMeta = '__entityMeta__';
 /**
  * Base class for extensible metadata attributes associated with an entity.
  * Allows storing arbitrary key-value pairs.
@@ -55,34 +56,28 @@ __decorate([
     __metadata("design:type", Object)
 ], EntityMetadata.prototype, "attributes", void 0);
 /**
- * Abstract base class for entities that include standard metadata.
- * Provides a default `id` (UUID primary key) and an `metadata` field.
+ * Abstract base class for entities that do *not* include the standard metadata fields.
+ * Provides only a default `id` (UUID primary key). Useful for simpler tables or join tables.
  */
-export class Entity {
+export class BaseEntity {
     id;
-    metadata;
 }
 __decorate([
     PrimaryKeyProperty(),
     UuidProperty({ defaultRandom: true }),
     __metadata("design:type", Object)
-], Entity.prototype, "id", void 0);
-__decorate([
-    EmbeddedProperty(EntityMetadata, { prefix: null }),
-    __metadata("design:type", Object)
-], Entity.prototype, "metadata", void 0);
+], BaseEntity.prototype, "id", void 0);
 /**
- * Abstract base class for entities that do *not* include the standard metadata fields.
- * Provides only a default `id` (UUID primary key). Useful for simpler tables or join tables.
+ * Abstract base class for entities that include standard metadata.
+ * Provides a default `id` (UUID primary key) and an `metadata` field.
  */
-export class EntityWithoutMetadata {
-    id;
+export class Entity extends BaseEntity {
+    metadata;
 }
 __decorate([
-    PrimaryKeyProperty(),
-    UuidProperty({ defaultRandom: true }),
+    EmbeddedProperty(EntityMetadata, { prefix: null }),
     __metadata("design:type", Object)
-], EntityWithoutMetadata.prototype, "id", void 0);
+], Entity.prototype, "metadata", void 0);
 export class TenantEntity extends Entity {
     tenantId;
 }
@@ -90,10 +85,15 @@ __decorate([
     UuidProperty(),
     __metadata("design:type", String)
 ], TenantEntity.prototype, "tenantId", void 0);
-export class TenantEntityWithoutMetadata extends EntityWithoutMetadata {
+export class TenantBaseEntity extends BaseEntity {
     tenantId;
 }
 __decorate([
     UuidProperty(),
     __metadata("design:type", String)
-], TenantEntityWithoutMetadata.prototype, "tenantId", void 0);
+], TenantBaseEntity.prototype, "tenantId", void 0);
+export { 
+/**
+ * @deprecated Use BaseEntity instead.
+ */
+BaseEntity as EntityWithoutMetadata, };

package/orm/repository.types.d.ts

@@ -7,7 +7,7 @@ import type { Paths, Record, SimplifyObject, TypedOmit } from '../types/index.js
 import type { UntaggedDeep } from '../types/tagged.js';
 import type { SQL, SQLWrapper } from 'drizzle-orm';
 import type { PartialDeep } from 'type-fest';
-import type { Entity, EntityMetadata, EntityWithoutMetadata } from './entity.js';
+import type { BaseEntity, Entity, EntityMetadata } from './entity.js';
 import type { FullTextSearchQuery, Query } from './query.js';
 import type { TsHeadlineOptions } from './sqls.js';
 type WithSql<T> = {
@@ -18,13 +18,13 @@ type WithSql<T> = {
  * or a raw Drizzle SQLWrapper for a complex target.
  * @template T - The entity type.
  */
-export type TargetColumnPaths<T extends EntityWithoutMetadata> = Paths<UntaggedDeep<T>>;
+export type TargetColumnPaths<T extends BaseEntity> = Paths<UntaggedDeep<T>>;
 /**
  * Specifies the target column (e.g. for ordering, distinct on), which can be a property path within the entity
  * or a raw Drizzle SQLWrapper for a complex target.
  * @template T - The entity type.
  */
-export type TargetColumn<T extends EntityWithoutMetadata> = TargetColumnPaths<T> | SQLWrapper;
+export type TargetColumn<T extends BaseEntity> = TargetColumnPaths<T> | SQLWrapper;
 /** Specifies the direction for ordering results ('asc' or 'desc'). */
 export type OrderDirection = 'asc' | 'desc';
 /**
@@ -32,26 +32,26 @@ export type OrderDirection = 'asc' | 'desc';
  * (optionally with direction), or an object mapping property paths to directions.
  * @template T - The entity type.
  */
-export type Order<T extends EntityWithoutMetadata> = TargetColumn<T> | (TargetColumn<T> | [TargetColumn<T>, OrderDirection])[] | Partial<Record<Exclude<TargetColumn<T>, SQLWrapper>, OrderDirection>>;
+export type Order<T extends BaseEntity> = TargetColumn<T> | (TargetColumn<T> | [TargetColumn<T>, OrderDirection])[] | Partial<Record<Exclude<TargetColumn<T>, SQLWrapper>, OrderDirection>>;
 /**
  * Options object containing ordering configuration.
  * @template T - The entity type.
  */
-export type OrderOptions<T extends EntityWithoutMetadata> = {
+export type OrderOptions<T extends BaseEntity> = {
     order?: Order<T>;
 };
 /**
  * Options for loading a single entity, including ordering and offset.
  * @template T - The entity type.
  */
-export type LoadOptions<T extends EntityWithoutMetadata> = OrderOptions<T> & {
+export type LoadOptions<T extends BaseEntity> = OrderOptions<T> & {
     offset?: number;
 };
 /**
  * Options for loading multiple entities, including ordering, offset, and limit.
  * @template T - The entity type.
  */
-export type LoadManyOptions<T extends EntityWithoutMetadata> = LoadOptions<T> & {
+export type LoadManyOptions<T extends BaseEntity> = LoadOptions<T> & {
     limit?: number;
     distinct?: boolean | TargetColumn<T>[];
 };
@@ -74,7 +74,7 @@ export type RankOptions = {
 /**
  * Options for highlighting search results.
  */
-export type HighlightOptions<T extends EntityWithoutMetadata> = {
+export type HighlightOptions<T extends BaseEntity> = {
     /**
      * The source to generate the highlight from. Can be one or more property paths or a raw SQL expression.
      */
@@ -84,7 +84,7 @@ export type HighlightOptions<T extends EntityWithoutMetadata> = {
  * Options for the `search` method.
  * @template T - The entity type.
  */
-export type SearchOptions<T extends EntityWithoutMetadata> = SimplifyObject<FullTextSearchQuery<T>['$fts'] & TypedOmit<LoadManyOptions<T>, 'order'> & {
+export type SearchOptions<T extends BaseEntity> = SimplifyObject<FullTextSearchQuery<T>['$fts'] & TypedOmit<LoadManyOptions<T>, 'order'> & {
     /**
      * An additional filter to apply to the search query.
      */
@@ -119,7 +119,7 @@ export type SearchOptions<T extends EntityWithoutMetadata> = SimplifyObject<Full
  * Represents a single result from a full-text search operation.
  * @template T - The entity type.
  */
-export type SearchResult<T extends EntityWithoutMetadata> = {
+export type SearchResult<T extends BaseEntity> = {
     entity: T;
     score?: number;
     highlight?: string;
@@ -128,7 +128,7 @@ export type SearchResult<T extends EntityWithoutMetadata> = {
  * Options for update operations (currently inherits from LoadOptions, primarily for ordering).
  * @template T - The entity type.
  */
-export type UpdateOptions<T extends EntityWithoutMetadata> = LoadOptions<T>;
+export type UpdateOptions<T extends BaseEntity> = LoadOptions<T>;
 /** Type definition for updating entity metadata attributes, allowing partial updates and SQL expressions. */
 export type EntityMetadataUpdate = WithSql<Partial<UntaggedDeep<Pick<EntityMetadata, 'attributes'>>>>;
 export type EntityMetadataInsert = Partial<Pick<EntityMetadata, 'attributes'>>;
@@ -138,7 +138,7 @@ export type EntityMetadataInsert = Partial<Pick<EntityMetadata, 'attributes'>>;
  * Allows SQL expressions for values.
  * @template T - The entity type.
  */
-export type NewEntity<T extends Entity | EntityWithoutMetadata> = T extends Entity ? WithSql<UntaggedDeep<TypedOmit<T, 'id' | 'metadata'> & {
+export type NewEntity<T extends Entity | BaseEntity> = T extends Entity ? WithSql<UntaggedDeep<TypedOmit<T, 'id' | 'metadata'> & {
     id?: string;
     metadata?: EntityMetadataInsert;
 }>> : WithSql<UntaggedDeep<TypedOmit<T, 'id'> & {
@@ -150,7 +150,7 @@ export type NewEntity<T extends Entity | EntityWithoutMetadata> = T extends Enti
  * Allows SQL expressions for values.
  * @template T - The entity type.
  */
-export type EntityUpdate<T extends EntityWithoutMetadata> = T extends Entity ? WithSql<PartialDeep<UntaggedDeep<TypedOmit<T, 'metadata'>>>> & {
+export type EntityUpdate<T extends BaseEntity> = T extends Entity ? WithSql<PartialDeep<UntaggedDeep<TypedOmit<T, 'metadata'>>>> & {
     metadata?: EntityMetadataUpdate;
 } : WithSql<PartialDeep<UntaggedDeep<T>>>;
 export {};