@naturalcycles/db-lib 8.43.4 → 8.43.5

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 import { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { BaseCommonDB } from '../../base.common.db';
 import { CommonDB } from '../../common.db';

package/dist/adapter/cachedb/cache.db.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheDB = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const base_common_db_1 = require("../../base.common.db");
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
@@ -160,7 +160,7 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
             return stream;
         }
         if (opt.skipCache || this.cfg.skipCache)
-            return stream_1.Readable.from([]);
+            return node_stream_1.Readable.from([]);
         const stream = this.cfg.cacheDB.streamQuery(q, opt);
         // if (this.cfg.logCached) {
         //   let count = 0

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalFilePersistencePlugin = void 0;
-const stream_1 = require("stream");
-const zlib_1 = require("zlib");
+const node_stream_1 = require("node:stream");
+const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const fs = require("fs-extra");
@@ -29,7 +29,7 @@ class LocalFilePersistencePlugin {
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         if (!(await fs.pathExists(filePath)))
             return [];
-        const transformUnzip = this.cfg.gzip ? [(0, zlib_1.createUnzip)()] : [];
+        const transformUnzip = this.cfg.gzip ? [(0, node_zlib_1.createUnzip)()] : [];
         const rows = [];
         await (0, nodejs_lib_1._pipeline)([
             fs.createReadStream(filePath),
@@ -47,9 +47,9 @@ class LocalFilePersistencePlugin {
         await fs.ensureDir(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        const transformZip = this.cfg.gzip ? [(0, zlib_1.createGzip)()] : [];
+        const transformZip = this.cfg.gzip ? [(0, node_zlib_1.createGzip)()] : [];
         await (0, nodejs_lib_1._pipeline)([
-            stream_1.Readable.from(rows),
+            node_stream_1.Readable.from(rows),
             (0, nodejs_lib_1.transformToNDJson)(),
             ...transformZip,
             fs.createWriteStream(filePath),

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryDB = void 0;
-const stream_1 = require("stream");
-const zlib_1 = require("zlib");
+const node_stream_1 = require("node:stream");
+const node_zlib_1 = require("node: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");
@@ -122,7 +122,7 @@ class InMemoryDB {
     }
     streamQuery(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
-        return stream_1.Readable.from((0, __1.queryInMemory)(q, Object.values(this.data[table] || {})));
+        return node_stream_1.Readable.from((0, __1.queryInMemory)(q, Object.values(this.data[table] || {})));
     }
     async commitTransaction(tx, opt) {
         const backup = (0, js_lib_1._deepCopy)(this.data);
@@ -156,7 +156,7 @@ class InMemoryDB {
         const { persistentStoragePath, persistZip } = this.cfg;
         const started = Date.now();
         await fs.emptyDir(persistentStoragePath);
-        const transformZip = persistZip ? [(0, zlib_1.createGzip)()] : [];
+        const transformZip = persistZip ? [(0, node_zlib_1.createGzip)()] : [];
         let tables = 0;
         // infinite concurrency for now
         await (0, js_lib_1.pMap)(Object.keys(this.data), async (table) => {
@@ -166,7 +166,7 @@ class InMemoryDB {
             tables++;
             const fname = `${persistentStoragePath}/${table}.ndjson${persistZip ? '.gz' : ''}`;
             await (0, nodejs_lib_1._pipeline)([
-                stream_1.Readable.from(rows),
+                node_stream_1.Readable.from(rows),
                 (0, nodejs_lib_1.transformToNDJson)(),
                 ...transformZip,
                 fs.createWriteStream(fname),
@@ -190,7 +190,7 @@ class InMemoryDB {
         await (0, js_lib_1.pMap)(files, async (file) => {
             const fname = `${persistentStoragePath}/${file}`;
             const table = file.split('.ndjson')[0];
-            const transformUnzip = file.endsWith('.gz') ? [(0, zlib_1.createUnzip)()] : [];
+            const transformUnzip = file.endsWith('.gz') ? [(0, node_zlib_1.createUnzip)()] : [];
             const rows = [];
             await (0, nodejs_lib_1._pipeline)([
                 fs.createReadStream(fname),

package/dist/adapter/inmemory/inMemoryKeyValueDB.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryKeyValueDB = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 class InMemoryKeyValueDB {
     constructor(cfg = {}) {
         this.cfg = cfg;
@@ -26,13 +26,13 @@ class InMemoryKeyValueDB {
         entries.forEach(([id, buf]) => (this.data[table][id] = buf));
     }
     streamIds(table, limit) {
-        return stream_1.Readable.from(Object.keys(this.data[table] || {}).slice(0, limit));
+        return node_stream_1.Readable.from(Object.keys(this.data[table] || {}).slice(0, limit));
     }
     streamValues(table, limit) {
-        return stream_1.Readable.from(Object.values(this.data[table] || {}).slice(0, limit));
+        return node_stream_1.Readable.from(Object.values(this.data[table] || {}).slice(0, limit));
     }
     streamEntries(table, limit) {
-        return stream_1.Readable.from(Object.entries(this.data[table] || {}).slice(0, limit));
+        return node_stream_1.Readable.from(Object.entries(this.data[table] || {}).slice(0, limit));
     }
     async count(table) {
         var _a;

package/dist/base.common.db.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommonDB = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const dbTransaction_util_1 = require("./transaction/dbTransaction.util");
 /**
  * No-op implementation of CommonDB interface.
@@ -39,7 +39,7 @@ class BaseCommonDB {
     }
     async saveBatch(_table, _rows, _opt) { }
     streamQuery(_q) {
-        return stream_1.Readable.from([]);
+        return node_stream_1.Readable.from([]);
     }
     /**
      * Naive implementation.

package/dist/commondao/common.dao.js

@@ -407,7 +407,9 @@ class CommonDao {
         const stream = this.cfg.db.streamQuery(q, opt);
         if (partialQuery || opt.raw)
             return stream;
-        return stream.pipe((0, nodejs_lib_1.transformMapSimple)(dbm => this.anyToDBM(dbm, opt), {
+        return stream
+            .on('error', err => stream.emit('error', err))
+            .pipe((0, nodejs_lib_1.transformMapSimple)(dbm => this.anyToDBM(dbm, opt), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }));
     }
@@ -433,6 +435,7 @@ class CommonDao {
             // optimization: 1 validation is enough
             // .pipe(transformMap<any, DBM>(dbm => this.anyToDBM(dbm, opt), safeOpt))
             // .pipe(transformMap<DBM, Saved<BM>>(dbm => this.dbmToBM(dbm, opt), safeOpt))
+            .on('error', err => stream.emit('error', err))
             .pipe((0, nodejs_lib_1.transformMap)(async (dbm) => await this.dbmToBM(dbm, opt), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }))
@@ -449,9 +452,13 @@ class CommonDao {
     streamQueryIds(q, opt = {}) {
         q.table = opt.table || q.table;
         opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
-        return this.cfg.db.streamQuery(q.select(['id']), opt).pipe((0, nodejs_lib_1.transformMapSimple)(objectWithId => objectWithId.id, {
+        const stream = this.cfg.db
+            .streamQuery(q.select(['id']), opt)
+            .on('error', err => stream.emit('error', err))
+            .pipe((0, nodejs_lib_1.transformMapSimple)(objectWithId => objectWithId.id, {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }));
+        return stream;
     }
     async streamQueryIdsForEach(q, mapper, opt = {}) {
         q.table = opt.table || q.table;

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

@@ -210,4 +210,4 @@ export interface CommonDaoStreamOptions extends CommonDaoOptions {
      */
     errorMode?: ErrorMode;
 }
-export declare type CommonDaoCreateOptions = CommonDBCreateOptions;
+export type CommonDaoCreateOptions = CommonDBCreateOptions;

package/dist/db.model.d.ts

@@ -7,7 +7,7 @@ import { ObjectWithId } from '@naturalcycles/js-lib';
  *
  * Default is Upsert.
  */
-export declare type CommonDBSaveMethod = 'upsert' | 'insert' | 'update';
+export type CommonDBSaveMethod = 'upsert' | 'insert' | 'update';
 export interface CommonDBOptions {
 }
 /**
@@ -27,7 +27,7 @@ export interface CommonDBSaveOptions<ROW extends Partial<ObjectWithId> = any> ex
      */
     assignGeneratedIds?: boolean;
 }
-export declare type CommonDBStreamOptions = CommonDBOptions;
+export type CommonDBStreamOptions = CommonDBOptions;
 export interface CommonDBCreateOptions extends CommonDBOptions {
     /**
      * Caution! If set to true - will actually DROP the table!
@@ -40,7 +40,7 @@ export interface RunQueryResult<T> {
     rows: T[];
     endCursor?: string;
 }
-export declare type DBOperation = DBSaveBatchOperation | DBDeleteByIdsOperation;
+export type DBOperation = DBSaveBatchOperation | DBDeleteByIdsOperation;
 export interface DBSaveBatchOperation<ROW extends Partial<ObjectWithId> = any> {
     type: 'saveBatch';
     table: string;

package/dist/kv/commonKeyValueDB.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDBCreateOptions } from '../db.model';
-export declare type KeyValueDBTuple = [key: string, value: Buffer];
+export type KeyValueDBTuple = [key: string, value: Buffer];
 /**
  * Common interface for Key-Value database implementations.
  *

package/dist/kv/commonKeyValueDao.js

@@ -103,17 +103,25 @@ class CommonKeyValueDao {
         }
         // todo: consider it when readableMap supports `errorMode: SUPPRESS`
         // readableMap(this.cfg.db.streamValues(this.cfg.table, limit), async buf => await this.cfg.hooks!.mapBufferToValue(buf))
-        return this.cfg.db.streamValues(this.cfg.table, limit).pipe((0, nodejs_lib_1.transformMap)(async (buf) => await this.cfg.hooks.mapBufferToValue(buf), {
+        const stream = this.cfg.db
+            .streamValues(this.cfg.table, limit)
+            .on('error', err => stream.emit('error', err))
+            .pipe((0, nodejs_lib_1.transformMap)(async (buf) => await this.cfg.hooks.mapBufferToValue(buf), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
         }));
+        return stream;
     }
     streamEntries(limit) {
         if (!this.cfg.hooks?.mapBufferToValue) {
             return this.cfg.db.streamEntries(this.cfg.table, limit);
         }
-        return this.cfg.db.streamEntries(this.cfg.table, limit).pipe((0, nodejs_lib_1.transformMap)(async ([id, buf]) => [id, await this.cfg.hooks.mapBufferToValue(buf)], {
+        const stream = this.cfg.db
+            .streamEntries(this.cfg.table, limit)
+            .on('error', err => stream.emit('error', err))
+            .pipe((0, nodejs_lib_1.transformMap)(async ([id, buf]) => [id, await this.cfg.hooks.mapBufferToValue(buf)], {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
         }));
+        return stream;
     }
 }
 exports.CommonKeyValueDao = CommonKeyValueDao;

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ZlibOptions } from 'zlib';
+import { ZlibOptions } from 'node:zlib';
 import { AsyncMapper, ErrorMode } from '@naturalcycles/js-lib';
 import { NDJsonStats, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from '../common.db';

package/dist/pipeline/dbPipelineBackup.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbPipelineBackup = void 0;
-const zlib_1 = require("zlib");
+const node_zlib_1 = require("node: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");
@@ -65,7 +65,7 @@ async function dbPipelineBackup(opt) {
                 rows++;
             }),
             (0, nodejs_lib_1.transformToNDJson)({ strict, sortObjects }),
-            ...(gzip ? [(0, zlib_1.createGzip)(zlibOptions)] : []),
+            ...(gzip ? [(0, node_zlib_1.createGzip)(zlibOptions)] : []),
             fs.createWriteStream(filePath),
         ]);
         const { size: sizeBytes } = await fs.stat(filePath);

package/dist/pipeline/dbPipelineRestore.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbPipelineRestore = void 0;
-const zlib_1 = require("zlib");
+const node_zlib_1 = require("node: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");
@@ -68,7 +68,7 @@ async function dbPipelineRestore(opt) {
         console.log(`<< ${(0, colors_1.grey)(filePath)} ${(0, colors_1.dimWhite)((0, js_lib_1._hb)(sizeBytes))} started...`);
         await (0, nodejs_lib_1._pipeline)([
             fs.createReadStream(filePath),
-            ...(gzip ? [(0, zlib_1.createUnzip)()] : []),
+            ...(gzip ? [(0, node_zlib_1.createUnzip)()] : []),
             (0, nodejs_lib_1.transformSplit)(),
             (0, nodejs_lib_1.transformJsonParse)({ strict }),
             (0, nodejs_lib_1.transformTap)(() => rows++),

package/dist/query/dbQuery.d.ts

@@ -22,7 +22,7 @@ import { RunQueryResult } from '../db.model';
  *
  * You may also look at queryInMemory() for its implementation (it implements all those).
  */
-export declare type DBQueryFilterOperator = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'in' | 'not-in' | 'array-contains' | 'array-contains-any';
+export type DBQueryFilterOperator = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'in' | 'not-in' | 'array-contains' | 'array-contains-any';
 export declare const dbQueryFilterOperatorValues: DBQueryFilterOperator[];
 export interface DBQueryFilter<ROW extends ObjectWithId = AnyObjectWithId> {
     name: keyof ROW;

package/dist/timeseries/timeSeries.model.d.ts

@@ -7,7 +7,7 @@ export interface CommonTimeSeriesDaoCfg {
  * Second number: value
  * null in the second position means "absense of value" (may exist in _RAW table)
  */
-export declare type TimeSeriesDataPoint = [number, number | null];
+export type TimeSeriesDataPoint = [number, number | null];
 export interface TimeSeriesRow {
     id: number;
     ts: number;

package/package.json

@@ -41,7 +41,7 @@
   "engines": {
     "node": ">=14.15"
   },
-  "version": "8.43.4",
+  "version": "8.43.5",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

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

@@ -1,4 +1,4 @@
-import { Readable } from 'stream'
+import { Readable } from 'node:stream'
 import {
   JsonSchemaObject,
   JsonSchemaRootObject,

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

@@ -1,5 +1,5 @@
-import { Readable } from 'stream'
-import { createGzip, createUnzip } from 'zlib'
+import { Readable } from 'node:stream'
+import { createGzip, createUnzip } from 'node:zlib'
 import { pMap, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   transformJsonParse,

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

@@ -1,5 +1,5 @@
-import { Readable } from 'stream'
-import { createGzip, createUnzip } from 'zlib'
+import { Readable } from 'node:stream'
+import { createGzip, createUnzip } from 'node:zlib'
 import {
   generateJsonSchemaFromData,
   JsonSchemaObject,

package/src/adapter/inmemory/inMemoryKeyValueDB.ts

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

package/src/base.common.db.ts

@@ -1,4 +1,4 @@
-import { Readable } from 'stream'
+import { Readable } from 'node:stream'
 import { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from './common.db'

package/src/commondao/common.dao.ts

@@ -498,11 +498,13 @@ export class CommonDao<
     const stream = this.cfg.db.streamQuery<DBM>(q, opt)
     if (partialQuery || opt.raw) return stream
 
-    return stream.pipe(
-      transformMapSimple<any, DBM>(dbm => this.anyToDBM(dbm, opt), {
-        errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-      }),
-    )
+    return stream
+      .on('error', err => stream.emit('error', err))
+      .pipe(
+        transformMapSimple<any, DBM>(dbm => this.anyToDBM(dbm, opt), {
+          errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
+        }),
+      )
   }
 
   /**
@@ -529,6 +531,7 @@ export class CommonDao<
         // optimization: 1 validation is enough
         // .pipe(transformMap<any, DBM>(dbm => this.anyToDBM(dbm, opt), safeOpt))
         // .pipe(transformMap<DBM, Saved<BM>>(dbm => this.dbmToBM(dbm, opt), safeOpt))
+        .on('error', err => stream.emit('error', err))
         .pipe(
           transformMap<DBM, Saved<BM>>(async dbm => await this.dbmToBM(dbm, opt), {
             errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
@@ -550,11 +553,16 @@ export class CommonDao<
     q.table = opt.table || q.table
     opt.errorMode ||= ErrorMode.SUPPRESS
 
-    return this.cfg.db.streamQuery<DBM>(q.select(['id']), opt).pipe(
-      transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
-        errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-      }),
-    )
+    const stream: ReadableTyped<ID> = this.cfg.db
+      .streamQuery<DBM>(q.select(['id']), opt)
+      .on('error', err => stream.emit('error', err))
+      .pipe(
+        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
+          errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
+        }),
+      )
+
+    return stream
   }
 
   async streamQueryIdsForEach(

package/src/kv/commonKeyValueDao.ts

@@ -163,11 +163,16 @@ export class CommonKeyValueDao<T> {
 
     // todo: consider it when readableMap supports `errorMode: SUPPRESS`
     // readableMap(this.cfg.db.streamValues(this.cfg.table, limit), async buf => await this.cfg.hooks!.mapBufferToValue(buf))
-    return this.cfg.db.streamValues(this.cfg.table, limit).pipe(
-      transformMap(async buf => await this.cfg.hooks!.mapBufferToValue!(buf), {
-        errorMode: ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
-      }),
-    )
+    const stream: ReadableTyped<Buffer> = this.cfg.db
+      .streamValues(this.cfg.table, limit)
+      .on('error', err => stream.emit('error', err))
+      .pipe(
+        transformMap(async buf => await this.cfg.hooks!.mapBufferToValue!(buf), {
+          errorMode: ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
+        }),
+      )
+
+    return stream
   }
 
   streamEntries(limit?: number): ReadableTyped<KeyValueTuple<string, T>> {
@@ -175,10 +180,15 @@ export class CommonKeyValueDao<T> {
       return this.cfg.db.streamEntries(this.cfg.table, limit)
     }
 
-    return this.cfg.db.streamEntries(this.cfg.table, limit).pipe(
-      transformMap(async ([id, buf]) => [id, await this.cfg.hooks!.mapBufferToValue!(buf)], {
-        errorMode: ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
-      }),
-    )
+    const stream: ReadableTyped<KeyValueTuple<string, T>> = this.cfg.db
+      .streamEntries(this.cfg.table, limit)
+      .on('error', err => stream.emit('error', err))
+      .pipe(
+        transformMap(async ([id, buf]) => [id, await this.cfg.hooks!.mapBufferToValue!(buf)], {
+          errorMode: ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
+        }),
+      )
+
+    return stream
   }
 }

package/src/pipeline/dbPipelineBackup.ts

@@ -1,4 +1,4 @@
-import { createGzip, ZlibOptions } from 'zlib'
+import { createGzip, ZlibOptions } from 'node:zlib'
 import {
   AppError,
   AsyncMapper,

package/src/pipeline/dbPipelineRestore.ts

@@ -1,4 +1,4 @@
-import { createUnzip } from 'zlib'
+import { createUnzip } from 'node:zlib'
 import {
   AsyncMapper,
   ErrorMode,