@naturalcycles/js-lib 14.159.0 → 14.160.0

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

@@ -69,6 +69,13 @@ export interface ErrorData {
     [k: string]: any;
 }
 export interface HttpRequestErrorData extends ErrorData {
+    /**
+     * Actual `fetch` Response as it was returned.
+     * Note that not every Request has a Response, hence it's optional.
+     *
+     * Non-enumerable.
+     */
+    response?: Response;
     requestUrl: string;
     requestBaseUrl?: string;
     requestMethod: HttpMethod;

package/dist/error/error.util.js

@@ -87,37 +87,43 @@ exports._errorLikeToErrorObject = _errorLikeToErrorObject;
 function _errorObjectToError(o, errorClass = Error) {
     if (o instanceof errorClass)
         return o;
-    const err = new errorClass(o.message);
+    // Here we pass constructor values assuming it's AppError or sub-class of it
+    // If not - will be checked at the next step
+    // We cannot check `if (errorClass instanceof AppError)`, only `err instanceof AppError`
+    const err = new errorClass(o.message, o.data, o.cause, o.name);
     // name: err.name, // cannot be assigned to a readonly property like this
     // stack: o.stack, // also readonly e.g in Firefox
-    Object.defineProperty(err, 'name', {
-        value: o.name,
-        configurable: true,
-        writable: true,
-    });
-    Object.defineProperty(err.constructor, 'name', {
-        value: o.name,
-        configurable: true,
-        writable: true,
-    });
-    Object.defineProperty(err, 'data', {
-        value: o.data,
-        writable: true,
-        configurable: true,
-        enumerable: false,
-    });
     if (o.stack) {
         Object.defineProperty(err, 'stack', {
             value: o.stack,
         });
     }
-    if (o.cause) {
-        Object.defineProperty(err, 'cause', {
-            value: o.cause,
+    if (!(err instanceof __1.AppError)) {
+        // Following actions are only needed for non-AppError-like errors
+        Object.defineProperty(err, 'name', {
+            value: o.name,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(err.constructor, 'name', {
+            value: o.name,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(err, 'data', {
+            value: o.data,
             writable: true,
             configurable: true,
             enumerable: false,
         });
+        if (o.cause) {
+            Object.defineProperty(err, 'cause', {
+                value: o.cause,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
     }
     return err;
 }

package/dist/error/httpRequestError.js

@@ -21,6 +21,14 @@ const app_error_1 = require("./app.error");
  */
 class HttpRequestError extends app_error_1.AppError {
     constructor(message, data, cause) {
+        if (data.response) {
+            Object.defineProperty(data, 'response', {
+                value: data.response,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
         super(message, data, cause, 'HttpRequestError');
     }
 }

package/dist/http/fetcher.js

@@ -309,6 +309,7 @@ class Fetcher {
         };
         const message = [res.fetchResponse?.status, res.signature].filter(Boolean).join(' ');
         res.err = new httpRequestError_1.HttpRequestError(message, (0, object_util_1._filterNullishValues)({
+            response: res.fetchResponse,
             responseStatusCode: res.fetchResponse?.status || 0,
             // These properties are provided to be used in e.g custom Sentry error grouping
             // Actually, disabled now, to avoid unnecessary error printing when both msg and data are printed
@@ -316,7 +317,7 @@ class Fetcher {
             // method: req.method,
             // tryCount: req.tryCount,
             requestUrl: res.req.fullUrl,
-            requestBaseUrl: this.cfg.baseUrl || null,
+            requestBaseUrl: this.cfg.baseUrl || undefined,
             requestMethod: res.req.init.method,
             requestSignature: res.signature,
             requestDuration: Date.now() - res.req.started,
@@ -543,7 +544,7 @@ class Fetcher {
         });
         if (Object.keys(searchParams).length) {
             const qs = new URLSearchParams(searchParams).toString();
-            req.fullUrl += req.fullUrl.includes('?') ? '&' : '?' + qs;
+            req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs;
         }
         // setup request body
         if (opt.json !== undefined) {

package/dist/http/fetcher.model.d.ts

@@ -1,3 +1,4 @@
+/// <reference lib="dom" />
 import type { CommonLogger } from '../log/commonLogger';
 import type { Promisable } from '../typeFest';
 import type { AnyObject, NumberOfMilliseconds, Reviver, UnixTimestampMillisNumber } from '../types';

package/dist/http/fetcher.model.js

@@ -1,2 +1,3 @@
 "use strict";
+/// <reference lib="dom"/>
 Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,4 +1,4 @@
-import { _jsonParseIfPossible, _stringifyAny } from '..';
+import { AppError, _jsonParseIfPossible, _stringifyAny } from '..';
 /**
  * Useful to ensure that error in `catch (err) { ... }`
  * is indeed an Error (and not e.g `string` or `undefined`).
@@ -78,37 +78,43 @@ export function _errorLikeToErrorObject(e) {
 export function _errorObjectToError(o, errorClass = Error) {
     if (o instanceof errorClass)
         return o;
-    const err = new errorClass(o.message);
+    // Here we pass constructor values assuming it's AppError or sub-class of it
+    // If not - will be checked at the next step
+    // We cannot check `if (errorClass instanceof AppError)`, only `err instanceof AppError`
+    const err = new errorClass(o.message, o.data, o.cause, o.name);
     // name: err.name, // cannot be assigned to a readonly property like this
     // stack: o.stack, // also readonly e.g in Firefox
-    Object.defineProperty(err, 'name', {
-        value: o.name,
-        configurable: true,
-        writable: true,
-    });
-    Object.defineProperty(err.constructor, 'name', {
-        value: o.name,
-        configurable: true,
-        writable: true,
-    });
-    Object.defineProperty(err, 'data', {
-        value: o.data,
-        writable: true,
-        configurable: true,
-        enumerable: false,
-    });
     if (o.stack) {
         Object.defineProperty(err, 'stack', {
             value: o.stack,
         });
     }
-    if (o.cause) {
-        Object.defineProperty(err, 'cause', {
-            value: o.cause,
+    if (!(err instanceof AppError)) {
+        // Following actions are only needed for non-AppError-like errors
+        Object.defineProperty(err, 'name', {
+            value: o.name,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(err.constructor, 'name', {
+            value: o.name,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(err, 'data', {
+            value: o.data,
             writable: true,
             configurable: true,
             enumerable: false,
         });
+        if (o.cause) {
+            Object.defineProperty(err, 'cause', {
+                value: o.cause,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
     }
     return err;
 }

package/dist-esm/error/httpRequestError.js

@@ -18,6 +18,14 @@ import { AppError } from './app.error';
  */
 export class HttpRequestError extends AppError {
     constructor(message, data, cause) {
+        if (data.response) {
+            Object.defineProperty(data, 'response', {
+                value: data.response,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
         super(message, data, cause, 'HttpRequestError');
     }
 }

package/dist-esm/http/fetcher.js

@@ -295,6 +295,7 @@ export class Fetcher {
         });
         const message = [(_a = res.fetchResponse) === null || _a === void 0 ? void 0 : _a.status, res.signature].filter(Boolean).join(' ');
         res.err = new HttpRequestError(message, _filterNullishValues({
+            response: res.fetchResponse,
             responseStatusCode: ((_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status) || 0,
             // These properties are provided to be used in e.g custom Sentry error grouping
             // Actually, disabled now, to avoid unnecessary error printing when both msg and data are printed
@@ -302,7 +303,7 @@ export class Fetcher {
             // method: req.method,
             // tryCount: req.tryCount,
             requestUrl: res.req.fullUrl,
-            requestBaseUrl: this.cfg.baseUrl || null,
+            requestBaseUrl: this.cfg.baseUrl || undefined,
             requestMethod: res.req.init.method,
             requestSignature: res.signature,
             requestDuration: Date.now() - res.req.started,
@@ -512,7 +513,7 @@ export class Fetcher {
         const searchParams = _filterUndefinedValues(Object.assign(Object.assign({}, this.cfg.searchParams), opt.searchParams));
         if (Object.keys(searchParams).length) {
             const qs = new URLSearchParams(searchParams).toString();
-            req.fullUrl += req.fullUrl.includes('?') ? '&' : '?' + qs;
+            req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs;
         }
         // setup request body
         if (opt.json !== undefined) {

package/dist-esm/http/fetcher.model.js

@@ -1 +1,2 @@
+/// <reference lib="dom"/>
 export {};

package/package.json

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

package/src/error/error.model.ts

@@ -85,6 +85,14 @@ export interface ErrorData {
 }
 
 export interface HttpRequestErrorData extends ErrorData {
+  /**
+   * Actual `fetch` Response as it was returned.
+   * Note that not every Request has a Response, hence it's optional.
+   *
+   * Non-enumerable.
+   */
+  response?: Response
+
   requestUrl: string
   requestBaseUrl?: string
   requestMethod: HttpMethod

package/src/error/error.util.ts

@@ -109,42 +109,49 @@ export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE exte
 ): ERROR_TYPE {
   if (o instanceof errorClass) return o
 
-  const err = new errorClass(o.message)
+  // Here we pass constructor values assuming it's AppError or sub-class of it
+  // If not - will be checked at the next step
+  // We cannot check `if (errorClass instanceof AppError)`, only `err instanceof AppError`
+  const err = new errorClass(o.message, o.data, o.cause, o.name)
   // name: err.name, // cannot be assigned to a readonly property like this
   // stack: o.stack, // also readonly e.g in Firefox
 
-  Object.defineProperty(err, 'name', {
-    value: o.name,
-    configurable: true,
-    writable: true,
-  })
-
-  Object.defineProperty(err.constructor, 'name', {
-    value: o.name,
-    configurable: true,
-    writable: true,
-  })
-
-  Object.defineProperty(err, 'data', {
-    value: o.data,
-    writable: true,
-    configurable: true,
-    enumerable: false,
-  })
-
   if (o.stack) {
     Object.defineProperty(err, 'stack', {
       value: o.stack,
     })
   }
 
-  if (o.cause) {
-    Object.defineProperty(err, 'cause', {
-      value: o.cause,
+  if (!(err instanceof AppError)) {
+    // Following actions are only needed for non-AppError-like errors
+
+    Object.defineProperty(err, 'name', {
+      value: o.name,
+      configurable: true,
+      writable: true,
+    })
+
+    Object.defineProperty(err.constructor, 'name', {
+      value: o.name,
+      configurable: true,
+      writable: true,
+    })
+
+    Object.defineProperty(err, 'data', {
+      value: o.data,
       writable: true,
       configurable: true,
       enumerable: false,
     })
+
+    if (o.cause) {
+      Object.defineProperty(err, 'cause', {
+        value: o.cause,
+        writable: true,
+        configurable: true,
+        enumerable: false,
+      })
+    }
   }
 
   return err

package/src/error/httpRequestError.ts

@@ -20,6 +20,15 @@ import type { ErrorObject, HttpRequestErrorData } from './error.model'
  */
 export class HttpRequestError extends AppError<HttpRequestErrorData> {
   constructor(message: string, data: HttpRequestErrorData, cause: ErrorObject) {
+    if (data.response) {
+      Object.defineProperty(data, 'response', {
+        value: data.response,
+        writable: true,
+        configurable: true,
+        enumerable: false,
+      })
+    }
+
     super(message, data, cause, 'HttpRequestError')
   }
 

package/src/http/fetcher.model.ts

@@ -1,3 +1,5 @@
+/// <reference lib="dom"/>
+
 import type { CommonLogger } from '../log/commonLogger'
 import type { Promisable } from '../typeFest'
 import type { AnyObject, NumberOfMilliseconds, Reviver, UnixTimestampMillisNumber } from '../types'

package/src/http/fetcher.ts

@@ -395,6 +395,7 @@ export class Fetcher {
     res.err = new HttpRequestError(
       message,
       _filterNullishValues({
+        response: res.fetchResponse,
         responseStatusCode: res.fetchResponse?.status || 0,
         // These properties are provided to be used in e.g custom Sentry error grouping
         // Actually, disabled now, to avoid unnecessary error printing when both msg and data are printed
@@ -402,7 +403,7 @@ export class Fetcher {
         // method: req.method,
         // tryCount: req.tryCount,
         requestUrl: res.req.fullUrl,
-        requestBaseUrl: this.cfg.baseUrl || (null as any),
+        requestBaseUrl: this.cfg.baseUrl || undefined,
         requestMethod: res.req.init.method,
         requestSignature: res.signature,
         requestDuration: Date.now() - res.req.started,
@@ -660,7 +661,7 @@ export class Fetcher {
 
     if (Object.keys(searchParams).length) {
       const qs = new URLSearchParams(searchParams).toString()
-      req.fullUrl += req.fullUrl.includes('?') ? '&' : '?' + qs
+      req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs
     }
 
     // setup request body