@takeshape/streams 10.21.3 → 10.22.0

package/dist/streams.d.ts

@@ -2,24 +2,19 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { Readable, type ReadableOptions, type Transform, Writable, type WritableOptions } from 'stream';
-type Stream = NodeJS.ReadableStream | NodeJS.WritableStream;
-export type Pump = {
-    (streams: Stream[]): Promise<any>;
-    (...streams: Stream[]): Promise<any>;
-};
-export declare const pump: Pump;
+import { PassThrough, Readable, type ReadableOptions, Writable, type WritableOptions, Transform } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+export { compose } from 'node:stream';
+export declare const pump: typeof pipeline;
 export declare function streamToPromise(stream: NodeJS.ReadableStream | NodeJS.WritableStream): Promise<void>;
 export declare function createTransform(transform: (data: any) => any): Transform;
 export declare function createAsyncTransform(transform: (data: any) => Promise<any>): Transform;
 export declare function createFilter(predicate: (data: any) => boolean): Transform;
-export declare const createAccumulator: (accumulator: (data: any) => void) => Transform;
-export declare const createAsyncWritable: (write: (data: any) => Promise<void>, concurrency?: number) => Writable;
-export declare const tee: (...args: NodeJS.WritableStream[] | [NodeJS.WritableStream[]]) => Writable;
-export declare const readableFromArray: (array: any[], options?: Partial<ReadableOptions>) => Readable;
-export declare const collectStreamIntoArray: (array?: any[], options?: Partial<WritableOptions>) => Writable;
+export declare function createAccumulator(accumulator: (data: any) => void): Transform;
+export declare function createAsyncWritable(write: (data: any) => Promise<void>, concurrency?: number): Writable;
+export declare function tee(...args: NodeJS.WritableStream[] | [NodeJS.WritableStream[]]): Writable;
+export declare function readableFromArray(array: any[], options?: Partial<ReadableOptions>): Readable;
+export declare function collectStreamIntoArray(array?: any[], options?: Partial<WritableOptions>): Writable;
 export declare function readStreamToBuffer(stream: NodeJS.ReadableStream): Promise<Buffer>;
-export {};
+export declare function mergeStreams(...streams: NodeJS.ReadableStream[]): PassThrough;
 //# sourceMappingURL=streams.d.ts.map

package/dist/streams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streams.d.ts","sourceRoot":"","sources":["../../src/streams.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAc,QAAQ,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAC,MAAM,QAAQ,CAAC;AAOnH,KAAK,MAAM,GAAG,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;AAE5D,MAAM,MAAM,IAAI,GAAG;IACjB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,IAAoC,CAAC;AAExD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAK1G;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,GAAG,SAAS,CASxE;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAWtF;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,GAAG,SAAS,CAYzE;AAED,eAAO,MAAM,iBAAiB,uBAAwB,GAAG,KAAK,IAAI,KAAG,SAIjE,CAAC;AAEL,eAAO,MAAM,mBAAmB,iBAAkB,GAAG,KAAK,QAAQ,IAAI,CAAC,2BAAqB,QAc3F,CAAC;AAEF,eAAO,MAAM,GAAG,YAAa,OAAO,cAAc,EAAE,GAAG,CAAC,OAAO,cAAc,EAAE,CAAC,KAAG,QAyBlF,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,GAAG,EAAE,YAAY,QAAQ,eAAe,CAAC,KAAG,QAUpF,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAW,GAAG,EAAE,YAAgB,QAAQ,eAAe,CAAC,KAAQ,QAQ/F,CAAC;AAEL,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAMvF"}
+{"version":3,"file":"streams.d.ts","sourceRoot":"","sources":["../../src/streams.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,SAAS,EAAC,MAAM,aAAa,CAAC;AACnH,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAK9C,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAEpC,eAAO,MAAM,IAAI,iBAAW,CAAC;AAE7B,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAK1G;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,aAY5D;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,aAc1E;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,aAe7D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,aAQjE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,SAAK,YAcxF;AAED,wBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,YA0B/E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,YAEjF;AAED,wBAAgB,sBAAsB,CAAC,KAAK,GAAE,GAAG,EAAO,EAAE,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,YAS/F;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,mBAMrE;AAED,wBAAgB,YAAY,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,cAAc,EAAE,eAS/D"}

package/dist/streams.js

@@ -3,24 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAccumulator = exports.collectStreamIntoArray = void 0;
+exports.collectStreamIntoArray = collectStreamIntoArray;
+Object.defineProperty(exports, "compose", {
+  enumerable: true,
+  get: function () {
+    return _nodeStream.compose;
+  }
+});
+exports.createAccumulator = createAccumulator;
 exports.createAsyncTransform = createAsyncTransform;
-exports.createAsyncWritable = void 0;
+exports.createAsyncWritable = createAsyncWritable;
 exports.createFilter = createFilter;
 exports.createTransform = createTransform;
+exports.mergeStreams = mergeStreams;
 exports.pump = void 0;
 exports.readStreamToBuffer = readStreamToBuffer;
-exports.readableFromArray = void 0;
+exports.readableFromArray = readableFromArray;
 exports.streamToPromise = streamToPromise;
-exports.tee = void 0;
-var _stream = require("stream");
-var _bluebird = _interopRequireDefault(require("bluebird"));
+exports.tee = tee;
+var _nodeStream = require("node:stream");
+var _promises = require("node:stream/promises");
+var _nodeUtil = require("node:util");
 var _pQueue = _interopRequireDefault(require("p-queue"));
 var _isStream = _interopRequireDefault(require("is-stream"));
-var _through = _interopRequireDefault(require("through2"));
-var _pump = _interopRequireDefault(require("pump"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const pump = exports.pump = _bluebird.default.promisify(_pump.default);
+const pump = exports.pump = _promises.pipeline;
 async function streamToPromise(stream) {
   return new Promise((resolve, reject) => {
     const doneEvent = _isStream.default.writable(stream) ? 'finish' : 'end';
@@ -28,70 +35,82 @@ async function streamToPromise(stream) {
   });
 }
 function createTransform(transform) {
-  return _through.default.obj(function (content, _, callback) {
-    try {
-      this.push(transform(content));
-      callback();
-    } catch (e) {
-      callback(e);
+  return new _nodeStream.Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        this.push(transform(chunk));
+        callback();
+      } catch (e) {
+        callback(e);
+      }
     }
   });
 }
 function createAsyncTransform(transform) {
-  return _through.default.obj(function (content, _, callback) {
-    try {
-      transform(content).then(result => {
-        this.push(result);
-        callback();
-      }, callback);
-    } catch (e) {
-      callback(e);
+  return new _nodeStream.Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        transform(chunk).then(result => {
+          this.push(result);
+          callback();
+        }, callback);
+      } catch (e) {
+        callback(e);
+      }
     }
   });
 }
 function createFilter(predicate) {
-  return _through.default.obj(function (content, _, callback) {
-    try {
-      if (predicate(content)) {
-        this.push(content);
+  return new _nodeStream.Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        if (predicate(chunk)) {
+          this.push(chunk);
+        }
+        callback();
+      } catch (e) {
+        callback(e);
       }
-      callback();
-    } catch (e) {
-      callback(e);
     }
   });
 }
-const createAccumulator = accumulator => _through.default.obj(function (item, _, cb) {
-  accumulator(item);
-  cb(null, item);
-});
-exports.createAccumulator = createAccumulator;
-const createAsyncWritable = (write, concurrency = 16) => {
+function createAccumulator(accumulator) {
+  return new _nodeStream.Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      accumulator(chunk);
+      callback(null, chunk);
+    }
+  });
+}
+function createAsyncWritable(write, concurrency = 16) {
   const queue = new _pQueue.default({
     concurrency
   });
-  return new _stream.Writable({
+  return new _nodeStream.Writable({
     objectMode: true,
-    write(data, _, cb) {
-      queue.add(async () => write(data)).catch(error => this.emit('error', error));
-      cb();
+    write(chunk, _, callback) {
+      queue.add(async () => write(chunk)).catch(error => this.emit('error', error));
+      callback();
     },
-    final(cb) {
+    final(callback) {
       void queue.onIdle().then(() => {
-        cb();
+        callback();
       });
     }
   });
-};
-exports.createAsyncWritable = createAsyncWritable;
-const tee = (...args) => {
+}
+function tee(...args) {
   const first = args[0];
   const streams = Array.isArray(first) ? first : args;
   const donePromises = streams.map(streamToPromise);
-  return new _stream.Writable({
+  return new _nodeStream.Writable({
     objectMode: true,
-    write(data, _, callback) {
-      void Promise.all(streams.map(stream => stream.write(data) || _bluebird.default.fromCallback(cb => stream.once('drain', cb)) // If .write() => false buffer is full, start promise to wait for drain event
+    write(chunk, _, callback) {
+      void Promise.all(streams.map(stream => stream.write(chunk) || (0, _nodeUtil.promisify)(cb => stream.once('drain', cb)) // If .write() => false buffer is full, start promise to wait for drain event
       )).then(() => {
         callback();
       });
@@ -105,35 +124,36 @@ const tee = (...args) => {
       });
     }
   });
-};
-exports.tee = tee;
-const readableFromArray = (array, options) => {
-  let index = 0;
-  return new _stream.Readable({
+}
+function readableFromArray(array, options) {
+  return _nodeStream.Readable.from(array, options);
+}
+function collectStreamIntoArray(array = [], options = {}) {
+  return new _nodeStream.Writable({
     objectMode: true,
-    read() {
-      this.push(index < array.length ? array[index] : null);
-      index++;
+    writev(chunks, callback) {
+      chunks.forEach(({
+        chunk
+      }) => array.push(chunk));
+      callback(null);
     },
     ...options
   });
-};
-exports.readableFromArray = readableFromArray;
-const collectStreamIntoArray = (array = [], options = {}) => new _stream.Writable({
-  objectMode: true,
-  writev(chunks, cb) {
-    chunks.forEach(({
-      chunk
-    }) => array.push(chunk));
-    cb(null);
-  },
-  ...options
-});
-exports.collectStreamIntoArray = collectStreamIntoArray;
+}
 async function readStreamToBuffer(stream) {
   const chunks = [];
-  const writeStream = new _stream.PassThrough();
+  const writeStream = new _nodeStream.PassThrough();
   writeStream.on('data', chunk => chunks.push(chunk));
   await pump(stream, writeStream);
   return Buffer.concat(chunks);
+}
+function mergeStreams(...streams) {
+  let passThrough = new _nodeStream.PassThrough();
+  for (const stream of streams) {
+    const end = stream === streams.at(-1);
+    passThrough = stream.pipe(passThrough, {
+      end
+    });
+  }
+  return passThrough;
 }

package/es/streams.js

@@ -1,10 +1,10 @@
-import { PassThrough, Readable, Writable } from 'stream';
-import BBPromise from 'bluebird';
+import { PassThrough, Readable, Writable, Transform } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { promisify } from 'node:util';
 import PQueue from 'p-queue';
 import isStream from 'is-stream';
-import through2 from 'through2';
-import basePump from 'pump';
-export const pump = BBPromise.promisify(basePump);
+export { compose } from 'node:stream';
+export const pump = pipeline;
 export async function streamToPromise(stream) {
   return new Promise((resolve, reject) => {
     const doneEvent = isStream.writable(stream) ? 'finish' : 'end';
@@ -12,68 +12,82 @@ export async function streamToPromise(stream) {
   });
 }
 export function createTransform(transform) {
-  return through2.obj(function (content, _, callback) {
-    try {
-      this.push(transform(content));
-      callback();
-    } catch (e) {
-      callback(e);
+  return new Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        this.push(transform(chunk));
+        callback();
+      } catch (e) {
+        callback(e);
+      }
     }
   });
 }
 export function createAsyncTransform(transform) {
-  return through2.obj(function (content, _, callback) {
-    try {
-      transform(content).then(result => {
-        this.push(result);
-        callback();
-      }, callback);
-    } catch (e) {
-      callback(e);
+  return new Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        transform(chunk).then(result => {
+          this.push(result);
+          callback();
+        }, callback);
+      } catch (e) {
+        callback(e);
+      }
     }
   });
 }
 export function createFilter(predicate) {
-  return through2.obj(function (content, _, callback) {
-    try {
-      if (predicate(content)) {
-        this.push(content);
+  return new Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        if (predicate(chunk)) {
+          this.push(chunk);
+        }
+        callback();
+      } catch (e) {
+        callback(e);
       }
-      callback();
-    } catch (e) {
-      callback(e);
     }
   });
 }
-export const createAccumulator = accumulator => through2.obj(function (item, _, cb) {
-  accumulator(item);
-  cb(null, item);
-});
-export const createAsyncWritable = (write, concurrency = 16) => {
+export function createAccumulator(accumulator) {
+  return new Transform({
+    objectMode: true,
+    transform(chunk, _, callback) {
+      accumulator(chunk);
+      callback(null, chunk);
+    }
+  });
+}
+export function createAsyncWritable(write, concurrency = 16) {
   const queue = new PQueue({
     concurrency
   });
   return new Writable({
     objectMode: true,
-    write(data, _, cb) {
-      queue.add(async () => write(data)).catch(error => this.emit('error', error));
-      cb();
+    write(chunk, _, callback) {
+      queue.add(async () => write(chunk)).catch(error => this.emit('error', error));
+      callback();
     },
-    final(cb) {
+    final(callback) {
       void queue.onIdle().then(() => {
-        cb();
+        callback();
       });
     }
   });
-};
-export const tee = (...args) => {
+}
+export function tee(...args) {
   const first = args[0];
   const streams = Array.isArray(first) ? first : args;
   const donePromises = streams.map(streamToPromise);
   return new Writable({
     objectMode: true,
-    write(data, _, callback) {
-      void Promise.all(streams.map(stream => stream.write(data) || BBPromise.fromCallback(cb => stream.once('drain', cb)) // If .write() => false buffer is full, start promise to wait for drain event
+    write(chunk, _, callback) {
+      void Promise.all(streams.map(stream => stream.write(chunk) || promisify(cb => stream.once('drain', cb)) // If .write() => false buffer is full, start promise to wait for drain event
       )).then(() => {
         callback();
       });
@@ -87,32 +101,36 @@ export const tee = (...args) => {
       });
     }
   });
-};
-export const readableFromArray = (array, options) => {
-  let index = 0;
-  return new Readable({
+}
+export function readableFromArray(array, options) {
+  return Readable.from(array, options);
+}
+export function collectStreamIntoArray(array = [], options = {}) {
+  return new Writable({
     objectMode: true,
-    read() {
-      this.push(index < array.length ? array[index] : null);
-      index++;
+    writev(chunks, callback) {
+      chunks.forEach(({
+        chunk
+      }) => array.push(chunk));
+      callback(null);
     },
     ...options
   });
-};
-export const collectStreamIntoArray = (array = [], options = {}) => new Writable({
-  objectMode: true,
-  writev(chunks, cb) {
-    chunks.forEach(({
-      chunk
-    }) => array.push(chunk));
-    cb(null);
-  },
-  ...options
-});
+}
 export async function readStreamToBuffer(stream) {
   const chunks = [];
   const writeStream = new PassThrough();
   writeStream.on('data', chunk => chunks.push(chunk));
   await pump(stream, writeStream);
   return Buffer.concat(chunks);
+}
+export function mergeStreams(...streams) {
+  let passThrough = new PassThrough();
+  for (const stream of streams) {
+    const end = stream === streams.at(-1);
+    passThrough = stream.pipe(passThrough, {
+      end
+    });
+  }
+  return passThrough;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/streams",
-  "version": "10.21.3",
+  "version": "10.22.0",
   "description": "Stream helpers",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -17,16 +17,8 @@
     "es"
   ],
   "dependencies": {
-    "bluebird": "^3.7.2",
     "is-stream": "^2.0.0",
-    "p-queue": "^6.4.0",
-    "pump": "^3.0.0",
-    "through2": "^3.0.2"
-  },
-  "devDependencies": {
-    "@types/bluebird": "^3.5.32",
-    "@types/pump": "^1.1.0",
-    "@types/through2": "^2.0.36"
+    "p-queue": "^6.4.0"
   },
   "engines": {
     "node": ">=18"
@@ -47,6 +39,7 @@
     "test-changed": "pnpm run test --changedSince=master",
     "test:ci": "JEST_JUNIT_OUTPUT_DIR=\"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}\" JEST_JUNIT_OUTPUT_NAME=\"jest-results.xml\" jest --silent --ci --coverageDirectory=\"${GITHUB_WORKSPACE}/coverage/${npm_package_name#*\\/}\" --reporters=default  --reporters=jest-junit --maxWorkers=4",
     "todo": "leasot 'src/**/*.{js,jsx,ts,tsx}'",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "typecheck:ci": "mkdir -p  \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}\" && tsc --noEmit --pretty false | typescript-jest-junit-reporter | tee \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}/typescript-results.xml\""
   }
 }