@naturalcycles/db-lib 8.34.0 → 8.35.0

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

@@ -85,7 +85,7 @@ export declare class CommonDao<BM extends Partial<ObjectWithId>, DBM extends Obj
      * Mutates with id, created, updated
      */
     save(bm: BM, opt?: CommonDaoSaveOptions<DBM>): Promise<Saved<BM>>;
-    private ensureImmutableDoesntExist;
+    private ensureImmutableDontExist;
     private ensureUniqueId;
     private throwIfObjectExists;
     /**

package/dist/commondao/common.dao.js

@@ -442,7 +442,7 @@ class CommonDao {
         if (opt.ensureUniqueId && idWasGenerated)
             await this.ensureUniqueId(table, dbm);
         if (this.cfg.immutable)
-            await this.ensureImmutableDoesntExist(table, dbm);
+            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], {
@@ -452,31 +452,29 @@ class CommonDao {
         this.logSaveResult(started, op, table);
         return bm;
     }
-    async ensureImmutableDoesntExist(table, dbm) {
-        await this.throwIfObjectExists(table, dbm, [
+    async ensureImmutableDontExist(table, ids) {
+        await this.throwIfObjectExists(table, ids, [
             cnst_1.DBLibError.OBJECT_IS_IMMUTABLE,
             {
                 code: cnst_1.DBLibError.OBJECT_IS_IMMUTABLE,
-                id: dbm.id,
                 table,
             },
         ]);
     }
     async ensureUniqueId(table, dbm) {
         // todo: retry N times
-        await this.throwIfObjectExists(table, dbm, [
+        await this.throwIfObjectExists(table, [dbm.id], [
             cnst_1.DBLibError.OBJECT_IS_IMMUTABLE,
             {
                 code: cnst_1.DBLibError.OBJECT_IS_IMMUTABLE,
-                id: dbm.id,
                 table,
             },
         ]);
     }
-    async throwIfObjectExists(table, dbm, errorMeta) {
-        const [existing] = await this.cfg.db.getByIds(table, [dbm.id]);
-        if (existing)
-            throw new js_lib_1.AppError(errorMeta[0], errorMeta[1]);
+    async throwIfObjectExists(table, ids, errorMeta) {
+        const existing = await this.cfg.db.getByIds(table, ids);
+        if (existing.length > 0)
+            throw new js_lib_1.AppError(errorMeta[0], { ...errorMeta[1], ids: existing.map(i => i.id) });
     }
     /**
      * Loads the row by id.
@@ -512,7 +510,7 @@ class CommonDao {
             if (opt.ensureUniqueId && idWasGenerated)
                 await this.ensureUniqueId(table, dbm);
             if (this.cfg.immutable)
-                await this.ensureImmutableDoesntExist(table, dbm);
+                await this.ensureImmutableDontExist(table, [dbm.id]);
         }
         const op = `saveAsDBM(${dbm.id})`;
         const started = this.logSaveStarted(op, dbm, table);
@@ -531,7 +529,7 @@ class CommonDao {
         if (opt.ensureUniqueId)
             throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
         if (this.cfg.immutable)
-            throw new js_lib_1.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) (${(0, js_lib_1._truncate)(dbms
             .slice(0, 10)
             .map(bm => bm.id)
@@ -553,7 +551,7 @@ class CommonDao {
             if (opt.ensureUniqueId)
                 throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
             if (this.cfg.immutable)
-                throw new js_lib_1.AppError('immutable objects are not supported in saveBatch');
+                await this.ensureImmutableDontExist(table, dbms.map(dbm => dbm.id));
         }
         const op = `saveBatchAsDBM ${dbms.length} row(s) (${(0, js_lib_1._truncate)(dbms
             .slice(0, 10)
@@ -571,7 +569,7 @@ class CommonDao {
         if (!id)
             return 0;
         this.requireWriteAccess();
-        if (!opt.allowMutabiliity)
+        if (!opt.allowMutability)
             this.requireObjectMutability();
         const op = `deleteById(${id})`;
         const table = opt.table || this.cfg.table;
@@ -582,7 +580,7 @@ class CommonDao {
     }
     async deleteByIds(ids, opt = {}) {
         this.requireWriteAccess();
-        if (!opt.allowMutabiliity)
+        if (!opt.allowMutability)
             this.requireObjectMutability();
         const op = `deleteByIds(${ids.join(', ')})`;
         const table = opt.table || this.cfg.table;
@@ -598,7 +596,7 @@ class CommonDao {
      */
     async deleteByQuery(q, opt = {}) {
         this.requireWriteAccess();
-        if (!opt.allowMutabiliity)
+        if (!opt.allowMutability)
             this.requireObjectMutability();
         q.table = opt.table || q.table;
         const op = `deleteByQuery(${q.pretty()})`;

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

@@ -140,7 +140,7 @@ export interface CommonDaoOptions extends CommonDBOptions {
     /**
      * @default false (for streams). Setting to true enables deletion of immutable objects
      */
-    allowMutabiliity?: boolean;
+    allowMutability?: boolean;
     /**
      * If true - data will be anonymized (by calling a BaseDao.anonymize() hook that you can extend in your Dao implementation).
      * Only applicable to loading/querying/streaming_loading operations (n/a for saving).

package/dist/index.d.ts

@@ -7,7 +7,6 @@ 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 } from './commondao/common.dao.model';
 import { CommonDBAdapter, CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBDeleteByIdsOperation, DBModelType, DBOperation, DBRelation, DBSaveBatchOperation, RunQueryResult } from './db.model';
-import { getDB } from './getDB';
 import { CommonKeyValueDao, CommonKeyValueDaoCfg } from './kv/commonKeyValueDao';
 import { CommonKeyValueDB, KeyValueDBTuple } from './kv/commonKeyValueDB';
 import { createdUpdatedFields, createdUpdatedIdFields, deserializeJsonField, serializeJsonField } from './model.util';
@@ -19,4 +18,4 @@ import { DBTransaction, RunnableDBTransaction } from './transaction/dbTransactio
 import { commitDBTransactionSimple, mergeDBOperations } from './transaction/dbTransaction.util';
 export * from './kv/commonKeyValueDaoMemoCache';
 export type { DBQueryFilterOperator, DBQueryFilter, DBQueryOrder, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBCreateOptions, CommonDB, RunQueryResult, CommonDaoCfg, CommonDaoCreateIdHook, CommonDaoParseNaturalIdHook, CommonDaoBeforeCreateHook, CommonDaoBeforeDBMValidateHook, CommonDaoBeforeDBMToBMHook, CommonDaoBeforeBMToDBMHook, CommonDaoBeforeTMToBMHook, CommonDaoBeforeBMToTMHook, CommonDaoAnonymizeHook, InMemoryDBCfg, InMemoryKeyValueDBCfg, DBPipelineBackupOptions, DBPipelineRestoreOptions, DBPipelineCopyOptions, CommonDBAdapter, DBOperation, DBSaveBatchOperation, DBDeleteByIdsOperation, CommonKeyValueDB, CommonKeyValueDaoCfg, KeyValueDBTuple, };
-export { DBQuery, dbQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, CommonDao, createdUpdatedFields, createdUpdatedIdFields, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, getDB, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonKeyValueDao, };
+export { DBQuery, dbQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, CommonDao, createdUpdatedFields, createdUpdatedIdFields, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonKeyValueDao, };

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.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.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 tslib_1 = require("tslib");
 const inMemory_db_1 = require("./adapter/inmemory/inMemory.db");
 Object.defineProperty(exports, "InMemoryDB", { enumerable: true, get: function () { return inMemory_db_1.InMemoryDB; } });
@@ -19,8 +19,6 @@ Object.defineProperty(exports, "CommonDaoLogLevel", { enumerable: true, get: fun
 const db_model_1 = require("./db.model");
 Object.defineProperty(exports, "DBModelType", { enumerable: true, get: function () { return db_model_1.DBModelType; } });
 Object.defineProperty(exports, "DBRelation", { enumerable: true, get: function () { return db_model_1.DBRelation; } });
-const getDB_1 = require("./getDB");
-Object.defineProperty(exports, "getDB", { enumerable: true, get: function () { return getDB_1.getDB; } });
 const commonKeyValueDao_1 = require("./kv/commonKeyValueDao");
 Object.defineProperty(exports, "CommonKeyValueDao", { enumerable: true, get: function () { return commonKeyValueDao_1.CommonKeyValueDao; } });
 const model_util_1 = require("./model.util");
@@ -44,4 +42,4 @@ Object.defineProperty(exports, "RunnableDBTransaction", { enumerable: true, get:
 const dbTransaction_util_1 = require("./transaction/dbTransaction.util");
 Object.defineProperty(exports, "commitDBTransactionSimple", { enumerable: true, get: function () { return dbTransaction_util_1.commitDBTransactionSimple; } });
 Object.defineProperty(exports, "mergeDBOperations", { enumerable: true, get: function () { return dbTransaction_util_1.mergeDBOperations; } });
-(0, tslib_1.__exportStar)(require("./kv/commonKeyValueDaoMemoCache"), exports);
+tslib_1.__exportStar(require("./kv/commonKeyValueDaoMemoCache"), exports);

package/dist/pipeline/dbPipelineBackup.js

@@ -5,7 +5,6 @@ const zlib_1 = require("zlib");
 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");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const fs = require("fs-extra");
 const index_1 = require("../index");
 /**
@@ -22,7 +21,7 @@ async function dbPipelineBackup(opt) {
     const strict = errorMode !== js_lib_1.ErrorMode.SUPPRESS;
     const gzip = opt.gzip !== false; // default to true
     let { tables } = opt;
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineBackup')} started in ${(0, colors_1.grey)(outputDirPath)}...${sinceUpdatedStr}`);
     fs.ensureDirSync(outputDirPath);
     if (!tables) {

package/dist/pipeline/dbPipelineCopy.js

@@ -4,7 +4,6 @@ exports.dbPipelineCopy = 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");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const dbQuery_1 = require("../query/dbQuery");
 /**
  * Pipeline from input stream(s) to CommonDB .saveBatch().
@@ -15,7 +14,7 @@ const dbQuery_1 = require("../query/dbQuery");
 async function dbPipelineCopy(opt) {
     const { batchSize = 100, dbInput, dbOutput, concurrency = 16, limit = 0, sinceUpdated, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, } = opt;
     let { tables } = opt;
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineCopy')} started...${sinceUpdatedStr}`);
     if (!tables) {
         tables = await dbInput.getTables();

package/dist/pipeline/dbPipelineRestore.js

@@ -5,7 +5,6 @@ const zlib_1 = require("zlib");
 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");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const fs = require("fs-extra");
 /**
  * Pipeline from NDJSON files in a folder (optionally gzipped) to CommonDB.
@@ -18,7 +17,7 @@ async function dbPipelineRestore(opt) {
     const { db, concurrency = 16, batchSize = 100, limit, sinceUpdated, inputDirPath, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, recreateTables = false, } = opt;
     const strict = errorMode !== js_lib_1.ErrorMode.SUPPRESS;
     const onlyTables = opt.tables && new Set(opt.tables);
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineRestore')} started in ${(0, colors_1.grey)(inputDirPath)}...${sinceUpdatedStr}`);
     fs.ensureDirSync(inputDirPath);
     const tablesToGzip = new Set();

package/package.json

@@ -6,7 +6,6 @@
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
     "@naturalcycles/nodejs-lib": "^12.0.0",
-    "@naturalcycles/time-lib": "^3.0.1",
     "fs-extra": "^10.0.0"
   },
   "devDependencies": {
@@ -43,7 +42,7 @@
   "engines": {
     "node": ">=14.15"
   },
-  "version": "8.34.0",
+  "version": "8.35.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

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

@@ -174,7 +174,7 @@ export interface CommonDaoOptions extends CommonDBOptions {
   /**
    * @default false (for streams). Setting to true enables deletion of immutable objects
    */
-  allowMutabiliity?: boolean
+  allowMutability?: boolean
 
   /**
    * If true - data will be anonymized (by calling a BaseDao.anonymize() hook that you can extend in your Dao implementation).

package/src/commondao/common.dao.ts

@@ -601,7 +601,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 +613,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: string[]): Promise<void> {
+    await this.throwIfObjectExists(table, ids, [
       DBLibError.OBJECT_IS_IMMUTABLE,
       {
         code: DBLibError.OBJECT_IS_IMMUTABLE,
-        id: dbm.id,
         table,
       },
     ])
@@ -626,23 +625,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: string[],
     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) })
   }
 
   /**
@@ -696,7 +699,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 +718,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 +749,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
@@ -771,7 +782,7 @@ export class CommonDao<
   async deleteById(id?: string, opt: CommonDaoOptions = {}): Promise<number> {
     if (!id) return 0
     this.requireWriteAccess()
-    if (!opt.allowMutabiliity) this.requireObjectMutability()
+    if (!opt.allowMutability) this.requireObjectMutability()
     const op = `deleteById(${id})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
@@ -782,7 +793,7 @@ export class CommonDao<
 
   async deleteByIds(ids: string[], opt: CommonDaoOptions = {}): Promise<number> {
     this.requireWriteAccess()
-    if (!opt.allowMutabiliity) this.requireObjectMutability()
+    if (!opt.allowMutability) this.requireObjectMutability()
     const op = `deleteByIds(${ids.join(', ')})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
@@ -801,7 +812,7 @@ export class CommonDao<
     opt: CommonDaoStreamForEachOptions<DBM> & { stream?: boolean } = {},
   ): Promise<number> {
     this.requireWriteAccess()
-    if (!opt.allowMutabiliity) this.requireObjectMutability()
+    if (!opt.allowMutability) this.requireObjectMutability()
     q.table = opt.table || q.table
     const op = `deleteByQuery(${q.pretty()})`
     const started = this.logStarted(op, q.table)

package/src/index.ts

@@ -36,7 +36,6 @@ import {
   DBSaveBatchOperation,
   RunQueryResult,
 } from './db.model'
-import { getDB } from './getDB'
 import { CommonKeyValueDao, CommonKeyValueDaoCfg } from './kv/commonKeyValueDao'
 import { CommonKeyValueDB, KeyValueDBTuple } from './kv/commonKeyValueDB'
 import {
@@ -117,7 +116,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/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);
-});

package/src/getDB.ts

@@ -1,50 +0,0 @@
-import { _memoFn } from '@naturalcycles/js-lib'
-import { secretOptional } from '@naturalcycles/nodejs-lib'
-import { white, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import { CommonDB } from './common.db'
-import { CommonDBAdapter } from './db.model'
-
-/**
- * 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 function getDB(index = 1): CommonDB {
-  return _getDB(index)
-}
-
-// Extra function to provide index=1 as default (since memo doesn't work well with default arguments)
-const _getDB = _memoFn((index: number) => {
-  const libName = process.env[`DB${index}`]
-
-  if (!libName) {
-    throw new Error(
-      `getDB(${yellow(index)}), but process.env.${white('DB' + index)} is not defined!`,
-    )
-  }
-
-  const lib: CommonDBAdapter = require(libName)
-
-  if (!lib.getDBAdapter) {
-    throw new Error(
-      `DB${index}=${libName}, but require('${libName}').getDBAdapter() is not defined`,
-    )
-  }
-
-  const cfg = secretOptional(`SECRET_DB${index}`)
-
-  return lib.getDBAdapter(cfg)
-})
-
-declare global {
-  namespace NodeJS {
-    interface ProcessEnv {
-      DB1?: string
-      DB2?: string
-    }
-  }
-}