@marianmeres/http-utils 2.3.0 → 2.5.0

package/dist/api.d.ts

@@ -10,7 +10,7 @@
  */
 export type RequestData = Record<string, unknown> | FormData | string | null;
 interface BaseParams {
-    method: 'GET' | 'POST' | 'PATCH' | 'DELETE' | 'PUT';
+    method: "GET" | "POST" | "PATCH" | "DELETE" | "PUT";
     path: string;
 }
 /**
@@ -22,11 +22,11 @@ export interface FetchParams {
     /** Bearer token (auto-adds `Authorization: Bearer {token}` header). */
     token?: string | null;
     /** Custom request headers. */
-    headers?: Record<string, string> | null;
+    headers?: HeadersInit | Record<string, string> | null;
     /** AbortSignal for request cancellation. */
     signal?: AbortSignal;
     /** Credentials mode for the request. */
-    credentials?: 'omit' | 'same-origin' | 'include' | null;
+    credentials?: "omit" | "same-origin" | "include" | null;
     /** If true, returns the raw Response object instead of parsed body. */
     raw?: boolean | null;
     /** If false, does not throw on HTTP errors (default: true). */

package/dist/api.js

@@ -4,14 +4,14 @@
  * HTTP API client factory and related types.
  * Provides a convenient wrapper over the native `fetch` API with sensible defaults.
  */
-import { createHttpError } from './error.js';
+import { createHttpError } from "./error.js";
 /**
  * Deep merges two objects. Later properties overwrite earlier properties.
  */
 function deepMerge(target, source) {
     const output = { ...target };
     if (isObject(target) && isObject(source)) {
-        Object.keys(source).forEach(key => {
+        Object.keys(source).forEach((key) => {
             const sourceVal = source[key];
             const targetVal = target[key];
             if (isObject(sourceVal)) {
@@ -30,10 +30,10 @@ function deepMerge(target, source) {
     return output;
 }
 function isObject(item) {
-    return item !== null && typeof item === 'object' && !Array.isArray(item);
+    return item !== null && typeof item === "object" && !Array.isArray(item);
 }
 /** Symbol marker for explicit options API detection. */
-const OPTIONS_MARKER = Symbol('options');
+const OPTIONS_MARKER = Symbol("options");
 /**
  * Marks an options object for the new options API.
  * Use this to explicitly indicate you're using the options-based API.
@@ -75,7 +75,7 @@ function parseGetOptions(paramsOrOptions, legacyRespHeaders, legacyErrorExtracto
  */
 function parseDataOptions(dataOrOptions, legacyParams, legacyRespHeaders, legacyErrorExtractor) {
     if (dataOrOptions &&
-        typeof dataOrOptions === 'object' &&
+        typeof dataOrOptions === "object" &&
         OPTIONS_MARKER in dataOrOptions) {
         // New options API (explicit via opts() wrapper)
         const o = dataOrOptions;
@@ -95,15 +95,20 @@ function parseDataOptions(dataOrOptions, legacyParams, legacyRespHeaders, legacy
     };
 }
 const _fetchRaw = async ({ method, path, data = null, token = null, headers = null, signal, credentials, }) => {
-    const normalizedHeaders = Object.entries(headers || {}).reduce((m, [k, v]) => ({ ...m, [k.toLowerCase()]: v }), {});
+    const normalizedHeaders = {};
+    if (headers) {
+        new Headers(headers).forEach((value, key) => {
+            normalizedHeaders[key] = value;
+        });
+    }
     const opts = {
         method,
         credentials: credentials ?? undefined,
         headers: normalizedHeaders,
-        signal
+        signal,
     };
     if (data) {
-        const isObj = typeof data === 'object';
+        const isObj = typeof data === "object";
         // FormData: multipart/form-data -- no explicit Content-Type
         if (data instanceof FormData) {
             opts.body = data;
@@ -111,15 +116,15 @@ const _fetchRaw = async ({ method, path, data = null, token = null, headers = nu
         // Cover 99% of use cases (may not fit all scenarios)
         else {
             // If not explicitly stated, assume JSON
-            if (isObj || !normalizedHeaders['content-type']) {
-                normalizedHeaders['content-type'] = 'application/json';
+            if (isObj || !normalizedHeaders["content-type"]) {
+                normalizedHeaders["content-type"] = "application/json";
             }
             opts.body = JSON.stringify(data);
         }
     }
     // Opinionated convention: auto-add Bearer token
     if (token) {
-        normalizedHeaders['authorization'] = `Bearer ${token}`;
+        normalizedHeaders["authorization"] = `Bearer ${token}`;
     }
     opts.headers = normalizedHeaders;
     return await fetch(path, opts);
@@ -159,7 +164,7 @@ const _fetch = async (params, respHeaders = null, errorMessageExtractor = null,
                     b?.message ||
                     b?.error ||
                     _response?.statusText ||
-                    'Unknown error');
+                    "Unknown error");
                 if (msg.length > 255)
                     msg = `[Shortened]: ${msg.slice(0, 255)}`;
                 return msg;
@@ -188,45 +193,72 @@ export class HttpApi {
         this.#base = base;
         this.#defaults = defaults;
         this.#factoryErrorMessageExtractor = factoryErrorMessageExtractor;
+        // Bind methods for destructuring support
+        this.get = this.get.bind(this);
+        this.post = this.post.bind(this);
+        this.put = this.put.bind(this);
+        this.patch = this.patch.bind(this);
+        this.del = this.del.bind(this);
+        this.url = this.url.bind(this);
     }
     #merge(a, b) {
         return deepMerge(a, b);
     }
     async #getDefs() {
-        if (typeof this.#defaults === 'function') {
+        if (typeof this.#defaults === "function") {
             return { ...(await this.#defaults()) };
         }
         return { ...(this.#defaults || {}) };
     }
     #buildPath(path, base) {
-        base = `${base || ''}`;
-        path = `${path || ''}`;
+        base = `${base || ""}`;
+        path = `${path || ""}`;
         return /^https?:/.test(path) ? path : base + path;
     }
     async get(path, paramsOrOptions, respHeaders, errorMessageExtractor, _dumpParams = false) {
-        const { params, respHeaders: headers, errorExtractor } = parseGetOptions(paramsOrOptions, respHeaders, errorMessageExtractor);
+        const { params, respHeaders: headers, errorExtractor, } = parseGetOptions(paramsOrOptions, respHeaders, errorMessageExtractor);
         path = this.#buildPath(path, this.#base);
-        return _fetch(this.#merge(await this.#getDefs(), { ...params, method: 'GET', path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
+        return _fetch(this.#merge(await this.#getDefs(), { ...params, method: "GET", path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
     }
     async post(path, dataOrOptions, params, respHeaders, errorMessageExtractor, _dumpParams = false) {
-        const { data, params: fetchParams, respHeaders: headers, errorExtractor } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
+        const { data, params: fetchParams, respHeaders: headers, errorExtractor, } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
         path = this.#buildPath(path, this.#base);
-        return _fetch(this.#merge(await this.#getDefs(), { ...(fetchParams || {}), data, method: 'POST', path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
+        return _fetch(this.#merge(await this.#getDefs(), {
+            ...(fetchParams || {}),
+            data,
+            method: "POST",
+            path,
+        }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
     }
     async put(path, dataOrOptions, params, respHeaders, errorMessageExtractor, _dumpParams = false) {
-        const { data, params: fetchParams, respHeaders: headers, errorExtractor } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
+        const { data, params: fetchParams, respHeaders: headers, errorExtractor, } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
         path = this.#buildPath(path, this.#base);
-        return _fetch(this.#merge(await this.#getDefs(), { ...(fetchParams || {}), data, method: 'PUT', path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
+        return _fetch(this.#merge(await this.#getDefs(), {
+            ...(fetchParams || {}),
+            data,
+            method: "PUT",
+            path,
+        }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
     }
     async patch(path, dataOrOptions, params, respHeaders, errorMessageExtractor, _dumpParams = false) {
-        const { data, params: fetchParams, respHeaders: headers, errorExtractor } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
+        const { data, params: fetchParams, respHeaders: headers, errorExtractor, } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
         path = this.#buildPath(path, this.#base);
-        return _fetch(this.#merge(await this.#getDefs(), { ...(fetchParams || {}), data, method: 'PATCH', path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
+        return _fetch(this.#merge(await this.#getDefs(), {
+            ...(fetchParams || {}),
+            data,
+            method: "PATCH",
+            path,
+        }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
     }
     async del(path, dataOrOptions, params, respHeaders, errorMessageExtractor, _dumpParams = false) {
-        const { data, params: fetchParams, respHeaders: headers, errorExtractor } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
+        const { data, params: fetchParams, respHeaders: headers, errorExtractor, } = parseDataOptions(dataOrOptions, params, respHeaders, errorMessageExtractor);
         path = this.#buildPath(path, this.#base);
-        return _fetch(this.#merge(await this.#getDefs(), { ...(fetchParams || {}), data, method: 'DELETE', path }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
+        return _fetch(this.#merge(await this.#getDefs(), {
+            ...(fetchParams || {}),
+            data,
+            method: "DELETE",
+            path,
+        }), headers, errorExtractor ?? this.#factoryErrorMessageExtractor, _dumpParams);
     }
     /**
      * Helper method to build the full URL from a path.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@marianmeres/http-utils",
-	"version": "2.3.0",
+	"version": "2.5.0",
 	"type": "module",
 	"main": "dist/mod.js",
 	"types": "dist/mod.d.ts",