@naturalcycles/js-lib 14.130.0 → 14.131.0

package/dist/error/app.error.d.ts

@@ -10,5 +10,9 @@ import type { ErrorData } from './error.model';
  */
 export declare class AppError<DATA_TYPE extends ErrorData = ErrorData> extends Error {
     data: DATA_TYPE;
+    /**
+     * cause here is normalized to be instance of Error
+     */
+    cause?: Error;
     constructor(message: string, data?: DATA_TYPE, opt?: ErrorOptions);
 }

package/dist/error/app.error.js

@@ -12,7 +12,7 @@ exports.AppError = void 0;
  */
 class AppError extends Error {
     constructor(message, data = {}, opt) {
-        super(message, opt);
+        super(message);
         Object.defineProperty(this, 'name', {
             value: this.constructor.name,
             configurable: true,
@@ -23,6 +23,15 @@ class AppError extends Error {
             configurable: true,
             enumerable: false,
         });
+        if (opt?.cause) {
+            Object.defineProperty(this, 'cause', {
+                // I'd love to do _anyToError(opt.cause) here, but it causes circular dep ;(
+                value: opt.cause,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
         // todo: check if it's needed at all!
         // if (Error.captureStackTrace) {
         //   Error.captureStackTrace(this, this.constructor)

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

@@ -93,7 +93,7 @@ export interface ErrorObject<DATA_TYPE extends ErrorData = ErrorData> {
      * It's non-optional, to save some null-checks.
      */
     data: DATA_TYPE;
-    cause?: any;
+    cause?: ErrorObject;
 }
 /**
  * JSON HTTP response from the Backend that represents "Error".

package/dist/error/error.util.d.ts

@@ -17,7 +17,6 @@ export declare function _anyToError<ERROR_TYPE extends Error = Error>(o: any, er
  */
 export declare function _anyToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(o: any, errorData?: Partial<DATA_TYPE>): ErrorObject<DATA_TYPE>;
 export declare function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(e: AppError<DATA_TYPE> | Error): ErrorObject<DATA_TYPE>;
-export declare function _errorObjectToAppError<DATA_TYPE extends ErrorData>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE>;
 export declare function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(o: ErrorObject<DATA_TYPE>, errorClass?: Class<ERROR_TYPE>): ERROR_TYPE;
 export declare function _isHttpErrorResponse(o: any): o is HttpErrorResponse;
 export declare function _isHttpErrorObject(o: any): o is ErrorObject<HttpErrorData>;

package/dist/error/error.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._errorDataAppend = exports._isErrorObject = exports._isHttpErrorObject = exports._isHttpErrorResponse = exports._errorObjectToError = exports._errorObjectToAppError = exports._errorToErrorObject = exports._anyToErrorObject = exports._anyToError = void 0;
+exports._errorDataAppend = exports._isErrorObject = exports._isHttpErrorObject = exports._isHttpErrorResponse = exports._errorObjectToError = exports._errorToErrorObject = exports._anyToErrorObject = exports._anyToError = void 0;
 const __1 = require("..");
 /**
  * Useful to ensure that error in `catch (err) { ... }`
@@ -79,10 +79,6 @@ function _errorToErrorObject(e) {
     return obj;
 }
 exports._errorToErrorObject = _errorToErrorObject;
-function _errorObjectToAppError(o) {
-    return _errorObjectToError(o, __1.AppError);
-}
-exports._errorObjectToAppError = _errorObjectToAppError;
 function _errorObjectToError(o, errorClass = Error) {
     if (o instanceof errorClass)
         return o;

package/dist/http/fetcher.js

@@ -173,6 +173,12 @@ class Fetcher {
                 else if (mode === 'text') {
                     res.body = res.fetchResponse.body ? await res.fetchResponse.text() : '';
                 }
+                else if (mode === 'arrayBuffer') {
+                    res.body = res.fetchResponse.body ? await res.fetchResponse.arrayBuffer() : {};
+                }
+                else if (mode === 'blob') {
+                    res.body = res.fetchResponse.body ? await res.fetchResponse.blob() : {};
+                }
                 clearTimeout(timeout);
                 res.retryStatus.retryStopped = true;
                 // res.err can happen on JSON.parse error

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

@@ -148,4 +148,4 @@ export interface FetcherErrorResponse<BODY = unknown> {
     retryStatus: FetcherRetryStatus;
 }
 export type FetcherResponse<BODY = unknown> = FetcherSuccessResponse<BODY> | FetcherErrorResponse<BODY>;
-export type FetcherMode = 'json' | 'text' | 'void';
+export type FetcherMode = 'json' | 'text' | 'void' | 'arrayBuffer' | 'blob';

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

@@ -9,7 +9,7 @@
  */
 export class AppError extends Error {
     constructor(message, data = {}, opt) {
-        super(message, opt);
+        super(message);
         Object.defineProperty(this, 'name', {
             value: this.constructor.name,
             configurable: true,
@@ -20,6 +20,15 @@ export class AppError extends Error {
             configurable: true,
             enumerable: false,
         });
+        if (opt === null || opt === void 0 ? void 0 : opt.cause) {
+            Object.defineProperty(this, 'cause', {
+                // I'd love to do _anyToError(opt.cause) here, but it causes circular dep ;(
+                value: opt.cause,
+                writable: true,
+                configurable: true,
+                enumerable: false,
+            });
+        }
         // todo: check if it's needed at all!
         // if (Error.captureStackTrace) {
         //   Error.captureStackTrace(this, this.constructor)

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

@@ -1,4 +1,4 @@
-import { AppError, _jsonParseIfPossible, _stringifyAny } from '..';
+import { _jsonParseIfPossible, _stringifyAny } from '..';
 /**
  * Useful to ensure that error in `catch (err) { ... }`
  * is indeed an Error (and not e.g `string` or `undefined`).
@@ -70,9 +70,6 @@ export function _errorToErrorObject(e) {
     }
     return obj;
 }
-export function _errorObjectToAppError(o) {
-    return _errorObjectToError(o, AppError);
-}
 export function _errorObjectToError(o, errorClass = Error) {
     if (o instanceof errorClass)
         return o;

package/dist-esm/http/fetcher.js

@@ -181,6 +181,12 @@ export class Fetcher {
                 else if (mode === 'text') {
                     res.body = res.fetchResponse.body ? await res.fetchResponse.text() : '';
                 }
+                else if (mode === 'arrayBuffer') {
+                    res.body = res.fetchResponse.body ? await res.fetchResponse.arrayBuffer() : {};
+                }
+                else if (mode === 'blob') {
+                    res.body = res.fetchResponse.body ? await res.fetchResponse.blob() : {};
+                }
                 clearTimeout(timeout);
                 res.retryStatus.retryStopped = true;
                 // res.err can happen on JSON.parse error

package/package.json

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

package/src/error/app.error.ts

@@ -12,8 +12,13 @@ import type { ErrorData } from './error.model'
 export class AppError<DATA_TYPE extends ErrorData = ErrorData> extends Error {
   data!: DATA_TYPE
 
+  /**
+   * cause here is normalized to be instance of Error
+   */
+  override cause?: Error
+
   constructor(message: string, data = {} as DATA_TYPE, opt?: ErrorOptions) {
-    super(message, opt)
+    super(message)
 
     Object.defineProperty(this, 'name', {
       value: this.constructor.name,
@@ -27,6 +32,16 @@ export class AppError<DATA_TYPE extends ErrorData = ErrorData> extends Error {
       enumerable: false,
     })
 
+    if (opt?.cause) {
+      Object.defineProperty(this, 'cause', {
+        // I'd love to do _anyToError(opt.cause) here, but it causes circular dep ;(
+        value: opt.cause,
+        writable: true,
+        configurable: true,
+        enumerable: false,
+      })
+    }
+
     // todo: check if it's needed at all!
     // if (Error.captureStackTrace) {
     //   Error.captureStackTrace(this, this.constructor)

package/src/error/error.model.ts

@@ -123,7 +123,7 @@ export interface ErrorObject<DATA_TYPE extends ErrorData = ErrorData> {
    */
   data: DATA_TYPE
 
-  cause?: any
+  cause?: ErrorObject
 }
 
 /**

package/src/error/error.util.ts

@@ -53,7 +53,7 @@ export function _anyToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(
     o = _jsonParseIfPossible(o)
 
     if (_isHttpErrorResponse(o)) {
-      eo = o.error as any
+      eo = o.error as ErrorObject<DATA_TYPE>
     } else if (_isErrorObject(o)) {
       eo = o as ErrorObject<DATA_TYPE>
     } else {
@@ -92,12 +92,6 @@ export function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(
   return obj
 }
 
-export function _errorObjectToAppError<DATA_TYPE extends ErrorData>(
-  o: ErrorObject<DATA_TYPE>,
-): AppError<DATA_TYPE> {
-  return _errorObjectToError(o, AppError)
-}
-
 export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(
   o: ErrorObject<DATA_TYPE>,
   errorClass: Class<ERROR_TYPE> = Error as any,

package/src/http/fetcher.model.ts

@@ -178,4 +178,4 @@ export type FetcherResponse<BODY = unknown> =
   | FetcherSuccessResponse<BODY>
   | FetcherErrorResponse<BODY>
 
-export type FetcherMode = 'json' | 'text' | 'void'
+export type FetcherMode = 'json' | 'text' | 'void' | 'arrayBuffer' | 'blob'

package/src/http/fetcher.ts

@@ -237,6 +237,10 @@ export class Fetcher {
           }
         } else if (mode === 'text') {
           res.body = res.fetchResponse.body ? await res.fetchResponse.text() : ''
+        } else if (mode === 'arrayBuffer') {
+          res.body = res.fetchResponse.body ? await res.fetchResponse.arrayBuffer() : {}
+        } else if (mode === 'blob') {
+          res.body = res.fetchResponse.body ? await res.fetchResponse.blob() : {}
         }
 
         clearTimeout(timeout)