@naturalcycles/nodejs-lib 12.47.4 → 12.49.0

package/dist/colors/colors.d.ts

@@ -1 +1,6 @@
-export declare function hasColors(): boolean;
+/**
+ * Based on: https://github.com/sindresorhus/yoctocolors/pull/5
+ *
+ * @experimental
+ */
+export declare const hasColors: boolean;

package/dist/colors/colors.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasColors = void 0;
-const supporsColorLib = require('supports-color');
-function hasColors() {
-    if (process.env['NO_COLOR'])
-        return false; // https://no-color.org/
-    return !!supporsColorLib.stdout;
-}
-exports.hasColors = hasColors;
+const tty = require("tty");
+/**
+ * Based on: https://github.com/sindresorhus/yoctocolors/pull/5
+ *
+ * @experimental
+ */
+exports.hasColors = !process.env['NO_COLOR'] && tty.WriteStream.prototype.hasColors();

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

@@ -75,6 +75,14 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
      * chunk is undefined for "final" stats, otherwise is defined.
      */
     extra?: (chunk: IN | undefined, index: number) => AnyObject;
+    /**
+     * If specified - will multiply the counter by this number.
+     * Useful e.g when using `transformBuffer({ batchSize: 500 })`, so
+     * it'll accurately represent the number of processed entries (not batches).
+     *
+     * Defaults to 1.
+     */
+    batchSize?: number;
 }
 /**
  * Pass-through transform that optionally logs progress.

package/dist/stream/transform/transformLogProgress.js

@@ -8,14 +8,14 @@ const time_lib_1 = require("@naturalcycles/time-lib");
 const colors_1 = require("../../colors");
 const colors_2 = require("../../colors/colors");
 const inspectOpt = {
-    colors: (0, colors_2.hasColors)(),
+    colors: colors_2.hasColors,
     breakLength: 300,
 };
 /**
  * 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, extra, } = opt;
+    const { metric = 'progress', heapTotal: logHeapTotal = false, heapUsed: logHeapUsed = false, rss: logRss = true, peakRSS: logPeakRSS = true, logRPS = true, logEvery = 1000, batchSize = 1, extra, } = opt;
     const logProgress = opt.logProgress !== false && logEvery !== 0; // true by default
     const logEvery10 = logEvery * 10;
     const started = Date.now();
@@ -46,15 +46,16 @@ function transformLogProgress(opt = {}) {
             return;
         const mem = process.memoryUsage();
         const now = Date.now();
-        const lastRPS = processedLastSecond / ((now - lastSecondStarted) / 1000) || 0;
-        const rpsTotal = Math.round(progress / ((now - started) / 1000)) || 0;
+        const batchedProgress = progress * batchSize;
+        const lastRPS = (processedLastSecond * batchedProgress) / ((now - lastSecondStarted) / 1000) || 0;
+        const rpsTotal = Math.round(batchedProgress / ((now - started) / 1000)) || 0;
         lastSecondStarted = now;
         processedLastSecond = 0;
         const rps10 = Math.round(sma.push(lastRPS));
         if (mem.rss > peakRSS)
             peakRSS = mem.rss;
         console.log((0, util_1.inspect)({
-            [final ? `${metric}_final` : metric]: progress,
+            [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) } : {}),
@@ -71,14 +72,14 @@ function transformLogProgress(opt = {}) {
                 : {}),
         }, inspectOpt));
         if (tenx) {
-            let perHour = Math.round((progress * 1000 * 60 * 60) / (now - started)) || 0;
+            let perHour = Math.round((batchedProgress * 1000 * 60 * 60) / (now - started)) || 0;
             if (perHour > 900) {
                 perHour = Math.round(perHour / 1000) + 'K';
             }
-            console.log(`${(0, colors_1.dimGrey)((0, time_lib_1.dayjs)().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} so far to process ${(0, colors_1.yellow)(progress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
+            console.log(`${(0, colors_1.dimGrey)((0, time_lib_1.dayjs)().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
         }
         else if (final) {
-            console.log(`${(0, colors_1.boldWhite)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} to process ${(0, colors_1.yellow)(progress)} rows with total RPS of ${(0, colors_1.yellow)(rpsTotal)}`);
+            console.log(`${(0, colors_1.boldWhite)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} to process ${(0, colors_1.yellow)(batchedProgress)} rows with total RPS of ${(0, colors_1.yellow)(rpsTotal)}`);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.47.4",
+  "version": "12.49.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -37,7 +37,6 @@
     "move-file": "^2.0.0",
     "nanoid": "^3.0.0",
     "sanitize-html": "^2.5.2",
-    "supports-color": "^8.0.0",
     "through2-concurrent": "^2.0.0",
     "yargs": "^17.0.0"
   },

package/src/colors/colors.ts

@@ -1,6 +1,8 @@
-const supporsColorLib = require('supports-color')
+import * as tty from 'tty'
 
-export function hasColors(): boolean {
-  if (process.env['NO_COLOR']) return false // https://no-color.org/
-  return !!supporsColorLib.stdout
-}
+/**
+ * Based on: https://github.com/sindresorhus/yoctocolors/pull/5
+ *
+ * @experimental
+ */
+export const hasColors = !process.env['NO_COLOR'] && tty.WriteStream.prototype.hasColors()

package/src/stream/transform/transformLogProgress.ts

@@ -92,10 +92,19 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
    * chunk is undefined for "final" stats, otherwise is defined.
    */
   extra?: (chunk: IN | undefined, index: number) => AnyObject
+
+  /**
+   * If specified - will multiply the counter by this number.
+   * Useful e.g when using `transformBuffer({ batchSize: 500 })`, so
+   * it'll accurately represent the number of processed entries (not batches).
+   *
+   * Defaults to 1.
+   */
+  batchSize?: number
 }
 
 const inspectOpt: InspectOptions = {
-  colors: hasColors(),
+  colors: hasColors,
   breakLength: 300,
 }
 
@@ -113,6 +122,7 @@ export function transformLogProgress<IN = any>(
     peakRSS: logPeakRSS = true,
     logRPS = true,
     logEvery = 1000,
+    batchSize = 1,
     extra,
   } = opt
   const logProgress = opt.logProgress !== false && logEvery !== 0 // true by default
@@ -153,8 +163,10 @@ export function transformLogProgress<IN = any>(
     const mem = process.memoryUsage()
 
     const now = Date.now()
-    const lastRPS = processedLastSecond / ((now - lastSecondStarted) / 1000) || 0
-    const rpsTotal = Math.round(progress / ((now - started) / 1000)) || 0
+    const batchedProgress = progress * batchSize
+    const lastRPS =
+      (processedLastSecond * batchedProgress) / ((now - lastSecondStarted) / 1000) || 0
+    const rpsTotal = Math.round(batchedProgress / ((now - started) / 1000)) || 0
     lastSecondStarted = now
     processedLastSecond = 0
 
@@ -164,7 +176,7 @@ export function transformLogProgress<IN = any>(
     console.log(
       inspect(
         {
-          [final ? `${metric}_final` : metric]: progress,
+          [final ? `${metric}_final` : metric]: batchedProgress,
           ...(extra ? extra(chunk, progress) : {}),
           ...(logHeapUsed ? { heapUsed: _mb(mem.heapUsed) } : {}),
           ...(logHeapTotal ? { heapTotal: _mb(mem.heapTotal) } : {}),
@@ -185,7 +197,8 @@ export function transformLogProgress<IN = any>(
     )
 
     if (tenx) {
-      let perHour: number | string = Math.round((progress * 1000 * 60 * 60) / (now - started)) || 0
+      let perHour: number | string =
+        Math.round((batchedProgress * 1000 * 60 * 60) / (now - started)) || 0
       if (perHour > 900) {
         perHour = Math.round(perHour / 1000) + 'K'
       }
@@ -193,12 +206,12 @@ export function transformLogProgress<IN = any>(
       console.log(
         `${dimGrey(dayjs().toPretty())} ${white(metric)} took ${yellow(
           _since(started),
-        )} so far to process ${yellow(progress)} rows, ~${yellow(perHour)}/hour`,
+        )} so far to process ${yellow(batchedProgress)} rows, ~${yellow(perHour)}/hour`,
       )
     } else if (final) {
       console.log(
         `${boldWhite(metric)} took ${yellow(_since(started))} to process ${yellow(
-          progress,
+          batchedProgress,
         )} rows with total RPS of ${yellow(rpsTotal)}`,
       )
     }