@naturalcycles/db-lib 8.34.1 → 8.36.0

package/src/commondao/common.dao.ts

@@ -59,49 +59,60 @@ const isCI = !!process.env['CI']
  * TM = Transport model (optimized to be sent over the wire)
  */
 export class CommonDao<
-  BM extends Partial<ObjectWithId>,
-  DBM extends ObjectWithId = Saved<BM>,
+  BM extends Partial<ObjectWithId<ID>>,
+  DBM extends ObjectWithId<ID> = Saved<BM>,
   TM = BM,
+  ID extends string | number = DBM['id'],
 > {
-  constructor(public cfg: CommonDaoCfg<BM, DBM, TM>) {
+  constructor(public cfg: CommonDaoCfg<BM, DBM, TM, ID>) {
     this.cfg = {
       // Default is to NOT log in AppEngine and in CI,
       // otherwise to log Operations
       // e.g in Dev (local machine), Test - it will log operations (useful for debugging)
       logLevel: isGAE || isCI ? CommonDaoLogLevel.NONE : CommonDaoLogLevel.OPERATIONS,
+      idType: 'string',
+      createId: true,
       created: true,
       updated: true,
       logger: console,
       ...cfg,
       hooks: {
-        createId: () => stringId(),
         parseNaturalId: () => ({}),
         beforeCreate: bm => bm as BM,
         beforeDBMValidate: dbm => dbm,
         beforeDBMToBM: dbm => dbm as any,
         beforeBMToDBM: bm => bm as any,
-        beforeTMToBM: tm => tm as any,
+        beforeTMToBM: tm => tm,
         beforeBMToTM: bm => bm as any,
         anonymize: dbm => dbm,
         onValidationError: err => err,
         ...cfg.hooks,
       },
     }
+
+    if (this.cfg.createId) {
+      _assert(
+        this.cfg.idType === 'string',
+        'db-lib: automatic generation of non-string ids is not supported',
+      )
+
+      this.cfg.hooks!.createId ||= () => stringId() as ID
+    } else {
+      delete this.cfg.hooks!.createId
+    }
   }
 
   // CREATE
   create(part: Partial<BM> = {}, opt: CommonDaoOptions = {}): Saved<BM> {
     let bm = this.cfg.hooks!.beforeCreate!(part) as BM
     bm = this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
-
-    // If no SCHEMA - return as is
     return this.assignIdCreatedUpdated(bm, opt)
   }
 
   // GET
   async getById(id: undefined, opt?: CommonDaoOptions): Promise<null>
-  async getById(id?: string, opt?: CommonDaoOptions): Promise<Saved<BM> | null>
-  async getById(id?: string, opt: CommonDaoOptions = {}): Promise<Saved<BM> | null> {
+  async getById(id?: ID, opt?: CommonDaoOptions): Promise<Saved<BM> | null>
+  async getById(id?: ID, opt: CommonDaoOptions = {}): Promise<Saved<BM> | null> {
     if (!id) return null
     const op = `getById(${id})`
     const table = opt.table || this.cfg.table
@@ -126,22 +137,14 @@ export class CommonDao<
     return bm || null
   }
 
-  async getByIdOrEmpty(
-    id: string,
-    part: Partial<BM> = {},
-    opt?: CommonDaoOptions,
-  ): Promise<Saved<BM>> {
+  async getByIdOrEmpty(id: ID, part: Partial<BM> = {}, opt?: CommonDaoOptions): Promise<Saved<BM>> {
     const bm = await this.getById(id, opt)
     if (bm) return bm
 
     return this.create({ ...part, id }, opt)
   }
 
-  async getByIdAsDBMOrEmpty(
-    id: string,
-    part: Partial<BM> = {},
-    opt?: CommonDaoOptions,
-  ): Promise<DBM> {
+  async getByIdAsDBMOrEmpty(id: ID, part: Partial<BM> = {}, opt?: CommonDaoOptions): Promise<DBM> {
     const dbm = await this.getByIdAsDBM(id, opt)
     if (dbm) return dbm
 
@@ -150,8 +153,8 @@ export class CommonDao<
   }
 
   async getByIdAsDBM(id: undefined, opt?: CommonDaoOptions): Promise<null>
-  async getByIdAsDBM(id?: string, opt?: CommonDaoOptions): Promise<DBM | null>
-  async getByIdAsDBM(id?: string, opt: CommonDaoOptions = {}): Promise<DBM | null> {
+  async getByIdAsDBM(id?: ID, opt?: CommonDaoOptions): Promise<DBM | null>
+  async getByIdAsDBM(id?: ID, opt: CommonDaoOptions = {}): Promise<DBM | null> {
     if (!id) return null
     const op = `getByIdAsDBM(${id})`
     const table = opt.table || this.cfg.table
@@ -165,8 +168,8 @@ export class CommonDao<
   }
 
   async getByIdAsTM(id: undefined, opt?: CommonDaoOptions): Promise<null>
-  async getByIdAsTM(id?: string, opt?: CommonDaoOptions): Promise<TM | null>
-  async getByIdAsTM(id?: string, opt: CommonDaoOptions = {}): Promise<TM | null> {
+  async getByIdAsTM(id?: ID, opt?: CommonDaoOptions): Promise<TM | null>
+  async getByIdAsTM(id?: ID, opt: CommonDaoOptions = {}): Promise<TM | null> {
     if (!id) return null
     const op = `getByIdAsTM(${id})`
     const table = opt.table || this.cfg.table
@@ -182,7 +185,7 @@ export class CommonDao<
     return tm || null
   }
 
-  async getByIds(ids: string[], opt: CommonDaoOptions = {}): Promise<Saved<BM>[]> {
+  async getByIds(ids: ID[], opt: CommonDaoOptions = {}): Promise<Saved<BM>[]> {
     const op = `getByIds ${ids.length} id(s) (${_truncate(ids.slice(0, 10).join(', '), 50)})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
@@ -192,7 +195,7 @@ export class CommonDao<
     return bms
   }
 
-  async getByIdsAsDBM(ids: string[], opt: CommonDaoOptions = {}): Promise<DBM[]> {
+  async getByIdsAsDBM(ids: ID[], opt: CommonDaoOptions = {}): Promise<DBM[]> {
     const op = `getByIdsAsDBM ${ids.length} id(s) (${_truncate(ids.slice(0, 10).join(', '), 50)})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
@@ -201,7 +204,7 @@ export class CommonDao<
     return dbms
   }
 
-  async requireById(id: string, opt: CommonDaoOptions = {}): Promise<Saved<BM>> {
+  async requireById(id: ID, opt: CommonDaoOptions = {}): Promise<Saved<BM>> {
     const r = await this.getById(id, opt)
     if (!r) {
       this.throwRequiredError(id, opt)
@@ -209,7 +212,7 @@ export class CommonDao<
     return r
   }
 
-  async requireByIdAsDBM(id: string, opt: CommonDaoOptions = {}): Promise<DBM> {
+  async requireByIdAsDBM(id: ID, opt: CommonDaoOptions = {}): Promise<DBM> {
     const r = await this.getByIdAsDBM(id, opt)
     if (!r) {
       this.throwRequiredError(id, opt)
@@ -217,7 +220,7 @@ export class CommonDao<
     return r
   }
 
-  private throwRequiredError(id: string, opt: CommonDaoOptions): never {
+  private throwRequiredError(id: ID, opt: CommonDaoOptions): never {
     const table = opt.table || this.cfg.table
     throw new AppError(`DB row required, but not found: ${table}.${id}`, {
       code: DBLibError.DB_ROW_REQUIRED,
@@ -267,8 +270,8 @@ export class CommonDao<
   /**
    * Pass `table` to override table
    */
-  query(table?: string): RunnableDBQuery<BM, DBM, TM> {
-    return new RunnableDBQuery<BM, DBM, TM>(this, table)
+  query(table?: string): RunnableDBQuery<BM, DBM, TM, ID> {
+    return new RunnableDBQuery<BM, DBM, TM, ID>(this, table)
   }
 
   async runQuery(q: DBQuery<DBM>, opt?: CommonDaoOptions): Promise<Saved<BM>[]> {
@@ -514,18 +517,18 @@ export class CommonDao<
     )
   }
 
-  async queryIds(q: DBQuery<DBM>, opt: CommonDaoOptions = {}): Promise<string[]> {
+  async queryIds(q: DBQuery<DBM>, opt: CommonDaoOptions = {}): Promise<ID[]> {
     q.table = opt.table || q.table
     const { rows } = await this.cfg.db.runQuery(q.select(['id']), opt)
     return rows.map(r => r.id)
   }
 
-  streamQueryIds(q: DBQuery<DBM>, opt: CommonDaoStreamOptions = {}): ReadableTyped<string> {
+  streamQueryIds(q: DBQuery<DBM>, opt: CommonDaoStreamOptions = {}): ReadableTyped<ID> {
     q.table = opt.table || q.table
     opt.errorMode ||= ErrorMode.SUPPRESS
 
     return this.cfg.db.streamQuery<DBM>(q.select(['id']), opt).pipe(
-      transformMapSimple<ObjectWithId, string>(objectWithId => objectWithId.id, {
+      transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
         errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
       }),
     )
@@ -533,8 +536,8 @@ export class CommonDao<
 
   async streamQueryIdsForEach(
     q: DBQuery<DBM>,
-    mapper: AsyncMapper<string, void>,
-    opt: CommonDaoStreamForEachOptions<string> = {},
+    mapper: AsyncMapper<ID, void>,
+    opt: CommonDaoStreamForEachOptions<ID> = {},
   ): Promise<void> {
     q.table = opt.table || q.table
     opt.errorMode = opt.errorMode || ErrorMode.SUPPRESS
@@ -545,9 +548,9 @@ export class CommonDao<
 
     await _pipeline([
       this.cfg.db.streamQuery<DBM>(q.select(['id']), opt),
-      transformMapSimple<ObjectWithId, string>(objectWithId => objectWithId.id),
+      transformMapSimple<DBM, ID>(objectWithId => objectWithId.id),
       transformTap(() => count++),
-      transformMap<string, void>(mapper, {
+      transformMap<ID, void>(mapper, {
         ...opt,
         predicate: _passthroughPredicate,
       }),
@@ -573,18 +576,14 @@ export class CommonDao<
   assignIdCreatedUpdated(obj: DBM | BM, opt: CommonDaoOptions = {}): DBM | Saved<BM> {
     const now = Math.floor(Date.now() / 1000)
 
-    obj.id = obj.id || this.cfg.hooks!.createId!(obj)
+    obj.id ||= this.cfg.hooks!.createId?.(obj)
 
     if (this.cfg.created) {
-      Object.assign(obj, {
-        created: (obj as any).created || (obj as any).updated || now,
-      })
+      obj['created'] ||= obj['updated'] || now
     }
 
     if (this.cfg.updated) {
-      Object.assign(obj, {
-        updated: opt.preserveUpdatedCreated && (obj as any).updated ? (obj as any).updated : now,
-      })
+      obj['updated'] = opt.preserveUpdatedCreated && obj['updated'] ? obj['updated'] : now
     }
 
     return obj as any
@@ -601,7 +600,7 @@ export class CommonDao<
     const dbm = await this.bmToDBM(bm, opt)
     const table = opt.table || this.cfg.table
     if (opt.ensureUniqueId && idWasGenerated) await this.ensureUniqueId(table, dbm)
-    if (this.cfg.immutable) await this.ensureImmutableDoesntExist(table, dbm)
+    if (this.cfg.immutable) await this.ensureImmutableDontExist(table, [dbm.id])
     const op = `save(${dbm.id})`
     const started = this.logSaveStarted(op, bm, table)
     await this.cfg.db.saveBatch(table, [dbm], {
@@ -613,12 +612,11 @@ export class CommonDao<
     return bm as any
   }
 
-  private async ensureImmutableDoesntExist(table: string, dbm: DBM): Promise<void> {
-    await this.throwIfObjectExists(table, dbm, [
+  private async ensureImmutableDontExist(table: string, ids: ID[]): Promise<void> {
+    await this.throwIfObjectExists(table, ids, [
       DBLibError.OBJECT_IS_IMMUTABLE,
       {
         code: DBLibError.OBJECT_IS_IMMUTABLE,
-        id: dbm.id,
         table,
       },
     ])
@@ -626,23 +624,27 @@ export class CommonDao<
 
   private async ensureUniqueId(table: string, dbm: DBM): Promise<void> {
     // todo: retry N times
-    await this.throwIfObjectExists(table, dbm, [
-      DBLibError.OBJECT_IS_IMMUTABLE,
-      {
-        code: DBLibError.OBJECT_IS_IMMUTABLE,
-        id: dbm.id,
-        table,
-      },
-    ])
+    await this.throwIfObjectExists(
+      table,
+      [dbm.id],
+      [
+        DBLibError.OBJECT_IS_IMMUTABLE,
+        {
+          code: DBLibError.OBJECT_IS_IMMUTABLE,
+          table,
+        },
+      ],
+    )
   }
 
   private async throwIfObjectExists(
     table: string,
-    dbm: DBM,
+    ids: ID[],
     errorMeta: [DBLibError, any],
   ): Promise<void> {
-    const [existing] = await this.cfg.db.getByIds<DBM>(table, [dbm.id])
-    if (existing) throw new AppError(errorMeta[0], errorMeta[1])
+    const existing = await this.cfg.db.getByIds<DBM>(table, ids)
+    if (existing.length > 0)
+      throw new AppError(errorMeta[0], { ...errorMeta[1], ids: existing.map(i => i.id) })
   }
 
   /**
@@ -653,11 +655,7 @@ export class CommonDao<
    *
    * Convenience method to replace 3 operations (loading+patching+saving) with one.
    */
-  async patch(
-    id: string,
-    patch: Partial<BM>,
-    opt: CommonDaoSaveOptions<DBM> = {},
-  ): Promise<Saved<BM>> {
+  async patch(id: ID, patch: Partial<BM>, opt: CommonDaoSaveOptions<DBM> = {}): Promise<Saved<BM>> {
     return await this.save(
       {
         ...(await this.getByIdOrEmpty(id, patch, opt)),
@@ -667,11 +665,7 @@ export class CommonDao<
     )
   }
 
-  async patchAsDBM(
-    id: string,
-    patch: Partial<DBM>,
-    opt: CommonDaoSaveOptions<DBM> = {},
-  ): Promise<DBM> {
+  async patchAsDBM(id: ID, patch: Partial<DBM>, opt: CommonDaoSaveOptions<DBM> = {}): Promise<DBM> {
     const dbm =
       (await this.getByIdAsDBM(id, opt)) ||
       (this.create({ ...patch, id } as Partial<BM>, opt) as any as DBM)
@@ -696,7 +690,7 @@ export class CommonDao<
       this.assignIdCreatedUpdated(dbm, opt) // mutates
       dbm = this.anyToDBM(dbm, opt)
       if (opt.ensureUniqueId && idWasGenerated) await this.ensureUniqueId(table, dbm)
-      if (this.cfg.immutable) await this.ensureImmutableDoesntExist(table, dbm)
+      if (this.cfg.immutable) await this.ensureImmutableDontExist(table, [dbm.id])
     }
     const op = `saveAsDBM(${dbm.id})`
     const started = this.logSaveStarted(op, dbm, table)
@@ -715,7 +709,11 @@ export class CommonDao<
     const dbms = await this.bmsToDBM(bms, opt)
     if (opt.ensureUniqueId) throw new AppError('ensureUniqueId is not supported in saveBatch')
     if (this.cfg.immutable)
-      throw new AppError('immutable DB entries are not supported in saveBatch')
+      await this.ensureImmutableDontExist(
+        table,
+        dbms.map(dbm => dbm.id),
+      )
+
     const op = `saveBatch ${dbms.length} row(s) (${_truncate(
       dbms
         .slice(0, 10)
@@ -742,7 +740,11 @@ export class CommonDao<
       dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)) // mutates
       dbms = this.anyToDBMs(dbms, opt)
       if (opt.ensureUniqueId) throw new AppError('ensureUniqueId is not supported in saveBatch')
-      if (this.cfg.immutable) throw new AppError('immutable objects are not supported in saveBatch')
+      if (this.cfg.immutable)
+        await this.ensureImmutableDontExist(
+          table,
+          dbms.map(dbm => dbm.id),
+        )
     }
     const op = `saveBatchAsDBM ${dbms.length} row(s) (${_truncate(
       dbms
@@ -767,8 +769,8 @@ export class CommonDao<
    * @returns number of deleted items
    */
   async deleteById(id: undefined, opt?: CommonDaoOptions): Promise<0>
-  async deleteById(id?: string, opt?: CommonDaoOptions): Promise<number>
-  async deleteById(id?: string, opt: CommonDaoOptions = {}): Promise<number> {
+  async deleteById(id?: ID, opt?: CommonDaoOptions): Promise<number>
+  async deleteById(id?: ID, opt: CommonDaoOptions = {}): Promise<number> {
     if (!id) return 0
     this.requireWriteAccess()
     if (!opt.allowMutability) this.requireObjectMutability()
@@ -780,7 +782,7 @@ export class CommonDao<
     return ids
   }
 
-  async deleteByIds(ids: string[], opt: CommonDaoOptions = {}): Promise<number> {
+  async deleteByIds(ids: ID[], opt: CommonDaoOptions = {}): Promise<number> {
     this.requireWriteAccess()
     if (!opt.allowMutability) this.requireObjectMutability()
     const op = `deleteByIds(${ids.join(', ')})`
@@ -812,7 +814,7 @@ export class CommonDao<
 
       await _pipeline([
         this.cfg.db.streamQuery<DBM>(q.select(['id']), opt),
-        transformMapSimple<ObjectWithId, string>(objectWithId => objectWithId.id, {
+        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
           errorMode: ErrorMode.SUPPRESS,
         }),
         transformBuffer<string>({ batchSize }),

package/src/db.model.ts

@@ -1,5 +1,4 @@
 import { AnyObjectWithId, ObjectWithId } from '@naturalcycles/js-lib'
-import { CommonDB } from './common.db'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CommonDBOptions {}
@@ -16,8 +15,9 @@ export type CommonDBStreamOptions = CommonDBOptions
 
 export interface CommonDBCreateOptions extends CommonDBOptions {
   /**
-   * @default false
    * Caution! If set to true - will actually DROP the table!
+   *
+   * @default false
    */
   dropIfExists?: boolean
 }
@@ -51,19 +51,3 @@ export enum DBModelType {
   BM = 'BM',
   TM = 'TM',
 }
-
-/**
- * Interface for a module (lib) that implements CommonDB.
- *
- * Example:
- *
- * const lib: CommonDBModule = require('mysql-lib')
- * const db = lib.getDB()
- */
-export interface CommonDBAdapter {
-  /**
-   * @param cfg was read from SECRET_DB${i} by secret('SECRET_DB${i}') method and passed there.
-   * It's a string that can contain e.g JSON.stringified configuration object (depends on the adapter).
-   */
-  getDBAdapter(cfg?: string): CommonDB
-}

package/src/index.ts

@@ -6,25 +6,16 @@ import { DBLibError } from './cnst'
 import { CommonDB } from './common.db'
 import { CommonDao } from './commondao/common.dao'
 import {
-  CommonDaoAnonymizeHook,
-  CommonDaoBeforeBMToDBMHook,
-  CommonDaoBeforeBMToTMHook,
-  CommonDaoBeforeCreateHook,
-  CommonDaoBeforeDBMToBMHook,
-  CommonDaoBeforeDBMValidateHook,
-  CommonDaoBeforeTMToBMHook,
   CommonDaoCfg,
-  CommonDaoCreateIdHook,
   CommonDaoCreateOptions,
   CommonDaoLogLevel,
   CommonDaoOptions,
-  CommonDaoParseNaturalIdHook,
   CommonDaoSaveOptions,
   CommonDaoStreamForEachOptions,
   CommonDaoStreamOptions,
+  CommonDaoHooks,
 } from './commondao/common.dao.model'
 import {
-  CommonDBAdapter,
   CommonDBCreateOptions,
   CommonDBOptions,
   CommonDBSaveOptions,
@@ -36,7 +27,6 @@ import {
   DBSaveBatchOperation,
   RunQueryResult,
 } from './db.model'
-import { getDB } from './getDB'
 import { CommonKeyValueDao, CommonKeyValueDaoCfg } from './kv/commonKeyValueDao'
 import { CommonKeyValueDB, KeyValueDBTuple } from './kv/commonKeyValueDB'
 import {
@@ -69,6 +59,7 @@ export type {
   CommonDaoSaveOptions,
   CommonDaoStreamForEachOptions,
   CommonDaoStreamOptions,
+  CommonDaoHooks,
   CommonDBOptions,
   CommonDBSaveOptions,
   CommonDBStreamOptions,
@@ -76,21 +67,11 @@ export type {
   CommonDB,
   RunQueryResult,
   CommonDaoCfg,
-  CommonDaoCreateIdHook,
-  CommonDaoParseNaturalIdHook,
-  CommonDaoBeforeCreateHook,
-  CommonDaoBeforeDBMValidateHook,
-  CommonDaoBeforeDBMToBMHook,
-  CommonDaoBeforeBMToDBMHook,
-  CommonDaoBeforeTMToBMHook,
-  CommonDaoBeforeBMToTMHook,
-  CommonDaoAnonymizeHook,
   InMemoryDBCfg,
   InMemoryKeyValueDBCfg,
   DBPipelineBackupOptions,
   DBPipelineRestoreOptions,
   DBPipelineCopyOptions,
-  CommonDBAdapter,
   DBOperation,
   DBSaveBatchOperation,
   DBDeleteByIdsOperation,
@@ -117,7 +98,6 @@ export {
   dbPipelineBackup,
   dbPipelineRestore,
   dbPipelineCopy,
-  getDB,
   DBLibError,
   BaseCommonDB,
   DBTransaction,

package/src/pipeline/dbPipelineBackup.ts

@@ -1,5 +1,12 @@
 import { createGzip, ZlibOptions } from 'zlib'
-import { AppError, AsyncMapper, ErrorMode, pMap, _passthroughMapper } from '@naturalcycles/js-lib'
+import {
+  AppError,
+  AsyncMapper,
+  ErrorMode,
+  pMap,
+  _passthroughMapper,
+  localTime,
+} from '@naturalcycles/js-lib'
 import {
   NDJsonStats,
   transformLogProgress,
@@ -11,7 +18,6 @@ import {
   _pipeline,
 } from '@naturalcycles/nodejs-lib'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import { dayjs } from '@naturalcycles/time-lib'
 import * as fs from 'fs-extra'
 import { CommonDB } from '../common.db'
 import { DBQuery } from '../index'
@@ -144,7 +150,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
 
   let { tables } = opt
 
-  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(dayjs.unix(sinceUpdated).toPretty()) : ''
+  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(localTime(sinceUpdated).toPretty()) : ''
 
   console.log(
     `>> ${dimWhite('dbPipelineBackup')} started in ${grey(outputDirPath)}...${sinceUpdatedStr}`,

package/src/pipeline/dbPipelineCopy.ts

@@ -1,4 +1,4 @@
-import { AsyncMapper, ErrorMode, pMap, _passthroughMapper } from '@naturalcycles/js-lib'
+import { AsyncMapper, ErrorMode, pMap, _passthroughMapper, localTime } from '@naturalcycles/js-lib'
 import {
   NDJsonStats,
   transformBuffer,
@@ -11,7 +11,6 @@ import {
   _pipeline,
 } from '@naturalcycles/nodejs-lib'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import { dayjs } from '@naturalcycles/time-lib'
 import { CommonDB } from '../common.db'
 import { CommonDBSaveOptions } from '../db.model'
 import { DBQuery } from '../query/dbQuery'
@@ -103,7 +102,7 @@ export async function dbPipelineCopy(opt: DBPipelineCopyOptions): Promise<NDJson
 
   let { tables } = opt
 
-  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(dayjs.unix(sinceUpdated).toPretty()) : ''
+  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(localTime(sinceUpdated).toPretty()) : ''
 
   console.log(`>> ${dimWhite('dbPipelineCopy')} started...${sinceUpdatedStr}`)
 

package/src/pipeline/dbPipelineRestore.ts

@@ -7,6 +7,7 @@ import {
   _mapValues,
   _passthroughMapper,
   SavedDBEntity,
+  localTime,
 } from '@naturalcycles/js-lib'
 import {
   NDJsonStats,
@@ -24,7 +25,6 @@ import {
   _pipeline,
 } from '@naturalcycles/nodejs-lib'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import { dayjs } from '@naturalcycles/time-lib'
 import * as fs from 'fs-extra'
 import { CommonDB } from '../common.db'
 import { CommonDBSaveOptions } from '../index'
@@ -133,7 +133,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
   const strict = errorMode !== ErrorMode.SUPPRESS
   const onlyTables = opt.tables && new Set(opt.tables)
 
-  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(dayjs.unix(sinceUpdated).toPretty()) : ''
+  const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(localTime(sinceUpdated).toPretty()) : ''
 
   console.log(
     `>> ${dimWhite('dbPipelineRestore')} started in ${grey(inputDirPath)}...${sinceUpdatedStr}`,

package/src/query/dbQuery.ts

@@ -216,14 +216,15 @@ export class DBQuery<ROW extends ObjectWithId = AnyObjectWithId> {
  * DBQuery that has additional method to support Fluent API style.
  */
 export class RunnableDBQuery<
-  BM extends Partial<ObjectWithId>,
-  DBM extends ObjectWithId,
+  BM extends Partial<ObjectWithId<ID>>,
+  DBM extends ObjectWithId<ID>,
   TM,
+  ID extends string | number,
 > extends DBQuery<DBM> {
   /**
    * Pass `table` to override table.
    */
-  constructor(public dao: CommonDao<BM, DBM, TM>, table?: string) {
+  constructor(public dao: CommonDao<BM, DBM, TM, ID>, table?: string) {
     super(table || dao.cfg.table)
   }
 
@@ -281,17 +282,17 @@ export class RunnableDBQuery<
     return this.dao.streamQueryAsDBM(this, opt)
   }
 
-  async queryIds(opt?: CommonDaoOptions): Promise<string[]> {
+  async queryIds(opt?: CommonDaoOptions): Promise<ID[]> {
     return await this.dao.queryIds(this, opt)
   }
 
-  streamQueryIds(opt?: CommonDaoStreamOptions): ReadableTyped<string> {
+  streamQueryIds(opt?: CommonDaoStreamOptions): ReadableTyped<ID> {
     return this.dao.streamQueryIds(this, opt)
   }
 
   async streamQueryIdsForEach(
-    mapper: AsyncMapper<string, void>,
-    opt?: CommonDaoStreamForEachOptions<string>,
+    mapper: AsyncMapper<ID, void>,
+    opt?: CommonDaoStreamForEachOptions<ID>,
   ): Promise<void> {
     await this.dao.streamQueryIdsForEach(this, mapper, opt)
   }

package/dist/adapter/inmemory/index.d.ts

@@ -1,3 +0,0 @@
-import { CommonDB } from '../../common.db';
-export declare function getDBAdapter(): CommonDB;
-export {};

package/dist/adapter/inmemory/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDBAdapter = void 0;
-const inMemory_db_1 = require("./inMemory.db");
-function getDBAdapter() {
-    return new inMemory_db_1.InMemoryDB();
-}
-exports.getDBAdapter = getDBAdapter;

package/dist/getDB.d.ts

@@ -1,19 +0,0 @@
-import { CommonDB } from './common.db';
-/**
- * Returns pre-configured DB
- *
- * @param index defaults to 1
- *
- * Requires process.env.DB${index} to be set to the name of the adapter, e.g `mysql-lib` or `db-lib/adapter/inmemory`.
- * Requires (by most adapters) process.env.SECRET_DB${index} to contain a "connection string" to that DB. Usually a JSON.stringified object,
- * but depends on the adapter.
- */
-export declare function getDB(index?: number): CommonDB;
-declare global {
-    namespace NodeJS {
-        interface ProcessEnv {
-            DB1?: string;
-            DB2?: string;
-        }
-    }
-}

package/dist/getDB.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDB = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-/**
- * Returns pre-configured DB
- *
- * @param index defaults to 1
- *
- * Requires process.env.DB${index} to be set to the name of the adapter, e.g `mysql-lib` or `db-lib/adapter/inmemory`.
- * Requires (by most adapters) process.env.SECRET_DB${index} to contain a "connection string" to that DB. Usually a JSON.stringified object,
- * but depends on the adapter.
- */
-function getDB(index = 1) {
-    return _getDB(index);
-}
-exports.getDB = getDB;
-// Extra function to provide index=1 as default (since memo doesn't work well with default arguments)
-const _getDB = (0, js_lib_1._memoFn)((index) => {
-    const libName = process.env[`DB${index}`];
-    if (!libName) {
-        throw new Error(`getDB(${(0, colors_1.yellow)(index)}), but process.env.${(0, colors_1.white)('DB' + index)} is not defined!`);
-    }
-    const lib = require(libName);
-    if (!lib.getDBAdapter) {
-        throw new Error(`DB${index}=${libName}, but require('${libName}').getDBAdapter() is not defined`);
-    }
-    const cfg = (0, nodejs_lib_1.secretOptional)(`SECRET_DB${index}`);
-    return lib.getDBAdapter(cfg);
-});