@naturalcycles/js-lib 14.156.0 → 14.157.0

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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.156.0",
+  "version": "14.157.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -21,7 +21,6 @@
     "crypto-js": "^4.1.1",
     "jest": "^29.0.0",
     "prettier": "^3.0.0",
-    "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",
     "vuepress-plugin-typescript": "^0.3.1"
   },

package/src/form.util.ts

@@ -0,0 +1,17 @@
+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 function objectToFormData(obj: AnyObject = {}): FormData {
+  const fd = new FormData()
+  Object.entries(obj).forEach(([k, v]) => fd.append(k, v))
+  return fd
+}
+
+export function formDataToObject<T extends AnyObject>(formData: FormData): T {
+  return Object.fromEntries(formData) as T
+}

package/src/http/fetcher.model.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
@@ -116,7 +116,7 @@ export interface FetcherRequest
    */
   fullUrl: string
   init: RequestInitNormalized
-  mode: FetcherMode
+  responseType: FetcherResponseType
   timeoutSeconds: number
   retry: FetcherRetryOptions
   retryPost: boolean
@@ -145,8 +145,6 @@ export interface FetcherOptions {
    */
   timeoutSeconds?: number
 
-  json?: any
-  text?: string
   /**
    * Supports all the types that RequestInit.body supports.
    *
@@ -154,6 +152,26 @@ export interface FetcherOptions {
    */
   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'.
@@ -167,7 +185,7 @@ export interface FetcherOptions {
   // init?: Partial<RequestInitNormalized>
 
   headers?: Record<string, any>
-  mode?: FetcherMode // default to 'void'
+  responseType?: FetcherResponseType // default to 'void'
 
   searchParams?: Record<string, any>
 
@@ -236,4 +254,10 @@ 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/src/http/fetcher.ts

@@ -1,4 +1,5 @@
 /// <reference lib="dom"/>
+/// <reference lib="dom.iterable"/>
 
 import { isServerSide } from '../env'
 import { ErrorLike, ErrorObject } from '../error/error.model'
@@ -28,11 +29,21 @@ import type {
   FetcherOptions,
   FetcherRequest,
   FetcherResponse,
+  FetcherResponseType,
   FetcherRetryOptions,
 } from './fetcher.model'
 import { HTTP_METHODS } from './http.model'
 import type { HttpStatusFamily } from './http.model'
 
+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,
@@ -56,32 +67,32 @@ export class Fetcher {
     HTTP_METHODS.forEach(method => {
       const m = method.toLowerCase()
 
-      // mode=void
+      // responseType=void
       ;(this as any)[`${m}Void`] = async (url: string, opt?: FetcherOptions): Promise<void> => {
         return await this.fetch<void>({
           url,
           method,
-          mode: 'void',
+          responseType: 'void',
           ...opt,
         })
       }
 
-      if (method === 'HEAD') return // mode=text
+      if (method === 'HEAD') return // responseType=text
       ;(this as any)[`${m}Text`] = async (url: string, opt?: FetcherOptions): Promise<string> => {
         return await this.fetch<string>({
           url,
           method,
-          mode: 'text',
+          responseType: 'text',
           ...opt,
         })
       }
 
-      // Default mode=json, but overridable
+      // Default responseType=json, but overridable
       ;(this as any)[m] = async <T = unknown>(url: string, opt?: FetcherOptions): Promise<T> => {
         return await this.fetch<T>({
           url,
           method,
-          mode: 'json',
+          responseType: 'json',
           ...opt,
         })
       }
@@ -113,21 +124,21 @@ export class Fetcher {
   }
 
   // These methods are generated dynamically in the constructor
-  // These default methods use mode=json
+  // These default methods use responseType=json
   get!: <T = unknown>(url: string, opt?: FetcherOptions) => Promise<T>
   post!: <T = unknown>(url: string, opt?: FetcherOptions) => Promise<T>
   put!: <T = unknown>(url: string, opt?: FetcherOptions) => Promise<T>
   patch!: <T = unknown>(url: string, opt?: FetcherOptions) => Promise<T>
   delete!: <T = unknown>(url: string, opt?: FetcherOptions) => Promise<T>
 
-  // mode=text
+  // responseType=text
   getText!: (url: string, opt?: FetcherOptions) => Promise<string>
   postText!: (url: string, opt?: FetcherOptions) => Promise<string>
   putText!: (url: string, opt?: FetcherOptions) => Promise<string>
   patchText!: (url: string, opt?: FetcherOptions) => Promise<string>
   deleteText!: (url: string, opt?: FetcherOptions) => Promise<string>
 
-  // mode=void (no body fetching/parsing)
+  // responseType=void (no body fetching/parsing)
   getVoid!: (url: string, opt?: FetcherOptions) => Promise<void>
   postVoid!: (url: string, opt?: FetcherOptions) => Promise<void>
   putVoid!: (url: string, opt?: FetcherOptions) => Promise<void>
@@ -135,7 +146,7 @@ export class Fetcher {
   deleteVoid!: (url: string, opt?: FetcherOptions) => Promise<void>
   headVoid!: (url: string, opt?: FetcherOptions) => Promise<void>
 
-  // mode=readableStream
+  // responseType=readableStream
   /**
    * Returns raw fetchResponse.body, which is a ReadableStream<Uint8Array>
    *
@@ -145,7 +156,7 @@ export class Fetcher {
   async getReadableStream(url: string, opt?: FetcherOptions): Promise<ReadableStream<Uint8Array>> {
     return await this.fetch({
       url,
-      mode: 'readableStream',
+      responseType: 'readableStream',
       ...opt,
     })
   }
@@ -255,9 +266,9 @@ export class Fetcher {
     timeout?: number,
   ): Promise<void> {
     const { req } = res
-    const { mode } = res.req
+    const { responseType } = res.req
 
-    if (mode === 'json') {
+    if (responseType === 'json') {
       if (res.fetchResponse.body) {
         const text = await res.fetchResponse.text()
 
@@ -289,13 +300,13 @@ export class Fetcher {
         // do not throw a "cannot parse null as Json" error
         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) {
@@ -531,7 +542,7 @@ export class Fetcher {
       {
         baseUrl: '',
         inputUrl: '',
-        mode: 'void',
+        responseType: 'void',
         searchParams: {},
         timeoutSeconds: 30,
         retryPost: false,
@@ -550,7 +561,10 @@ export class Fetcher {
         retry: { ...defRetryOptions },
         init: {
           method: cfg.method || 'GET',
-          headers: cfg.headers || {},
+          headers: {
+            'user-agent': 'fetcher',
+            ...cfg.headers,
+          },
           credentials: cfg.credentials,
           redirect: cfg.redirect,
         },
@@ -571,7 +585,7 @@ export class Fetcher {
         'retryPost',
         'retry4xx',
         'retry5xx',
-        'mode',
+        'responseType',
         'jsonReviver',
         'logRequest',
         'logRequestBody',
@@ -625,10 +639,21 @@ export class Fetcher {
     } else if (opt.text !== undefined) {
       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/src/index.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'