@naturalcycles/js-lib 14.132.0 → 14.133.1

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

@@ -14,5 +14,5 @@ export declare class AppError<DATA_TYPE extends ErrorData = ErrorData> extends E
      * cause here is normalized to be instance of Error
      */
     cause?: Error;
-    constructor(message: string, data?: DATA_TYPE, opt?: ErrorOptions);
+    constructor(message: string, data?: DATA_TYPE, opt?: ErrorOptions, name?: string);
 }

package/dist/error/app.error.js

@@ -11,11 +11,18 @@ exports.AppError = void 0;
  * Based on: https://medium.com/@xpl/javascript-deriving-from-error-properly-8d2f8f315801
  */
 class AppError extends Error {
-    constructor(message, data = {}, opt) {
+    constructor(message, data = {}, opt, name) {
         super(message);
         Object.defineProperty(this, 'name', {
-            value: this.constructor.name,
+            value: name || this.constructor.name,
             configurable: true,
+            writable: true,
+        });
+        // this is to allow changing this.constuctor.name to a non-minified version
+        Object.defineProperty(this.constructor, 'name', {
+            value: name || this.constructor.name,
+            configurable: true,
+            writable: true,
         });
         Object.defineProperty(this, 'data', {
             value: data,

package/dist/error/assert.d.ts

@@ -36,4 +36,5 @@ export declare function _assertIsString(v: any, message?: string): asserts v is
 export declare function _assertIsNumber(v: any, message?: string): asserts v is number;
 export declare function _assertTypeOf<T>(v: any, expectedType: string, message?: string): asserts v is T;
 export declare class AssertionError extends AppError {
+    constructor(message: string, data?: {}, opt?: ErrorOptions);
 }

package/dist/error/assert.js

@@ -103,5 +103,8 @@ function _assertTypeOf(v, expectedType, message) {
 }
 exports._assertTypeOf = _assertTypeOf;
 class AssertionError extends app_error_1.AppError {
+    constructor(message, data = {}, opt) {
+        super(message, data, opt, 'AssertionError');
+    }
 }
 exports.AssertionError = AssertionError;

package/dist/error/error.util.js

@@ -88,6 +88,12 @@ function _errorObjectToError(o, errorClass = Error) {
     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,

package/dist/error/http.error.js

@@ -7,7 +7,7 @@ const app_error_1 = require("./app.error");
  */
 class HttpError extends app_error_1.AppError {
     constructor(message, data, opt) {
-        super(message, data, opt);
+        super(message, data, opt, 'HttpError');
     }
 }
 exports.HttpError = HttpError;

package/dist/http/fetcher.js

@@ -345,7 +345,7 @@ class Fetcher {
         return norm;
     }
     normalizeOptions(url, opt) {
-        const { baseUrl, timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
+        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
         const req = {
             mode,
             url,
@@ -370,6 +370,7 @@ class Fetcher {
             }),
         };
         // setup url
+        const baseUrl = opt.baseUrl || this.cfg.baseUrl;
         if (baseUrl) {
             if (url.startsWith('/')) {
                 console.warn(`Fetcher: url should not start with / when baseUrl is specified`);

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

@@ -68,7 +68,7 @@ export interface FetcherRetryOptions {
     timeoutMax: number;
     timeoutMultiplier: number;
 }
-export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers'> {
+export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers' | 'baseUrl'> {
     url: string;
     init: RequestInitNormalized;
     mode: FetcherMode;
@@ -81,6 +81,7 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
 }
 export interface FetcherOptions {
     method?: HttpMethod;
+    baseUrl?: string;
     throwHttpErrors?: boolean;
     /**
      * Default: 30.

package/dist/promise/pTimeout.d.ts

@@ -2,6 +2,7 @@ import { AppError } from '../error/app.error';
 import type { ErrorData } from '../error/error.model';
 import type { AnyAsyncFunction } from '../types';
 export declare class TimeoutError extends AppError {
+    constructor(message: string, data?: {}, opt?: ErrorOptions);
 }
 export interface PTimeoutOptions {
     /**

package/dist/promise/pTimeout.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pTimeout = exports.pTimeoutFn = exports.TimeoutError = void 0;
 const app_error_1 = require("../error/app.error");
 class TimeoutError extends app_error_1.AppError {
+    constructor(message, data = {}, opt) {
+        super(message, data, opt, 'TimeoutError');
+    }
 }
 exports.TimeoutError = TimeoutError;
 /**

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

@@ -8,11 +8,18 @@
  * Based on: https://medium.com/@xpl/javascript-deriving-from-error-properly-8d2f8f315801
  */
 export class AppError extends Error {
-    constructor(message, data = {}, opt) {
+    constructor(message, data = {}, opt, name) {
         super(message);
         Object.defineProperty(this, 'name', {
-            value: this.constructor.name,
+            value: name || this.constructor.name,
             configurable: true,
+            writable: true,
+        });
+        // this is to allow changing this.constuctor.name to a non-minified version
+        Object.defineProperty(this.constructor, 'name', {
+            value: name || this.constructor.name,
+            configurable: true,
+            writable: true,
         });
         Object.defineProperty(this, 'data', {
             value: data,

package/dist-esm/error/assert.js

@@ -84,4 +84,7 @@ export function _assertTypeOf(v, expectedType, message) {
     }
 }
 export class AssertionError extends AppError {
+    constructor(message, data = {}, opt) {
+        super(message, data, opt, 'AssertionError');
+    }
 }

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

@@ -79,6 +79,12 @@ export function _errorObjectToError(o, errorClass = Error) {
     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,

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

@@ -4,6 +4,6 @@ import { AppError } from './app.error';
  */
 export class HttpError extends AppError {
     constructor(message, data, opt) {
-        super(message, data, opt);
+        super(message, data, opt, 'HttpError');
     }
 }

package/dist-esm/http/fetcher.js

@@ -387,7 +387,7 @@ export class Fetcher {
     }
     normalizeOptions(url, opt) {
         var _a, _b;
-        const { baseUrl, timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
+        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
         const req = Object.assign(Object.assign({ mode,
             url,
             timeoutSeconds,
@@ -399,6 +399,7 @@ export class Fetcher {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url
+        const baseUrl = opt.baseUrl || this.cfg.baseUrl;
         if (baseUrl) {
             if (url.startsWith('/')) {
                 console.warn(`Fetcher: url should not start with / when baseUrl is specified`);

package/dist-esm/promise/pTimeout.js

@@ -1,5 +1,8 @@
 import { AppError } from '../error/app.error';
 export class TimeoutError extends AppError {
+    constructor(message, data = {}, opt) {
+        super(message, data, opt, 'TimeoutError');
+    }
 }
 /**
  * Decorates a Function with a timeout.

package/package.json

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

package/src/error/app.error.ts

@@ -17,12 +17,20 @@ export class AppError<DATA_TYPE extends ErrorData = ErrorData> extends Error {
    */
   override cause?: Error
 
-  constructor(message: string, data = {} as DATA_TYPE, opt?: ErrorOptions) {
+  constructor(message: string, data = {} as DATA_TYPE, opt?: ErrorOptions, name?: string) {
     super(message)
 
     Object.defineProperty(this, 'name', {
-      value: this.constructor.name,
+      value: name || this.constructor.name,
       configurable: true,
+      writable: true,
+    })
+
+    // this is to allow changing this.constuctor.name to a non-minified version
+    Object.defineProperty(this.constructor, 'name', {
+      value: name || this.constructor.name,
+      configurable: true,
+      writable: true,
     })
 
     Object.defineProperty(this, 'data', {

package/src/error/assert.ts

@@ -123,4 +123,8 @@ export function _assertTypeOf<T>(v: any, expectedType: string, message?: string)
   }
 }
 
-export class AssertionError extends AppError {}
+export class AssertionError extends AppError {
+  constructor(message: string, data = {}, opt?: ErrorOptions) {
+    super(message, data, opt, 'AssertionError')
+  }
+}

package/src/error/error.util.ts

@@ -105,6 +105,13 @@ export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE exte
   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', {

package/src/error/http.error.ts

@@ -8,6 +8,6 @@ export class HttpError<
   DATA_TYPE extends HttpErrorData = HttpErrorData,
 > extends AppError<DATA_TYPE> {
   constructor(message: string, data: DATA_TYPE, opt?: ErrorOptions) {
-    super(message, data, opt)
+    super(message, data, opt, 'HttpError')
   }
 }

package/src/http/fetcher.model.ts

@@ -79,7 +79,7 @@ export interface FetcherRetryOptions {
   timeoutMultiplier: number
 }
 
-export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers'> {
+export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers' | 'baseUrl'> {
   url: string
   init: RequestInitNormalized
   mode: FetcherMode
@@ -93,6 +93,9 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
 
 export interface FetcherOptions {
   method?: HttpMethod
+
+  baseUrl?: string
+
   throwHttpErrors?: boolean
   /**
    * Default: 30.

package/src/http/fetcher.ts

@@ -436,7 +436,6 @@ export class Fetcher {
 
   private normalizeOptions(url: string, opt: FetcherOptions): FetcherRequest {
     const {
-      baseUrl,
       timeoutSeconds,
       throwHttpErrors,
       retryPost,
@@ -475,6 +474,7 @@ export class Fetcher {
     }
 
     // setup url
+    const baseUrl = opt.baseUrl || this.cfg.baseUrl
     if (baseUrl) {
       if (url.startsWith('/')) {
         console.warn(`Fetcher: url should not start with / when baseUrl is specified`)

package/src/http/http.model.ts

@@ -1,3 +1,4 @@
+// Should be uppercase, because e.g this browser issue: https://github.com/axios/axios/issues/26
 export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD'
 
 export type HttpStatusFamily = 5 | 4 | 3 | 2 | 1

package/src/promise/pTimeout.ts

@@ -2,7 +2,11 @@ import { AppError } from '../error/app.error'
 import type { ErrorData } from '../error/error.model'
 import type { AnyAsyncFunction } from '../types'
 
-export class TimeoutError extends AppError {}
+export class TimeoutError extends AppError {
+  constructor(message: string, data = {}, opt?: ErrorOptions) {
+    super(message, data, opt, 'TimeoutError')
+  }
+}
 
 export interface PTimeoutOptions {
   /**