@naturalcycles/db-lib 8.21.3 → 8.24.1

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonKeyValueDao = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.idField = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.dbQueryFilterOperatorValues = exports.DBQuery = void 0;
+exports.CommonKeyValueDao = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.dbQueryFilterOperatorValues = exports.DBQuery = void 0;
 const inMemory_db_1 = require("./adapter/inmemory/inMemory.db");
 Object.defineProperty(exports, "InMemoryDB", { enumerable: true, get: function () { return inMemory_db_1.InMemoryDB; } });
 const inMemoryKeyValueDB_1 = require("./adapter/inmemory/inMemoryKeyValueDB");
@@ -26,7 +26,6 @@ const model_util_1 = require("./model.util");
 Object.defineProperty(exports, "createdUpdatedFields", { enumerable: true, get: function () { return model_util_1.createdUpdatedFields; } });
 Object.defineProperty(exports, "createdUpdatedIdFields", { enumerable: true, get: function () { return model_util_1.createdUpdatedIdFields; } });
 Object.defineProperty(exports, "deserializeJsonField", { enumerable: true, get: function () { return model_util_1.deserializeJsonField; } });
-Object.defineProperty(exports, "idField", { enumerable: true, get: function () { return model_util_1.idField; } });
 Object.defineProperty(exports, "serializeJsonField", { enumerable: true, get: function () { return model_util_1.serializeJsonField; } });
 const dbPipelineBackup_1 = require("./pipeline/dbPipelineBackup");
 Object.defineProperty(exports, "dbPipelineBackup", { enumerable: true, get: function () { return dbPipelineBackup_1.dbPipelineBackup; } });

package/dist/model.util.d.ts

@@ -1,4 +1,4 @@
-import { CreatedUpdated, CreatedUpdatedId, ObjectWithId } from './db.model';
+import { CreatedUpdated, CreatedUpdatedId, ObjectWithId } from '@naturalcycles/js-lib';
 export declare function createdUpdatedFields(existingObject?: Partial<CreatedUpdated> | null): CreatedUpdated;
 export declare function createdUpdatedIdFields(existingObject?: Partial<CreatedUpdatedId> | null): CreatedUpdatedId;
 export declare function idField(existingObject?: Partial<CreatedUpdatedId> | null): ObjectWithId;

package/dist/pipeline/dbPipelineBackup.js

@@ -8,7 +8,6 @@ const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const time_lib_1 = require("@naturalcycles/time-lib");
 const fs = require("fs-extra");
 const index_1 = require("../index");
-// const log = Debug('nc:db-lib:pipeline')
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).
  * File is overwritten (by default).

package/dist/query/dbQuery.d.ts

@@ -1,8 +1,8 @@
-import { AsyncMapper, Saved } from '@naturalcycles/js-lib';
+import { AnyObjectWithId, ObjectWithId, AsyncMapper, Saved } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDaoOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from '..';
 import { CommonDao } from '../commondao/common.dao';
-import { AnyObjectWithId, ObjectWithId, RunQueryResult } from '../db.model';
+import { RunQueryResult } from '../db.model';
 /**
  * Modeled after Firestore operators (WhereFilterOp type)
  *
@@ -99,5 +99,7 @@ export declare class RunnableDBQuery<BM extends Partial<ObjectWithId>, DBM exten
     queryIds(opt?: CommonDaoOptions): Promise<string[]>;
     streamQueryIds(opt?: CommonDaoStreamOptions): ReadableTyped<string>;
     streamQueryIdsForEach(mapper: AsyncMapper<string, void>, opt?: CommonDaoStreamForEachOptions<string>): Promise<void>;
-    deleteByQuery(opt?: CommonDaoOptions): Promise<number>;
+    deleteByQuery(opt?: CommonDaoStreamForEachOptions<DBM> & {
+        stream?: boolean;
+    }): Promise<number>;
 }

package/dist/transaction/dbTransaction.d.ts

@@ -1,5 +1,6 @@
+import { AnyObjectWithId, ObjectWithId } from '@naturalcycles/js-lib';
 import type { CommonDB } from '../common.db';
-import type { AnyObjectWithId, CommonDBSaveOptions, DBOperation, ObjectWithId } from '../db.model';
+import type { CommonDBSaveOptions, DBOperation } from '../db.model';
 /**
  * Convenience class that stores the list of DBOperations and provides a fluent API to add them.
  */

package/dist/validation/index.d.ts

@@ -1,8 +1,8 @@
 import { CommonDBOptions, CommonDBSaveOptions } from '../db.model';
 import { DBQuery, DBQueryFilter, DBQueryOrder } from '../query/dbQuery';
 export declare const commonDBOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBOptions, CommonDBOptions>;
-export declare const commonDBSaveOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBSaveOptions<import("../db.model").AnyObjectWithId>, CommonDBSaveOptions<import("../db.model").AnyObjectWithId>>;
+export declare const commonDBSaveOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBSaveOptions<import("@naturalcycles/js-lib").AnyObjectWithId>, CommonDBSaveOptions<import("@naturalcycles/js-lib").AnyObjectWithId>>;
 export declare const dbQueryFilterOperatorSchema: import("@naturalcycles/nodejs-lib/dist/validation/joi/string.extensions").ExtendedStringSchema;
-export declare const dbQueryFilterSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryFilter<import("../db.model").AnyObjectWithId>, DBQueryFilter<import("../db.model").AnyObjectWithId>>;
-export declare const dbQueryOrderSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryOrder<import("../db.model").AnyObjectWithId>, DBQueryOrder<import("../db.model").AnyObjectWithId>>;
+export declare const dbQueryFilterSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId>, DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId>>;
+export declare const dbQueryOrderSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId>, DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId>>;
 export declare const dbQuerySchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQuery<any>, DBQuery<any>>;

package/package.json

@@ -40,9 +40,9 @@
     "url": "https://github.com/NaturalCycles/db-lib"
   },
   "engines": {
-    "node": ">=12.13"
+    "node": ">=14.15"
   },
-  "version": "8.21.3",
+  "version": "8.24.1",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/readme.md

@@ -295,11 +295,6 @@ Passing empty array will actually return an array of empty objects (documented e
 .select(['id']) //=> [ { id: 'id1' }, { id: 'id2' }, ... ]
 ```
 
-# DEBUG namespaces
-
-- `nc:db-lib:commondao`
-- `nc:db-lib:inmemorydb`
-
 # Exports
 
 - `/` root
@@ -315,6 +310,6 @@ Passing empty array will actually return an array of empty objects (documented e
 # Packaging
 
 - `engines.node >= LTS`
-- `main: dist/index.js`: commonjs, es2019
+- `main: dist/index.js`: commonjs, es2020
 - `types: dist/index.d.ts`: typescript types
 - `/src` folder with source `*.ts` files included

package/src/adapter/cachedb/cache.db.model.ts

@@ -1,10 +1,6 @@
+import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
 import { CommonDB } from '../../common.db'
-import {
-  CommonDBCreateOptions,
-  CommonDBSaveOptions,
-  CommonDBStreamOptions,
-  ObjectWithId,
-} from '../../db.model'
+import { CommonDBCreateOptions, CommonDBSaveOptions, CommonDBStreamOptions } from '../../db.model'
 
 export interface CacheDBCfg {
   name: string
@@ -42,6 +38,14 @@ export interface CacheDBCfg {
    * @default false
    */
   logDownstream?: boolean
+
+  /**
+   * Pass noopLogger (or undefined) to skip logging completely.
+   *
+   * Defaults to `console` in dev.
+   * Default to noop in AppEngine.
+   */
+  logger?: CommonLogger
 }
 
 export interface CacheDBOptions<ROW extends ObjectWithId> extends CommonDBSaveOptions<ROW> {

package/src/adapter/cachedb/cache.db.ts

@@ -1,9 +1,13 @@
 import { Readable } from 'stream'
-import { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib'
-import { Debug, IDebugger } from '@naturalcycles/nodejs-lib'
+import {
+  JsonSchemaObject,
+  JsonSchemaRootObject,
+  ObjectWithId,
+  StringMap,
+} from '@naturalcycles/js-lib'
 import { BaseCommonDB } from '../../base.common.db'
 import { CommonDB } from '../../common.db'
-import { ObjectWithId, RunQueryResult } from '../../db.model'
+import { RunQueryResult } from '../../db.model'
 import { DBQuery } from '../../query/dbQuery'
 import {
   CacheDBCfg,
@@ -12,6 +16,8 @@ import {
   CacheDBStreamOptions,
 } from './cache.db.model'
 
+const isGAE = !!process.env['GAE_INSTANCE']
+
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
  * and does in-memory caching.
@@ -19,12 +25,15 @@ import {
  * Queries always hit downstream (unless `onlyCache` is passed)
  */
 export class CacheDB extends BaseCommonDB implements CommonDB {
-  constructor(public cfg: CacheDBCfg) {
+  constructor(cfg: CacheDBCfg) {
     super()
-    this.log = Debug(`nc:db-lib:${cfg.name}`)
+    this.cfg = {
+      logger: isGAE ? undefined : console,
+      ...cfg,
+    }
   }
 
-  log!: IDebugger
+  cfg: CacheDBCfg
 
   override async ping(): Promise<void> {
     await Promise.all([this.cfg.cacheDB.ping(), this.cfg.downstreamDB.ping()])
@@ -68,7 +77,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     ids: string[],
     opt: CacheDBOptions<ROW> = {},
   ): Promise<ROW[]> {
-    const resultMap: Record<string, ROW> = {}
+    const resultMap: StringMap<ROW> = {}
     const missingIds: string[] = []
 
     if (!opt.skipCache && !this.cfg.skipCache) {
@@ -79,7 +88,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       missingIds.push(...ids.filter(id => !resultMap[id]))
 
       if (this.cfg.logCached) {
-        this.log(
+        this.cfg.logger?.log(
           `${table}.getByIds ${results.length} rows from cache: [${results
             .map(r => r.id)
             .join(', ')}]`,
@@ -92,7 +101,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       results.forEach(r => (resultMap[r.id] = r))
 
       if (this.cfg.logDownstream) {
-        this.log(
+        this.cfg.logger?.log(
           `${table}.getByIds ${results.length} rows from downstream: [${results
             .map(r => r.id)
             .join(', ')}]`,
@@ -120,14 +129,14 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       deletedIds = await this.cfg.downstreamDB.deleteByIds(table, ids, opt)
 
       if (this.cfg.logDownstream) {
-        this.log(`${table}.deleteByIds ${deletedIds} rows from downstream`)
+        this.cfg.logger?.log(`${table}.deleteByIds ${deletedIds} rows from downstream`)
       }
     }
 
     if (!opt.skipCache && !this.cfg.skipCache) {
       const cacheResult = this.cfg.cacheDB.deleteByIds(table, ids, opt).then(deletedFromCache => {
         if (this.cfg.logCached) {
-          this.log(`${table}.deleteByIds ${deletedFromCache} rows from cache`)
+          this.cfg.logger?.log(`${table}.deleteByIds ${deletedFromCache} rows from cache`)
         }
       })
       if (this.cfg.awaitCache) await cacheResult
@@ -145,7 +154,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       await this.cfg.downstreamDB.saveBatch(table, rows, opt)
 
       if (this.cfg.logDownstream) {
-        this.log(
+        this.cfg.logger?.log(
           `${table}.saveBatch ${rows.length} rows to downstream: [${rows
             .map(r => r.id)
             .join(', ')}]`,
@@ -156,7 +165,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     if (!opt.skipCache && !this.cfg.skipCache) {
       const cacheResult = this.cfg.cacheDB.saveBatch(table, rows, opt).then(() => {
         if (this.cfg.logCached) {
-          this.log(
+          this.cfg.logger?.log(
             `${table}.saveBatch ${rows.length} rows to cache: [${rows.map(r => r.id).join(', ')}]`,
           )
         }
@@ -173,7 +182,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       const { rows, ...queryResult } = await this.cfg.downstreamDB.runQuery(q, opt)
 
       if (this.cfg.logDownstream) {
-        this.log(`${q.table}.runQuery ${rows.length} rows from downstream`)
+        this.cfg.logger?.log(`${q.table}.runQuery ${rows.length} rows from downstream`)
       }
 
       // Don't save to cache if it was a projection query
@@ -189,7 +198,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     const { rows, ...queryResult } = await this.cfg.cacheDB.runQuery(q, opt)
 
     if (this.cfg.logCached) {
-      this.log(`${q.table}.runQuery ${rows.length} rows from cache`)
+      this.cfg.logger?.log(`${q.table}.runQuery ${rows.length} rows from cache`)
     }
 
     return { rows, ...queryResult }
@@ -206,7 +215,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     const count = await this.cfg.cacheDB.runQueryCount(q, opt)
 
     if (this.cfg.logCached) {
-      this.log(`${q.table}.runQueryCount ${count} rows from cache`)
+      this.cfg.logger?.log(`${q.table}.runQueryCount ${count} rows from cache`)
     }
 
     return count
@@ -259,7 +268,9 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       const deletedIds = await this.cfg.downstreamDB.deleteByQuery(q, opt)
 
       if (this.cfg.logDownstream) {
-        this.log(`${q.table}.deleteByQuery ${deletedIds} rows from downstream and cache`)
+        this.cfg.logger?.log(
+          `${q.table}.deleteByQuery ${deletedIds} rows from downstream and cache`,
+        )
       }
 
       if (!opt.skipCache && !this.cfg.skipCache) {
@@ -275,7 +286,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     const deletedIds = await this.cfg.cacheDB.deleteByQuery(q, opt)
 
     if (this.cfg.logCached) {
-      this.log(`${q.table}.deleteByQuery ${deletedIds} rows from cache`)
+      this.cfg.logger?.log(`${q.table}.deleteByQuery ${deletedIds} rows from cache`)
     }
 
     return deletedIds

package/src/adapter/file/file.db.model.ts

@@ -1,4 +1,5 @@
-import { DBSaveBatchOperation, ObjectWithId } from '../../db.model'
+import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
+import { DBSaveBatchOperation } from '../../db.model'
 import type { DBQueryOrder } from '../../query/dbQuery'
 
 export interface FileDBPersistencePlugin {
@@ -22,6 +23,12 @@ export interface FileDBCfg {
    */
   sortObjects?: boolean
 
+  /**
+   * Defaults to `console` in dev.
+   * Default to noop in AppEngine.
+   */
+  logger?: CommonLogger
+
   /**
    * @default false
    */

package/src/adapter/file/file.db.ts

@@ -11,16 +11,12 @@ import {
   _uniq,
   JsonSchemaRootObject,
   _filterUndefinedValues,
+  ObjectWithId,
+  AnyObjectWithId,
 } from '@naturalcycles/js-lib'
-import { Debug, readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
-import {
-  AnyObjectWithId,
-  BaseCommonDB,
-  DBSaveBatchOperation,
-  ObjectWithId,
-  queryInMemory,
-} from '../..'
+import { BaseCommonDB, DBSaveBatchOperation, queryInMemory } from '../..'
 import { CommonDB } from '../../common.db'
 import {
   CommonDBOptions,
@@ -32,7 +28,7 @@ import { DBQuery } from '../../query/dbQuery'
 import { DBTransaction } from '../../transaction/dbTransaction'
 import { FileDBCfg } from './file.db.model'
 
-const log = Debug('nc:db-lib:filedb')
+const isGAE = !!process.env['GAE_INSTANCE']
 
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
@@ -50,6 +46,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     this.cfg = {
       sortObjects: true,
       logFinished: true,
+      logger: isGAE ? undefined : console,
       ...cfg,
     }
   }
@@ -275,13 +272,13 @@ export class FileDB extends BaseCommonDB implements CommonDB {
 
   private logStarted(op: string): number {
     if (this.cfg.logStarted) {
-      log(`>> ${op}`)
+      this.cfg.logger?.log(`>> ${op}`)
     }
     return Date.now()
   }
 
   private logFinished(started: number, op: string): void {
     if (!this.cfg.logFinished) return
-    log(`<< ${op} ${dimGrey(`in ${_since(started)}`)}`)
+    this.cfg.logger?.log(`<< ${op} ${dimGrey(`in ${_since(started)}`)}`)
   }
 }

package/src/adapter/file/inMemory.persistence.plugin.ts

@@ -1,5 +1,5 @@
-import { StringMap, _by } from '@naturalcycles/js-lib'
-import { DBSaveBatchOperation, ObjectWithId } from '../../db.model'
+import { StringMap, _by, ObjectWithId } from '@naturalcycles/js-lib'
+import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
 
 /**

package/src/adapter/file/localFile.persistence.plugin.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'stream'
 import { createGzip, createUnzip } from 'zlib'
-import { pMap } from '@naturalcycles/js-lib'
+import { pMap, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   transformJsonParse,
   transformSplit,
@@ -9,7 +9,7 @@ import {
   _pipeline,
 } from '@naturalcycles/nodejs-lib'
 import * as fs from 'fs-extra'
-import { DBSaveBatchOperation, ObjectWithId } from '../../db.model'
+import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
 
 export interface LocalFilePersistencePluginCfg {

package/src/adapter/file/noop.persistence.plugin.ts

@@ -1,4 +1,5 @@
-import { DBSaveBatchOperation, ObjectWithId } from '../../db.model'
+import { ObjectWithId } from '@naturalcycles/js-lib'
+import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
 
 export class NoopPersistencePlugin implements FileDBPersistencePlugin {

package/src/adapter/inmemory/inMemory.db.ts

@@ -9,10 +9,12 @@ import {
   _since,
   _sortObjectDeep,
   JsonSchemaRootObject,
+  ObjectWithId,
+  _stringMapValues,
+  CommonLogger,
 } from '@naturalcycles/js-lib'
 import {
   bufferReviver,
-  Debug,
   ReadableTyped,
   transformJsonParse,
   transformSplit,
@@ -22,7 +24,7 @@ import {
 } from '@naturalcycles/nodejs-lib'
 import { dimGrey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
 import * as fs from 'fs-extra'
-import { CommonDB, DBTransaction, ObjectWithId, queryInMemory } from '../..'
+import { CommonDB, DBTransaction, queryInMemory } from '../..'
 import {
   CommonDBCreateOptions,
   CommonDBOptions,
@@ -61,9 +63,15 @@ export interface InMemoryDBCfg {
    * @default true
    */
   persistZip: boolean
+
+  /**
+   * Defaults to `console` in dev.
+   * Default to noop in AppEngine.
+   */
+  logger?: CommonLogger
 }
 
-const log = Debug('nc:db-lib:inmemorydb')
+const isGAE = !!process.env['GAE_INSTANCE']
 
 export class InMemoryDB implements CommonDB {
   constructor(cfg?: Partial<InMemoryDBCfg>) {
@@ -73,6 +81,7 @@ export class InMemoryDB implements CommonDB {
       persistenceEnabled: false,
       persistZip: true,
       persistentStoragePath: './tmp/inmemorydb',
+      logger: isGAE ? undefined : console,
       ...cfg,
     }
   }
@@ -98,13 +107,13 @@ export class InMemoryDB implements CommonDB {
   async resetCache(_table?: string): Promise<void> {
     if (_table) {
       const table = this.cfg.tablesPrefix + _table
-      log(`reset ${table}`)
+      this.cfg.logger?.log(`reset ${table}`)
       this.data[table] = {}
     } else {
       ;(await this.getTables()).forEach(table => {
         this.data[table] = {}
       })
-      log('reset')
+      this.cfg.logger?.log('reset')
     }
   }
 
@@ -117,7 +126,7 @@ export class InMemoryDB implements CommonDB {
   ): Promise<JsonSchemaRootObject<ROW>> {
     const table = this.cfg.tablesPrefix + _table
     return {
-      ...generateJsonSchemaFromData(Object.values(this.data[table] || {})),
+      ...generateJsonSchemaFromData(_stringMapValues(this.data[table] || {})),
       $id: `${table}.schema.json`,
     }
   }
@@ -155,7 +164,7 @@ export class InMemoryDB implements CommonDB {
 
     rows.forEach(r => {
       if (!r.id) {
-        log.warn({ rows })
+        this.cfg.logger?.warn({ rows })
         throw new Error(`InMemoryDB: id doesn't exist for row`)
       }
 
@@ -264,7 +273,9 @@ export class InMemoryDB implements CommonDB {
       ])
     })
 
-    log(`flushToDisk took ${dimGrey(_since(started))} to save ${yellow(tables)} tables`)
+    this.cfg.logger?.log(
+      `flushToDisk took ${dimGrey(_since(started))} to save ${yellow(tables)} tables`,
+    )
   }
 
   /**
@@ -304,6 +315,8 @@ export class InMemoryDB implements CommonDB {
       this.data[table] = _by(rows, r => r.id)
     })
 
-    log(`restoreFromDisk took ${dimGrey(_since(started))} to read ${yellow(files.length)} tables`)
+    this.cfg.logger?.log(
+      `restoreFromDisk took ${dimGrey(_since(started))} to read ${yellow(files.length)} tables`,
+    )
   }
 }

package/src/adapter/inmemory/queryInMemory.ts

@@ -1,5 +1,4 @@
-import { _pick } from '@naturalcycles/js-lib'
-import { ObjectWithId } from '../../db.model'
+import { _pick, ObjectWithId } from '@naturalcycles/js-lib'
 import { DBQuery, DBQueryFilterOperator } from '../../query/dbQuery'
 
 type FilterFn = (v: any, val: any) => boolean

package/src/base.common.db.ts

@@ -1,8 +1,8 @@
 import { Readable } from 'stream'
-import { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib'
+import { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from './common.db'
-import { CommonDBOptions, CommonDBSaveOptions, ObjectWithId, RunQueryResult } from './db.model'
+import { CommonDBOptions, CommonDBSaveOptions, RunQueryResult } from './db.model'
 import { DBQuery } from './query/dbQuery'
 import { DBTransaction } from './transaction/dbTransaction'
 import { commitDBTransactionSimple } from './transaction/dbTransaction.util'

package/src/common.db.ts

@@ -1,11 +1,10 @@
-import { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib'
+import { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import {
   CommonDBCreateOptions,
   CommonDBOptions,
   CommonDBSaveOptions,
   CommonDBStreamOptions,
-  ObjectWithId,
   RunQueryResult,
 } from './db.model'
 import { DBQuery } from './query/dbQuery'

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

@@ -1,4 +1,4 @@
-import { ErrorMode } from '@naturalcycles/js-lib'
+import { CommonLogger, ErrorMode, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   AjvSchema,
   AjvValidationError,
@@ -8,12 +8,7 @@ import {
   TransformMapOptions,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'
-import {
-  CommonDBCreateOptions,
-  CommonDBOptions,
-  CommonDBSaveOptions,
-  ObjectWithId,
-} from '../db.model'
+import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model'
 
 // Hook DBM, BM, TM types should follow this exact order
 export type CommonDaoCreateIdHook<BM, DBM> = (obj: DBM | BM) => string
@@ -75,6 +70,14 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId>, DBM extends Obje
    */
   readOnly?: boolean
 
+  /**
+   * Pass undefined (or noopLogger) to disable logging completely.
+   *
+   * Defaults to `console` in dev.
+   * Default to noop in AppEngine.
+   */
+  logger?: CommonLogger
+
   /**
    * @default OPERATIONS
    */
@@ -93,6 +96,17 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId>, DBM extends Obje
    * Set to false to disable created/updated fields management.
    */
   createdUpdated?: 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
 }
 
 /**