metal-orm 1.0.34 → 1.0.36

package/dist/index.d.cts

@@ -24,11 +24,13 @@ interface ForeignKeyReference {
 /**
  * Definition of a database column
  */
-interface ColumnDef<T extends ColumnType = ColumnType> {
+interface ColumnDef<T extends ColumnType = ColumnType, TRuntime = unknown> {
     /** Column name (filled at runtime by defineTable) */
     name: string;
     /** Data type of the column */
     type: T;
+    /** Optional override for the inferred TypeScript type */
+    tsType?: TRuntime;
     /** Whether this column is a primary key */
     primary?: boolean;
     /** Whether this column cannot be null */
@@ -102,19 +104,19 @@ declare const col: {
     /**
      * Creates a timestamp column definition
      */
-    timestamp: () => ColumnDef<"TIMESTAMP">;
+    timestamp: <TRuntime = string>() => ColumnDef<"TIMESTAMP", TRuntime>;
     /**
      * Creates a timestamptz column definition
      */
-    timestamptz: () => ColumnDef<"TIMESTAMPTZ">;
+    timestamptz: <TRuntime = string>() => ColumnDef<"TIMESTAMPTZ", TRuntime>;
     /**
      * Creates a date column definition
      */
-    date: () => ColumnDef<"DATE">;
+    date: <TRuntime = string>() => ColumnDef<"DATE", TRuntime>;
     /**
      * Creates a datetime column definition
      */
-    datetime: () => ColumnDef<"DATETIME">;
+    datetime: <TRuntime = string>() => ColumnDef<"DATETIME", TRuntime>;
     /**
      * Creates a JSON column definition
      * @returns ColumnDef with JSON type
@@ -371,7 +373,9 @@ type RelationTargetTable<TRel extends RelationDef> = TRel extends HasManyRelatio
 /**
  * Maps a ColumnDef to its TypeScript type representation
  */
-type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
+type ColumnToTs<T extends ColumnDef> = [
+    unknown
+] extends [T['tsType']] ? T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string : Exclude<T['tsType'], undefined>;
 /**
  * Infers a row shape from a table definition
  */
@@ -3619,7 +3623,7 @@ declare class TypeScriptGenerator implements ExpressionVisitor<string>, OperandV
 }
 
 declare const createEntityProxy: <TTable extends TableDef, TLazy extends keyof RelationMap<TTable> = keyof RelationMap<TTable>>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: TLazy[]) => EntityInstance<TTable>;
-declare const createEntityFromRow: <TTable extends TableDef>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: (keyof RelationMap<TTable>)[]) => EntityInstance<TTable>;
+declare const createEntityFromRow: <TTable extends TableDef, TResult extends EntityInstance<TTable> = EntityInstance<TTable>>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: (keyof RelationMap<TTable>)[]) => TResult;
 
 type Rows$3 = Record<string, any>[];
 declare const loadHasManyRelation: (ctx: EntityContext, rootTable: TableDef, _relationName: string, relation: HasManyRelation) => Promise<Map<string, Rows$3>>;
@@ -3753,8 +3757,9 @@ interface ColumnOptions {
     args?: ColumnDef['args'];
     notNull?: boolean;
     primary?: boolean;
+    tsType?: ColumnDef['tsType'];
 }
-type ColumnInput = ColumnOptions | ColumnDef;
+type ColumnInput = ColumnOptions | ColumnDef<any, any>;
 declare function Column(definition: ColumnInput): DualModePropertyDecorator;
 declare function PrimaryKey(definition: ColumnInput): DualModePropertyDecorator;
 
@@ -3789,8 +3794,8 @@ declare function BelongsTo(options: BelongsToOptions): DualModePropertyDecorator
 declare function BelongsToMany(options: BelongsToManyOptions): DualModePropertyDecorator;
 
 declare const bootstrapEntities: () => TableDef[];
-declare const getTableDefFromEntity: (ctor: EntityConstructor) => TableDef | undefined;
-declare const selectFromEntity: <TTable extends TableDef>(ctor: EntityConstructor) => SelectQueryBuilder<any, TTable>;
+declare const getTableDefFromEntity: <TTable extends TableDef = TableDef>(ctor: EntityConstructor) => TTable | undefined;
+declare const selectFromEntity: <TTable extends TableDef = TableDef>(ctor: EntityConstructor) => SelectQueryBuilder<any, TTable>;
 
 interface PostgresClientLike {
     query(text: string, params?: unknown[]): Promise<{

package/dist/index.d.ts

@@ -24,11 +24,13 @@ interface ForeignKeyReference {
 /**
  * Definition of a database column
  */
-interface ColumnDef<T extends ColumnType = ColumnType> {
+interface ColumnDef<T extends ColumnType = ColumnType, TRuntime = unknown> {
     /** Column name (filled at runtime by defineTable) */
     name: string;
     /** Data type of the column */
     type: T;
+    /** Optional override for the inferred TypeScript type */
+    tsType?: TRuntime;
     /** Whether this column is a primary key */
     primary?: boolean;
     /** Whether this column cannot be null */
@@ -102,19 +104,19 @@ declare const col: {
     /**
      * Creates a timestamp column definition
      */
-    timestamp: () => ColumnDef<"TIMESTAMP">;
+    timestamp: <TRuntime = string>() => ColumnDef<"TIMESTAMP", TRuntime>;
     /**
      * Creates a timestamptz column definition
      */
-    timestamptz: () => ColumnDef<"TIMESTAMPTZ">;
+    timestamptz: <TRuntime = string>() => ColumnDef<"TIMESTAMPTZ", TRuntime>;
     /**
      * Creates a date column definition
      */
-    date: () => ColumnDef<"DATE">;
+    date: <TRuntime = string>() => ColumnDef<"DATE", TRuntime>;
     /**
      * Creates a datetime column definition
      */
-    datetime: () => ColumnDef<"DATETIME">;
+    datetime: <TRuntime = string>() => ColumnDef<"DATETIME", TRuntime>;
     /**
      * Creates a JSON column definition
      * @returns ColumnDef with JSON type
@@ -371,7 +373,9 @@ type RelationTargetTable<TRel extends RelationDef> = TRel extends HasManyRelatio
 /**
  * Maps a ColumnDef to its TypeScript type representation
  */
-type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
+type ColumnToTs<T extends ColumnDef> = [
+    unknown
+] extends [T['tsType']] ? T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string : Exclude<T['tsType'], undefined>;
 /**
  * Infers a row shape from a table definition
  */
@@ -3619,7 +3623,7 @@ declare class TypeScriptGenerator implements ExpressionVisitor<string>, OperandV
 }
 
 declare const createEntityProxy: <TTable extends TableDef, TLazy extends keyof RelationMap<TTable> = keyof RelationMap<TTable>>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: TLazy[]) => EntityInstance<TTable>;
-declare const createEntityFromRow: <TTable extends TableDef>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: (keyof RelationMap<TTable>)[]) => EntityInstance<TTable>;
+declare const createEntityFromRow: <TTable extends TableDef, TResult extends EntityInstance<TTable> = EntityInstance<TTable>>(ctx: EntityContext, table: TTable, row: Record<string, any>, lazyRelations?: (keyof RelationMap<TTable>)[]) => TResult;
 
 type Rows$3 = Record<string, any>[];
 declare const loadHasManyRelation: (ctx: EntityContext, rootTable: TableDef, _relationName: string, relation: HasManyRelation) => Promise<Map<string, Rows$3>>;
@@ -3753,8 +3757,9 @@ interface ColumnOptions {
     args?: ColumnDef['args'];
     notNull?: boolean;
     primary?: boolean;
+    tsType?: ColumnDef['tsType'];
 }
-type ColumnInput = ColumnOptions | ColumnDef;
+type ColumnInput = ColumnOptions | ColumnDef<any, any>;
 declare function Column(definition: ColumnInput): DualModePropertyDecorator;
 declare function PrimaryKey(definition: ColumnInput): DualModePropertyDecorator;
 
@@ -3789,8 +3794,8 @@ declare function BelongsTo(options: BelongsToOptions): DualModePropertyDecorator
 declare function BelongsToMany(options: BelongsToManyOptions): DualModePropertyDecorator;
 
 declare const bootstrapEntities: () => TableDef[];
-declare const getTableDefFromEntity: (ctor: EntityConstructor) => TableDef | undefined;
-declare const selectFromEntity: <TTable extends TableDef>(ctor: EntityConstructor) => SelectQueryBuilder<any, TTable>;
+declare const getTableDefFromEntity: <TTable extends TableDef = TableDef>(ctor: EntityConstructor) => TTable | undefined;
+declare const selectFromEntity: <TTable extends TableDef = TableDef>(ctor: EntityConstructor) => SelectQueryBuilder<any, TTable>;
 
 interface PostgresClientLike {
     query(text: string, params?: unknown[]): Promise<{

package/dist/index.js

@@ -7576,6 +7576,7 @@ var normalizeColumnInput = (input) => {
     args: asOptions.args ?? asDefinition.args,
     notNull: asOptions.notNull ?? asDefinition.notNull,
     primary: asOptions.primary ?? asDefinition.primary,
+    tsType: asDefinition.tsType ?? asOptions.tsType,
     unique: asDefinition.unique,
     default: asDefinition.default,
     autoIncrement: asDefinition.autoIncrement,