@naturalcycles/db-lib 9.5.0 → 9.7.0

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

@@ -2,7 +2,7 @@
 import { Transform } from 'node:stream';
 import { AsyncMapper, BaseDBEntity, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, UnixTimestampMillisNumber, Unsaved, ZodSchema } from '@naturalcycles/js-lib';
 import { AjvSchema, ObjectSchema, ReadableTyped } from '@naturalcycles/nodejs-lib';
-import { CommonDBTransactionOptions, DBModelType, DBPatch, DBTransaction, RunQueryResult } from '../db.model';
+import { CommonDBTransactionOptions, DBPatch, DBTransaction, RunQueryResult } from '../db.model';
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery';
 import { CommonDaoCfg, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveBatchOptions, CommonDaoSaveOptions, CommonDaoStreamDeleteOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDaoStreamSaveOptions } from './common.dao.model';
 /**
@@ -19,7 +19,6 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     getById(id: undefined | null, opt?: CommonDaoOptions): Promise<null>;
     getById(id?: string | null, opt?: CommonDaoOptions): Promise<BM | null>;
     getByIdOrEmpty(id: string, part?: Partial<BM>, opt?: CommonDaoOptions): Promise<BM>;
-    getByIdAsDBMOrEmpty(id: string, part?: Partial<BM>, opt?: CommonDaoOptions): Promise<DBM>;
     getByIdAsDBM(id: undefined | null, opt?: CommonDaoOptions): Promise<null>;
     getByIdAsDBM(id?: string | null, opt?: CommonDaoOptions): Promise<DBM | null>;
     getByIds(ids: string[], opt?: CommonDaoOptions): Promise<BM[]>;
@@ -79,10 +78,6 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * "Returns", just to have a type of "Saved"
      */
     assignIdCreatedUpdated<T extends BaseDBEntity>(obj: Partial<T>, opt?: CommonDaoOptions): T;
-    /**
-     * Mutates with id, created, updated
-     */
-    save(bm: Unsaved<BM>, opt?: CommonDaoSaveOptions<BM, DBM>): Promise<BM>;
     /**
      * 1. Applies the patch
      * 2. If object is the same after patching - skips saving it
@@ -117,7 +112,11 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Like patch, but runs all operations within a Transaction.
      */
     patchInTransaction(bm: BM, patch: Partial<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<BM>;
-    saveAsDBM(dbm: Unsaved<DBM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<DBM>;
+    /**
+     * Mutates with id, created, updated
+     */
+    save(bm: Unsaved<BM>, opt?: CommonDaoSaveOptions<BM, DBM>): Promise<BM>;
+    saveAsDBM(dbm: Unsaved<DBM>, opt?: CommonDaoSaveOptions<BM, DBM>): Promise<DBM>;
     saveBatch(bms: Unsaved<BM>[], opt?: CommonDaoSaveBatchOptions<DBM>): Promise<BM[]>;
     saveBatchAsDBM(dbms: Unsaved<DBM>[], opt?: CommonDaoSaveBatchOptions<DBM>): Promise<DBM[]>;
     /**
@@ -130,7 +129,6 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     /**
      * @returns number of deleted items
      */
-    deleteById(id: undefined | null, opt?: CommonDaoOptions): Promise<0>;
     deleteById(id?: string | null, opt?: CommonDaoOptions): Promise<number>;
     deleteByIds(ids: string[], opt?: CommonDaoOptions): Promise<number>;
     /**
@@ -161,7 +159,7 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert<T>(obj: Partial<T>, schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined, modelType?: DBModelType, opt?: CommonDaoOptions): any;
+    validateAndConvert<T>(obj: Partial<T>, schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined, opt?: CommonDaoOptions): any;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
@@ -194,8 +192,16 @@ export declare class CommonDaoTransaction {
     rollback(): Promise<void>;
     getById<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, id?: string | null, opt?: CommonDaoOptions): Promise<BM | null>;
     getByIds<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, ids: string[], opt?: CommonDaoOptions): Promise<BM[]>;
-    save<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, bm: Unsaved<BM>, opt?: CommonDaoSaveBatchOptions<DBM>): Promise<BM>;
+    save<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, bm: Unsaved<BM>, opt?: CommonDaoSaveOptions<BM, DBM>): Promise<BM>;
     saveBatch<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, bms: Unsaved<BM>[], opt?: CommonDaoSaveBatchOptions<DBM>): Promise<BM[]>;
+    /**
+     * DaoTransaction.patch does not load from DB.
+     * It assumes the bm was previously loaded in the same Transaction, hence could not be
+     * concurrently modified. Hence it's safe to not sync with DB.
+     *
+     * So, this method is a rather simple convenience "Object.assign and then save".
+     */
+    patch<BM extends BaseDBEntity, DBM extends BaseDBEntity>(dao: CommonDao<BM, DBM>, bm: BM, patch: Partial<BM>, opt?: CommonDaoSaveOptions<BM, DBM>): Promise<BM>;
     deleteById(dao: CommonDao<any>, id?: string | null, opt?: CommonDaoOptions): Promise<number>;
     deleteByIds(dao: CommonDao<any>, ids: string[], opt?: CommonDaoOptions): Promise<number>;
 }

package/dist/commondao/common.dao.js

@@ -4,7 +4,6 @@ exports.CommonDaoTransaction = exports.CommonDao = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const cnst_1 = require("../cnst");
-const db_model_1 = require("../db.model");
 const dbQuery_1 = require("../query/dbQuery");
 const common_dao_model_1 = require("./common.dao.model");
 const isGAE = !!process.env['GAE_INSTANCE'];
@@ -33,9 +32,6 @@ class CommonDao {
             hooks: {
                 parseNaturalId: () => ({}),
                 beforeCreate: bm => bm,
-                beforeDBMValidate: dbm => dbm,
-                beforeDBMToBM: dbm => dbm,
-                beforeBMToDBM: bm => bm,
                 anonymize: dbm => dbm,
                 onValidationError: err => err,
                 ...cfg.hooks,
@@ -53,7 +49,7 @@ class CommonDao {
         const bm = this.cfg.hooks.beforeCreate(part);
         // First assignIdCreatedUpdated, then validate!
         this.assignIdCreatedUpdated(bm, opt);
-        return this.validateAndConvert(bm, this.cfg.bmSchema, db_model_1.DBModelType.BM, opt);
+        return this.validateAndConvert(bm, this.cfg.bmSchema, opt);
     }
     async getById(id, opt = {}) {
         if (!id)
@@ -62,10 +58,10 @@ class CommonDao {
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         let dbm = (await (opt.tx || this.cfg.db).getByIds(table, [id]))[0];
-        if (dbm && !opt.raw && this.cfg.hooks.afterLoad) {
+        if (dbm && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
-        const bm = opt.raw ? dbm : await this.dbmToBM(dbm, opt);
+        const bm = await this.dbmToBM(dbm, opt);
         this.logResult(started, op, bm, table);
         return bm || null;
     }
@@ -75,13 +71,6 @@ class CommonDao {
             return bm;
         return this.create({ ...part, id }, opt);
     }
-    async getByIdAsDBMOrEmpty(id, part = {}, opt) {
-        const dbm = await this.getByIdAsDBM(id, opt);
-        if (dbm)
-            return dbm;
-        const bm = this.create({ ...part, id }, opt);
-        return await this.bmToDBM(bm, opt);
-    }
     async getByIdAsDBM(id, opt = {}) {
         if (!id)
             return null;
@@ -89,12 +78,10 @@ class CommonDao {
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         let [dbm] = await (opt.tx || this.cfg.db).getByIds(table, [id]);
-        if (dbm && !opt.raw && this.cfg.hooks.afterLoad) {
+        if (dbm && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
-        if (!opt.raw) {
-            dbm = this.anyToDBM(dbm, opt);
-        }
+        dbm = this.anyToDBM(dbm, opt);
         this.logResult(started, op, dbm, table);
         return dbm || null;
     }
@@ -105,10 +92,10 @@ class CommonDao {
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids);
-        if (!opt.raw && this.cfg.hooks.afterLoad && dbms.length) {
+        if (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);
         }
-        const bms = opt.raw ? dbms : await this.dbmsToBM(dbms, opt);
+        const bms = await this.dbmsToBM(dbms, opt);
         this.logResult(started, op, bms, table);
         return bms;
     }
@@ -119,7 +106,7 @@ class CommonDao {
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids);
-        if (!opt.raw && this.cfg.hooks.afterLoad && dbms.length) {
+        if (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);
         }
         this.logResult(started, op, dbms, table);
@@ -218,10 +205,10 @@ class CommonDao {
         const started = this.logStarted(op, q.table);
         let { rows, ...queryResult } = await this.cfg.db.runQuery(q, opt);
         const partialQuery = !!q._selectedFieldNames;
-        if (!opt.raw && this.cfg.hooks.afterLoad && rows.length) {
+        if (this.cfg.hooks.afterLoad && rows.length) {
             rows = (await (0, js_lib_1.pMap)(rows, async (dbm) => await this.cfg.hooks.afterLoad(dbm))).filter(js_lib_1._isTruthy);
         }
-        const bms = partialQuery || opt.raw ? rows : await this.dbmsToBM(rows, opt);
+        const bms = partialQuery ? rows : await this.dbmsToBM(rows, opt);
         this.logResult(started, op, bms, q.table);
         return {
             rows: bms,
@@ -237,11 +224,11 @@ class CommonDao {
         const op = `runQueryAsDBM(${q.pretty()})`;
         const started = this.logStarted(op, q.table);
         let { rows, ...queryResult } = await this.cfg.db.runQuery(q, opt);
-        if (!opt.raw && this.cfg.hooks.afterLoad && rows.length) {
+        if (this.cfg.hooks.afterLoad && rows.length) {
             rows = (await (0, js_lib_1.pMap)(rows, async (dbm) => await this.cfg.hooks.afterLoad(dbm))).filter(js_lib_1._isTruthy);
         }
         const partialQuery = !!q._selectedFieldNames;
-        const dbms = partialQuery || opt.raw ? rows : this.anyToDBMs(rows, opt);
+        const dbms = partialQuery ? rows : this.anyToDBMs(rows, opt);
         this.logResult(started, op, dbms, q.table);
         return { rows: dbms, ...queryResult };
     }
@@ -268,7 +255,7 @@ class CommonDao {
             this.cfg.db.streamQuery(q, opt),
             (0, nodejs_lib_1.transformMap)(async (dbm) => {
                 count++;
-                if (partialQuery || opt.raw)
+                if (partialQuery)
                     return dbm;
                 if (this.cfg.hooks.afterLoad) {
                     dbm = (await this.cfg.hooks.afterLoad(dbm));
@@ -307,7 +294,7 @@ class CommonDao {
             this.cfg.db.streamQuery(q, opt),
             (0, nodejs_lib_1.transformMap)(async (dbm) => {
                 count++;
-                if (partialQuery || opt.raw)
+                if (partialQuery)
                     return dbm;
                 if (this.cfg.hooks.afterLoad) {
                     dbm = (await this.cfg.hooks.afterLoad(dbm));
@@ -343,7 +330,7 @@ class CommonDao {
         opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const partialQuery = !!q._selectedFieldNames;
         const stream = this.cfg.db.streamQuery(q, opt);
-        if (partialQuery || opt.raw)
+        if (partialQuery)
             return stream;
         return stream
             .on('error', err => stream.emit('error', err))
@@ -374,7 +361,7 @@ class CommonDao {
         opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const stream = this.cfg.db.streamQuery(q, opt);
         const partialQuery = !!q._selectedFieldNames;
-        if (partialQuery || opt.raw)
+        if (partialQuery)
             return stream;
         return (stream
             // optimization: 1 validation is enough
@@ -457,45 +444,6 @@ class CommonDao {
         return obj;
     }
     // SAVE
-    /**
-     * Mutates with id, created, updated
-     */
-    async save(bm, opt = {}) {
-        this.requireWriteAccess();
-        if (opt.skipIfEquals && (0, js_lib_1._deepJsonEquals)(bm, opt.skipIfEquals)) {
-            // Skipping the save operation
-            return bm;
-        }
-        const idWasGenerated = !bm.id && this.cfg.generateId;
-        this.assignIdCreatedUpdated(bm, opt); // mutates
-        (0, js_lib_1._typeCast)(bm);
-        let dbm = await this.bmToDBM(bm, opt);
-        if (this.cfg.hooks.beforeSave) {
-            dbm = (await this.cfg.hooks.beforeSave(dbm));
-            if (dbm === null)
-                return bm;
-        }
-        const table = opt.table || this.cfg.table;
-        if (opt.ensureUniqueId && idWasGenerated)
-            await this.ensureUniqueId(table, dbm);
-        if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
-            opt = { ...opt, saveMethod: 'insert' };
-        }
-        const op = `save(${dbm.id})`;
-        const started = this.logSaveStarted(op, bm, table);
-        const { excludeFromIndexes } = this.cfg;
-        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
-        await (opt.tx || this.cfg.db).saveBatch(table, [dbm], {
-            excludeFromIndexes,
-            assignGeneratedIds,
-            ...opt,
-        });
-        if (assignGeneratedIds) {
-            bm.id = dbm.id;
-        }
-        this.logSaveResult(started, op, table);
-        return bm;
-    }
     /**
      * 1. Applies the patch
      * 2. If object is the same after patching - skips saving it
@@ -591,19 +539,55 @@ class CommonDao {
             return await this.patch(bm, patch, { ...opt, tx: daoTx.tx });
         });
     }
+    /**
+     * Mutates with id, created, updated
+     */
+    async save(bm, opt = {}) {
+        this.requireWriteAccess();
+        if (opt.skipIfEquals && (0, js_lib_1._deepJsonEquals)(bm, opt.skipIfEquals)) {
+            // Skipping the save operation
+            return bm;
+        }
+        const idWasGenerated = !bm.id && this.cfg.generateId;
+        this.assignIdCreatedUpdated(bm, opt); // mutates
+        (0, js_lib_1._typeCast)(bm);
+        let dbm = await this.bmToDBM(bm, opt); // validates BM
+        if (this.cfg.hooks.beforeSave) {
+            dbm = (await this.cfg.hooks.beforeSave(dbm));
+            if (dbm === null)
+                return bm;
+        }
+        const table = opt.table || this.cfg.table;
+        if (opt.ensureUniqueId && idWasGenerated)
+            await this.ensureUniqueId(table, dbm);
+        if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
+            opt = { ...opt, saveMethod: 'insert' };
+        }
+        const op = `save(${dbm.id})`;
+        const started = this.logSaveStarted(op, bm, table);
+        const { excludeFromIndexes } = this.cfg;
+        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
+        await (opt.tx || this.cfg.db).saveBatch(table, [dbm], {
+            excludeFromIndexes,
+            assignGeneratedIds,
+            ...opt,
+        });
+        if (assignGeneratedIds) {
+            bm.id = dbm.id;
+        }
+        this.logSaveResult(started, op, table);
+        return bm;
+    }
     async saveAsDBM(dbm, opt = {}) {
         this.requireWriteAccess();
         const table = opt.table || this.cfg.table;
         // assigning id in case it misses the id
         // will override/set `updated` field, unless opts.preserveUpdated is set
-        let row = dbm;
-        if (!opt.raw) {
-            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);
-        }
+        const idWasGenerated = !dbm.id && this.cfg.generateId;
+        this.assignIdCreatedUpdated(dbm, opt); // mutates
+        let row = this.anyToDBM(dbm, opt);
+        if (opt.ensureUniqueId && idWasGenerated)
+            await this.ensureUniqueId(table, row);
         if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
             opt = { ...opt, saveMethod: 'insert' };
         }
@@ -665,13 +649,10 @@ class CommonDao {
             return [];
         this.requireWriteAccess();
         const table = opt.table || this.cfg.table;
-        let rows = dbms;
-        if (!opt.raw) {
-            dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)); // mutates
-            rows = this.anyToDBMs(dbms, opt);
-            if (opt.ensureUniqueId)
-                throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
-        }
+        dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)); // mutates
+        let rows = this.anyToDBMs(dbms, opt);
+        if (opt.ensureUniqueId)
+            throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
         if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
             opt = { ...opt, saveMethod: 'insert' };
         }
@@ -748,17 +729,14 @@ class CommonDao {
             (0, nodejs_lib_1.writableVoid)(),
         ];
     }
+    // DELETE
+    /**
+     * @returns number of deleted items
+     */
     async deleteById(id, opt = {}) {
         if (!id)
             return 0;
-        this.requireWriteAccess();
-        this.requireObjectMutability(opt);
-        const op = `deleteById(${id})`;
-        const table = opt.table || this.cfg.table;
-        const started = this.logStarted(op, table);
-        const count = await this.cfg.db.deleteByIds(table, [id], opt);
-        this.logSaveResult(started, op, table);
-        return count;
+        return await this.deleteByIds([id], opt);
     }
     async deleteByIds(ids, opt = {}) {
         if (!ids.length)
@@ -842,9 +820,15 @@ class CommonDao {
             dbm = this.cfg.hooks.anonymize(dbm);
         }
         // DBM > BM
-        const bm = await this.cfg.hooks.beforeDBMToBM(dbm);
+        let bm;
+        if (this.cfg.hooks.beforeDBMToBM) {
+            bm = await this.cfg.hooks.beforeDBMToBM(dbm);
+        }
+        else {
+            bm = dbm;
+        }
         // Validate/convert BM
-        return this.validateAndConvert(bm, this.cfg.bmSchema, db_model_1.DBModelType.BM, opt);
+        return this.validateAndConvert(bm, this.cfg.bmSchema, opt);
     }
     async dbmsToBM(dbms, opt = {}) {
         return await (0, js_lib_1.pMap)(dbms, async (dbm) => await this.dbmToBM(dbm, opt));
@@ -852,16 +836,21 @@ class CommonDao {
     async bmToDBM(bm, opt) {
         if (bm === undefined)
             return;
-        // optimization: no need to run the BM validation, since DBM will be validated anyway
-        // Validate/convert BM
-        // bm gets assigned to the new reference
-        // bm = this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
         // should not do it on load, but only on save!
         // this.assignIdCreatedUpdated(bm, opt)
+        // bm gets assigned to the new reference
+        bm = this.validateAndConvert(bm, this.cfg.bmSchema, opt);
         // BM > DBM
-        const dbm = { ...(await this.cfg.hooks.beforeBMToDBM(bm)) };
+        let dbm;
+        if (this.cfg.hooks.beforeBMToDBM) {
+            dbm = { ...(await this.cfg.hooks.beforeBMToDBM(bm)) };
+        }
+        else {
+            dbm = bm;
+        }
         // Validate/convert DBM
-        return this.validateAndConvert(dbm, this.cfg.dbmSchema, db_model_1.DBModelType.DBM, opt);
+        // return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+        return dbm;
     }
     async bmsToDBM(bms, opt = {}) {
         // try/catch?
@@ -873,11 +862,14 @@ class CommonDao {
         // this shouldn't be happening on load! but should on save!
         // this.assignIdCreatedUpdated(dbm, opt)
         dbm = { ...dbm, ...this.cfg.hooks.parseNaturalId(dbm.id) };
+        // todo: is this the right place?
+        // todo: is anyToDBM even needed?
         if (opt.anonymize) {
             dbm = this.cfg.hooks.anonymize(dbm);
         }
         // Validate/convert DBM
-        return this.validateAndConvert(dbm, this.cfg.dbmSchema, db_model_1.DBModelType.DBM, opt);
+        // return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+        return dbm;
     }
     anyToDBMs(entities, opt = {}) {
         return entities.map(entity => this.anyToDBM(entity, opt));
@@ -888,10 +880,7 @@ class CommonDao {
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert(obj, schema, modelType, opt = {}) {
-        // `raw` option completely bypasses any processing
-        if (opt.raw)
-            return obj;
+    validateAndConvert(obj, schema, opt = {}) {
         // Kirill 2021-10-18: I realized that there's little reason to keep removing null values
         // So, from now on we'll preserve them
         // "undefined" values, I believe, are/were not saved to/from DB anyway (due to e.g JSON.stringify removing them)
@@ -901,23 +890,14 @@ class CommonDao {
         // obj = _filterNullishValues(obj as any)
         // We still filter `undefined` values here, because `beforeDBMToBM` can return undefined values
         // and they can be annoying with snapshot tests
-        if (this.cfg.filterNullishValues) {
-            obj = (0, js_lib_1._filterNullishValues)(obj);
-        }
-        else {
-            obj = (0, js_lib_1._filterUndefinedValues)(obj);
-        }
-        // Pre-validation hooks
-        if (modelType === db_model_1.DBModelType.DBM) {
-            obj = this.cfg.hooks.beforeDBMValidate(obj);
-        }
+        obj = (0, js_lib_1._filterUndefinedValues)(obj);
         // Return as is if no schema is passed or if `skipConversion` is set
         if (!schema || opt.skipConversion) {
             return obj;
         }
         // This will Convert and Validate
         const table = opt.table || this.cfg.table;
-        const objectName = table + (modelType || '');
+        const objectName = table;
         let error;
         let convertedValue;
         if (schema instanceof js_lib_1.ZodSchema) {
@@ -1070,11 +1050,23 @@ class CommonDaoTransaction {
     //   }
     // }
     async save(dao, bm, opt) {
-        return (await this.saveBatch(dao, [bm], opt))[0];
+        return await dao.save(bm, { ...opt, tx: this.tx });
     }
     async saveBatch(dao, bms, opt) {
         return await dao.saveBatch(bms, { ...opt, tx: this.tx });
     }
+    /**
+     * DaoTransaction.patch does not load from DB.
+     * It assumes the bm was previously loaded in the same Transaction, hence could not be
+     * concurrently modified. Hence it's safe to not sync with DB.
+     *
+     * So, this method is a rather simple convenience "Object.assign and then save".
+     */
+    async patch(dao, bm, patch, opt) {
+        const skipIfEquals = (0, js_lib_1._deepCopy)(bm);
+        Object.assign(bm, patch);
+        return await dao.save(bm, { ...opt, skipIfEquals, tx: this.tx });
+    }
     async deleteById(dao, id, opt) {
         if (!id)
             return 0;

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

@@ -28,16 +28,6 @@ export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntit
      * - patch, patchAsDBM
      */
     beforeCreate: (bm: Partial<BM>) => Partial<BM>;
-    /**
-     * Called when loading things "as DBM" and validation is not skipped.
-     * When loading things as BM/TM - other hooks get involved instead:
-     * - beforeDBMToBM
-     * - beforeBMToTM
-     *
-     * TODO: maybe rename those to `validateAs(model)`
-     * as it only validates "final state", not intermediate
-     */
-    beforeDBMValidate: (dbm: Partial<DBM>) => Partial<DBM>;
     beforeDBMToBM: (dbm: DBM) => Partial<BM> | Promise<Partial<BM>>;
     beforeBMToDBM: (bm: BM) => Partial<DBM> | Promise<Partial<DBM>>;
     /**
@@ -109,7 +99,6 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
     /**
      * Joi, AjvSchema or ZodSchema is supported.
      */
-    dbmSchema?: ObjectSchema<DBM> | AjvSchema<DBM> | ZodSchema<DBM>;
     bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>;
     excludeFromIndexes?: (keyof DBM)[];
     /**
@@ -161,16 +150,6 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Set to false to disable `updated` field management.
      */
     useUpdatedProperty?: boolean;
-    /**
-     * Default is false.
-     * If true - will run `_filterNullishValues` inside `validateAndConvert` function
-     * (instead of `_filterUndefinedValues`).
-     * This was the old db-lib behavior.
-     * This option allows to keep backwards-compatible behavior.
-     *
-     * @deprecated
-     */
-    filterNullishValues?: boolean;
     /**
      * Defaults to false.
      * If true - run patch operations (patch, patchById) in a Transaction.
@@ -198,15 +177,6 @@ export interface CommonDaoOptions extends CommonDBOptions {
      * @default false
      */
     skipConversion?: boolean;
-    /**
-     * If true - will SKIP ANY transformation/processing, will return DB objects as they are. Will also skip created/updated/id
-     * generation.
-     *
-     * Useful for performance/streaming/pipelines.
-     *
-     * @default false
-     */
-    raw?: boolean;
     /**
      * @default false
      */

package/dist/testing/daoTest.js

@@ -13,7 +13,6 @@ function runCommonDaoTest(db, quirks = {}) {
     const dao = new common_dao_1.CommonDao({
         table: test_model_1.TEST_TABLE,
         db,
-        dbmSchema: test_model_1.testItemDBMSchema,
         bmSchema: test_model_1.testItemBMSchema,
         logStarted: true,
         logLevel: __1.CommonDaoLogLevel.DATA_FULL,
@@ -32,7 +31,7 @@ function runCommonDaoTest(db, quirks = {}) {
     // CREATE TABLE, DROP
     if (support.createTable) {
         test('createTable, dropIfExists=true', async () => {
-            await dao.createTable(test_model_1.testItemDBMJsonSchema, { dropIfExists: true });
+            await dao.createTable(test_model_1.testItemBMJsonSchema, { dropIfExists: true });
         });
     }
     if (support.queries) {

package/dist/testing/dbTest.js

@@ -20,7 +20,7 @@ function runCommonDBTest(db, quirks = {}) {
     // CREATE TABLE, DROP
     if (support.createTable) {
         test('createTable, dropIfExists=true', async () => {
-            await db.createTable(test_model_1.TEST_TABLE, test_model_1.testItemDBMJsonSchema, { dropIfExists: true });
+            await db.createTable(test_model_1.TEST_TABLE, test_model_1.testItemBMJsonSchema, { dropIfExists: true });
         });
     }
     if (support.queries) {

package/dist/testing/index.d.ts

@@ -1,6 +1,6 @@
 import { runCommonDaoTest } from './daoTest';
 import { CommonDBImplementationQuirks, runCommonDBTest } from './dbTest';
 import { runCommonKeyValueDBTest } from './keyValueDBTest';
-import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, TestItemBM, testItemBMJsonSchema, testItemBMSchema, TestItemDBM, testItemDBMJsonSchema, testItemDBMSchema, TestItemTM, testItemTMSchema, TEST_TABLE } from './test.model';
+import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, TestItemBM, testItemBMJsonSchema, testItemBMSchema, TestItemDBM, TestItemTM, testItemTMSchema, TEST_TABLE } from './test.model';
 export type { TestItemDBM, TestItemBM, TestItemTM, CommonDBImplementationQuirks };
-export { TEST_TABLE, createTestItemDBM, createTestItemBM, createTestItemsDBM, createTestItemsBM, testItemDBMSchema, testItemBMSchema, testItemTMSchema, testItemBMJsonSchema, testItemDBMJsonSchema, runCommonDBTest, runCommonDaoTest, runCommonKeyValueDBTest, };
+export { TEST_TABLE, createTestItemDBM, createTestItemBM, createTestItemsDBM, createTestItemsBM, testItemBMSchema, testItemTMSchema, testItemBMJsonSchema, runCommonDBTest, runCommonDaoTest, runCommonKeyValueDBTest, };

package/dist/testing/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommonKeyValueDBTest = exports.runCommonDaoTest = exports.runCommonDBTest = exports.testItemDBMJsonSchema = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.testItemDBMSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.TEST_TABLE = void 0;
+exports.runCommonKeyValueDBTest = exports.runCommonDaoTest = exports.runCommonDBTest = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.TEST_TABLE = void 0;
 const daoTest_1 = require("./daoTest");
 Object.defineProperty(exports, "runCommonDaoTest", { enumerable: true, get: function () { return daoTest_1.runCommonDaoTest; } });
 const dbTest_1 = require("./dbTest");
@@ -14,7 +14,5 @@ Object.defineProperty(exports, "createTestItemsBM", { enumerable: true, get: fun
 Object.defineProperty(exports, "createTestItemsDBM", { enumerable: true, get: function () { return test_model_1.createTestItemsDBM; } });
 Object.defineProperty(exports, "testItemBMJsonSchema", { enumerable: true, get: function () { return test_model_1.testItemBMJsonSchema; } });
 Object.defineProperty(exports, "testItemBMSchema", { enumerable: true, get: function () { return test_model_1.testItemBMSchema; } });
-Object.defineProperty(exports, "testItemDBMJsonSchema", { enumerable: true, get: function () { return test_model_1.testItemDBMJsonSchema; } });
-Object.defineProperty(exports, "testItemDBMSchema", { enumerable: true, get: function () { return test_model_1.testItemDBMSchema; } });
 Object.defineProperty(exports, "testItemTMSchema", { enumerable: true, get: function () { return test_model_1.testItemTMSchema; } });
 Object.defineProperty(exports, "TEST_TABLE", { enumerable: true, get: function () { return test_model_1.TEST_TABLE; } });

package/dist/testing/test.model.d.ts

@@ -15,10 +15,8 @@ export interface TestItemTM {
     even?: boolean;
 }
 export declare const testItemBMSchema: import("joi").ObjectSchema<TestItemBM>;
-export declare const testItemDBMSchema: import("joi").ObjectSchema<TestItemDBM>;
 export declare const testItemTMSchema: import("joi").ObjectSchema<TestItemTM>;
 export declare const testItemBMJsonSchema: JsonSchemaObject<TestItemBM>;
-export declare const testItemDBMJsonSchema: JsonSchemaObject<TestItemDBM>;
 export declare function createTestItemDBM(num?: number): TestItemDBM;
 export declare function createTestItemBM(num?: number): TestItemBM;
 export declare function createTestItemsDBM(count?: number): TestItemDBM[];

package/dist/testing/test.model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.testItemDBMJsonSchema = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemDBMSchema = exports.testItemBMSchema = exports.TEST_TABLE = void 0;
+exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.TEST_TABLE = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const MOCK_TS_2018_06_21 = 1529539200;
@@ -12,13 +12,6 @@ exports.testItemBMSchema = (0, nodejs_lib_1.objectSchema)({
     even: nodejs_lib_1.booleanSchema.optional(),
     b1: nodejs_lib_1.binarySchema.optional(),
 }).concat(nodejs_lib_1.baseDBEntitySchema);
-exports.testItemDBMSchema = (0, nodejs_lib_1.objectSchema)({
-    k1: nodejs_lib_1.stringSchema,
-    k2: nodejs_lib_1.stringSchema.allow(null).optional(),
-    k3: nodejs_lib_1.numberSchema.optional(),
-    even: nodejs_lib_1.booleanSchema.optional(),
-    b1: nodejs_lib_1.binarySchema.optional(),
-}).concat(nodejs_lib_1.baseDBEntitySchema);
 exports.testItemTMSchema = (0, nodejs_lib_1.objectSchema)({
     k1: nodejs_lib_1.stringSchema,
     even: nodejs_lib_1.booleanSchema.optional(),
@@ -37,19 +30,6 @@ exports.testItemBMJsonSchema = js_lib_1.jsonSchema
 })
     .baseDBEntity()
     .build();
-exports.testItemDBMJsonSchema = js_lib_1.jsonSchema
-    .rootObject({
-    // todo: figure out how to not copy-paste these 3 fields
-    id: js_lib_1.jsonSchema.string(),
-    created: js_lib_1.jsonSchema.unixTimestamp(),
-    updated: js_lib_1.jsonSchema.unixTimestamp(),
-    k1: js_lib_1.jsonSchema.string(),
-    k2: js_lib_1.jsonSchema.string().optional(),
-    k3: js_lib_1.jsonSchema.number().optional(),
-    even: js_lib_1.jsonSchema.boolean().optional(),
-    b1: js_lib_1.jsonSchema.buffer().optional(),
-})
-    .build();
 function createTestItemDBM(num = 1) {
     return {
         id: `id${num}`,