@naturalcycles/js-lib 14.132.0 → 14.133.0

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-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/package.json

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

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