@naturalcycles/js-lib 14.124.0 → 14.125.0

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/http/fetcher.d.ts

@@ -89,6 +89,10 @@ export interface FetcherOptions {
      */
     body?: Blob | BufferSource | FormData | URLSearchParams | string;
     credentials?: RequestCredentials;
+    /**
+     * Default to true.
+     */
+    followRedirects?: boolean;
     headers?: Record<string, any>;
     mode?: FetcherMode;
     searchParams?: Record<string, any>;
@@ -166,6 +170,10 @@ export declare class Fetcher {
     deleteVoid: (url: string, opt?: FetcherOptions) => Promise<void>;
     headVoid: (url: string, opt?: FetcherOptions) => Promise<void>;
     fetch<T = unknown>(url: string, opt?: FetcherOptions): Promise<T>;
+    /**
+     * Returns FetcherResponse.
+     * Never throws, returns `err` property in the response instead.
+     */
     rawFetch<T = unknown>(url: string, rawOpt?: FetcherOptions): Promise<FetcherResponse<T>>;
     private processRetry;
     /**

package/dist/http/fetcher.js

@@ -88,6 +88,10 @@ class Fetcher {
         }
         return res.body;
     }
+    /**
+     * Returns FetcherResponse.
+     * Never throws, returns `err` property in the response instead.
+     */
     async rawFetch(url, rawOpt = {}) {
         const { logger } = this.cfg;
         const req = this.normalizeOptions(url, rawOpt);
@@ -332,6 +336,7 @@ class Fetcher {
                 ...this.cfg.init,
                 method: opt.method || this.cfg.init.method,
                 credentials: opt.credentials || this.cfg.init.credentials,
+                redirect: opt.followRedirects ?? this.cfg.followRedirects ?? true ? 'follow' : 'error',
             }, {
                 headers: (0, object_util_1._mapKeys)(opt.headers || {}, k => k.toLowerCase()),
             }),

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/dist-esm/http/fetcher.js

@@ -77,6 +77,10 @@ export class Fetcher {
         }
         return res.body;
     }
+    /**
+     * Returns FetcherResponse.
+     * Never throws, returns `err` property in the response instead.
+     */
     async rawFetch(url, rawOpt = {}) {
         var _a, e_1, _b, _c, _d, e_2, _e, _f;
         var _g, _h, _j;
@@ -355,6 +359,7 @@ export class Fetcher {
         return norm;
     }
     normalizeOptions(url, opt) {
+        var _a, _b;
         const { baseUrl, timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode } = this.cfg;
         const req = Object.assign(Object.assign({ mode,
             url,
@@ -362,7 +367,7 @@ export class Fetcher {
             throwHttpErrors,
             retryPost,
             retry4xx,
-            retry5xx }, _omit(opt, ['method', 'headers', 'credentials'])), { retry: Object.assign(Object.assign({}, retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials }), {
+            retry5xx }, _omit(opt, ['method', 'headers', 'credentials'])), { retry: Object.assign(Object.assign({}, retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: ((_b = (_a = opt.followRedirects) !== null && _a !== void 0 ? _a : this.cfg.followRedirects) !== null && _b !== void 0 ? _b : true) ? 'follow' : 'error' }), {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.124.0",
+  "version": "14.125.0",
   "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
 }
 
 /**

package/src/http/fetcher.ts

@@ -117,6 +117,10 @@ export interface FetcherOptions {
   body?: Blob | BufferSource | FormData | URLSearchParams | string
 
   credentials?: RequestCredentials
+  /**
+   * Default to true.
+   */
+  followRedirects?: boolean
 
   // Removing RequestInit from options to simplify FetcherOptions interface.
   // Will instead only add hand-picked useful options, such as `credentials`.
@@ -287,6 +291,10 @@ export class Fetcher {
     return res.body!
   }
 
+  /**
+   * Returns FetcherResponse.
+   * Never throws, returns `err` property in the response instead.
+   */
   async rawFetch<T = unknown>(
     url: string,
     rawOpt: FetcherOptions = {},
@@ -575,6 +583,7 @@ export class Fetcher {
           ...this.cfg.init,
           method: opt.method || this.cfg.init.method,
           credentials: opt.credentials || this.cfg.init.credentials,
+          redirect: opt.followRedirects ?? this.cfg.followRedirects ?? true ? 'follow' : 'error',
         },
         {
           headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),