@naturalcycles/js-lib 15.39.0 → 15.40.1

package/dist/http/fetcher.d.ts

@@ -16,8 +16,12 @@ export declare class Fetcher {
      *
      * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
      */
-    static readonly VERSION = 2;
-    static readonly userAgent: string | undefined;
+    static readonly VERSION = 3;
+    /**
+     * userAgent is statically exposed as Fetcher.userAgent.
+     * It can be modified globally, and will be used (read) at the start of every request.
+     */
+    static userAgent: string | undefined;
     private constructor();
     /**
      * Add BeforeRequest hook at the end of the hooks list.

package/dist/http/fetcher.js

@@ -12,20 +12,6 @@ import { pTimeout } from '../promise/pTimeout.js';
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util.js';
 import { _stringify } from '../string/stringify.js';
 import { HTTP_METHODS } from './http.model.js';
-const acceptByResponseType = {
-    text: 'text/plain',
-    json: 'application/json',
-    void: '*/*',
-    readableStream: 'application/octet-stream',
-    arrayBuffer: 'application/octet-stream',
-    blob: 'application/octet-stream',
-};
-const defRetryOptions = {
-    count: 2,
-    timeout: 1000,
-    timeoutMax: 30_000,
-    timeoutMultiplier: 2,
-};
 /**
  * Experimental wrapper around Fetch.
  * Works in both Browser and Node, using `globalThis.fetch`.
@@ -37,7 +23,11 @@ export class Fetcher {
      *
      * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
      */
-    static VERSION = 2;
+    static VERSION = 3;
+    /**
+     * userAgent is statically exposed as Fetcher.userAgent.
+     * It can be modified globally, and will be used (read) at the start of every request.
+     */
     static userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined;
     constructor(cfg = {}) {
         if (typeof globalThis.fetch !== 'function') {
@@ -614,7 +604,7 @@ export class Fetcher {
             logResponseBody: debug,
             logWithBaseUrl: isServerSide(),
             logWithSearchParams: true,
-            retry: { ...defRetryOptions },
+            retry: { ...defaultRetryOptions },
             init: {
                 method: cfg.method || 'GET',
                 headers: _filterNullishValues({
@@ -659,7 +649,10 @@ export class Fetcher {
             },
             init: _merge({
                 ...this.cfg.init,
-                headers: { ...this.cfg.init.headers }, // this avoids mutation
+                headers: {
+                    ...this.cfg.init.headers, // this avoids mutation
+                    'user-agent': Fetcher.userAgent, // re-load it here, to support setting it globally post-fetcher-creation
+                },
                 method: opt.method || this.cfg.init.method,
                 credentials: opt.credentials || this.cfg.init.credentials,
                 redirect: opt.redirect || this.cfg.init.redirect || 'follow',
@@ -716,3 +709,17 @@ export class Fetcher {
 export function getFetcher(cfg = {}) {
     return Fetcher.create(cfg);
 }
+const acceptByResponseType = {
+    text: 'text/plain',
+    json: 'application/json',
+    void: '*/*',
+    readableStream: 'application/octet-stream',
+    arrayBuffer: 'application/octet-stream',
+    blob: 'application/octet-stream',
+};
+const defaultRetryOptions = {
+    count: 2,
+    timeout: 1000,
+    timeoutMax: 30_000,
+    timeoutMultiplier: 2,
+};

package/dist/object/map2.d.ts

@@ -10,6 +10,10 @@ export declare class Map2<K = any, V = any> extends Map<K, V> {
      * Convenience way to create Map2 from object.
      */
     static of<V>(obj: Record<any, V>): Map2<string, V>;
+    /**
+     * Allows to set multiple key-value pairs at once.
+     */
+    setMany(obj: Record<any, V>): this;
     toObject(): Record<string, V>;
     toJSON(): Record<string, V>;
 }

package/dist/object/map2.js

@@ -12,6 +12,15 @@ export class Map2 extends Map {
     static of(obj) {
         return new Map2(Object.entries(obj));
     }
+    /**
+     * Allows to set multiple key-value pairs at once.
+     */
+    setMany(obj) {
+        for (const [k, v] of Object.entries(obj)) {
+            this.set(k, v);
+        }
+        return this;
+    }
     toObject() {
         return Object.fromEntries(this);
     }

package/dist/object/set2.d.ts

@@ -6,6 +6,11 @@
  * @experimental
  */
 export declare class Set2<T = any> extends Set<T> {
+    /**
+     * Like .add(), but allows to add multiple items at once.
+     * Mutates the Set, but also returns it conveniently.
+     */
+    addMany(items: Iterable<T>): this;
     toArray(): T[];
     toJSON(): T[];
 }

package/dist/object/set2.js

@@ -6,6 +6,16 @@
  * @experimental
  */
 export class Set2 extends Set {
+    /**
+     * Like .add(), but allows to add multiple items at once.
+     * Mutates the Set, but also returns it conveniently.
+     */
+    addMany(items) {
+        for (const item of items) {
+            this.add(item);
+        }
+        return this;
+    }
     toArray() {
         return [...this];
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.39.0",
+  "version": "15.40.1",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",

package/src/http/fetcher.ts

@@ -56,22 +56,6 @@ import type {
 import type { HttpStatusFamily } from './http.model.js'
 import { HTTP_METHODS } from './http.model.js'
 
-const acceptByResponseType: Record<FetcherResponseType, string> = {
-  text: 'text/plain',
-  json: 'application/json',
-  void: '*/*',
-  readableStream: 'application/octet-stream',
-  arrayBuffer: 'application/octet-stream',
-  blob: 'application/octet-stream',
-}
-
-const defRetryOptions: FetcherRetryOptions = {
-  count: 2,
-  timeout: 1000,
-  timeoutMax: 30_000,
-  timeoutMultiplier: 2,
-}
-
 /**
  * Experimental wrapper around Fetch.
  * Works in both Browser and Node, using `globalThis.fetch`.
@@ -83,8 +67,12 @@ export class Fetcher {
    *
    * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
    */
-  static readonly VERSION = 2
-  static readonly userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined
+  static readonly VERSION = 3
+  /**
+   * userAgent is statically exposed as Fetcher.userAgent.
+   * It can be modified globally, and will be used (read) at the start of every request.
+   */
+  static userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined
 
   private constructor(cfg: FetcherCfg & FetcherOptions = {}) {
     if (typeof globalThis.fetch !== 'function') {
@@ -750,7 +738,7 @@ export class Fetcher {
         logResponseBody: debug,
         logWithBaseUrl: isServerSide(),
         logWithSearchParams: true,
-        retry: { ...defRetryOptions },
+        retry: { ...defaultRetryOptions },
         init: {
           method: cfg.method || 'GET',
           headers: _filterNullishValues({
@@ -801,7 +789,10 @@ export class Fetcher {
       init: _merge(
         {
           ...this.cfg.init,
-          headers: { ...this.cfg.init.headers }, // this avoids mutation
+          headers: {
+            ...this.cfg.init.headers, // this avoids mutation
+            'user-agent': Fetcher.userAgent, // re-load it here, to support setting it globally post-fetcher-creation
+          },
           method: opt.method || this.cfg.init.method,
           credentials: opt.credentials || this.cfg.init.credentials,
           redirect: opt.redirect || this.cfg.init.redirect || 'follow',
@@ -864,3 +855,19 @@ export class Fetcher {
 export function getFetcher(cfg: FetcherCfg & FetcherOptions = {}): Fetcher {
   return Fetcher.create(cfg)
 }
+
+const acceptByResponseType: Record<FetcherResponseType, string> = {
+  text: 'text/plain',
+  json: 'application/json',
+  void: '*/*',
+  readableStream: 'application/octet-stream',
+  arrayBuffer: 'application/octet-stream',
+  blob: 'application/octet-stream',
+}
+
+const defaultRetryOptions: FetcherRetryOptions = {
+  count: 2,
+  timeout: 1000,
+  timeoutMax: 30_000,
+  timeoutMultiplier: 2,
+}

package/src/object/map2.ts

@@ -13,6 +13,16 @@ export class Map2<K = any, V = any> extends Map<K, V> {
     return new Map2(Object.entries(obj))
   }
 
+  /**
+   * Allows to set multiple key-value pairs at once.
+   */
+  setMany(obj: Record<any, V>): this {
+    for (const [k, v] of Object.entries(obj)) {
+      this.set(k as K, v)
+    }
+    return this
+  }
+
   toObject(): Record<string, V> {
     return Object.fromEntries(this)
   }

package/src/object/set2.ts

@@ -6,6 +6,17 @@
  * @experimental
  */
 export class Set2<T = any> extends Set<T> {
+  /**
+   * Like .add(), but allows to add multiple items at once.
+   * Mutates the Set, but also returns it conveniently.
+   */
+  addMany(items: Iterable<T>): this {
+    for (const item of items) {
+      this.add(item)
+    }
+    return this
+  }
+
   toArray(): T[] {
     return [...this]
   }