@naturalcycles/nodejs-lib 12.48.2 → 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.js

@@ -8,7 +8,7 @@ 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,
 };
 /**
@@ -46,14 +46,14 @@ function transformLogProgress(opt = {}) {
             return;
         const mem = process.memoryUsage();
         const now = Date.now();
-        const lastRPS = (processedLastSecond * batchSize) / ((now - lastSecondStarted) / 1000) || 0;
-        const rpsTotal = Math.round((progress * batchSize) / ((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;
-        const batchedProgress = progress * batchSize;
         console.log((0, util_1.inspect)({
             [final ? `${metric}_final` : metric]: batchedProgress,
             ...(extra ? extra(chunk, progress) : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.48.2",
+  "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

@@ -104,7 +104,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
 }
 
 const inspectOpt: InspectOptions = {
-  colors: hasColors(),
+  colors: hasColors,
   breakLength: 300,
 }
 
@@ -163,16 +163,16 @@ export function transformLogProgress<IN = any>(
     const mem = process.memoryUsage()
 
     const now = Date.now()
-    const lastRPS = (processedLastSecond * batchSize) / ((now - lastSecondStarted) / 1000) || 0
-    const rpsTotal = Math.round((progress * batchSize) / ((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
 
-    const batchedProgress = progress * batchSize
-
     console.log(
       inspect(
         {