@naturalcycles/nodejs-lib 12.48.0 → 12.50.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 / ((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;
-        const batchedProgress = progress * batchSize;
         console.log((0, util_1.inspect)({
             [final ? `${metric}_final` : metric]: batchedProgress,
             ...(extra ? extra(chunk, progress) : {}),
@@ -72,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/dist/validation/ajv/ajvValidationError.js

@@ -5,20 +5,6 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 class AjvValidationError extends js_lib_1.AppError {
     constructor(message, data) {
         super(message, data);
-        this.constructor = AjvValidationError;
-        this.__proto__ = AjvValidationError.prototype;
-        Object.defineProperty(this, 'name', {
-            value: this.constructor.name,
-            configurable: true,
-        });
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, this.constructor);
-        }
-        else {
-            Object.defineProperty(this, 'stack', {
-                value: new Error().stack, //  eslint-disable-line unicorn/error-message
-            });
-        }
     }
 }
 exports.AjvValidationError = AjvValidationError;

package/dist/validation/joi/joi.validation.error.js

@@ -5,20 +5,6 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 class JoiValidationError extends js_lib_1.AppError {
     constructor(message, data) {
         super(message, data);
-        this.constructor = JoiValidationError;
-        this.__proto__ = JoiValidationError.prototype;
-        Object.defineProperty(this, 'name', {
-            value: this.constructor.name,
-            configurable: true,
-        });
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, this.constructor);
-        }
-        else {
-            Object.defineProperty(this, 'stack', {
-                value: new Error().stack, //  eslint-disable-line unicorn/error-message
-            });
-        }
     }
 }
 exports.JoiValidationError = JoiValidationError;

package/dist/validation/joi/joi.validation.util.js

@@ -130,6 +130,7 @@ function createError(value, err, objectName) {
     // Make annotation non-enumerable, to not get it automatically printed,
     // but still accessible
     Object.defineProperty(data, 'annotation', {
+        writable: true,
         configurable: true,
         enumerable: false,
         value: annotation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.48.0",
+  "version": "12.50.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 / ((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
 
-    const batchedProgress = progress * batchSize
-
     console.log(
       inspect(
         {
@@ -197,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'
       }
@@ -205,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)}`,
       )
     }

package/src/validation/ajv/ajvValidationError.ts

@@ -10,20 +10,5 @@ export interface AjvValidationErrorData extends ErrorData {
 export class AjvValidationError extends AppError<AjvValidationErrorData> {
   constructor(message: string, data: AjvValidationErrorData) {
     super(message, data)
-
-    this.constructor = AjvValidationError
-    ;(this as any).__proto__ = AjvValidationError.prototype
-    Object.defineProperty(this, 'name', {
-      value: this.constructor.name,
-      configurable: true,
-    })
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor)
-    } else {
-      Object.defineProperty(this, 'stack', {
-        value: new Error().stack, //  eslint-disable-line unicorn/error-message
-      })
-    }
   }
 }

package/src/validation/joi/joi.validation.error.ts

@@ -28,20 +28,5 @@ export interface JoiValidationErrorData extends ErrorData {
 export class JoiValidationError extends AppError<JoiValidationErrorData> {
   constructor(message: string, data: JoiValidationErrorData) {
     super(message, data)
-
-    this.constructor = JoiValidationError
-    ;(this as any).__proto__ = JoiValidationError.prototype
-    Object.defineProperty(this, 'name', {
-      value: this.constructor.name,
-      configurable: true,
-    })
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor)
-    } else {
-      Object.defineProperty(this, 'stack', {
-        value: new Error().stack, //  eslint-disable-line unicorn/error-message
-      })
-    }
   }
 }

package/src/validation/joi/joi.validation.util.ts

@@ -172,6 +172,7 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
   // Make annotation non-enumerable, to not get it automatically printed,
   // but still accessible
   Object.defineProperty(data, 'annotation', {
+    writable: true,
     configurable: true,
     enumerable: false,
     value: annotation,