@naturalcycles/db-lib 10.4.1 → 10.6.0

package/dist/adapter/file/file.db.js

@@ -1,5 +1,5 @@
 import { _assert, _by, _deepEquals, _filterUndefinedValues, _since, _sortBy, _sortObjectDeep, _stringMapValues, generateJsonSchemaFromData, localTime, } from '@naturalcycles/js-lib';
-import { dimGrey } from '@naturalcycles/nodejs-lib';
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 import { readableCreate } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../base.common.db.js';
 import { commonDBFullSupport } from '../../common.db.js';
@@ -148,7 +148,7 @@ export class FileDB extends BaseCommonDB {
     sortRows(rows) {
         rows = rows.map(r => _filterUndefinedValues(r));
         if (this.cfg.sortOnSave) {
-            _sortBy(rows, r => r[this.cfg.sortOnSave.name], true);
+            _sortBy(rows, r => r[this.cfg.sortOnSave.name], { mutate: true });
             if (this.cfg.sortOnSave.descending)
                 rows.reverse(); // mutates
         }

package/dist/adapter/file/localFile.persistence.plugin.js

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { pMap } from '@naturalcycles/js-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
-import { _pipeline } from '@naturalcycles/nodejs-lib/stream';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { _pipeline, createReadStreamAsNDJSON, createWriteStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Persists in local filesystem as ndjson.
  */
@@ -26,7 +26,7 @@ export class LocalFilePersistencePlugin {
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         if (!(await fs2.pathExistsAsync(filePath)))
             return [];
-        return await fs2.createReadStreamAsNDJSON(filePath).toArray();
+        return await createReadStreamAsNDJSON(filePath).toArray();
     }
     async saveFiles(ops) {
         await pMap(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 32 });
@@ -35,6 +35,6 @@ export class LocalFilePersistencePlugin {
         await fs2.ensureDirAsync(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(filePath)]);
+        await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(filePath)]);
     }
 }

package/dist/adapter/inmemory/inMemory.db.js

@@ -1,8 +1,8 @@
 import { Readable } from 'node:stream';
 import { _assert, _by, _deepCopy, _isEmptyObject, _since, _sortObjectDeep, _stringMapEntries, _stringMapValues, generateJsonSchemaFromData, localTime, pMap, } from '@naturalcycles/js-lib';
-import { dimGrey, yellow } from '@naturalcycles/nodejs-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
-import { _pipeline, bufferReviver } from '@naturalcycles/nodejs-lib/stream';
+import { dimGrey, yellow } from '@naturalcycles/nodejs-lib/colors';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { _pipeline, bufferReviver, createReadStreamAsNDJSON, createWriteStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 import { commonDBFullSupport, CommonDBType } from '../../common.db.js';
 import { queryInMemory } from './queryInMemory.js';
 export class InMemoryDB {
@@ -183,7 +183,7 @@ export class InMemoryDB {
                 return; // 0 rows
             tables++;
             const fname = `${persistentStoragePath}/${table}.ndjson${persistZip ? '.gz' : ''}`;
-            await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(fname)]);
+            await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(fname)]);
         });
         this.cfg.logger.log(`flushToDisk took ${dimGrey(_since(started))} to save ${yellow(tables)} tables`);
     }
@@ -201,7 +201,7 @@ export class InMemoryDB {
         await pMap(files, async (file) => {
             const fname = `${persistentStoragePath}/${file}`;
             const table = file.split('.ndjson')[0];
-            const rows = await fs2.createReadStreamAsNDJSON(fname).toArray();
+            const rows = await createReadStreamAsNDJSON(fname).toArray();
             this.data[table] = _by(rows, r => r.id);
         });
         this.cfg.logger.log(`restoreFromDisk took ${dimGrey(_since(started))} to read ${yellow(files.length)} tables`);

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

@@ -1,5 +1,5 @@
 import type { Transform } from 'node:stream';
-import type { AsyncMapper, BaseDBEntity, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, StringMap, UnixTimestampMillis, Unsaved } from '@naturalcycles/js-lib';
+import type { AsyncIndexedMapper, BaseDBEntity, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, StringMap, UnixTimestampMillis, Unsaved } from '@naturalcycles/js-lib';
 import { ZodType } from '@naturalcycles/js-lib/zod';
 import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
@@ -55,8 +55,8 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     runQueryAsDBM(q: DBQuery<DBM>, opt?: CommonDaoReadOptions): Promise<DBM[]>;
     runQueryExtendedAsDBM(q: DBQuery<DBM>, opt?: CommonDaoReadOptions): Promise<RunQueryResult<DBM>>;
     runQueryCount(q: DBQuery<DBM>, opt?: CommonDaoReadOptions): Promise<number>;
-    streamQueryForEach(q: DBQuery<DBM>, mapper: AsyncMapper<BM, void>, opt?: CommonDaoStreamForEachOptions<BM>): Promise<void>;
-    streamQueryAsDBMForEach(q: DBQuery<DBM>, mapper: AsyncMapper<DBM, void>, opt?: CommonDaoStreamForEachOptions<DBM>): Promise<void>;
+    streamQueryForEach(q: DBQuery<DBM>, mapper: AsyncIndexedMapper<BM, void>, opt?: CommonDaoStreamForEachOptions<BM>): Promise<void>;
+    streamQueryAsDBMForEach(q: DBQuery<DBM>, mapper: AsyncIndexedMapper<DBM, void>, opt?: CommonDaoStreamForEachOptions<DBM>): Promise<void>;
     /**
      * Stream as Readable, to be able to .pipe() it further with support of backpressure.
      */
@@ -73,7 +73,7 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     streamQuery(q: DBQuery<DBM>, opt?: CommonDaoStreamOptions<BM>): ReadableTyped<BM>;
     queryIds(q: DBQuery<DBM>, opt?: CommonDaoReadOptions): Promise<ID[]>;
     streamQueryIds(q: DBQuery<DBM>, opt?: CommonDaoStreamOptions<ID>): ReadableTyped<ID>;
-    streamQueryIdsForEach(q: DBQuery<DBM>, mapper: AsyncMapper<ID, void>, opt?: CommonDaoStreamForEachOptions<ID>): Promise<void>;
+    streamQueryIdsForEach(q: DBQuery<DBM>, mapper: AsyncIndexedMapper<ID, void>, opt?: CommonDaoStreamForEachOptions<ID>): Promise<void>;
     /**
      * Mutates!
      * "Returns", just to have a type of "Saved"

package/dist/kv/commonKeyValueDao.js

@@ -1,5 +1,5 @@
 import { AppError, pMap } from '@naturalcycles/js-lib';
-import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib';
+import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib/zip';
 export const commonKeyValueDaoDeflatedJsonTransformer = {
     valueToBuffer: async (v) => await deflateString(JSON.stringify(v)),
     bufferToValue: async (buf) => JSON.parse(await inflateToString(buf)),

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -1,6 +1,6 @@
 import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
+import { type TransformLogProgressOptions, type TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import { NDJsonStats } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB } from '../common.db.js';
 import { DBQuery } from '../query/dbQuery.js';

package/dist/pipeline/dbPipelineBackup.js

@@ -1,6 +1,7 @@
 import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { createWriteStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 import { _pipeline, NDJsonStats, transformLogProgress, transformMap, transformTap, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**
@@ -68,7 +69,7 @@ export async function dbPipelineBackup(opt) {
             transformTap(() => {
                 rows++;
             }),
-            ...fs2.createWriteStreamAsNDJSON(filePath),
+            ...createWriteStreamAsNDJSON(filePath),
         ]);
         const { size: sizeBytes } = await fs2.statAsync(filePath);
         const stats = NDJsonStats.create({

package/dist/pipeline/dbPipelineCopy.js

@@ -1,5 +1,5 @@
 import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors';
 import { _pipeline, NDJsonStats, transformChunk, transformLogProgress, transformMap, transformTap, writableForEach, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**

package/dist/pipeline/dbPipelineRestore.d.ts

@@ -1,6 +1,6 @@
 import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
+import { type TransformLogProgressOptions, type TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import { NDJsonStats } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB } from '../common.db.js';
 import type { CommonDBSaveOptions } from '../db.model.js';

package/dist/pipeline/dbPipelineRestore.js

@@ -1,6 +1,7 @@
 import { _hb, _mapValues, _passthroughMapper, ErrorMode, localTime, pMap, } from '@naturalcycles/js-lib';
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { createReadStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 import { _pipeline, NDJsonStats, transformChunk, transformFilterSync, transformLogProgress, transformMap, transformTap, writableForEach, } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Pipeline from NDJSON files in a folder (optionally gzipped) to CommonDB.
@@ -62,7 +63,7 @@ export async function dbPipelineRestore(opt) {
         const sizeBytes = sizeByTable[table];
         console.log(`<< ${grey(filePath)} ${dimWhite(_hb(sizeBytes))} started...`);
         await _pipeline([
-            fs2.createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
+            createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
             transformTap(() => rows++),
             transformLogProgress({
                 logEvery: 1000,

package/dist/query/dbQuery.d.ts

@@ -1,4 +1,4 @@
-import type { AsyncMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib';
+import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDao } from '../commondao/common.dao.js';
 import type { CommonDaoOptions, CommonDaoReadOptions, CommonDaoStreamDeleteOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from '../commondao/common.dao.model.js';
@@ -100,12 +100,12 @@ export declare class RunnableDBQuery<BM extends BaseDBEntity, DBM extends BaseDB
     runQueryExtendedAsDBM(opt?: CommonDaoReadOptions): Promise<RunQueryResult<DBM>>;
     runQueryCount(opt?: CommonDaoReadOptions): Promise<number>;
     patchByQuery(patch: Partial<DBM>, opt?: CommonDaoOptions): Promise<number>;
-    streamQueryForEach(mapper: AsyncMapper<BM, void>, opt?: CommonDaoStreamForEachOptions<BM>): Promise<void>;
-    streamQueryAsDBMForEach(mapper: AsyncMapper<DBM, void>, opt?: CommonDaoStreamForEachOptions<DBM>): Promise<void>;
+    streamQueryForEach(mapper: AsyncIndexedMapper<BM, void>, opt?: CommonDaoStreamForEachOptions<BM>): Promise<void>;
+    streamQueryAsDBMForEach(mapper: AsyncIndexedMapper<DBM, void>, opt?: CommonDaoStreamForEachOptions<DBM>): Promise<void>;
     streamQuery(opt?: CommonDaoStreamOptions<BM>): ReadableTyped<BM>;
     streamQueryAsDBM(opt?: CommonDaoStreamOptions<DBM>): ReadableTyped<DBM>;
     queryIds(opt?: CommonDaoReadOptions): Promise<ID[]>;
     streamQueryIds(opt?: CommonDaoStreamOptions<ID>): ReadableTyped<ID>;
-    streamQueryIdsForEach(mapper: AsyncMapper<ID, void>, opt?: CommonDaoStreamForEachOptions<ID>): Promise<void>;
+    streamQueryIdsForEach(mapper: AsyncIndexedMapper<ID, void>, opt?: CommonDaoStreamForEachOptions<ID>): Promise<void>;
     deleteByQuery(opt?: CommonDaoStreamDeleteOptions<DBM>): Promise<number>;
 }

package/dist/testing/keyValueDBTest.js

@@ -39,7 +39,7 @@ export async function runCommonKeyValueDBTest(db) {
     test('saveBatch, then getByIds', async () => {
         await db.saveBatch(TEST_TABLE, testEntries);
         const entries = await db.getByIds(TEST_TABLE, testIds);
-        _sortBy(entries, e => e[0], true);
+        _sortBy(entries, e => e[0], { mutate: true });
         expect(entries).toEqual(testEntries);
     });
     if (support.count) {

package/dist/testing/keyValueDaoTest.js

@@ -41,7 +41,7 @@ export async function runCommonKeyValueDaoTest(db) {
         await dao.saveBatch(testEntries);
         const entries = await dao.getByIds(testIds);
         // console.log(typeof entries[0]![1], entries[0]![1])
-        _sortBy(entries, e => e[0], true);
+        _sortBy(entries, e => e[0], { mutate: true });
         expect(entries).toEqual(testEntries); // Jest doesn't allow to compare Buffers directly
         // expect(entries.map(e => e[0])).toEqual(testEntries.map(e => e[0]))
         // expect(entries.map(e => e[1].toString())).toEqual(testEntries.map(e => e[1].toString()))

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.4.1",
+  "version": "10.6.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "19.4.5"
+    "@naturalcycles/dev-lib": "19.6.0"
   },
   "files": [
     "dist",

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

@@ -11,7 +11,7 @@ import {
   generateJsonSchemaFromData,
   localTime,
 } from '@naturalcycles/js-lib'
-import { dimGrey } from '@naturalcycles/nodejs-lib'
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { readableCreate } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../base.common.db.js'
@@ -228,7 +228,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     rows = rows.map(r => _filterUndefinedValues(r))
 
     if (this.cfg.sortOnSave) {
-      _sortBy(rows, r => r[this.cfg.sortOnSave!.name as keyof ROW], true)
+      _sortBy(rows, r => r[this.cfg.sortOnSave!.name as keyof ROW] as string, { mutate: true })
       if (this.cfg.sortOnSave.descending) rows.reverse() // mutates
     }
 

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

@@ -1,8 +1,12 @@
 import { Readable } from 'node:stream'
 import type { ObjectWithId } from '@naturalcycles/js-lib'
 import { pMap } from '@naturalcycles/js-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import { _pipeline } from '@naturalcycles/nodejs-lib/stream'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  _pipeline,
+  createReadStreamAsNDJSON,
+  createWriteStreamAsNDJSON,
+} from '@naturalcycles/nodejs-lib/stream'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 
@@ -47,7 +51,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
 
     if (!(await fs2.pathExistsAsync(filePath))) return []
 
-    return await fs2.createReadStreamAsNDJSON(filePath).toArray()
+    return await createReadStreamAsNDJSON(filePath).toArray()
   }
 
   async saveFiles(ops: DBSaveBatchOperation<any>[]): Promise<void> {
@@ -59,6 +63,6 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
 
-    await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(filePath)])
+    await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(filePath)])
   }
 }

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

@@ -20,9 +20,15 @@ import {
   localTime,
   pMap,
 } from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '@naturalcycles/nodejs-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import { _pipeline, bufferReviver, type ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { dimGrey, yellow } from '@naturalcycles/nodejs-lib/colors'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  _pipeline,
+  bufferReviver,
+  createReadStreamAsNDJSON,
+  createWriteStreamAsNDJSON,
+  type ReadableTyped,
+} from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB, CommonDBSupport } from '../../common.db.js'
 import { commonDBFullSupport, CommonDBType } from '../../common.db.js'
 import type {
@@ -329,7 +335,7 @@ export class InMemoryDB implements CommonDB {
       tables++
       const fname = `${persistentStoragePath}/${table}.ndjson${persistZip ? '.gz' : ''}`
 
-      await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(fname)])
+      await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(fname)])
     })
 
     this.cfg.logger!.log(
@@ -357,7 +363,7 @@ export class InMemoryDB implements CommonDB {
       const fname = `${persistentStoragePath}/${file}`
       const table = file.split('.ndjson')[0]!
 
-      const rows = await fs2.createReadStreamAsNDJSON(fname).toArray()
+      const rows = await createReadStreamAsNDJSON(fname).toArray()
 
       this.data[table] = _by(rows, r => r.id)
     })

package/src/commondao/common.dao.ts

@@ -1,6 +1,6 @@
 import type { Transform } from 'node:stream'
 import type {
-  AsyncMapper,
+  AsyncIndexedMapper,
   BaseDBEntity,
   CommonLogger,
   JsonSchemaObject,
@@ -358,7 +358,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
 
   async streamQueryForEach(
     q: DBQuery<DBM>,
-    mapper: AsyncMapper<BM, void>,
+    mapper: AsyncIndexedMapper<BM, void>,
     opt: CommonDaoStreamForEachOptions<BM> = {},
   ): Promise<void> {
     this.validateQueryIndexes(q) // throws if query uses `excludeFromIndexes` property
@@ -408,7 +408,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
 
   async streamQueryAsDBMForEach(
     q: DBQuery<DBM>,
-    mapper: AsyncMapper<DBM, void>,
+    mapper: AsyncIndexedMapper<DBM, void>,
     opt: CommonDaoStreamForEachOptions<DBM> = {},
   ): Promise<void> {
     this.validateQueryIndexes(q) // throws if query uses `excludeFromIndexes` property
@@ -581,7 +581,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
 
   async streamQueryIdsForEach(
     q: DBQuery<DBM>,
-    mapper: AsyncMapper<ID, void>,
+    mapper: AsyncIndexedMapper<ID, void>,
     opt: CommonDaoStreamForEachOptions<ID> = {},
   ): Promise<void> {
     this.validateQueryIndexes(q) // throws if query uses `excludeFromIndexes` property

package/src/kv/commonKeyValueDao.ts

@@ -1,7 +1,7 @@
 import type { CommonLogger, KeyValueTuple } from '@naturalcycles/js-lib'
 import { AppError, pMap } from '@naturalcycles/js-lib'
-import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib/zip'
 import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js'
 import type { CommonDBCreateOptions } from '../db.model.js'
 import type {

package/src/pipeline/dbPipelineBackup.ts

@@ -1,10 +1,11 @@
 import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib'
 import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import type {
-  TransformLogProgressOptions,
-  TransformMapOptions,
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  createWriteStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
@@ -223,7 +224,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
         transformTap(() => {
           rows++
         }),
-        ...fs2.createWriteStreamAsNDJSON(filePath),
+        ...createWriteStreamAsNDJSON(filePath),
       ])
 
       const { size: sizeBytes } = await fs2.statAsync(filePath)

package/src/pipeline/dbPipelineCopy.ts

@@ -1,6 +1,6 @@
 import type { AsyncMapper, BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib'
 import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
 import type {
   TransformLogProgressOptions,
   TransformMapOptions,

package/src/pipeline/dbPipelineRestore.ts

@@ -12,11 +12,12 @@ import {
   localTime,
   pMap,
 } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import type {
-  TransformLogProgressOptions,
-  TransformMapOptions,
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  createReadStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
@@ -200,7 +201,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
       console.log(`<< ${grey(filePath)} ${dimWhite(_hb(sizeBytes))} started...`)
 
       await _pipeline([
-        fs2.createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
+        createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
         transformTap(() => rows++),
         transformLogProgress({
           logEvery: 1000,

package/src/query/dbQuery.ts

@@ -1,4 +1,4 @@
-import type { AsyncMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib'
+import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib'
 import { _objectAssign, _truncate } from '@naturalcycles/js-lib'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDao } from '../commondao/common.dao.js'
@@ -276,14 +276,14 @@ export class RunnableDBQuery<
   }
 
   async streamQueryForEach(
-    mapper: AsyncMapper<BM, void>,
+    mapper: AsyncIndexedMapper<BM, void>,
     opt?: CommonDaoStreamForEachOptions<BM>,
   ): Promise<void> {
     await this.dao.streamQueryForEach(this, mapper, opt)
   }
 
   async streamQueryAsDBMForEach(
-    mapper: AsyncMapper<DBM, void>,
+    mapper: AsyncIndexedMapper<DBM, void>,
     opt?: CommonDaoStreamForEachOptions<DBM>,
   ): Promise<void> {
     await this.dao.streamQueryAsDBMForEach(this, mapper, opt)
@@ -306,7 +306,7 @@ export class RunnableDBQuery<
   }
 
   async streamQueryIdsForEach(
-    mapper: AsyncMapper<ID, void>,
+    mapper: AsyncIndexedMapper<ID, void>,
     opt?: CommonDaoStreamForEachOptions<ID>,
   ): Promise<void> {
     await this.dao.streamQueryIdsForEach(this, mapper, opt)

package/src/testing/keyValueDBTest.ts

@@ -54,7 +54,7 @@ export async function runCommonKeyValueDBTest(db: CommonKeyValueDB): Promise<voi
     await db.saveBatch(TEST_TABLE, testEntries)
 
     const entries = await db.getByIds(TEST_TABLE, testIds)
-    _sortBy(entries, e => e[0], true)
+    _sortBy(entries, e => e[0], { mutate: true })
     expect(entries).toEqual(testEntries)
   })
 

package/src/testing/keyValueDaoTest.ts

@@ -54,7 +54,7 @@ export async function runCommonKeyValueDaoTest(db: CommonKeyValueDB): Promise<vo
     const entries = await dao.getByIds(testIds)
     // console.log(typeof entries[0]![1], entries[0]![1])
 
-    _sortBy(entries, e => e[0], true)
+    _sortBy(entries, e => e[0], { mutate: true })
     expect(entries).toEqual(testEntries) // Jest doesn't allow to compare Buffers directly
     // expect(entries.map(e => e[0])).toEqual(testEntries.map(e => e[0]))
     // expect(entries.map(e => e[1].toString())).toEqual(testEntries.map(e => e[1].toString()))