@naturalcycles/db-lib 9.5.0 → 9.6.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';
 /**
@@ -161,7 +161,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>;
     /**

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;
     }
@@ -89,12 +85,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 +99,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 +113,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 +212,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 +231,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 +262,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 +301,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 +337,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 +368,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
@@ -469,7 +463,7 @@ class CommonDao {
         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);
+        let dbm = await this.bmToDBM(bm, opt); // validates BM
         if (this.cfg.hooks.beforeSave) {
             dbm = (await this.cfg.hooks.beforeSave(dbm));
             if (dbm === null)
@@ -596,14 +590,11 @@ class CommonDao {
         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 +656,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' };
         }
@@ -842,9 +830,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 +846,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 +872,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 +890,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 +900,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) {

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}`,

package/package.json

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

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

@@ -47,17 +47,6 @@ export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntit
    */
   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>>
 
@@ -136,7 +125,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)[]
@@ -201,17 +189,6 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
    */
   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.
@@ -242,16 +219,6 @@ export interface CommonDaoOptions extends CommonDBOptions {
    */
   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/src/commondao/common.dao.ts

@@ -2,7 +2,6 @@ import { Transform } from 'node:stream'
 import {
   _assert,
   _deepJsonEquals,
-  _filterNullishValues,
   _filterUndefinedValues,
   _isTruthy,
   _objectAssignExact,
@@ -43,13 +42,7 @@ import {
   writableVoid,
 } from '@naturalcycles/nodejs-lib'
 import { DBLibError } from '../cnst'
-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,
@@ -91,9 +84,6 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
       hooks: {
         parseNaturalId: () => ({}),
         beforeCreate: bm => bm as BM,
-        beforeDBMValidate: dbm => dbm,
-        beforeDBMToBM: dbm => dbm as any,
-        beforeBMToDBM: bm => bm as any,
         anonymize: dbm => dbm,
         onValidationError: err => err,
         ...cfg.hooks,
@@ -112,7 +102,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const bm = this.cfg.hooks!.beforeCreate!(part)
     // First assignIdCreatedUpdated, then validate!
     this.assignIdCreatedUpdated(bm, opt)
-    return this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
+    return this.validateAndConvert(bm, this.cfg.bmSchema, opt)
   }
 
   // GET
@@ -125,11 +115,11 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const started = this.logStarted(op, table)
 
     let dbm = (await (opt.tx || this.cfg.db).getByIds<DBM>(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 as any) : await this.dbmToBM(dbm, opt)
+    const bm = await this.dbmToBM(dbm, opt)
     this.logResult(started, op, bm, table)
     return bm || null
   }
@@ -161,13 +151,11 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
     let [dbm] = await (opt.tx || this.cfg.db).getByIds<DBM>(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
   }
@@ -178,13 +166,13 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
     let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids)
-    if (!opt.raw && this.cfg.hooks!.afterLoad && dbms.length) {
+    if (this.cfg.hooks!.afterLoad && dbms.length) {
       dbms = (await pMap(dbms, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
       )
     }
 
-    const bms = opt.raw ? (dbms as any) : await this.dbmsToBM(dbms, opt)
+    const bms = await this.dbmsToBM(dbms, opt)
     this.logResult(started, op, bms, table)
     return bms
   }
@@ -195,7 +183,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
     let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids)
-    if (!opt.raw && this.cfg.hooks!.afterLoad && dbms.length) {
+    if (this.cfg.hooks!.afterLoad && dbms.length) {
       dbms = (await pMap(dbms, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
       )
@@ -318,13 +306,13 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const started = this.logStarted(op, q.table)
     let { rows, ...queryResult } = await this.cfg.db.runQuery<DBM>(q, opt)
     const partialQuery = !!q._selectedFieldNames
-    if (!opt.raw && this.cfg.hooks!.afterLoad && rows.length) {
+    if (this.cfg.hooks!.afterLoad && rows.length) {
       rows = (await pMap(rows, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
       )
     }
 
-    const bms = partialQuery || opt.raw ? (rows as any[]) : await this.dbmsToBM(rows, opt)
+    const bms = partialQuery ? (rows as any[]) : await this.dbmsToBM(rows, opt)
     this.logResult(started, op, bms, q.table)
     return {
       rows: bms,
@@ -345,14 +333,14 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const op = `runQueryAsDBM(${q.pretty()})`
     const started = this.logStarted(op, q.table)
     let { rows, ...queryResult } = await this.cfg.db.runQuery<DBM>(q, opt)
-    if (!opt.raw && this.cfg.hooks!.afterLoad && rows.length) {
+    if (this.cfg.hooks!.afterLoad && rows.length) {
       rows = (await pMap(rows, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _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 }
   }
@@ -388,7 +376,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
       transformMap<DBM, BM>(
         async dbm => {
           count++
-          if (partialQuery || opt.raw) return dbm as any
+          if (partialQuery) return dbm as any
 
           if (this.cfg.hooks!.afterLoad) {
             dbm = (await this.cfg.hooks!.afterLoad(dbm))!
@@ -438,7 +426,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
       transformMap<any, DBM>(
         async dbm => {
           count++
-          if (partialQuery || opt.raw) return dbm
+          if (partialQuery) return dbm
 
           if (this.cfg.hooks!.afterLoad) {
             dbm = (await this.cfg.hooks!.afterLoad(dbm))!
@@ -480,7 +468,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const partialQuery = !!q._selectedFieldNames
 
     const stream = this.cfg.db.streamQuery<DBM>(q, opt)
-    if (partialQuery || opt.raw) return stream
+    if (partialQuery) return stream
 
     return stream
       .on('error', err => stream.emit('error', err))
@@ -518,7 +506,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
 
     const stream = this.cfg.db.streamQuery<DBM>(q, opt)
     const partialQuery = !!q._selectedFieldNames
-    if (partialQuery || opt.raw) return stream
+    if (partialQuery) return stream
 
     return (
       stream
@@ -641,7 +629,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     const idWasGenerated = !bm.id && this.cfg.generateId
     this.assignIdCreatedUpdated(bm, opt) // mutates
     _typeCast<BM>(bm)
-    let dbm = await this.bmToDBM(bm, opt)
+    let dbm = await this.bmToDBM(bm, opt) // validates BM
 
     if (this.cfg.hooks!.beforeSave) {
       dbm = (await this.cfg.hooks!.beforeSave(dbm))!
@@ -800,13 +788,11 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
 
     // assigning id in case it misses the id
     // will override/set `updated` field, unless opts.preserveUpdated is set
-    let row = dbm as 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' }
     }
@@ -885,12 +871,10 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     if (!dbms.length) return []
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
-    let rows = dbms as DBM[]
-    if (!opt.raw) {
-      dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)) // mutates
-      rows = this.anyToDBMs(dbms as DBM[], opt)
-      if (opt.ensureUniqueId) throw new AppError('ensureUniqueId is not supported in saveBatch')
-    }
+    dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)) // mutates
+    let rows = this.anyToDBMs(dbms as DBM[], opt)
+    if (opt.ensureUniqueId) throw new AppError('ensureUniqueId is not supported in saveBatch')
+
     if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
       opt = { ...opt, saveMethod: 'insert' }
     }
@@ -1119,11 +1103,16 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     }
 
     // DBM > BM
-    const bm = await this.cfg.hooks!.beforeDBMToBM!(dbm)
+    let bm: Partial<BM>
+    if (this.cfg.hooks!.beforeDBMToBM) {
+      bm = await this.cfg.hooks!.beforeDBMToBM(dbm)
+    } else {
+      bm = dbm as any
+    }
 
     // Validate/convert BM
 
-    return this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
+    return this.validateAndConvert(bm, this.cfg.bmSchema, opt)
   }
 
   async dbmsToBM(dbms: DBM[], opt: CommonDaoOptions = {}): Promise<BM[]> {
@@ -1139,20 +1128,23 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
   async bmToDBM(bm?: BM, opt?: CommonDaoOptions): Promise<DBM | undefined> {
     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: DBM
+    if (this.cfg.hooks!.beforeBMToDBM) {
+      dbm = { ...((await this.cfg.hooks!.beforeBMToDBM(bm!)) as DBM) }
+    } else {
+      dbm = bm as any
+    }
 
     // Validate/convert DBM
-
-    return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+    // return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+    return dbm
   }
 
   async bmsToDBM(bms: BM[], opt: CommonDaoOptions = {}): Promise<DBM[]> {
@@ -1170,12 +1162,15 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
 
     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, DBModelType.DBM, opt)
+    // return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+    return dbm
   }
 
   anyToDBMs(entities: DBM[], opt: CommonDaoOptions = {}): DBM[] {
@@ -1191,12 +1186,8 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
   validateAndConvert<T>(
     obj: Partial<T>,
     schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined,
-    modelType?: DBModelType,
     opt: CommonDaoOptions = {},
   ): any {
-    // `raw` option completely bypasses any processing
-    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
     // "undefined" values, I believe, are/were not saved to/from DB anyway (due to e.g JSON.stringify removing them)
@@ -1206,16 +1197,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
     // 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 = _filterNullishValues(obj)
-    } else {
-      obj = _filterUndefinedValues(obj)
-    }
-
-    // Pre-validation hooks
-    if (modelType === DBModelType.DBM) {
-      obj = this.cfg.hooks!.beforeDBMValidate!(obj as any) as T
-    }
+    obj = _filterUndefinedValues(obj)
 
     // Return as is if no schema is passed or if `skipConversion` is set
     if (!schema || opt.skipConversion) {
@@ -1224,7 +1206,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
 
     // This will Convert and Validate
     const table = opt.table || this.cfg.table
-    const objectName = table + (modelType || '')
+    const objectName = table
 
     let error: JoiValidationError | AjvValidationError | ZodValidationError<T> | undefined
     let convertedValue: any

package/src/testing/daoTest.ts

@@ -8,10 +8,9 @@ import { CommonDBImplementationQuirks, expectMatch } from './dbTest'
 import {
   createTestItemsBM,
   testItemBMSchema,
-  testItemDBMSchema,
   TEST_TABLE,
   createTestItemBM,
-  testItemDBMJsonSchema,
+  testItemBMJsonSchema,
 } from './test.model'
 import { TestItemBM } from '.'
 
@@ -20,7 +19,6 @@ export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQui
   const dao = new CommonDao({
     table: TEST_TABLE,
     db,
-    dbmSchema: testItemDBMSchema,
     bmSchema: testItemBMSchema,
     logStarted: true,
     logLevel: CommonDaoLogLevel.DATA_FULL,
@@ -43,7 +41,7 @@ export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQui
   // CREATE TABLE, DROP
   if (support.createTable) {
     test('createTable, dropIfExists=true', async () => {
-      await dao.createTable(testItemDBMJsonSchema, { dropIfExists: true })
+      await dao.createTable(testItemBMJsonSchema, { dropIfExists: true })
     })
   }
 

package/src/testing/dbTest.ts

@@ -7,8 +7,8 @@ import {
   createTestItemDBM,
   createTestItemsDBM,
   TEST_TABLE,
+  testItemBMJsonSchema,
   TestItemDBM,
-  testItemDBMJsonSchema,
 } from './test.model'
 import { deepFreeze } from './test.util'
 
@@ -42,7 +42,7 @@ export function runCommonDBTest(db: CommonDB, quirks: CommonDBImplementationQuir
   // CREATE TABLE, DROP
   if (support.createTable) {
     test('createTable, dropIfExists=true', async () => {
-      await db.createTable(TEST_TABLE, testItemDBMJsonSchema, { dropIfExists: true })
+      await db.createTable(TEST_TABLE, testItemBMJsonSchema, { dropIfExists: true })
     })
   }
 

package/src/testing/index.ts

@@ -10,8 +10,6 @@ import {
   testItemBMJsonSchema,
   testItemBMSchema,
   TestItemDBM,
-  testItemDBMJsonSchema,
-  testItemDBMSchema,
   TestItemTM,
   testItemTMSchema,
   TEST_TABLE,
@@ -25,11 +23,9 @@ export {
   createTestItemBM,
   createTestItemsDBM,
   createTestItemsBM,
-  testItemDBMSchema,
   testItemBMSchema,
   testItemTMSchema,
   testItemBMJsonSchema,
-  testItemDBMJsonSchema,
   runCommonDBTest,
   runCommonDaoTest,
   runCommonKeyValueDBTest,

package/src/testing/test.model.ts

@@ -35,14 +35,6 @@ export const testItemBMSchema = objectSchema<TestItemBM>({
   b1: binarySchema.optional(),
 }).concat(baseDBEntitySchema as any)
 
-export const testItemDBMSchema = objectSchema<TestItemDBM>({
-  k1: stringSchema,
-  k2: stringSchema.allow(null).optional(),
-  k3: numberSchema.optional(),
-  even: booleanSchema.optional(),
-  b1: binarySchema.optional(),
-}).concat(baseDBEntitySchema as any)
-
 export const testItemTMSchema = objectSchema<TestItemTM>({
   k1: stringSchema,
   even: booleanSchema.optional(),
@@ -63,20 +55,6 @@ export const testItemBMJsonSchema: JsonSchemaObject<TestItemBM> = jsonSchema
   .baseDBEntity()
   .build()
 
-export const testItemDBMJsonSchema: JsonSchemaObject<TestItemDBM> = jsonSchema
-  .rootObject<TestItemDBM>({
-    // todo: figure out how to not copy-paste these 3 fields
-    id: jsonSchema.string(),
-    created: jsonSchema.unixTimestamp(),
-    updated: jsonSchema.unixTimestamp(),
-    k1: jsonSchema.string(),
-    k2: jsonSchema.string().optional(),
-    k3: jsonSchema.number().optional(),
-    even: jsonSchema.boolean().optional(),
-    b1: jsonSchema.buffer().optional(),
-  })
-  .build()
-
 export function createTestItemDBM(num = 1): TestItemDBM {
   return {
     id: `id${num}`,