@naturalcycles/js-lib 14.155.1 → 14.157.0

package/dist/datetime/dateInterval.d.ts

@@ -1,4 +1,4 @@
-import type { Inclusiveness, LocalDateConfig, LocalDateUnit } from './localDate';
+import type { Inclusiveness, LocalDateInput, LocalDateUnit } from './localDate';
 import { LocalDate } from './localDate';
 export type DateIntervalConfig = DateInterval | DateIntervalString;
 export type DateIntervalString = string;
@@ -11,7 +11,7 @@ export declare class DateInterval {
     start: LocalDate;
     end: LocalDate;
     private constructor();
-    static of(start: LocalDateConfig, end: LocalDateConfig): DateInterval;
+    static of(start: LocalDateInput, end: LocalDateInput): DateInterval;
     /**
      * Parses string like `2022-02-24/2023-03-30` into a DateInterval.
      */
@@ -24,7 +24,7 @@ export declare class DateInterval {
     /**
      * Ranges of DateInterval (start, end) are INCLUSIVE.
      */
-    includes(d: LocalDateConfig, incl?: Inclusiveness): boolean;
+    includes(d: LocalDateInput, incl?: Inclusiveness): boolean;
     intersects(int: DateIntervalConfig, inclusive?: boolean): boolean;
     /**
      * DateIntervals compare by start date.

package/dist/datetime/localDate.d.ts

@@ -3,7 +3,7 @@ import { LocalTime } from './localTime';
 export type LocalDateUnit = LocalDateUnitStrict | 'week';
 export type LocalDateUnitStrict = 'year' | 'month' | 'day';
 export type Inclusiveness = '()' | '[]' | '[)' | '(]';
-export type LocalDateConfig = LocalDate | Date | IsoDateString;
+export type LocalDateInput = LocalDate | Date | IsoDateString;
 export type LocalDateFormatter = (ld: LocalDate) => string;
 /**
  * @experimental
@@ -18,23 +18,23 @@ export declare class LocalDate {
      * Parses input String into LocalDate.
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
-    static of(d: LocalDateConfig): LocalDate;
+    static of(d: LocalDateInput): LocalDate;
     static parseCompact(d: string): LocalDate;
     static fromDate(d: Date): LocalDate;
     static fromDateUTC(d: Date): LocalDate;
     /**
      * Returns null if invalid.
      */
-    static parseOrNull(d: LocalDateConfig | undefined | null): LocalDate | null;
+    static parseOrNull(d: LocalDateInput | undefined | null): LocalDate | null;
     static isValid(iso: string | undefined | null): boolean;
     static today(): LocalDate;
     static todayUTC(): LocalDate;
     static sort(items: LocalDate[], mutate?: boolean, descending?: boolean): LocalDate[];
-    static earliestOrUndefined(items: LocalDateConfig[]): LocalDate | undefined;
-    static earliest(items: LocalDateConfig[]): LocalDate;
-    static latestOrUndefined(items: LocalDateConfig[]): LocalDate | undefined;
-    static latest(items: LocalDateConfig[]): LocalDate;
-    static range(min: LocalDateConfig, max: LocalDateConfig, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
+    static earliestOrUndefined(items: LocalDateInput[]): LocalDate | undefined;
+    static earliest(items: LocalDateInput[]): LocalDate;
+    static latestOrUndefined(items: LocalDateInput[]): LocalDate | undefined;
+    static latest(items: LocalDateInput[]): LocalDate;
+    static range(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
     get(unit: LocalDateUnitStrict): number;
     set(unit: LocalDateUnitStrict, v: number, mutate?: boolean): LocalDate;
     year(): number;
@@ -43,28 +43,28 @@ export declare class LocalDate {
     month(v: number): LocalDate;
     day(): number;
     day(v: number): LocalDate;
-    isSame(d: LocalDateConfig): boolean;
-    isBefore(d: LocalDateConfig, inclusive?: boolean): boolean;
-    isSameOrBefore(d: LocalDateConfig): boolean;
-    isAfter(d: LocalDateConfig, inclusive?: boolean): boolean;
-    isSameOrAfter(d: LocalDateConfig): boolean;
-    isBetween(min: LocalDateConfig, max: LocalDateConfig, incl?: Inclusiveness): boolean;
+    isSame(d: LocalDateInput): boolean;
+    isBefore(d: LocalDateInput, inclusive?: boolean): boolean;
+    isSameOrBefore(d: LocalDateInput): boolean;
+    isAfter(d: LocalDateInput, inclusive?: boolean): boolean;
+    isSameOrAfter(d: LocalDateInput): boolean;
+    isBetween(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness): boolean;
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal
      * returns -1 if this < d
      */
-    cmp(d: LocalDateConfig): -1 | 0 | 1;
+    cmp(d: LocalDateInput): -1 | 0 | 1;
     /**
      * Same as Math.abs( diff )
      */
-    absDiff(d: LocalDateConfig, unit: LocalDateUnit): number;
+    absDiff(d: LocalDateInput, unit: LocalDateUnit): number;
     /**
      * Returns the number of **full** units difference (aka `Math.floor`).
      *
      * a.diff(b) means "a minus b"
      */
-    diff(d: LocalDateConfig, unit: LocalDateUnit): number;
+    diff(d: LocalDateInput, unit: LocalDateUnit): number;
     add(num: number, unit: LocalDateUnit, mutate?: boolean): LocalDate;
     subtract(num: number, unit: LocalDateUnit, mutate?: boolean): LocalDate;
     startOf(unit: LocalDateUnitStrict): LocalDate;
@@ -96,4 +96,4 @@ export declare class LocalDate {
 /**
  * Shortcut wrapper around `LocalDate.parse` / `LocalDate.today`
  */
-export declare function localDate(d?: LocalDateConfig): LocalDate;
+export declare function localDate(d?: LocalDateInput): LocalDate;

package/dist/datetime/localTime.d.ts

@@ -11,7 +11,7 @@ export declare enum ISODayOfWeek {
     SATURDAY = 6,
     SUNDAY = 7
 }
-export type LocalTimeConfig = LocalTime | Date | IsoDateTimeString | UnixTimestampNumber;
+export type LocalTimeInput = LocalTime | Date | IsoDateTimeString | UnixTimestampNumber;
 export type LocalTimeFormatter = (ld: LocalTime) => string;
 export interface LocalTimeComponents {
     year: number;
@@ -31,7 +31,7 @@ export declare class LocalTime {
      * Parses input String into LocalDate.
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
-    static of(d: LocalTimeConfig): LocalTime;
+    static of(d: LocalTimeInput): LocalTime;
     /**
      * Create LocalTime from unixTimestamp in milliseconds (not in seconds).
      */
@@ -39,10 +39,10 @@ export declare class LocalTime {
     /**
      * Returns null if invalid
      */
-    static parseOrNull(d: LocalTimeConfig | undefined | null): LocalTime | null;
-    static parseToDate(d: LocalTimeConfig): Date;
-    static parseToUnixTimestamp(d: LocalTimeConfig): UnixTimestampNumber;
-    static isValid(d: LocalTimeConfig | undefined | null): boolean;
+    static parseOrNull(d: LocalTimeInput | undefined | null): LocalTime | null;
+    static parseToDate(d: LocalTimeInput): Date;
+    static parseToUnixTimestamp(d: LocalTimeInput): UnixTimestampNumber;
+    static isValid(d: LocalTimeInput | undefined | null): boolean;
     static now(): LocalTime;
     static fromComponents(c: {
         year: number;
@@ -72,29 +72,29 @@ export declare class LocalTime {
     setComponents(c: Partial<LocalTimeComponents>, mutate?: boolean): LocalTime;
     add(num: number, unit: LocalTimeUnit, mutate?: boolean): LocalTime;
     subtract(num: number, unit: LocalTimeUnit, mutate?: boolean): LocalTime;
-    absDiff(other: LocalTimeConfig, unit: LocalTimeUnit): number;
-    diff(other: LocalTimeConfig, unit: LocalTimeUnit): number;
+    absDiff(other: LocalTimeInput, unit: LocalTimeUnit): number;
+    diff(other: LocalTimeInput, unit: LocalTimeUnit): number;
     startOf(unit: LocalTimeUnit, mutate?: boolean): LocalTime;
     endOf(unit: LocalTimeUnit, mutate?: boolean): LocalTime;
     static sort(items: LocalTime[], mutate?: boolean, descending?: boolean): LocalTime[];
-    static earliestOrUndefined(items: LocalTimeConfig[]): LocalTime | undefined;
-    static earliest(items: LocalTimeConfig[]): LocalTime;
-    static latestOrUndefined(items: LocalTimeConfig[]): LocalTime | undefined;
-    static latest(items: LocalTimeConfig[]): LocalTime;
-    isSame(d: LocalTimeConfig): boolean;
-    isBefore(d: LocalTimeConfig, inclusive?: boolean): boolean;
-    isSameOrBefore(d: LocalTimeConfig): boolean;
-    isAfter(d: LocalTimeConfig, inclusive?: boolean): boolean;
-    isSameOrAfter(d: LocalTimeConfig): boolean;
-    isBetween(min: LocalTimeConfig, max: LocalTimeConfig, incl?: Inclusiveness): boolean;
+    static earliestOrUndefined(items: LocalTimeInput[]): LocalTime | undefined;
+    static earliest(items: LocalTimeInput[]): LocalTime;
+    static latestOrUndefined(items: LocalTimeInput[]): LocalTime | undefined;
+    static latest(items: LocalTimeInput[]): LocalTime;
+    isSame(d: LocalTimeInput): boolean;
+    isBefore(d: LocalTimeInput, inclusive?: boolean): boolean;
+    isSameOrBefore(d: LocalTimeInput): boolean;
+    isAfter(d: LocalTimeInput, inclusive?: boolean): boolean;
+    isSameOrAfter(d: LocalTimeInput): boolean;
+    isBetween(min: LocalTimeInput, max: LocalTimeInput, incl?: Inclusiveness): boolean;
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal
      * returns -1 if this < d
      */
-    cmp(d: LocalTimeConfig): -1 | 0 | 1;
+    cmp(d: LocalTimeInput): -1 | 0 | 1;
     components(): LocalTimeComponents;
-    fromNow(now?: LocalTimeConfig): string;
+    fromNow(now?: LocalTimeInput): string;
     getDate(): Date;
     clone(): LocalTime;
     unix(): UnixTimestampNumber;
@@ -125,4 +125,4 @@ export declare class LocalTime {
 /**
  * Shortcut wrapper around `LocalDate.parse` / `LocalDate.today`
  */
-export declare function localTime(d?: LocalTimeConfig): LocalTime;
+export declare function localTime(d?: LocalTimeInput): LocalTime;

package/dist/datetime/timeInterval.d.ts

@@ -1,6 +1,6 @@
 import type { UnixTimestampNumber } from '../types';
 import type { Inclusiveness } from './localDate';
-import type { LocalTimeConfig } from './localTime';
+import type { LocalTimeInput } from './localTime';
 import { LocalTime } from './localTime';
 export type TimeIntervalConfig = TimeInterval | TimeIntervalString;
 export type TimeIntervalString = string;
@@ -14,7 +14,7 @@ export declare class TimeInterval {
     private $start;
     private $end;
     private constructor();
-    static of(start: LocalTimeConfig, end: LocalTimeConfig): TimeInterval;
+    static of(start: LocalTimeInput, end: LocalTimeInput): TimeInterval;
     get start(): UnixTimestampNumber;
     get end(): UnixTimestampNumber;
     get startTime(): LocalTime;
@@ -28,7 +28,7 @@ export declare class TimeInterval {
     isSameOrBefore(d: TimeIntervalConfig): boolean;
     isAfter(d: TimeIntervalConfig, inclusive?: boolean): boolean;
     isSameOrAfter(d: TimeIntervalConfig): boolean;
-    includes(d: LocalTimeConfig, incl?: Inclusiveness): boolean;
+    includes(d: LocalTimeInput, incl?: Inclusiveness): boolean;
     /**
      * TimeIntervals compare by start date.
      * If it's the same - then by end date.

package/dist/form.util.d.ts

@@ -0,0 +1,9 @@
+import type { AnyObject } from './types';
+/**
+ * Convert any object to FormData.
+ * Please note that every key and value of FormData is `string`.
+ * Even if you pass a number - it'll be converted to string.
+ * Think URLSearchParams.
+ */
+export declare function objectToFormData(obj?: AnyObject): FormData;
+export declare function formDataToObject<T extends AnyObject>(formData: FormData): T;

package/dist/form.util.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formDataToObject = exports.objectToFormData = void 0;
+/**
+ * Convert any object to FormData.
+ * Please note that every key and value of FormData is `string`.
+ * Even if you pass a number - it'll be converted to string.
+ * Think URLSearchParams.
+ */
+function objectToFormData(obj = {}) {
+    const fd = new FormData();
+    Object.entries(obj).forEach(([k, v]) => fd.append(k, v));
+    return fd;
+}
+exports.objectToFormData = objectToFormData;
+function formDataToObject(formData) {
+    return Object.fromEntries(formData);
+}
+exports.formDataToObject = formDataToObject;

package/dist/http/fetcher.d.ts

@@ -1,4 +1,5 @@
 /// <reference lib="dom" />
+/// <reference lib="dom.iterable" />
 import type { FetcherAfterResponseHook, FetcherBeforeRequestHook, FetcherBeforeRetryHook, FetcherCfg, FetcherNormalizedCfg, FetcherOptions, FetcherResponse } from './fetcher.model';
 /**
  * Experimental wrapper around Fetch.

package/dist/http/fetcher.js

@@ -1,5 +1,6 @@
 "use strict";
 /// <reference lib="dom"/>
+/// <reference lib="dom.iterable"/>
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFetcher = exports.Fetcher = void 0;
 const env_1 = require("../env");
@@ -13,6 +14,14 @@ const json_util_1 = require("../string/json.util");
 const stringifyAny_1 = require("../string/stringifyAny");
 const time_util_1 = require("../time/time.util");
 const http_model_1 = require("./http.model");
+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,
@@ -36,18 +45,18 @@ class Fetcher {
                 return await this.fetch({
                     url,
                     method,
-                    mode: 'void',
+                    responseType: 'void',
                     ...opt,
                 });
             };
             if (method === 'HEAD')
-                return // mode=text
+                return // responseType=text
                 ;
             this[`${m}Text`] = async (url, opt) => {
                 return await this.fetch({
                     url,
                     method,
-                    mode: 'text',
+                    responseType: 'text',
                     ...opt,
                 });
             };
@@ -55,7 +64,7 @@ class Fetcher {
                 return await this.fetch({
                     url,
                     method,
-                    mode: 'json',
+                    responseType: 'json',
                     ...opt,
                 });
             };
@@ -82,7 +91,7 @@ class Fetcher {
     static create(cfg = {}) {
         return new Fetcher(cfg);
     }
-    // mode=readableStream
+    // responseType=readableStream
     /**
      * Returns raw fetchResponse.body, which is a ReadableStream<Uint8Array>
      *
@@ -92,7 +101,7 @@ class Fetcher {
     async getReadableStream(url, opt) {
         return await this.fetch({
             url,
-            mode: 'readableStream',
+            responseType: 'readableStream',
             ...opt,
         });
     }
@@ -183,8 +192,8 @@ class Fetcher {
     }
     async onOkResponse(res, timeout) {
         const { req } = res;
-        const { mode } = res.req;
-        if (mode === 'json') {
+        const { responseType } = res.req;
+        if (responseType === 'json') {
             if (res.fetchResponse.body) {
                 const text = await res.fetchResponse.text();
                 if (text) {
@@ -218,16 +227,16 @@ class Fetcher {
                 res.body = {};
             }
         }
-        else if (mode === 'text') {
+        else if (responseType === 'text') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.text() : '';
         }
-        else if (mode === 'arrayBuffer') {
+        else if (responseType === 'arrayBuffer') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.arrayBuffer() : {};
         }
-        else if (mode === 'blob') {
+        else if (responseType === 'blob') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.blob() : {};
         }
-        else if (mode === 'readableStream') {
+        else if (responseType === 'readableStream') {
             res.body = res.fetchResponse.body;
             if (res.body === null) {
                 res.err = new Error(`fetchResponse.body is null`);
@@ -429,7 +438,7 @@ class Fetcher {
         const norm = (0, object_util_1._merge)({
             baseUrl: '',
             inputUrl: '',
-            mode: 'void',
+            responseType: 'void',
             searchParams: {},
             timeoutSeconds: 30,
             retryPost: false,
@@ -448,7 +457,10 @@ class Fetcher {
             retry: { ...defRetryOptions },
             init: {
                 method: cfg.method || 'GET',
-                headers: cfg.headers || {},
+                headers: {
+                    'user-agent': 'fetcher',
+                    ...cfg.headers,
+                },
                 credentials: cfg.credentials,
                 redirect: cfg.redirect,
             },
@@ -464,7 +476,7 @@ class Fetcher {
                 'retryPost',
                 'retry4xx',
                 'retry5xx',
-                'mode',
+                'responseType',
                 'jsonReviver',
                 'logRequest',
                 'logRequestBody',
@@ -514,9 +526,20 @@ class Fetcher {
             req.init.body = opt.text;
             req.init.headers['content-type'] = 'text/plain';
         }
+        else if (opt.form) {
+            if (opt.form instanceof URLSearchParams || opt.form instanceof FormData) {
+                req.init.body = opt.form;
+            }
+            else {
+                req.init.body = new URLSearchParams(opt.form);
+            }
+            req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
+        }
         else if (opt.body !== undefined) {
             req.init.body = opt.body;
         }
+        // Unless `accept` header was already set - set it based on responseType
+        req.init.headers['accept'] ||= acceptByResponseType[req.responseType];
         return req;
     }
 }

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

@@ -1,6 +1,6 @@
 import type { CommonLogger } from '../log/commonLogger';
 import type { Promisable } from '../typeFest';
-import type { Reviver, UnixTimestampMillisNumber } from '../types';
+import type { AnyObject, Reviver, UnixTimestampMillisNumber } from '../types';
 import type { HttpMethod, HttpStatusFamily } from './http.model';
 export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody' | 'redirect' | 'credentials'> {
     logger: CommonLogger;
@@ -88,7 +88,7 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
      */
     fullUrl: string;
     init: RequestInitNormalized;
-    mode: FetcherMode;
+    responseType: FetcherResponseType;
     timeoutSeconds: number;
     retry: FetcherRetryOptions;
     retryPost: boolean;
@@ -112,14 +112,29 @@ export interface FetcherOptions {
      * so both should finish within this single timeout (not each).
      */
     timeoutSeconds?: number;
-    json?: any;
-    text?: string;
     /**
      * Supports all the types that RequestInit.body supports.
      *
      * Useful when you want to e.g pass FormData.
      */
     body?: Blob | BufferSource | FormData | URLSearchParams | string;
+    /**
+     * Same as `body`, but also conveniently sets the
+     * Content-Type header to `text/plain`
+     */
+    text?: string;
+    /**
+     * Same as `body`, but:
+     * 1. JSON.stringifies the passed variable
+     * 2. Conveniently sets the Content-Type header to `application/json`
+     */
+    json?: any;
+    /**
+     * Same as `body`, but:
+     * 1. Transforms the passed plain js object into URLSearchParams and passes it to `body`
+     * 2. Conveniently sets the Content-Type header to `application/x-www-form-urlencoded`
+     */
+    form?: FormData | URLSearchParams | AnyObject;
     credentials?: RequestCredentials;
     /**
      * Default to 'follow'.
@@ -128,7 +143,7 @@ export interface FetcherOptions {
      */
     redirect?: RequestRedirect;
     headers?: Record<string, any>;
-    mode?: FetcherMode;
+    responseType?: FetcherResponseType;
     searchParams?: Record<string, any>;
     /**
      * Default is 2 retries (3 tries in total).
@@ -185,4 +200,4 @@ export interface FetcherErrorResponse<BODY = unknown> {
     signature: string;
 }
 export type FetcherResponse<BODY = unknown> = FetcherSuccessResponse<BODY> | FetcherErrorResponse<BODY>;
-export type FetcherMode = 'json' | 'text' | 'void' | 'arrayBuffer' | 'blob' | 'readableStream';
+export type FetcherResponseType = 'json' | 'text' | 'void' | 'arrayBuffer' | 'blob' | 'readableStream';

package/dist/index.d.ts

@@ -80,6 +80,7 @@ export * from './http/fetcher';
 export * from './http/fetcher.model';
 export * from './string/hash.util';
 export * from './env/buildInfo';
+export * from './form.util';
 export * from './zod/zod.util';
 export * from './zod/zod.shared.schemas';
 import { z, ZodSchema, ZodError, ZodIssue } from 'zod';

package/dist/index.js

@@ -84,6 +84,7 @@ tslib_1.__exportStar(require("./http/fetcher"), exports);
 tslib_1.__exportStar(require("./http/fetcher.model"), exports);
 tslib_1.__exportStar(require("./string/hash.util"), exports);
 tslib_1.__exportStar(require("./env/buildInfo"), exports);
+tslib_1.__exportStar(require("./form.util"), exports);
 tslib_1.__exportStar(require("./zod/zod.util"), exports);
 tslib_1.__exportStar(require("./zod/zod.shared.schemas"), exports);
 const zod_1 = require("zod");

package/dist-esm/form.util.js

@@ -0,0 +1,14 @@
+/**
+ * Convert any object to FormData.
+ * Please note that every key and value of FormData is `string`.
+ * Even if you pass a number - it'll be converted to string.
+ * Think URLSearchParams.
+ */
+export function objectToFormData(obj = {}) {
+    const fd = new FormData();
+    Object.entries(obj).forEach(([k, v]) => fd.append(k, v));
+    return fd;
+}
+export function formDataToObject(formData) {
+    return Object.fromEntries(formData);
+}

package/dist-esm/http/fetcher.js

@@ -1,4 +1,5 @@
 /// <reference lib="dom"/>
+/// <reference lib="dom.iterable"/>
 import { isServerSide } from '../env';
 import { _anyToError, _anyToErrorObject, _errorLikeToErrorObject } from '../error/error.util';
 import { HttpRequestError } from '../error/httpRequestError';
@@ -10,6 +11,14 @@ import { _jsonParse, _jsonParseIfPossible } from '../string/json.util';
 import { _stringifyAny } from '../string/stringifyAny';
 import { _since } from '../time/time.util';
 import { HTTP_METHODS } from './http.model';
+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,
@@ -31,18 +40,18 @@ export class Fetcher {
             const m = method.toLowerCase();
             this[`${m}Void`] = async (url, opt) => {
                 return await this.fetch(Object.assign({ url,
-                    method, mode: 'void' }, opt));
+                    method, responseType: 'void' }, opt));
             };
             if (method === 'HEAD')
-                return // mode=text
+                return // responseType=text
                 ;
             this[`${m}Text`] = async (url, opt) => {
                 return await this.fetch(Object.assign({ url,
-                    method, mode: 'text' }, opt));
+                    method, responseType: 'text' }, opt));
             };
             this[m] = async (url, opt) => {
                 return await this.fetch(Object.assign({ url,
-                    method, mode: 'json' }, opt));
+                    method, responseType: 'json' }, opt));
             };
         });
     }
@@ -70,7 +79,7 @@ export class Fetcher {
     static create(cfg = {}) {
         return new Fetcher(cfg);
     }
-    // mode=readableStream
+    // responseType=readableStream
     /**
      * Returns raw fetchResponse.body, which is a ReadableStream<Uint8Array>
      *
@@ -78,7 +87,7 @@ export class Fetcher {
      * https://css-tricks.com/web-streams-everywhere-and-fetch-for-node-js/
      */
     async getReadableStream(url, opt) {
-        return await this.fetch(Object.assign({ url, mode: 'readableStream' }, opt));
+        return await this.fetch(Object.assign({ url, responseType: 'readableStream' }, opt));
     }
     async fetch(opt) {
         const res = await this.doFetch(opt);
@@ -168,8 +177,8 @@ export class Fetcher {
     }
     async onOkResponse(res, timeout) {
         const { req } = res;
-        const { mode } = res.req;
-        if (mode === 'json') {
+        const { responseType } = res.req;
+        if (responseType === 'json') {
             if (res.fetchResponse.body) {
                 const text = await res.fetchResponse.text();
                 if (text) {
@@ -203,16 +212,16 @@ export class Fetcher {
                 res.body = {};
             }
         }
-        else if (mode === 'text') {
+        else if (responseType === 'text') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.text() : '';
         }
-        else if (mode === 'arrayBuffer') {
+        else if (responseType === 'arrayBuffer') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.arrayBuffer() : {};
         }
-        else if (mode === 'blob') {
+        else if (responseType === 'blob') {
             res.body = res.fetchResponse.body ? await res.fetchResponse.blob() : {};
         }
-        else if (mode === 'readableStream') {
+        else if (responseType === 'readableStream') {
             res.body = res.fetchResponse.body;
             if (res.body === null) {
                 res.err = new Error(`fetchResponse.body is null`);
@@ -419,7 +428,7 @@ export class Fetcher {
         const norm = _merge({
             baseUrl: '',
             inputUrl: '',
-            mode: 'void',
+            responseType: 'void',
             searchParams: {},
             timeoutSeconds: 30,
             retryPost: false,
@@ -438,7 +447,7 @@ export class Fetcher {
             retry: Object.assign({}, defRetryOptions),
             init: {
                 method: cfg.method || 'GET',
-                headers: cfg.headers || {},
+                headers: Object.assign({ 'user-agent': 'fetcher' }, cfg.headers),
                 credentials: cfg.credentials,
                 redirect: cfg.redirect,
             },
@@ -448,12 +457,13 @@ export class Fetcher {
         return norm;
     }
     normalizeOptions(opt) {
+        var _a;
         const req = Object.assign(Object.assign(Object.assign(Object.assign({}, _pick(this.cfg, [
             'timeoutSeconds',
             'retryPost',
             'retry4xx',
             'retry5xx',
-            'mode',
+            'responseType',
             'jsonReviver',
             'logRequest',
             'logRequestBody',
@@ -485,9 +495,20 @@ export class Fetcher {
             req.init.body = opt.text;
             req.init.headers['content-type'] = 'text/plain';
         }
+        else if (opt.form) {
+            if (opt.form instanceof URLSearchParams || opt.form instanceof FormData) {
+                req.init.body = opt.form;
+            }
+            else {
+                req.init.body = new URLSearchParams(opt.form);
+            }
+            req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
+        }
         else if (opt.body !== undefined) {
             req.init.body = opt.body;
         }
+        // Unless `accept` header was already set - set it based on responseType
+        (_a = req.init.headers)['accept'] || (_a['accept'] = acceptByResponseType[req.responseType]);
         return req;
     }
 }

package/dist-esm/index.js

@@ -80,6 +80,7 @@ export * from './http/fetcher';
 export * from './http/fetcher.model';
 export * from './string/hash.util';
 export * from './env/buildInfo';
+export * from './form.util';
 export * from './zod/zod.util';
 export * from './zod/zod.shared.schemas';
 import { z, ZodSchema, ZodError } from 'zod';