@naturalcycles/nodejs-lib 12.58.0 → 12.62.0

package/dist/stream/transform/transformLogProgress.d.ts

@@ -84,6 +84,26 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
      * Defaults to 1.
      */
     batchSize?: number;
+    /**
+     * Experimental logging of item (shunk) sizes, when json-stringified.
+     *
+     * Defaults to false.
+     *
+     * @experimental
+     */
+    logSizes?: boolean;
+    /**
+     * How many last item sizes to keep in a buffer, to calculate stats (p50, p90, avg, etc).
+     * Defaults to 100_000.
+     * Cannot be Infinity.
+     */
+    logSizesBuffer?: number;
+    /**
+     * Works in addition to `logSizes`. Adds "zipped sizes".
+     *
+     * @experimental
+     */
+    logZippedSizes?: boolean;
 }
 /**
  * Pass-through transform that optionally logs progress.

package/dist/stream/transform/transformLogProgress.js

@@ -7,6 +7,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const time_lib_1 = require("@naturalcycles/time-lib");
 const colors_1 = require("../../colors");
 const colors_2 = require("../../colors/colors");
+const sizeStack_1 = require("../sizeStack");
 const inspectOpt = {
     colors: colors_2.hasColors,
     breakLength: 300,
@@ -15,7 +16,7 @@ const inspectOpt = {
  * Pass-through transform that optionally logs progress.
  */
 function transformLogProgress(opt = {}) {
-    const { metric = 'progress', heapTotal: logHeapTotal = false, heapUsed: logHeapUsed = false, rss: logRss = true, peakRSS: logPeakRSS = true, logRPS = true, logEvery = 1000, batchSize = 1, extra, logger = console, } = opt;
+    const { metric = 'progress', heapTotal: logHeapTotal = false, heapUsed: logHeapUsed = false, rss: logRss = true, peakRSS: logPeakRSS = true, logRPS = true, logEvery = 1000, logSizes = false, logSizesBuffer = 100000, logZippedSizes = false, batchSize = 1, extra, logger = console, } = opt;
     const logProgress = opt.logProgress !== false && logEvery !== 0; // true by default
     const logEvery10 = logEvery * 10;
     const started = Date.now();
@@ -24,13 +25,19 @@ function transformLogProgress(opt = {}) {
     let processedLastSecond = 0;
     let progress = 0;
     let peakRSS = 0;
+    const sizes = logSizes ? new sizeStack_1.SizeStack('json', logSizesBuffer) : undefined;
+    const sizesZipped = logZippedSizes ? new sizeStack_1.SizeStack('json.gz', logSizesBuffer) : undefined;
     logStats(); // initial
     return new stream_1.Transform({
         objectMode: true,
         ...opt,
-        transform(chunk, _encoding, cb) {
+        transform(chunk, _, cb) {
             progress++;
             processedLastSecond++;
+            if (sizes) {
+                // Check it, cause gzipping might be delayed here..
+                void sizeStack_1.SizeStack.countItem(chunk, logger, sizes, sizesZipped);
+            }
             if (logProgress && progress % logEvery === 0) {
                 logStats(chunk, false, progress % logEvery10 === 0);
             }
@@ -54,23 +61,34 @@ function transformLogProgress(opt = {}) {
         const rps10 = Math.round(sma.push(lastRPS));
         if (mem.rss > peakRSS)
             peakRSS = mem.rss;
-        logger.log((0, util_1.inspect)({
+        const o = {
             [final ? `${metric}_final` : metric]: batchedProgress,
-            ...(extra ? extra(chunk, progress) : {}),
-            ...(logHeapUsed ? { heapUsed: (0, js_lib_1._mb)(mem.heapUsed) } : {}),
-            ...(logHeapTotal ? { heapTotal: (0, js_lib_1._mb)(mem.heapTotal) } : {}),
-            ...(logRss ? { rss: (0, js_lib_1._mb)(mem.rss) } : {}),
-            ...(logPeakRSS ? { peakRSS: (0, js_lib_1._mb)(peakRSS) } : {}),
-            ...(opt.rssMinusHeap ? { rssMinusHeap: (0, js_lib_1._mb)(mem.rss - mem.heapTotal) } : {}),
-            ...(opt.external ? { external: (0, js_lib_1._mb)(mem.external) } : {}),
-            ...(opt.arrayBuffers ? { arrayBuffers: (0, js_lib_1._mb)(mem.arrayBuffers || 0) } : {}),
-            ...(logRPS
-                ? {
-                    rps10,
-                    rpsTotal,
-                }
-                : {}),
-        }, inspectOpt));
+        };
+        if (extra)
+            Object.assign(o, extra(chunk, progress));
+        if (logHeapUsed)
+            o.heapUsed = (0, js_lib_1._mb)(mem.heapUsed);
+        if (logHeapTotal)
+            o.heapTotal = (0, js_lib_1._mb)(mem.heapTotal);
+        if (logRss)
+            o.rss = (0, js_lib_1._mb)(mem.rss);
+        if (logPeakRSS)
+            o.peakRSS = (0, js_lib_1._mb)(peakRSS);
+        if (opt.rssMinusHeap)
+            o.rssMinusHeap = (0, js_lib_1._mb)(mem.rss - mem.heapTotal);
+        if (opt.external)
+            o.external = (0, js_lib_1._mb)(mem.external);
+        if (opt.arrayBuffers)
+            o.arrayBuffers = (0, js_lib_1._mb)(mem.arrayBuffers || 0);
+        if (logRPS)
+            Object.assign(o, { rps10, rpsTotal });
+        logger.log((0, util_1.inspect)(o, inspectOpt));
+        if (sizes?.items.length) {
+            logger.log(sizes.getStats());
+            if (sizesZipped?.items.length) {
+                logger.log(sizesZipped.getStats());
+            }
+        }
         if (tenx) {
             let perHour = Math.round((batchedProgress * 1000 * 60 * 60) / (now - started)) || 0;
             if (perHour > 900) {

package/dist/stream/transform/transformMap.d.ts

@@ -1,6 +1,5 @@
-import { AsyncMapper, AsyncPredicate, CommonLogger, ErrorMode } from '@naturalcycles/js-lib';
+import { AbortableAsyncMapper, AsyncPredicate, CommonLogger, ErrorMode } from '@naturalcycles/js-lib';
 import { TransformTyped } from '../stream.model';
-import { transformMapLegacy } from './legacy/transformMap';
 export interface TransformMapOptions<IN = any, OUT = IN> {
     /**
      * Set true to support "multiMap" - possibility to return [] and emit 1 result for each item in the array.
@@ -12,9 +11,8 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
      * Predicate to filter outgoing results (after mapper).
      * Allows to not emit all results.
      *
-     * Set to `r => r` (passthrough predicate) to pass ANY value (including undefined/null)
-     *
-     * @default to filter out undefined/null values, but pass anything else
+     * Defaults to "pass everything" (including null, undefined, etc).
+     * Simpler way to exclude certain cases is to return SKIP symbol from the mapper.
      */
     predicate?: AsyncPredicate<OUT>;
     /**
@@ -38,17 +36,8 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
      * @default `stream`
      */
     metric?: string;
-    /**
-     * If defined - called BEFORE `final()` callback is called.
-     */
-    beforeFinal?: () => any;
     logger?: CommonLogger;
 }
-export declare function notNullishPredicate(item: any): boolean;
-/**
- * Temporary export legacy transformMap, to debug 503 errors
- */
-export declare const transformMap: typeof transformMapLegacy;
 /**
  * Like pMap, but for streams.
  * Inspired by `through2`.
@@ -61,4 +50,4 @@ export declare const transformMap: typeof transformMapLegacy;
  *
  * If an Array is returned by `mapper` - it will be flattened and multiple results will be emitted from it. Tested by Array.isArray().
  */
-export declare function transformMapNew<IN = any, OUT = IN>(mapper: AsyncMapper<IN, OUT>, opt?: TransformMapOptions<IN, OUT>): TransformTyped<IN, OUT>;
+export declare function transformMap<IN = any, OUT = IN>(mapper: AbortableAsyncMapper<IN, OUT>, opt?: TransformMapOptions<IN, OUT>): TransformTyped<IN, OUT>;

package/dist/stream/transform/transformMap.js

@@ -1,18 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformMapNew = exports.transformMap = exports.notNullishPredicate = void 0;
-const stream_1 = require("stream");
+exports.transformMap = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
+const through2Concurrent = require("through2-concurrent");
 const colors_1 = require("../../colors");
-const transformMap_1 = require("./legacy/transformMap");
-function notNullishPredicate(item) {
-    return item !== undefined && item !== null;
-}
-exports.notNullishPredicate = notNullishPredicate;
-/**
- * Temporary export legacy transformMap, to debug 503 errors
- */
-exports.transformMap = transformMap_1.transformMapLegacy;
+const stream_util_1 = require("../stream.util");
+// doesn't work, cause here we don't construct our Transform instance ourselves
+// export class TransformMap extends AbortableTransform {}
 /**
  * Like pMap, but for streams.
  * Inspired by `through2`.
@@ -25,84 +19,73 @@ exports.transformMap = transformMap_1.transformMapLegacy;
  *
  * If an Array is returned by `mapper` - it will be flattened and multiple results will be emitted from it. Tested by Array.isArray().
  */
-function transformMapNew(mapper, opt = {}) {
-    const { concurrency = 16, predicate = notNullishPredicate, errorMode = js_lib_1.ErrorMode.THROW_IMMEDIATELY, flattenArrayOutput, onError, beforeFinal, metric = 'stream', logger = console, } = opt;
+function transformMap(mapper, opt = {}) {
+    const { concurrency = 16, predicate, // we now default to "no predicate" (meaning pass-everything)
+    errorMode = js_lib_1.ErrorMode.THROW_IMMEDIATELY, flattenArrayOutput, onError, metric = 'stream', logger = console, } = opt;
     let index = -1;
-    let isRejected = false;
+    let isSettled = false;
     let errors = 0;
     const collectedErrors = []; // only used if errorMode == THROW_AGGREGATED
-    const q = new js_lib_1.PQueue({
-        concurrency,
-        resolveOn: 'start',
-        // debug: true,
-    });
-    return new stream_1.Transform({
-        objectMode: true,
+    return through2Concurrent.obj({
+        maxConcurrency: concurrency,
         async final(cb) {
-            // console.log('transformMap final', {index}, q.inFlight, q.queueSize)
-            // wait for the current inFlight jobs to complete and push their results
-            await q.onIdle();
-            logErrorStats(logger, true);
-            await beforeFinal?.(); // call beforeFinal if defined
+            // console.log('transformMap final')
+            logErrorStats(true);
             if (collectedErrors.length) {
                 // emit Aggregated error
-                // For the same reason, magically, let's not call `cb`, but emit an error event instead
-                // this.emit('error', new AggregatedError(collectedErrors))
                 cb(new js_lib_1.AggregatedError(collectedErrors));
             }
             else {
                 // emit no error
-                // It is truly a mistery, but calling cb() here was causing ERR_MULTIPLE_CALLBACK ?!
-                // Commenting it out seems to work ?!
-                // ?!
-                // cb()
+                cb();
             }
         },
-        async transform(chunk, _encoding, cb) {
-            index++;
-            // console.log('transform', {index})
-            // Stop processing if THROW_IMMEDIATELY mode is used
-            if (isRejected && errorMode === js_lib_1.ErrorMode.THROW_IMMEDIATELY)
-                return cb();
-            // It resolves when it is successfully STARTED execution.
-            // If it's queued instead - it'll wait and resolve only upon START.
-            await q.push(async () => {
-                try {
-                    const currentIndex = index; // because we need to pass it to 2 functions - mapper and predicate. Refers to INPUT index (since it may return multiple outputs)
-                    const res = await mapper(chunk, currentIndex);
-                    const passedResults = await (0, js_lib_1.pFilter)(flattenArrayOutput && Array.isArray(res) ? res : [res], async (r) => await predicate(r, currentIndex));
-                    passedResults.forEach(r => this.push(r));
-                }
-                catch (err) {
-                    logger.error(err);
-                    errors++;
-                    logErrorStats(logger);
-                    if (onError) {
-                        try {
-                            onError(err, chunk);
-                        }
-                        catch { }
-                    }
-                    if (errorMode === js_lib_1.ErrorMode.THROW_IMMEDIATELY) {
-                        isRejected = true;
-                        // Emit error immediately
-                        // return cb(err as Error)
-                        return this.emit('error', err);
-                    }
-                    if (errorMode === js_lib_1.ErrorMode.THROW_AGGREGATED) {
-                        collectedErrors.push(err);
-                    }
+    }, async function transformMapFn(chunk, _, cb) {
+        // Stop processing if isSettled (either THROW_IMMEDIATELY was fired or END received)
+        if (isSettled)
+            return cb();
+        const currentIndex = ++index;
+        try {
+            const res = await mapper(chunk, currentIndex);
+            const passedResults = await (0, js_lib_1.pFilter)(flattenArrayOutput && Array.isArray(res) ? res : [res], async (r) => {
+                if (r === js_lib_1.END) {
+                    isSettled = true; // will be checked later
+                    return false;
                 }
+                return r !== js_lib_1.SKIP && (!predicate || (await predicate(r, currentIndex)));
             });
-            // Resolved, which means it STARTED processing
-            // This means we can take more load
+            passedResults.forEach(r => this.push(r));
+            if (isSettled) {
+                logger.log(`transformMap END received at index ${currentIndex}`);
+                (0, stream_util_1.pipelineClose)('transformMap', this, this.sourceReadable, this.streamDone, logger);
+            }
+            cb(); // done processing
+        }
+        catch (err) {
+            logger.error(err);
+            errors++;
+            logErrorStats();
+            if (onError) {
+                try {
+                    onError(err, chunk);
+                }
+                catch { }
+            }
+            if (errorMode === js_lib_1.ErrorMode.THROW_IMMEDIATELY) {
+                isSettled = true;
+                return cb(err); // Emit error immediately
+            }
+            if (errorMode === js_lib_1.ErrorMode.THROW_AGGREGATED) {
+                collectedErrors.push(err);
+            }
+            // Tell input stream that we're done processing, but emit nothing to output - not error nor result
             cb();
-        },
+        }
     });
-    function logErrorStats(logger, final = false) {
+    function logErrorStats(final = false) {
         if (!errors)
             return;
         logger.log(`${metric} ${final ? 'final ' : ''}errors: ${(0, colors_1.yellow)(errors)}`);
     }
 }
-exports.transformMapNew = transformMapNew;
+exports.transformMap = transformMap;

package/dist/stream/transform/transformMapSimple.js

@@ -17,7 +17,7 @@ function transformMapSimple(mapper, opt = {}) {
     const { errorMode = js_lib_1.ErrorMode.THROW_IMMEDIATELY, logger = console } = opt;
     return new stream_1.Transform({
         objectMode: true,
-        transform(chunk, _encoding, cb) {
+        transform(chunk, _, cb) {
             try {
                 cb(null, mapper(chunk, ++index));
             }

package/dist/stream/transform/transformMapSync.d.ts

@@ -1,4 +1,5 @@
 import { CommonLogger, ErrorMode, Mapper, Predicate } from '@naturalcycles/js-lib';
+import { AbortableTransform } from '../pipeline/pipeline';
 import { TransformTyped } from '../stream.model';
 export interface TransformMapSyncOptions<IN = any, OUT = IN> {
     /**
@@ -14,9 +15,8 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
      * Predicate to filter outgoing results (after mapper).
      * Allows to not emit all results.
      *
-     * @default to filter out undefined/null values, but pass anything else
-     *
-     * Set to `r => r` (passthrough predicate) to pass ANY value (including undefined/null)
+     * Defaults to "pass everything".
+     * Simpler way to skip individual entries is to return SKIP symbol.
      */
     predicate?: Predicate<OUT>;
     /**
@@ -36,6 +36,8 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
     metric?: string;
     logger?: CommonLogger;
 }
+export declare class TransformMapSync extends AbortableTransform {
+}
 /**
  * Sync (not async) version of transformMap.
  * Supposedly faster, for cases when async is not needed.

package/dist/stream/transform/transformMapSync.js

@@ -1,42 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformMapSync = void 0;
-const stream_1 = require("stream");
+exports.transformMapSync = exports.TransformMapSync = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("../../colors");
-const transformMap_1 = require("./transformMap");
+const pipeline_1 = require("../pipeline/pipeline");
+const stream_util_1 = require("../stream.util");
+class TransformMapSync extends pipeline_1.AbortableTransform {
+}
+exports.TransformMapSync = TransformMapSync;
 /**
  * Sync (not async) version of transformMap.
  * Supposedly faster, for cases when async is not needed.
  */
 function transformMapSync(mapper, opt = {}) {
     let index = -1;
-    const { predicate = transformMap_1.notNullishPredicate, errorMode = js_lib_1.ErrorMode.THROW_IMMEDIATELY, flattenArrayOutput = false, onError, metric = 'stream', objectMode = true, logger = console, } = opt;
-    let isRejected = false;
+    const { predicate, // defaults to "no predicate" (pass everything)
+    errorMode = js_lib_1.ErrorMode.THROW_IMMEDIATELY, flattenArrayOutput = false, onError, metric = 'stream', objectMode = true, logger = console, } = opt;
+    let isSettled = false;
     let errors = 0;
     const collectedErrors = []; // only used if errorMode == THROW_AGGREGATED
-    return new stream_1.Transform({
+    return new TransformMapSync({
         objectMode,
         ...opt,
-        transform(chunk, _encoding, cb) {
-            // Stop processing if THROW_IMMEDIATELY mode is used
-            if (isRejected && errorMode === js_lib_1.ErrorMode.THROW_IMMEDIATELY) {
+        transform(chunk, _, cb) {
+            // Stop processing if isSettled
+            if (isSettled)
                 return cb();
-            }
+            const currentIndex = ++index;
             try {
-                if (!predicate(chunk, ++index)) {
-                    cb(); // signal that we've finished processing, but emit no output here
-                    return;
-                }
                 // map and pass through
-                const v = mapper(chunk, index);
-                if (flattenArrayOutput && Array.isArray(v)) {
-                    // Pass each item individually
-                    v.forEach(item => this.push(item));
-                }
-                else {
-                    cb(null, v);
+                const v = mapper(chunk, currentIndex);
+                const passedResults = (flattenArrayOutput && Array.isArray(v) ? v : [v]).filter(r => {
+                    if (r === js_lib_1.END) {
+                        isSettled = true; // will be checked later
+                        return false;
+                    }
+                    return r !== js_lib_1.SKIP && (!predicate || predicate(r, currentIndex));
+                });
+                passedResults.forEach(r => this.push(r));
+                if (isSettled) {
+                    logger.log(`transformMapSync END received at index ${currentIndex}`);
+                    (0, stream_util_1.pipelineClose)('transformMapSync', this, this.sourceReadable, this.streamDone, logger);
                 }
+                cb(); // done processing
             }
             catch (err) {
                 logger.error(err);
@@ -49,7 +55,7 @@ function transformMapSync(mapper, opt = {}) {
                     catch { }
                 }
                 if (errorMode === js_lib_1.ErrorMode.THROW_IMMEDIATELY) {
-                    isRejected = true;
+                    isSettled = true;
                     // Emit error immediately
                     return cb(err);
                 }

package/dist/stream/transform/transformNoOp.js

@@ -10,7 +10,7 @@ const stream_1 = require("stream");
 function transformNoOp() {
     return new stream_1.Transform({
         objectMode: true,
-        transform(chunk, _encoding, cb) {
+        transform(chunk, _, cb) {
             cb(null, chunk);
         },
     });

package/dist/stream/transform/transformTap.js

@@ -10,14 +10,14 @@ const stream_1 = require("stream");
  */
 function transformTap(fn, opt = {}) {
     const { logger = console } = opt;
-    let index = 0;
+    let index = -1;
     return new stream_1.Transform({
         objectMode: true,
         ...opt,
-        async transform(chunk, _encoding, cb) {
+        async transform(chunk, _, cb) {
             // console.log('tap', chunk)
             try {
-                await fn(chunk, index++);
+                await fn(chunk, ++index);
             }
             catch (err) {
                 logger.error(err);

package/dist/stream/transform/transformToArray.js

@@ -10,7 +10,7 @@ function transformToArray(opt = {}) {
     return new stream_1.Transform({
         objectMode: true,
         ...opt,
-        transform(chunk, _encoding, cb) {
+        transform(chunk, _, cb) {
             res.push(chunk);
             // callback to signal that we processed input, but not emitting any output
             cb();

package/dist/stream/transform/transformToString.js

@@ -15,8 +15,8 @@ function transformToString() {
     return new stream_1.Transform({
         objectMode: false,
         readableObjectMode: true,
-        transform(chunk, _encoding, cb) {
-            // console.log(`enc: ${_encoding}`, chunk.toString())
+        transform(chunk, _, cb) {
+            // console.log(`enc: ${_}`, chunk.toString())
             cb(null, chunk.toString());
         },
     });

package/dist/stream/transform/worker/transformMultiThreaded.js

@@ -71,7 +71,7 @@ function transformMultiThreaded(opt) {
                 cb(err);
             }
         },
-    }, async function transformMapFn(chunk, _encoding, cb) {
+    }, async function transformMapFn(chunk, _, cb) {
         // Freezing the index, because it may change due to concurrency
         const currentIndex = ++index;
         // Create the unresolved promise (to avait)

package/dist/stream/transform/worker/workerClassProxy.js

@@ -10,6 +10,7 @@ if (!workerFile) {
 // console.log(`worker#${workerIndex} created`)
 
 try {
+  // require('esbuild-register') // alternative
   require('ts-node/register/transpile-only')
   require('tsconfig-paths/register')
 } catch {} // require if exists

package/dist/stream/writable/writableFork.js

@@ -24,7 +24,7 @@ function writableFork(chains, opt) {
     return new stream_1.Writable({
         objectMode: true,
         ...opt,
-        write(chunk, _encoding, cb) {
+        write(chunk, _, cb) {
             // Push/fork to all sub-streams
             // No backpressure is ensured here, it'll push regardless of the
             readables.forEach(readable => readable.push(chunk));

package/dist/stream/writable/writableLimit.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import { Readable } from 'stream';
+import { WritableTyped } from '../stream.model';
+/**
+ * Allows to stop the Readable stream after the pipeline has processed X number of rows.
+ * It counts OUTPUT rows (not input), because this Writable is always at the end of the Pipeline.
+ * It ensures that everything has been processed before issuing a STOP on the readable.
+ */
+export declare function writableLimit<T>(readable: Readable, limit: number): WritableTyped<T>;

package/dist/stream/writable/writableLimit.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writableLimit = void 0;
+const stream_1 = require("stream");
+/**
+ * Allows to stop the Readable stream after the pipeline has processed X number of rows.
+ * It counts OUTPUT rows (not input), because this Writable is always at the end of the Pipeline.
+ * It ensures that everything has been processed before issuing a STOP on the readable.
+ */
+function writableLimit(readable, limit) {
+    let i = 0;
+    return new stream_1.Writable({
+        objectMode: true,
+        write(chunk, _, cb) {
+            if (limit === 0)
+                return cb(); // no limit, just passthrough
+            i++;
+            if (i === limit) {
+                console.log(`writableLimit of ${limit} reached`);
+                readable.destroy();
+                cb(); // do we need it?
+            }
+            else {
+                cb(); // passthrough
+            }
+        },
+    });
+}
+exports.writableLimit = writableLimit;

package/dist/stream/writable/writablePushToArray.js

@@ -9,7 +9,7 @@ function writablePushToArray(arr, opt = {}) {
     return new stream_1.Writable({
         objectMode: true,
         ...opt,
-        write(chunk, _encoding, cb) {
+        write(chunk, _, cb) {
             arr.push(chunk);
             // callback to signal that we processed input, but not emitting any output
             cb();

package/dist/stream/writable/writableVoid.d.ts

@@ -1,9 +1,16 @@
 /// <reference types="node" />
 import { Writable } from 'stream';
+import { DeferredPromise } from '@naturalcycles/js-lib';
 import { TransformOptions } from '../stream.model';
+export interface WritableVoidOptions extends TransformOptions {
+    /**
+     * If set - it will be Resolved when the Stream is done (after final.cb)
+     */
+    streamDone?: DeferredPromise;
+}
 /**
  * Use as a "null-terminator" of stream.pipeline.
  * It consumes the stream as quickly as possible without doing anything.
  * Put it in the end of your pipeline in case it ends with Transform that needs a consumer.
  */
-export declare function writableVoid(opt?: TransformOptions): Writable;
+export declare function writableVoid(opt?: WritableVoidOptions): Writable;

package/dist/stream/writable/writableVoid.js

@@ -7,13 +7,17 @@ const stream_1 = require("stream");
  * It consumes the stream as quickly as possible without doing anything.
  * Put it in the end of your pipeline in case it ends with Transform that needs a consumer.
  */
-function writableVoid(opt) {
+function writableVoid(opt = {}) {
     return new stream_1.Writable({
         objectMode: true,
         ...opt,
-        write(chunk, _encoding, cb) {
+        write(chunk, _, cb) {
             cb();
         },
+        final(cb) {
+            cb();
+            opt.streamDone?.resolve();
+        },
     });
 }
 exports.writableVoid = writableVoid;

package/dist/util/zip.util.d.ts

@@ -1,18 +1,26 @@
 /// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 /**
- * zipBuffer uses `deflate`.
- * It's 9 bytes shorter than gzip.
+ * deflateBuffer uses `deflate`.
+ * It's 9 bytes shorter than `gzip`.
  */
-export declare function zipBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
+export declare function deflateBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
+export declare function inflateBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
+/**
+ * deflateString uses `deflate`.
+ * It's 9 bytes shorter than `gzip`.
+ */
+export declare function deflateString(s: string, options?: ZlibOptions): Promise<Buffer>;
+export declare function inflateToString(buf: Buffer, options?: ZlibOptions): Promise<string>;
 /**
  * gzipBuffer uses `gzip`
- * It's 9 bytes longer than deflate.
+ * It's 9 bytes longer than `deflate`.
  */
 export declare function gzipBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
-export declare function unzipBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
 export declare function gunzipBuffer(buf: Buffer, options?: ZlibOptions): Promise<Buffer>;
-export declare function zipString(s: string, options?: ZlibOptions): Promise<Buffer>;
+/**
+ * gzipString uses `gzip`.
+ * It's 9 bytes longer than `deflate`.
+ */
 export declare function gzipString(s: string, options?: ZlibOptions): Promise<Buffer>;
-export declare function unzipToString(buf: Buffer, options?: ZlibOptions): Promise<string>;
 export declare function gunzipToString(buf: Buffer, options?: ZlibOptions): Promise<string>;