@naturalcycles/db-lib 10.4.0 → 10.5.0

package/dist/adapter/cachedb/cache.db.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../base.common.db.js';
 import type { CommonDB, CommonDBSupport } from '../../common.db.js';
 import type { RunQueryResult } from '../../db.model.js';

package/dist/adapter/file/file.db.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../base.common.db.js';
 import type { CommonDB, CommonDBSupport } from '../../common.db.js';
 import type { CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBSaveBatchOperation, RunQueryResult } from '../../db.model.js';

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

@@ -1,5 +1,6 @@
 import { _assert, _by, _deepEquals, _filterUndefinedValues, _since, _sortBy, _sortObjectDeep, _stringMapValues, generateJsonSchemaFromData, localTime, } from '@naturalcycles/js-lib';
-import { dimGrey, readableCreate } from '@naturalcycles/nodejs-lib';
+import { dimGrey } from '@naturalcycles/nodejs-lib';
+import { readableCreate } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../base.common.db.js';
 import { commonDBFullSupport } from '../../common.db.js';
 import { queryInMemory } from '../inmemory/queryInMemory.js';
@@ -147,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,6 +1,7 @@
 import { Readable } from 'node:stream';
 import { pMap } from '@naturalcycles/js-lib';
-import { _pipeline, fs2 } from '@naturalcycles/nodejs-lib';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { _pipeline } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Persists in local filesystem as ndjson.
  */

package/dist/adapter/inmemory/inMemory.db.d.ts

@@ -1,5 +1,5 @@
 import type { AnyObjectWithId, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import { type ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB, CommonDBSupport } from '../../common.db.js';
 import { CommonDBType } from '../../common.db.js';
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBOperation, DBTransaction, DBTransactionFn, RunQueryResult } from '../../db.model.js';

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

@@ -1,6 +1,8 @@
 import { Readable } from 'node:stream';
 import { _assert, _by, _deepCopy, _isEmptyObject, _since, _sortObjectDeep, _stringMapEntries, _stringMapValues, generateJsonSchemaFromData, localTime, pMap, } from '@naturalcycles/js-lib';
-import { _pipeline, bufferReviver, dimGrey, fs2, yellow } from '@naturalcycles/nodejs-lib';
+import { dimGrey, yellow } from '@naturalcycles/nodejs-lib';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { _pipeline, bufferReviver } from '@naturalcycles/nodejs-lib/stream';
 import { commonDBFullSupport, CommonDBType } from '../../common.db.js';
 import { queryInMemory } from './queryInMemory.js';
 export class InMemoryDB {

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

@@ -1,5 +1,5 @@
 import type { StringMap } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBCreateOptions } from '../../db.model.js';
 import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '../../kv/commonKeyValueDB.js';
 export interface InMemoryKeyValueDBCfg {

package/dist/base.common.db.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB, CommonDBSupport } from './common.db.js';
 import { CommonDBType } from './common.db.js';
 import type { CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from './db.model.js';

package/dist/common.db.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from './db.model.js';
 import type { DBQuery } from './query/dbQuery.js';
 export declare enum CommonDBType {

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

@@ -1,8 +1,9 @@
 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 type { ObjectSchema, ReadableTyped } from '@naturalcycles/nodejs-lib';
-import { AjvSchema } from '@naturalcycles/nodejs-lib';
+import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
+import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBTransactionOptions, DBTransaction, RunQueryResult } from '../db.model.js';
 import type { DBQuery } from '../query/dbQuery.js';
 import { RunnableDBQuery } from '../query/dbQuery.js';
@@ -54,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.
      */
@@ -72,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/commondao/common.dao.js

@@ -1,6 +1,9 @@
 import { _assert, _deepCopy, _deepJsonEquals, _filterUndefinedValues, _isTruthy, _objectAssignExact, _passthroughPredicate, _since, _truncate, _typeCast, _uniqBy, AppError, ErrorMode, localTime, pMap, SKIP, } from '@naturalcycles/js-lib';
 import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod';
-import { _pipeline, AjvSchema, getValidationResult, stringId, transformChunk, transformLogProgress, transformMap, transformNoOp, writableVoid, } from '@naturalcycles/nodejs-lib';
+import { stringId } from '@naturalcycles/nodejs-lib';
+import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
+import { getValidationResult, } from '@naturalcycles/nodejs-lib/joi';
+import { _pipeline, transformChunk, transformLogProgress, transformMap, transformNoOp, writableVoid, } from '@naturalcycles/nodejs-lib/stream';
 import { DBLibError } from '../cnst.js';
 import { RunnableDBQuery } from '../query/dbQuery.js';
 import { CommonDaoLogLevel } from './common.dao.model.js';

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

@@ -1,6 +1,8 @@
 import type { BaseDBEntity, CommonLogger, ErrorMode, NumberOfMilliseconds, Promisable, UnixTimestamp } from '@naturalcycles/js-lib';
 import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod';
-import type { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchema, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
+import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv';
+import type { JoiValidationError, ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
+import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB } from '../common.db.js';
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model.js';
 export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntity, ID = BM['id']> {

package/dist/kv/commonKeyValueDB.d.ts

@@ -1,5 +1,5 @@
 import type { Integer, UnixTimestamp } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBCreateOptions } from '../db.model.js';
 /**
  * Common interface for Key-Value database implementations.

package/dist/kv/commonKeyValueDao.d.ts

@@ -1,5 +1,5 @@
 import type { CommonLogger, KeyValueTuple } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js';
 import type { CommonDBCreateOptions } from '../db.model.js';
 import type { CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from './commonKeyValueDB.js';

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -1,7 +1,7 @@
 import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
-import { NDJsonStats } from '@naturalcycles/nodejs-lib';
+import type { TransformLogProgressOptions, 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';
 export interface DBPipelineBackupOptions extends TransformLogProgressOptions {

package/dist/pipeline/dbPipelineBackup.js

@@ -1,5 +1,7 @@
 import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
-import { _pipeline, boldWhite, dimWhite, fs2, grey, NDJsonStats, transformLogProgress, transformMap, transformTap, yellow, } from '@naturalcycles/nodejs-lib';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { _pipeline, NDJsonStats, transformLogProgress, transformMap, transformTap, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).

package/dist/pipeline/dbPipelineCopy.d.ts

@@ -1,7 +1,7 @@
 import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
-import { NDJsonStats } from '@naturalcycles/nodejs-lib';
+import type { TransformLogProgressOptions, 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';
 export interface DBPipelineCopyOptions extends TransformLogProgressOptions {

package/dist/pipeline/dbPipelineCopy.js

@@ -1,5 +1,6 @@
 import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
-import { _pipeline, boldWhite, dimWhite, grey, NDJsonStats, transformChunk, transformLogProgress, transformMap, transformTap, writableForEach, yellow, } from '@naturalcycles/nodejs-lib';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
+import { _pipeline, NDJsonStats, transformChunk, transformLogProgress, transformMap, transformTap, writableForEach, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**
  * Pipeline from input stream(s) to CommonDB .saveBatch().

package/dist/pipeline/dbPipelineRestore.d.ts

@@ -1,7 +1,7 @@
 import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
-import { NDJsonStats } from '@naturalcycles/nodejs-lib';
+import type { TransformLogProgressOptions, 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';
 export interface DBPipelineRestoreOptions extends TransformLogProgressOptions {

package/dist/pipeline/dbPipelineRestore.js

@@ -1,5 +1,7 @@
 import { _hb, _mapValues, _passthroughMapper, ErrorMode, localTime, pMap, } from '@naturalcycles/js-lib';
-import { _pipeline, boldWhite, dimWhite, fs2, grey, NDJsonStats, transformChunk, transformFilterSync, transformLogProgress, transformMap, transformTap, writableForEach, yellow, } from '@naturalcycles/nodejs-lib';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+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.
  * Allows to define a mapper and a predicate to map/filter objects between input and output.

package/dist/query/dbQuery.d.ts

@@ -1,5 +1,5 @@
-import type { AsyncMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '@naturalcycles/nodejs-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';
 import type { RunQueryResult } from '../db.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/commonDaoTest.js

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
 import { _deepCopy, _filterObject, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib';
-import { _pipeline } from '@naturalcycles/nodejs-lib';
+import { _pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { CommonDao } from '../commondao/common.dao.js';
 import { CommonDaoLogLevel } from '../commondao/common.dao.model.js';
 import { DBQuery } from '../query/dbQuery.js';

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/dist/testing/test.model.d.ts

@@ -1,5 +1,5 @@
 import type { BaseDBEntity, JsonSchemaObject } from '@naturalcycles/js-lib';
-import { type ObjectSchema } from '@naturalcycles/nodejs-lib';
+import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
 export declare const TEST_TABLE = "TEST_TABLE";
 export interface TestItemBM extends BaseDBEntity {
     k1: string;

package/dist/testing/test.model.js

@@ -1,5 +1,5 @@
 import { _range, jsonSchema } from '@naturalcycles/js-lib';
-import { baseDBEntitySchema, binarySchema, booleanSchema, numberSchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib';
+import { baseDBEntitySchema, binarySchema, booleanSchema, numberSchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
 const MOCK_TS_2018_06_21 = 1529539200;
 export const TEST_TABLE = 'TEST_TABLE';
 export const testItemBMSchema = objectSchema({

package/dist/validation/index.d.ts

@@ -1,4 +1,4 @@
-import { type ObjectSchema, type StringSchema } from '@naturalcycles/nodejs-lib';
+import { type ObjectSchema, type StringSchema } from '@naturalcycles/nodejs-lib/joi';
 import type { CommonDBOptions, CommonDBSaveOptions } from '../db.model.js';
 import type { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryOrder } from '../query/dbQuery.js';
 export declare const commonDBOptionsSchema: ObjectSchema<CommonDBOptions>;

package/dist/validation/index.js

@@ -1,4 +1,4 @@
-import { anySchema, arraySchema, booleanSchema, integerSchema, Joi, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib';
+import { anySchema, arraySchema, booleanSchema, integerSchema, Joi, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
 import { dbQueryFilterOperatorValues } from '../query/dbQuery.js';
 export const commonDBOptionsSchema = objectSchema({
     ['onlyCache']: booleanSchema.optional(),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
-    "@naturalcycles/nodejs-lib": "^14"
+    "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "19.5.0"
   },
   "files": [
     "dist",

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

@@ -6,7 +6,7 @@ import type {
   StringMap,
 } from '@naturalcycles/js-lib'
 import { _isTruthy } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../base.common.db.js'
 import type { CommonDB, CommonDBSupport } from '../../common.db.js'
 import { commonDBFullSupport } from '../../common.db.js'

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

@@ -11,8 +11,9 @@ import {
   generateJsonSchemaFromData,
   localTime,
 } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { dimGrey, readableCreate } from '@naturalcycles/nodejs-lib'
+import { dimGrey } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { readableCreate } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../base.common.db.js'
 import type { CommonDB, CommonDBSupport } from '../../common.db.js'
 import { commonDBFullSupport } from '../../common.db.js'
@@ -227,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,7 +1,8 @@
 import { Readable } from 'node:stream'
 import type { ObjectWithId } from '@naturalcycles/js-lib'
 import { pMap } from '@naturalcycles/js-lib'
-import { _pipeline, fs2 } from '@naturalcycles/nodejs-lib'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs'
+import { _pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 

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

@@ -20,8 +20,9 @@ import {
   localTime,
   pMap,
 } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { _pipeline, bufferReviver, dimGrey, fs2, yellow } from '@naturalcycles/nodejs-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 type { CommonDB, CommonDBSupport } from '../../common.db.js'
 import { commonDBFullSupport, CommonDBType } from '../../common.db.js'
 import type {

package/src/adapter/inmemory/inMemoryKeyValueDB.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream'
 import type { StringMap } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDBCreateOptions } from '../../db.model.js'
 import type {
   CommonKeyValueDB,

package/src/base.common.db.ts

@@ -4,7 +4,7 @@ import type {
   ObjectWithId,
   StringMap,
 } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB, CommonDBSupport } from './common.db.js'
 import { CommonDBType } from './common.db.js'
 import type {

package/src/common.db.ts

@@ -4,7 +4,7 @@ import type {
   ObjectWithId,
   StringMap,
 } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type {
   CommonDBCreateOptions,
   CommonDBOptions,

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

@@ -7,14 +7,12 @@ import type {
   UnixTimestamp,
 } from '@naturalcycles/js-lib'
 import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod'
+import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
+import type { JoiValidationError, ObjectSchema } from '@naturalcycles/nodejs-lib/joi'
 import type {
-  AjvSchema,
-  AjvValidationError,
-  JoiValidationError,
-  ObjectSchema,
   TransformLogProgressOptions,
   TransformMapOptions,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../common.db.js'
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model.js'
 

package/src/commondao/common.dao.ts

@@ -1,6 +1,6 @@
 import type { Transform } from 'node:stream'
 import type {
-  AsyncMapper,
+  AsyncIndexedMapper,
   BaseDBEntity,
   CommonLogger,
   JsonSchemaObject,
@@ -30,23 +30,22 @@ import {
 } from '@naturalcycles/js-lib'
 import type { ZodValidationError } from '@naturalcycles/js-lib/zod'
 import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod'
-import type {
-  AjvValidationError,
-  JoiValidationError,
-  ObjectSchema,
-  ReadableTyped,
-} from '@naturalcycles/nodejs-lib'
+import { stringId } from '@naturalcycles/nodejs-lib'
+import { AjvSchema, type AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
 import {
-  _pipeline,
-  AjvSchema,
   getValidationResult,
-  stringId,
+  type JoiValidationError,
+  type ObjectSchema,
+} from '@naturalcycles/nodejs-lib/joi'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import {
+  _pipeline,
   transformChunk,
   transformLogProgress,
   transformMap,
   transformNoOp,
   writableVoid,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/stream'
 import { DBLibError } from '../cnst.js'
 import type { CommonDBTransactionOptions, DBTransaction, RunQueryResult } from '../db.model.js'
 import type { DBQuery } from '../query/dbQuery.js'
@@ -359,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
@@ -409,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
@@ -582,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/commonKeyValueDB.ts

@@ -1,5 +1,5 @@
 import type { Integer, UnixTimestamp } from '@naturalcycles/js-lib'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDBCreateOptions } from '../db.model.js'
 
 /**

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 type { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js'
 import type { CommonDBCreateOptions } from '../db.model.js'
 import type {

package/src/pipeline/dbPipelineBackup.ts

@@ -1,18 +1,18 @@
 import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib'
 import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib'
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs'
+import type {
+  TransformLogProgressOptions,
+  TransformMapOptions,
+} from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
-  boldWhite,
-  dimWhite,
-  fs2,
-  grey,
   NDJsonStats,
   transformLogProgress,
   transformMap,
   transformTap,
-  yellow,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../common.db.js'
 import { DBQuery } from '../query/dbQuery.js'
 

package/src/pipeline/dbPipelineCopy.ts

@@ -1,19 +1,19 @@
 import type { AsyncMapper, BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib'
 import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib'
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
+import type {
+  TransformLogProgressOptions,
+  TransformMapOptions,
+} from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
-  boldWhite,
-  dimWhite,
-  grey,
   NDJsonStats,
   transformChunk,
   transformLogProgress,
   transformMap,
   transformTap,
   writableForEach,
-  yellow,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../common.db.js'
 import type { CommonDBSaveOptions } from '../db.model.js'
 import { DBQuery } from '../query/dbQuery.js'

package/src/pipeline/dbPipelineRestore.ts

@@ -12,13 +12,14 @@ import {
   localTime,
   pMap,
 } from '@naturalcycles/js-lib'
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib'
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs'
+import type {
+  TransformLogProgressOptions,
+  TransformMapOptions,
+} from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
-  boldWhite,
-  dimWhite,
-  fs2,
-  grey,
   NDJsonStats,
   transformChunk,
   transformFilterSync,
@@ -26,8 +27,7 @@ import {
   transformMap,
   transformTap,
   writableForEach,
-  yellow,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../common.db.js'
 import type { CommonDBSaveOptions } from '../db.model.js'
 

package/src/query/dbQuery.ts

@@ -1,6 +1,6 @@
-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'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDao } from '../commondao/common.dao.js'
 import type {
   CommonDaoOptions,
@@ -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/commonDaoTest.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream'
 import { _deepCopy, _filterObject, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib'
-import { _pipeline } from '@naturalcycles/nodejs-lib'
+import { _pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../common.db.js'
 import { CommonDao } from '../commondao/common.dao.js'
 import { CommonDaoLogLevel } from '../commondao/common.dao.model.js'

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()))

package/src/testing/test.model.ts

@@ -8,7 +8,7 @@ import {
   type ObjectSchema,
   objectSchema,
   stringSchema,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/joi'
 
 const MOCK_TS_2018_06_21 = 1529539200 as UnixTimestamp
 

package/src/validation/index.ts

@@ -8,7 +8,7 @@ import {
   objectSchema,
   type StringSchema,
   stringSchema,
-} from '@naturalcycles/nodejs-lib'
+} from '@naturalcycles/nodejs-lib/joi'
 import type { CommonDBOptions, CommonDBSaveOptions } from '../db.model.js'
 import type {
   DBQuery,