@naturalcycles/js-lib 14.124.0 → 14.124.1

package/dist/error/error.util.js

@@ -11,12 +11,23 @@ const __1 = require("..");
  * Alternatively, if you're sure it's Error - you can use `_assertIsError(err)`.
  */
 function _anyToError(o, errorClass = Error, errorData, opt) {
-    if (o instanceof errorClass)
-        return o;
-    // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
-    const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt);
-    Object.assign(errorObject.data, errorData);
-    return _errorObjectToError(errorObject, errorClass);
+    let e;
+    if (o instanceof errorClass) {
+        e = o;
+    }
+    else {
+        // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
+        const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt);
+        e = _errorObjectToError(errorObject, errorClass);
+    }
+    if (errorData) {
+        ;
+        e.data = {
+            ...e.data,
+            ...errorData,
+        };
+    }
+    return e;
 }
 exports._anyToError = _anyToError;
 /**

package/dist-esm/error/error.util.js

@@ -8,12 +8,20 @@ import { AppError, _jsonParseIfPossible, _stringifyAny } from '..';
  * Alternatively, if you're sure it's Error - you can use `_assertIsError(err)`.
  */
 export function _anyToError(o, errorClass = Error, errorData, opt) {
-    if (o instanceof errorClass)
-        return o;
-    // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
-    const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt);
-    Object.assign(errorObject.data, errorData);
-    return _errorObjectToError(errorObject, errorClass);
+    let e;
+    if (o instanceof errorClass) {
+        e = o;
+    }
+    else {
+        // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
+        const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt);
+        e = _errorObjectToError(errorObject, errorClass);
+    }
+    if (errorData) {
+        ;
+        e.data = Object.assign(Object.assign({}, e.data), errorData);
+    }
+    return e;
 }
 /**
  * Converts "anything" to ErrorObject.

package/package.json

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

package/src/error/error.util.ts

@@ -22,13 +22,25 @@ export function _anyToError<ERROR_TYPE extends Error = Error>(
   errorData?: ErrorData,
   opt?: StringifyAnyOptions,
 ): ERROR_TYPE {
-  if (o instanceof errorClass) return o
+  let e: ERROR_TYPE
+
+  if (o instanceof errorClass) {
+    e = o
+  } else {
+    // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
 
-  // If it's an instance of Error, but ErrorClass is something else (e.g AppError) - it'll be "repacked" into AppError
+    const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt)
+    e = _errorObjectToError(errorObject, errorClass) as any
+  }
+
+  if (errorData) {
+    ;(e as any).data = {
+      ...(e as any).data,
+      ...errorData,
+    }
+  }
 
-  const errorObject = _isErrorObject(o) ? o : _anyToErrorObject(o, {}, opt)
-  Object.assign(errorObject.data, errorData)
-  return _errorObjectToError(errorObject, errorClass)
+  return e
 }
 
 /**