@naturalcycles/db-lib 9.3.2 → 9.4.0

package/dist/commondao/common.dao.d.ts

@@ -106,6 +106,10 @@ export declare class CommonDao<BM extends PartialObjectWithId, DBM extends Parti
      * 3. Saves (as fast as possible since the read) with the Patch applied, but only if the data has changed.
      */
     patchById(id: string, patch: Partial<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<BM>>;
+    /**
+     * Like patchById, but runs all operations within a Transaction.
+     */
+    patchByIdInTransaction(id: string, patch: Partial<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<BM>>;
     /**
      * Same as patchById, but takes the whole object as input.
      * This "whole object" is mutated with the patch and returned.
@@ -113,6 +117,10 @@ export declare class CommonDao<BM extends PartialObjectWithId, DBM extends Parti
      * It still loads the row from the DB.
      */
     patch(bm: Saved<BM>, patch: Partial<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<BM>>;
+    /**
+     * Like patch, but runs all operations within a Transaction.
+     */
+    patchInTransaction(bm: Saved<BM>, patch: Partial<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<BM>>;
     saveAsDBM(dbm: DBM, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<DBM>>;
     saveBatch(bms: BM[], opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<BM>[]>;
     saveBatchAsDBM(dbms: DBM[], opt?: CommonDaoSaveBatchOptions<DBM>): Promise<Saved<DBM>[]>;
@@ -160,14 +168,14 @@ export declare class CommonDao<BM extends PartialObjectWithId, DBM extends Parti
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
+    validateAndConvert<T>(obj: Partial<T>, schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): any;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
      * Proxy to this.cfg.db.ping
      */
     ping(): Promise<void>;
-    runInTransaction(fn: CommonDaoTransactionFn, opt?: CommonDBTransactionOptions): Promise<void>;
+    runInTransaction<T = void>(fn: CommonDaoTransactionFn<T>, opt?: CommonDBTransactionOptions): Promise<T>;
     protected logResult(started: number, op: string, res: any, table: string): void;
     protected logSaveResult(started: number, op: string, table: string): void;
     protected logStarted(op: string, table: string, force?: boolean): UnixTimestampMillisNumber;
@@ -178,13 +186,13 @@ export declare class CommonDao<BM extends PartialObjectWithId, DBM extends Parti
  *
  * Transaction is rolled back when the function returns rejected Promise (aka "throws").
  */
-export type CommonDaoTransactionFn = (tx: CommonDaoTransaction) => Promise<void>;
+export type CommonDaoTransactionFn<T = void> = (tx: CommonDaoTransaction) => Promise<T>;
 /**
  * Transaction context.
  * Has similar API than CommonDao, but all operations are performed in the context of the transaction.
  */
 export declare class CommonDaoTransaction {
-    private tx;
+    tx: DBTransaction;
     private logger;
     constructor(tx: DBTransaction, logger: CommonLogger);
     /**

package/dist/commondao/common.dao.js

@@ -24,7 +24,7 @@ class CommonDao {
             // otherwise to log Operations
             // e.g in Dev (local machine), Test - it will log operations (useful for debugging)
             logLevel: isGAE || isCI ? common_dao_model_1.CommonDaoLogLevel.NONE : common_dao_model_1.CommonDaoLogLevel.OPERATIONS,
-            createId: true,
+            generateId: true,
             assignGeneratedIds: false,
             useCreatedProperty: true,
             useUpdatedProperty: true,
@@ -42,7 +42,7 @@ class CommonDao {
                 ...cfg.hooks,
             },
         };
-        if (this.cfg.createId) {
+        if (this.cfg.generateId) {
             this.cfg.hooks.createRandomId ||= () => (0, nodejs_lib_1.stringId)();
         }
         else {
@@ -62,7 +62,7 @@ class CommonDao {
         const op = `getById(${id})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let dbm = (await this.cfg.db.getByIds(table, [id]))[0];
+        let dbm = (await (opt.tx || this.cfg.db).getByIds(table, [id]))[0];
         if (dbm && !opt.raw && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
@@ -89,7 +89,7 @@ class CommonDao {
         const op = `getByIdAsDBM(${id})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let [dbm] = await this.cfg.db.getByIds(table, [id]);
+        let [dbm] = await (opt.tx || this.cfg.db).getByIds(table, [id]);
         if (dbm && !opt.raw && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
@@ -105,7 +105,7 @@ class CommonDao {
         const op = `getByIdAsTM(${id})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let [dbm] = await this.cfg.db.getByIds(table, [id]);
+        let [dbm] = await (opt.tx || this.cfg.db).getByIds(table, [id]);
         if (dbm && !opt.raw && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
@@ -138,7 +138,7 @@ class CommonDao {
         const op = `getByIdsAsDBM ${ids.length} id(s) (${(0, js_lib_1._truncate)(ids.slice(0, 10).join(', '), 50)})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let dbms = await this.cfg.db.getByIds(table, ids);
+        let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids);
         if (!opt.raw && this.cfg.hooks.afterLoad && dbms.length) {
             dbms = (await (0, js_lib_1.pMap)(dbms, async (dbm) => await this.cfg.hooks.afterLoad(dbm))).filter(js_lib_1._isTruthy);
         }
@@ -491,7 +491,7 @@ class CommonDao {
         if (this.cfg.useUpdatedProperty) {
             obj.updated = opt.preserveUpdatedCreated && obj.updated ? obj.updated : now;
         }
-        if (this.cfg.createId) {
+        if (this.cfg.generateId) {
             obj.id ||= this.cfg.hooks.createNaturalId?.(obj) || this.cfg.hooks.createRandomId();
         }
         return obj;
@@ -506,7 +506,7 @@ class CommonDao {
             // Skipping the save operation
             return bm;
         }
-        const idWasGenerated = !bm.id && this.cfg.createId;
+        const idWasGenerated = !bm.id && this.cfg.generateId;
         this.assignIdCreatedUpdated(bm, opt); // mutates
         let dbm = await this.bmToDBM(bm, opt);
         if (this.cfg.hooks.beforeSave) {
@@ -524,7 +524,7 @@ class CommonDao {
         const started = this.logSaveStarted(op, bm, table);
         const { excludeFromIndexes } = this.cfg;
         const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
-        await this.cfg.db.saveBatch(table, [dbm], {
+        await (opt.tx || this.cfg.db).saveBatch(table, [dbm], {
             excludeFromIndexes,
             assignGeneratedIds,
             ...opt,
@@ -566,6 +566,12 @@ class CommonDao {
      * 3. Saves (as fast as possible since the read) with the Patch applied, but only if the data has changed.
      */
     async patchById(id, patch, opt = {}) {
+        if (this.cfg.patchInTransaction && !opt.tx) {
+            // patchInTransaction means that we should run this op in Transaction
+            // But if opt.tx is passed - means that we are already in a Transaction,
+            // and should just continue as-is
+            return await this.patchByIdInTransaction(id, patch, opt);
+        }
         let patched;
         const loaded = await this.getById(id, opt);
         if (loaded) {
@@ -580,6 +586,14 @@ class CommonDao {
         }
         return await this.save(patched, opt);
     }
+    /**
+     * Like patchById, but runs all operations within a Transaction.
+     */
+    async patchByIdInTransaction(id, patch, opt) {
+        return await this.runInTransaction(async (daoTx) => {
+            return await this.patchById(id, patch, { ...opt, tx: daoTx.tx });
+        });
+    }
     /**
      * Same as patchById, but takes the whole object as input.
      * This "whole object" is mutated with the patch and returned.
@@ -587,9 +601,12 @@ class CommonDao {
      * It still loads the row from the DB.
      */
     async patch(bm, patch, opt = {}) {
-        (0, js_lib_1._assert)(bm.id, 'patch argument object should have an id', {
-            bm,
-        });
+        if (this.cfg.patchInTransaction && !opt.tx) {
+            // patchInTransaction means that we should run this op in Transaction
+            // But if opt.tx is passed - means that we are already in a Transaction,
+            // and should just continue as-is
+            return await this.patchInTransaction(bm, patch, opt);
+        }
         const loaded = await this.getById(bm.id, opt);
         if (loaded) {
             Object.assign(loaded, patch);
@@ -605,6 +622,14 @@ class CommonDao {
         }
         return await this.save(bm, opt);
     }
+    /**
+     * Like patch, but runs all operations within a Transaction.
+     */
+    async patchInTransaction(bm, patch, opt) {
+        return await this.runInTransaction(async (daoTx) => {
+            return await this.patch(bm, patch, { ...opt, tx: daoTx.tx });
+        });
+    }
     async saveAsDBM(dbm, opt = {}) {
         this.requireWriteAccess();
         const table = opt.table || this.cfg.table;
@@ -612,7 +637,7 @@ class CommonDao {
         // will override/set `updated` field, unless opts.preserveUpdated is set
         let row = dbm;
         if (!opt.raw) {
-            const idWasGenerated = !dbm.id && this.cfg.createId;
+            const idWasGenerated = !dbm.id && this.cfg.generateId;
             this.assignIdCreatedUpdated(dbm, opt); // mutates
             row = this.anyToDBM(dbm, opt);
             if (opt.ensureUniqueId && idWasGenerated)
@@ -630,7 +655,7 @@ class CommonDao {
             if (row === null)
                 return dbm;
         }
-        await this.cfg.db.saveBatch(table, [row], {
+        await (opt.tx || this.cfg.db).saveBatch(table, [row], {
             excludeFromIndexes,
             assignGeneratedIds,
             ...opt,
@@ -699,7 +724,7 @@ class CommonDao {
         if (this.cfg.hooks.beforeSave && rows.length) {
             rows = (await (0, js_lib_1.pMap)(rows, async (row) => await this.cfg.hooks.beforeSave(row))).filter(js_lib_1._isTruthy);
         }
-        await this.cfg.db.saveBatch(table, rows, {
+        await (opt.tx || this.cfg.db).saveBatch(table, rows, {
             excludeFromIndexes,
             assignGeneratedIds,
             ...opt,
@@ -858,7 +883,6 @@ class CommonDao {
         // DBM > BM
         const bm = await this.cfg.hooks.beforeDBMToBM(dbm);
         // Validate/convert BM
-        // eslint-disable-next-line @typescript-eslint/return-await
         return this.validateAndConvert(bm, this.cfg.bmSchema, db_model_1.DBModelType.BM, opt);
     }
     async dbmsToBM(dbms, opt = {}) {
@@ -876,7 +900,6 @@ class CommonDao {
         // BM > DBM
         const dbm = { ...(await this.cfg.hooks.beforeBMToDBM(bm)) };
         // Validate/convert DBM
-        // eslint-disable-next-line @typescript-eslint/return-await
         return this.validateAndConvert(dbm, this.cfg.dbmSchema, db_model_1.DBModelType.DBM, opt);
     }
     async bmsToDBM(bms, opt = {}) {
@@ -993,16 +1016,18 @@ class CommonDao {
         await this.cfg.db.ping();
     }
     async runInTransaction(fn, opt) {
+        let r;
         await this.cfg.db.runInTransaction(async (tx) => {
             const daoTx = new CommonDaoTransaction(tx, this.cfg.logger);
             try {
-                await fn(daoTx);
+                r = await fn(daoTx);
             }
             catch (err) {
                 await daoTx.rollback(); // graceful rollback that "never throws"
                 throw err;
             }
         }, opt);
+        return r;
     }
     logResult(started, op, res, table) {
         if (!this.cfg.logLevel)
@@ -1081,9 +1106,7 @@ class CommonDaoTransaction {
         }
     }
     async getById(dao, id, opt) {
-        if (!id)
-            return null;
-        return (await this.getByIds(dao, [id], opt))[0] || null;
+        return await dao.getById(id, { ...opt, tx: this.tx });
     }
     async getByIds(dao, ids, opt) {
         return await dao.getByIds(ids, { ...opt, tx: this.tx });

package/dist/commondao/common.dao.model.d.ts

@@ -147,7 +147,7 @@ export interface CommonDaoCfg<BM extends PartialObjectWithId, DBM extends Partia
      * Set to false to disable auto-generation of `id`.
      * Useful e.g when your DB is generating ids by itself (e.g mysql auto_increment).
      */
-    createId?: boolean;
+    generateId?: boolean;
     /**
      * See the same option in CommonDB.
      * Defaults to false normally.
@@ -173,6 +173,13 @@ export interface CommonDaoCfg<BM extends PartialObjectWithId, DBM extends Partia
      * @deprecated
      */
     filterNullishValues?: boolean;
+    /**
+     * Defaults to false.
+     * If true - run patch operations (patch, patchById) in a Transaction.
+     *
+     * @experimental
+     */
+    patchInTransaction?: boolean;
 }
 /**
  * All properties default to undefined.

package/package.json

@@ -40,7 +40,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "9.3.2",
+  "version": "9.4.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/commondao/common.dao.model.ts

@@ -193,7 +193,7 @@ export interface CommonDaoCfg<
    * Set to false to disable auto-generation of `id`.
    * Useful e.g when your DB is generating ids by itself (e.g mysql auto_increment).
    */
-  createId?: boolean
+  generateId?: boolean
 
   /**
    * See the same option in CommonDB.
@@ -223,6 +223,14 @@ export interface CommonDaoCfg<
    * @deprecated
    */
   filterNullishValues?: boolean
+
+  /**
+   * Defaults to false.
+   * If true - run patch operations (patch, patchById) in a Transaction.
+   *
+   * @experimental
+   */
+  patchInTransaction?: boolean
 }
 
 /**

package/src/commondao/common.dao.ts

@@ -87,7 +87,7 @@ export class CommonDao<
       // otherwise to log Operations
       // e.g in Dev (local machine), Test - it will log operations (useful for debugging)
       logLevel: isGAE || isCI ? CommonDaoLogLevel.NONE : CommonDaoLogLevel.OPERATIONS,
-      createId: true,
+      generateId: true,
       assignGeneratedIds: false,
       useCreatedProperty: true,
       useUpdatedProperty: true,
@@ -106,7 +106,7 @@ export class CommonDao<
       } satisfies Partial<CommonDaoHooks<BM, DBM, TM>>,
     }
 
-    if (this.cfg.createId) {
+    if (this.cfg.generateId) {
       this.cfg.hooks!.createRandomId ||= () => stringId()
     } else {
       delete this.cfg.hooks!.createRandomId
@@ -130,7 +130,7 @@ export class CommonDao<
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
 
-    let dbm = (await this.cfg.db.getByIds<DBM>(table, [id]))[0]
+    let dbm = (await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id]))[0]
     if (dbm && !opt.raw && this.cfg.hooks!.afterLoad) {
       dbm = (await this.cfg.hooks!.afterLoad(dbm)) || undefined
     }
@@ -170,7 +170,7 @@ export class CommonDao<
     const op = `getByIdAsDBM(${id})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let [dbm] = await this.cfg.db.getByIds<DBM>(table, [id])
+    let [dbm] = await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id])
     if (dbm && !opt.raw && this.cfg.hooks!.afterLoad) {
       dbm = (await this.cfg.hooks!.afterLoad(dbm)) || undefined
     }
@@ -189,7 +189,7 @@ export class CommonDao<
     const op = `getByIdAsTM(${id})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let [dbm] = await this.cfg.db.getByIds<DBM>(table, [id])
+    let [dbm] = await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id])
     if (dbm && !opt.raw && this.cfg.hooks!.afterLoad) {
       dbm = (await this.cfg.hooks!.afterLoad(dbm)) || undefined
     }
@@ -226,7 +226,7 @@ export class CommonDao<
     const op = `getByIdsAsDBM ${ids.length} id(s) (${_truncate(ids.slice(0, 10).join(', '), 50)})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let dbms = await this.cfg.db.getByIds<DBM>(table, ids)
+    let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids)
     if (!opt.raw && this.cfg.hooks!.afterLoad && dbms.length) {
       dbms = (await pMap(dbms, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
@@ -689,7 +689,7 @@ export class CommonDao<
       obj.updated = opt.preserveUpdatedCreated && obj.updated ? obj.updated : now
     }
 
-    if (this.cfg.createId) {
+    if (this.cfg.generateId) {
       obj.id ||= this.cfg.hooks!.createNaturalId?.(obj as any) || this.cfg.hooks!.createRandomId!()
     }
 
@@ -708,7 +708,7 @@ export class CommonDao<
       return bm as Saved<BM>
     }
 
-    const idWasGenerated = !bm.id && this.cfg.createId
+    const idWasGenerated = !bm.id && this.cfg.generateId
     this.assignIdCreatedUpdated(bm, opt) // mutates
     let dbm = await this.bmToDBM(bm, opt)
 
@@ -727,7 +727,7 @@ export class CommonDao<
     const { excludeFromIndexes } = this.cfg
     const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
 
-    await this.cfg.db.saveBatch(table, [dbm], {
+    await (opt.tx || this.cfg.db).saveBatch(table, [dbm], {
       excludeFromIndexes,
       assignGeneratedIds,
       ...opt,
@@ -784,6 +784,13 @@ export class CommonDao<
     patch: Partial<BM>,
     opt: CommonDaoSaveBatchOptions<DBM> = {},
   ): Promise<Saved<BM>> {
+    if (this.cfg.patchInTransaction && !opt.tx) {
+      // patchInTransaction means that we should run this op in Transaction
+      // But if opt.tx is passed - means that we are already in a Transaction,
+      // and should just continue as-is
+      return await this.patchByIdInTransaction(id, patch, opt)
+    }
+
     let patched: Saved<BM>
     const loaded = await this.getById(id, opt)
 
@@ -801,6 +808,19 @@ export class CommonDao<
     return await this.save(patched, opt)
   }
 
+  /**
+   * Like patchById, but runs all operations within a Transaction.
+   */
+  async patchByIdInTransaction(
+    id: string,
+    patch: Partial<BM>,
+    opt?: CommonDaoSaveBatchOptions<DBM>,
+  ): Promise<Saved<BM>> {
+    return await this.runInTransaction(async daoTx => {
+      return await this.patchById(id, patch, { ...opt, tx: daoTx.tx })
+    })
+  }
+
   /**
    * Same as patchById, but takes the whole object as input.
    * This "whole object" is mutated with the patch and returned.
@@ -812,9 +832,12 @@ export class CommonDao<
     patch: Partial<BM>,
     opt: CommonDaoSaveBatchOptions<DBM> = {},
   ): Promise<Saved<BM>> {
-    _assert(bm.id, 'patch argument object should have an id', {
-      bm,
-    })
+    if (this.cfg.patchInTransaction && !opt.tx) {
+      // patchInTransaction means that we should run this op in Transaction
+      // But if opt.tx is passed - means that we are already in a Transaction,
+      // and should just continue as-is
+      return await this.patchInTransaction(bm, patch, opt)
+    }
 
     const loaded = await this.getById(bm.id, opt)
 
@@ -835,6 +858,19 @@ export class CommonDao<
     return await this.save(bm, opt)
   }
 
+  /**
+   * Like patch, but runs all operations within a Transaction.
+   */
+  async patchInTransaction(
+    bm: Saved<BM>,
+    patch: Partial<BM>,
+    opt?: CommonDaoSaveBatchOptions<DBM>,
+  ): Promise<Saved<BM>> {
+    return await this.runInTransaction(async daoTx => {
+      return await this.patch(bm, patch, { ...opt, tx: daoTx.tx })
+    })
+  }
+
   async saveAsDBM(dbm: DBM, opt: CommonDaoSaveBatchOptions<DBM> = {}): Promise<Saved<DBM>> {
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
@@ -843,7 +879,7 @@ export class CommonDao<
     // will override/set `updated` field, unless opts.preserveUpdated is set
     let row = dbm as Saved<DBM>
     if (!opt.raw) {
-      const idWasGenerated = !dbm.id && this.cfg.createId
+      const idWasGenerated = !dbm.id && this.cfg.generateId
       this.assignIdCreatedUpdated(dbm, opt) // mutates
       row = this.anyToDBM(dbm, opt)
       if (opt.ensureUniqueId && idWasGenerated) await this.ensureUniqueId(table, row)
@@ -861,7 +897,7 @@ export class CommonDao<
       if (row === null) return dbm as Saved<DBM>
     }
 
-    await this.cfg.db.saveBatch(table, [row], {
+    await (opt.tx || this.cfg.db).saveBatch(table, [row], {
       excludeFromIndexes,
       assignGeneratedIds,
       ...opt,
@@ -952,7 +988,7 @@ export class CommonDao<
       )
     }
 
-    await this.cfg.db.saveBatch(table, rows, {
+    await (opt.tx || this.cfg.db).saveBatch(table, rows, {
       excludeFromIndexes,
       assignGeneratedIds,
       ...opt,
@@ -1163,7 +1199,7 @@ export class CommonDao<
     const bm = await this.cfg.hooks!.beforeDBMToBM!(dbm)
 
     // Validate/convert BM
-    // eslint-disable-next-line @typescript-eslint/return-await
+
     return this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
   }
 
@@ -1192,7 +1228,7 @@ export class CommonDao<
     const dbm = { ...(await this.cfg.hooks!.beforeBMToDBM!(bm)) }
 
     // Validate/convert DBM
-    // eslint-disable-next-line @typescript-eslint/return-await
+
     return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
   }
 
@@ -1251,14 +1287,14 @@ export class CommonDao<
    *
    * Does NOT mutate the object.
    */
-  validateAndConvert<IN, OUT = IN>(
-    obj: Partial<IN>,
-    schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined,
+  validateAndConvert<T>(
+    obj: Partial<T>,
+    schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined,
     modelType: DBModelType,
     opt: CommonDaoOptions = {},
-  ): OUT {
+  ): any {
     // `raw` option completely bypasses any processing
-    if (opt.raw) return obj as any as OUT
+    if (opt.raw) return obj as any
 
     // Kirill 2021-10-18: I realized that there's little reason to keep removing null values
     // So, from now on we'll preserve them
@@ -1277,31 +1313,31 @@ export class CommonDao<
 
     // Pre-validation hooks
     if (modelType === DBModelType.DBM) {
-      obj = this.cfg.hooks!.beforeDBMValidate!(obj as any) as IN
+      obj = this.cfg.hooks!.beforeDBMValidate!(obj as any) as T
     }
 
     // Return as is if no schema is passed or if `skipConversion` is set
     if (!schema || opt.skipConversion) {
-      return obj as OUT
+      return obj
     }
 
     // This will Convert and Validate
     const table = opt.table || this.cfg.table
     const objectName = table + (modelType || '')
 
-    let error: JoiValidationError | AjvValidationError | ZodValidationError<IN> | undefined
+    let error: JoiValidationError | AjvValidationError | ZodValidationError<T> | undefined
     let convertedValue: any
 
     if (schema instanceof ZodSchema) {
       // Zod schema
-      const vr = zSafeValidate(obj as IN, schema)
+      const vr = zSafeValidate(obj as T, schema)
       error = vr.error
       convertedValue = vr.data
     } else if (schema instanceof AjvSchema) {
       // Ajv schema
       convertedValue = obj // because Ajv mutates original object
 
-      error = schema.getValidationError(obj as IN, {
+      error = schema.getValidationError(obj as T, {
         objectName,
       })
     } else {
@@ -1337,20 +1373,24 @@ export class CommonDao<
     await this.cfg.db.ping()
   }
 
-  async runInTransaction(
-    fn: CommonDaoTransactionFn,
+  async runInTransaction<T = void>(
+    fn: CommonDaoTransactionFn<T>,
     opt?: CommonDBTransactionOptions,
-  ): Promise<void> {
+  ): Promise<T> {
+    let r: T
+
     await this.cfg.db.runInTransaction(async tx => {
       const daoTx = new CommonDaoTransaction(tx, this.cfg.logger!)
 
       try {
-        await fn(daoTx)
+        r = await fn(daoTx)
       } catch (err) {
         await daoTx.rollback() // graceful rollback that "never throws"
         throw err
       }
     }, opt)
+
+    return r!
   }
 
   protected logResult(started: number, op: string, res: any, table: string): void {
@@ -1415,7 +1455,7 @@ export class CommonDao<
  *
  * Transaction is rolled back when the function returns rejected Promise (aka "throws").
  */
-export type CommonDaoTransactionFn = (tx: CommonDaoTransaction) => Promise<void>
+export type CommonDaoTransactionFn<T = void> = (tx: CommonDaoTransaction) => Promise<T>
 
 /**
  * Transaction context.
@@ -1423,7 +1463,7 @@ export type CommonDaoTransactionFn = (tx: CommonDaoTransaction) => Promise<void>
  */
 export class CommonDaoTransaction {
   constructor(
-    private tx: DBTransaction,
+    public tx: DBTransaction,
     private logger: CommonLogger,
   ) {}
 
@@ -1444,8 +1484,7 @@ export class CommonDaoTransaction {
     id?: string | null,
     opt?: CommonDaoOptions,
   ): Promise<Saved<BM> | null> {
-    if (!id) return null
-    return (await this.getByIds(dao, [id], opt))[0] || null
+    return await dao.getById(id, { ...opt, tx: this.tx })
   }
 
   async getByIds<BM extends PartialObjectWithId, DBM extends PartialObjectWithId>(