metal-orm 1.0.35 → 1.0.37

package/dist/index.d.cts

@@ -373,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['tsType'] extends undefined ? 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>;
+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
  */
@@ -2295,7 +2297,9 @@ declare class OrmSession<E extends DomainEvent = OrmDomainEvent> implements Enti
     persist(entity: object): Promise<void>;
     remove(entity: object): Promise<void>;
     flush(): Promise<void>;
+    private flushWithHooks;
     commit(): Promise<void>;
+    transaction<T>(fn: (session: OrmSession<E>) => Promise<T>): Promise<T>;
     rollback(): Promise<void>;
     getExecutionContext(): ExecutionContext;
     getHydrationContext(): HydrationContext<E>;
@@ -3621,7 +3625,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>>;
@@ -3755,8 +3759,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;
 
@@ -3791,8 +3796,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

@@ -373,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['tsType'] extends undefined ? 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>;
+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
  */
@@ -2295,7 +2297,9 @@ declare class OrmSession<E extends DomainEvent = OrmDomainEvent> implements Enti
     persist(entity: object): Promise<void>;
     remove(entity: object): Promise<void>;
     flush(): Promise<void>;
+    private flushWithHooks;
     commit(): Promise<void>;
+    transaction<T>(fn: (session: OrmSession<E>) => Promise<T>): Promise<T>;
     rollback(): Promise<void>;
     getExecutionContext(): ExecutionContext;
     getHydrationContext(): HydrationContext<E>;
@@ -3621,7 +3625,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>>;
@@ -3755,8 +3759,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;
 
@@ -3791,8 +3796,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

@@ -7408,20 +7408,41 @@ var OrmSession = class {
   async flush() {
     await this.unitOfWork.flush();
   }
+  async flushWithHooks() {
+    for (const interceptor of this.interceptors) {
+      await interceptor.beforeFlush?.(this);
+    }
+    await this.unitOfWork.flush();
+    await this.relationChanges.process();
+    await this.unitOfWork.flush();
+    for (const interceptor of this.interceptors) {
+      await interceptor.afterFlush?.(this);
+    }
+  }
   async commit() {
     await runInTransaction(this.executor, async () => {
-      for (const interceptor of this.interceptors) {
-        await interceptor.beforeFlush?.(this);
-      }
-      await this.unitOfWork.flush();
-      await this.relationChanges.process();
-      await this.unitOfWork.flush();
-      for (const interceptor of this.interceptors) {
-        await interceptor.afterFlush?.(this);
-      }
+      await this.flushWithHooks();
     });
     await this.domainEvents.dispatch(this.unitOfWork.getTracked(), this);
   }
+  async transaction(fn4) {
+    if (!this.executor.beginTransaction) {
+      const result = await fn4(this);
+      await this.commit();
+      return result;
+    }
+    await this.executor.beginTransaction();
+    try {
+      const result = await fn4(this);
+      await this.flushWithHooks();
+      await this.executor.commitTransaction?.();
+      await this.domainEvents.dispatch(this.unitOfWork.getTracked(), this);
+      return result;
+    } catch (err) {
+      await this.rollback();
+      throw err;
+    }
+  }
   async rollback() {
     await this.executor.rollbackTransaction?.();
     this.unitOfWork.reset();
@@ -7576,6 +7597,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,