@naturalcycles/js-lib 14.166.1 → 14.168.0

package/dist/error/error.model.d.ts

@@ -48,14 +48,6 @@ export interface ErrorData {
      * Sentry takes string[], but for convenience we allow to pass a singe string.
      */
     fingerprint?: string | string[];
-    /**
-     * If set to true - it'll use error.message as fingerprint,
-     * so, all errors with the same message will be grouped together, even if they occurred in different places.
-     * Defaults to false.
-     *
-     * @experimental
-     */
-    fingerprintByMessage?: boolean;
     /**
      * Set when throwing an error from your backend code, to indicate desired http status code.
      * e.g throw new AppError('oj', { backendResponseStatusCode: 401 })

package/dist/object/deepEquals.d.ts

@@ -1,3 +1,10 @@
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export declare function _deepJsonEquals(a: any, b: any): boolean;
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */

package/dist/object/deepEquals.js

@@ -1,45 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._deepEquals = void 0;
+exports._deepEquals = exports._deepJsonEquals = void 0;
 const isArray = Array.isArray;
 const keyList = Object.keys;
 const hasProp = Object.prototype.hasOwnProperty;
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+function _deepJsonEquals(a, b) {
+    if (a === b)
+        return true;
+    const aj = JSON.stringify(a);
+    const bj = JSON.stringify(b);
+    if (aj === bj)
+        return true;
+    return _deepEquals(JSON.parse(aj), JSON.parse(bj));
+}
+exports._deepJsonEquals = _deepJsonEquals;
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */
 function _deepEquals(a, b) {
     if (a === b)
         return true;
-    if (a && b && typeof a == 'object' && typeof b == 'object') {
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
         const arrA = isArray(a);
         const arrB = isArray(b);
         let i;
         let length;
         let key;
+        if (arrA !== arrB)
+            return false;
         if (arrA && arrB) {
             length = a.length;
-            if (length != b.length)
+            if (length !== b.length)
                 return false;
             for (i = length; i-- !== 0;)
                 if (!_deepEquals(a[i], b[i]))
                     return false;
             return true;
         }
-        if (arrA != arrB)
-            return false;
         const dateA = a instanceof Date;
         const dateB = b instanceof Date;
-        if (dateA != dateB)
+        if (dateA !== dateB)
             return false;
         if (dateA && dateB)
-            return a.getTime() == b.getTime();
+            return a.getTime() === b.getTime();
         const regexpA = a instanceof RegExp;
         const regexpB = b instanceof RegExp;
-        if (regexpA != regexpB)
+        if (regexpA !== regexpB)
             return false;
         if (regexpA && regexpB)
-            return a.toString() == b.toString();
+            return a.toString() === b.toString();
         const keys = keyList(a);
         length = keys.length;
         if (length !== keyList(b).length)

package/dist/string/stringifyAny.d.ts

@@ -32,6 +32,12 @@ export interface StringifyAnyOptions {
      * @default true
      */
     includeErrorCause?: boolean;
+    /**
+     * Set to true to include Error.data.
+     *
+     * @default false
+     */
+    includeErrorData?: boolean;
     /**
      * Allows to pass custom "stringify function".
      * E.g in Node.js you can pass `util.inspect` instead.

package/dist/string/stringifyAny.js

@@ -78,6 +78,9 @@ function _stringifyAny(obj, opt = {}) {
             // Error that has no `data`, but has `code` property
             s += `\ncode: ${obj.code}`;
         }
+        if (opt.includeErrorData && (0, error_util_1._isErrorObject)(obj)) {
+            s += '\n' + _stringifyAny(obj.data, opt);
+        }
         if (opt.includeErrorStack && obj.stack) {
             // Here we're using the previously-generated "title line" (e.g "Error: some_message"),
             // concatenating it with the Stack (but without the title line of the Stack)

package/dist-esm/object/deepEquals.js

@@ -1,42 +1,56 @@
 const isArray = Array.isArray;
 const keyList = Object.keys;
 const hasProp = Object.prototype.hasOwnProperty;
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export function _deepJsonEquals(a, b) {
+    if (a === b)
+        return true;
+    const aj = JSON.stringify(a);
+    const bj = JSON.stringify(b);
+    if (aj === bj)
+        return true;
+    return _deepEquals(JSON.parse(aj), JSON.parse(bj));
+}
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */
 export function _deepEquals(a, b) {
     if (a === b)
         return true;
-    if (a && b && typeof a == 'object' && typeof b == 'object') {
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
         const arrA = isArray(a);
         const arrB = isArray(b);
         let i;
         let length;
         let key;
+        if (arrA !== arrB)
+            return false;
         if (arrA && arrB) {
             length = a.length;
-            if (length != b.length)
+            if (length !== b.length)
                 return false;
             for (i = length; i-- !== 0;)
                 if (!_deepEquals(a[i], b[i]))
                     return false;
             return true;
         }
-        if (arrA != arrB)
-            return false;
         const dateA = a instanceof Date;
         const dateB = b instanceof Date;
-        if (dateA != dateB)
+        if (dateA !== dateB)
             return false;
         if (dateA && dateB)
-            return a.getTime() == b.getTime();
+            return a.getTime() === b.getTime();
         const regexpA = a instanceof RegExp;
         const regexpB = b instanceof RegExp;
-        if (regexpA != regexpB)
+        if (regexpA !== regexpB)
             return false;
         if (regexpA && regexpB)
-            return a.toString() == b.toString();
+            return a.toString() === b.toString();
         const keys = keyList(a);
         length = keys.length;
         if (length !== keyList(b).length)

package/dist-esm/string/stringifyAny.js

@@ -1,4 +1,4 @@
-import { _isBackendErrorResponseObject, _isErrorLike } from '../error/error.util';
+import { _isBackendErrorResponseObject, _isErrorLike, _isErrorObject } from '../error/error.util';
 import { _jsonParseIfPossible } from './json.util';
 import { _safeJsonStringify } from './safeJsonStringify';
 const supportsAggregateError = typeof globalThis.AggregateError === 'function';
@@ -74,6 +74,9 @@ export function _stringifyAny(obj, opt = {}) {
             // Error that has no `data`, but has `code` property
             s += `\ncode: ${obj.code}`;
         }
+        if (opt.includeErrorData && _isErrorObject(obj)) {
+            s += '\n' + _stringifyAny(obj.data, opt);
+        }
         if (opt.includeErrorStack && obj.stack) {
             // Here we're using the previously-generated "title line" (e.g "Error: some_message"),
             // concatenating it with the Stack (but without the title line of the Stack)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.166.1",
+  "version": "14.168.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/error/error.model.ts

@@ -59,15 +59,6 @@ export interface ErrorData {
    */
   fingerprint?: string | string[]
 
-  /**
-   * If set to true - it'll use error.message as fingerprint,
-   * so, all errors with the same message will be grouped together, even if they occurred in different places.
-   * Defaults to false.
-   *
-   * @experimental
-   */
-  fingerprintByMessage?: boolean
-
   /**
    * Set when throwing an error from your backend code, to indicate desired http status code.
    * e.g throw new AppError('oj', { backendResponseStatusCode: 401 })

package/src/object/deepEquals.ts

@@ -2,7 +2,19 @@ const isArray = Array.isArray
 const keyList = Object.keys
 const hasProp = Object.prototype.hasOwnProperty
 
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export function _deepJsonEquals(a: any, b: any): boolean {
+  if (a === b) return true
+  const aj = JSON.stringify(a)
+  const bj = JSON.stringify(b)
+  if (aj === bj) return true
+  return _deepEquals(JSON.parse(aj), JSON.parse(bj))
+}
 
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
@@ -10,31 +22,31 @@ const hasProp = Object.prototype.hasOwnProperty
 export function _deepEquals(a: any, b: any): boolean {
   if (a === b) return true
 
-  if (a && b && typeof a == 'object' && typeof b == 'object') {
+  if (a && b && typeof a === 'object' && typeof b === 'object') {
     const arrA = isArray(a)
     const arrB = isArray(b)
-    let i
-    let length
+    let i: number
+    let length: number
     let key: string
 
+    if (arrA !== arrB) return false
+
     if (arrA && arrB) {
       length = a.length
-      if (length != b.length) return false
+      if (length !== b.length) return false
       for (i = length; i-- !== 0; ) if (!_deepEquals(a[i], b[i])) return false
       return true
     }
 
-    if (arrA != arrB) return false
-
     const dateA = a instanceof Date
     const dateB = b instanceof Date
-    if (dateA != dateB) return false
-    if (dateA && dateB) return a.getTime() == b.getTime()
+    if (dateA !== dateB) return false
+    if (dateA && dateB) return a.getTime() === b.getTime()
 
     const regexpA = a instanceof RegExp
     const regexpB = b instanceof RegExp
-    if (regexpA != regexpB) return false
-    if (regexpA && regexpB) return a.toString() == b.toString()
+    if (regexpA !== regexpB) return false
+    if (regexpA && regexpB) return a.toString() === b.toString()
 
     const keys = keyList(a)
     length = keys.length

package/src/string/stringifyAny.ts

@@ -1,4 +1,4 @@
-import { _isBackendErrorResponseObject, _isErrorLike } from '../error/error.util'
+import { _isBackendErrorResponseObject, _isErrorLike, _isErrorObject } from '../error/error.util'
 import type { Reviver } from '../types'
 import { _jsonParseIfPossible } from './json.util'
 import { _safeJsonStringify } from './safeJsonStringify'
@@ -47,6 +47,13 @@ export interface StringifyAnyOptions {
    */
   includeErrorCause?: boolean
 
+  /**
+   * Set to true to include Error.data.
+   *
+   * @default false
+   */
+  includeErrorData?: boolean
+
   /**
    * Allows to pass custom "stringify function".
    * E.g in Node.js you can pass `util.inspect` instead.
@@ -115,6 +122,10 @@ export function _stringifyAny(obj: any, opt: StringifyAnyOptions = {}): string {
       s += `\ncode: ${(obj as any).code}`
     }
 
+    if (opt.includeErrorData && _isErrorObject(obj)) {
+      s += '\n' + _stringifyAny(obj.data, opt)
+    }
+
     if (opt.includeErrorStack && obj.stack) {
       // Here we're using the previously-generated "title line" (e.g "Error: some_message"),
       // concatenating it with the Stack (but without the title line of the Stack)