@naturalcycles/db-lib 10.24.0 → 10.26.0

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

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

package/dist/query/dbQuery.d.ts

@@ -1,5 +1,5 @@
 import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib/types';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
+import { Pipeline, 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';
@@ -104,8 +104,11 @@ export declare class RunnableDBQuery<BM extends BaseDBEntity, DBM extends BaseDB
     streamQueryAsDBMForEach(mapper: AsyncIndexedMapper<DBM, void>, opt?: CommonDaoStreamForEachOptions<DBM>): Promise<void>;
     streamQuery(opt?: CommonDaoStreamOptions<BM>): ReadableTyped<BM>;
     streamQueryAsDBM(opt?: CommonDaoStreamOptions<DBM>): ReadableTyped<DBM>;
+    pipeline(opt?: CommonDaoStreamOptions<BM>): Pipeline<BM>;
+    pipelineAsDBM(opt?: CommonDaoStreamOptions<DBM>): Pipeline<DBM>;
     queryIds(opt?: CommonDaoReadOptions): Promise<ID[]>;
     streamQueryIds(opt?: CommonDaoStreamOptions<ID>): ReadableTyped<ID>;
+    pipelineIds(opt?: CommonDaoStreamOptions<ID>): Pipeline<ID>;
     streamQueryIdsForEach(mapper: AsyncIndexedMapper<ID, void>, opt?: CommonDaoStreamForEachOptions<ID>): Promise<void>;
     deleteByQuery(opt?: CommonDaoStreamDeleteOptions<DBM>): Promise<number>;
 }

package/dist/query/dbQuery.js

@@ -1,5 +1,6 @@
 import { _truncate } from '@naturalcycles/js-lib/string/string.util.js';
 import { _objectAssign } from '@naturalcycles/js-lib/types';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 export const dbQueryFilterOperatorValues = [
     '<',
     '<=',
@@ -187,12 +188,21 @@ export class RunnableDBQuery extends DBQuery {
     streamQueryAsDBM(opt) {
         return this.dao.streamQueryAsDBM(this, opt);
     }
+    pipeline(opt) {
+        return Pipeline.from(this.dao.streamQuery(this, opt));
+    }
+    pipelineAsDBM(opt) {
+        return Pipeline.from(this.dao.streamQueryAsDBM(this, opt));
+    }
     async queryIds(opt) {
         return await this.dao.queryIds(this, opt);
     }
     streamQueryIds(opt) {
         return this.dao.streamQueryIds(this, opt);
     }
+    pipelineIds(opt) {
+        return Pipeline.from(this.dao.streamQueryIds(this, opt));
+    }
     async streamQueryIdsForEach(mapper, opt) {
         await this.dao.streamQueryIdsForEach(this, mapper, opt);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.24.0",
+  "version": "10.26.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"

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

@@ -1,7 +1,7 @@
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
-import { createReadStreamAsNDJSON, Pipeline } from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 
@@ -46,7 +46,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
 
     if (!(await fs2.pathExistsAsync(filePath))) return []
 
-    return await createReadStreamAsNDJSON(filePath).toArray()
+    return await Pipeline.fromNDJsonFile<ROW>(filePath).toArray()
   }
 
   async saveFiles(ops: DBSaveBatchOperation<any>[]): Promise<void> {

package/src/query/dbQuery.ts

@@ -1,7 +1,7 @@
 import { _truncate } from '@naturalcycles/js-lib/string/string.util.js'
 import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib/types'
 import { _objectAssign } from '@naturalcycles/js-lib/types'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline, type ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDao } from '../commondao/common.dao.js'
 import type {
   CommonDaoOptions,
@@ -298,6 +298,14 @@ export class RunnableDBQuery<
     return this.dao.streamQueryAsDBM(this, opt)
   }
 
+  pipeline(opt?: CommonDaoStreamOptions<BM>): Pipeline<BM> {
+    return Pipeline.from(this.dao.streamQuery(this, opt))
+  }
+
+  pipelineAsDBM(opt?: CommonDaoStreamOptions<DBM>): Pipeline<DBM> {
+    return Pipeline.from(this.dao.streamQueryAsDBM(this, opt))
+  }
+
   async queryIds(opt?: CommonDaoReadOptions): Promise<ID[]> {
     return await this.dao.queryIds(this, opt)
   }
@@ -306,6 +314,10 @@ export class RunnableDBQuery<
     return this.dao.streamQueryIds(this, opt)
   }
 
+  pipelineIds(opt?: CommonDaoStreamOptions<ID>): Pipeline<ID> {
+    return Pipeline.from(this.dao.streamQueryIds(this, opt))
+  }
+
   async streamQueryIdsForEach(
     mapper: AsyncIndexedMapper<ID, void>,
     opt?: CommonDaoStreamForEachOptions<ID>,