@ahoo-wang/fetcher 1.5.0 → 1.5.1

package/dist/index.es.js

@@ -1,27 +1,27 @@
 function F(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
-function C(r, t) {
-  return F(t) ? t : t ? r.replace(/\/?\/$/, "") + "/" + t.replace(/^\/+/, "") : r;
+function C(r, e) {
+  return F(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.replace(/^\/+/, "") : r;
 }
 var U = /* @__PURE__ */ ((r) => (r[r.UriTemplate = 0] = "UriTemplate", r[r.Express = 1] = "Express", r))(U || {});
 function D(r) {
   return r === 1 ? v : L;
 }
-function q(r, t, e) {
-  return e ? r.replace(t, (s, n) => {
-    const o = e[n];
-    if (o === void 0)
-      throw new Error(`Missing required path parameter: ${n}`);
-    return encodeURIComponent(o);
+function q(r, e, t) {
+  return t ? r.replace(e, (s, o) => {
+    const n = t[o];
+    if (n === void 0)
+      throw new Error(`Missing required path parameter: ${o}`);
+    return encodeURIComponent(n);
   }) : r;
 }
-function w(r, t) {
-  const e = [];
+function w(r, e) {
+  const t = [];
   let s;
-  for (; (s = t.exec(r)) !== null; )
-    e.push(s[1]);
-  return e;
+  for (; (s = e.exec(r)) !== null; )
+    t.push(s[1]);
+  return t;
 }
 const c = class c {
   /**
@@ -47,9 +47,9 @@ const c = class c {
    * // noParams = []
    * ```
    */
-  extractPathParams(t) {
+  extractPathParams(e) {
     return w(
-      t,
+      e,
       c.PATH_PARAM_REGEX
     );
   }
@@ -89,17 +89,17 @@ const c = class c {
    * }
    * ```
    */
-  resolve(t, e) {
+  resolve(e, t) {
     return q(
-      t,
+      e,
       c.PATH_PARAM_REGEX,
-      e
+      t
     );
   }
 };
 c.PATH_PARAM_REGEX = /{([^}]+)}/g;
-let f = c;
-const L = new f(), h = class h {
+let P = c;
+const L = new P(), h = class h {
   /**
    * Extracts path parameters from an Express-style URL string.
    *
@@ -119,9 +119,9 @@ const L = new f(), h = class h {
    * // noParams = []
    * ```
    */
-  extractPathParams(t) {
+  extractPathParams(e) {
     return w(
-      t,
+      e,
       h.PATH_PARAM_REGEX
     );
   }
@@ -157,18 +157,18 @@ const L = new f(), h = class h {
    * }
    * ```
    */
-  resolve(t, e) {
+  resolve(e, t) {
     return q(
-      t,
+      e,
       h.PATH_PARAM_REGEX,
-      e
+      t
     );
   }
 };
 h.PATH_PARAM_REGEX = /:([^/]+)/g;
-let P = h;
-const v = new P();
-class x {
+let A = h;
+const v = new A();
+class G {
   /**
    * Initializes a new UrlBuilder instance.
    *
@@ -186,8 +186,8 @@ class x {
    * const expressUrlBuilder = new UrlBuilder('https://api.example.com', UrlTemplateStyle.Express);
    * ```
    */
-  constructor(t, e) {
-    this.baseURL = t, this.urlTemplateResolver = D(e);
+  constructor(e, t) {
+    this.baseURL = e, this.urlTemplateResolver = D(t);
   }
   /**
    * Builds a complete URL, including path parameter replacement and query parameter addition.
@@ -207,11 +207,11 @@ class x {
    * // Result: https://api.example.com/users/123/posts/456?filter=active&limit=10
    * ```
    */
-  build(t, e) {
-    const s = e?.path, n = e?.query, o = C(this.baseURL, t);
-    let u = this.urlTemplateResolver.resolve(o, s);
-    if (n) {
-      const a = new URLSearchParams(n).toString();
+  build(e, t) {
+    const s = t?.path, o = t?.query, n = C(this.baseURL, e);
+    let u = this.urlTemplateResolver.resolve(n, s);
+    if (o) {
+      const a = new URLSearchParams(o).toString();
       a && (u += "?" + a);
     }
     return u;
@@ -225,8 +225,8 @@ class x {
    * @param request - The FetchRequest containing URL and URL parameters
    * @returns Complete resolved URL string
    */
-  resolveRequestUrl(t) {
-    return this.build(t.url, t.urlParams);
+  resolveRequestUrl(e) {
+    return this.build(e.url, e.urlParams);
   }
 }
 class l extends Error {
@@ -236,9 +236,9 @@ class l extends Error {
    * @param errorMsg - Optional error message. If not provided, will use the cause's message or a default message.
    * @param cause - Optional underlying error that caused this error.
    */
-  constructor(t, e) {
-    const s = t || e?.message || "An error occurred in the fetcher";
-    super(s), this.cause = e, this.name = "FetcherError", e?.stack && (this.stack = e.stack), Object.setPrototypeOf(this, l.prototype);
+  constructor(e, t) {
+    const s = e || t?.message || "An error occurred in the fetcher";
+    super(s), this.cause = t, this.name = "FetcherError", t?.stack && (this.stack = t.stack), Object.setPrototypeOf(this, l.prototype);
   }
 }
 class I extends l {
@@ -247,34 +247,34 @@ class I extends l {
    *
    * @param request - The request options that timed out
    */
-  constructor(t) {
-    const e = t.method || "GET", s = `Request timeout of ${t.timeout}ms exceeded for ${e} ${t.url}`;
-    super(s), this.name = "FetchTimeoutError", this.request = t, Object.setPrototypeOf(this, I.prototype);
+  constructor(e) {
+    const t = e.method || "GET", s = `Request timeout of ${e.timeout}ms exceeded for ${t} ${e.url}`;
+    super(s), this.name = "FetchTimeoutError", this.request = e, Object.setPrototypeOf(this, I.prototype);
   }
 }
-function G(r, t) {
-  return typeof r < "u" ? r : t;
+function M(r, e) {
+  return typeof r < "u" ? r : e;
 }
-async function M(r) {
-  const t = r.url, e = r.timeout, s = r;
+async function x(r) {
+  const e = r.url, t = r.timeout, s = r;
   if (r.signal)
-    return fetch(t, s);
-  if (!e)
-    return r.abortController && (s.signal = r.abortController.signal), fetch(t, s);
-  const n = r.abortController ?? new AbortController();
-  s.signal = n.signal;
-  let o = null;
+    return fetch(e, s);
+  if (!t)
+    return r.abortController && (s.signal = r.abortController.signal), fetch(e, s);
+  const o = r.abortController ?? new AbortController();
+  s.signal = o.signal;
+  let n = null;
   const u = new Promise((a, p) => {
-    o = setTimeout(() => {
-      o && clearTimeout(o);
-      const b = new I(r);
-      n.abort(b), p(b);
-    }, e);
+    n = setTimeout(() => {
+      n && clearTimeout(n);
+      const O = new I(r);
+      o.abort(O), p(O);
+    }, t);
   });
   try {
-    return await Promise.race([fetch(t, s), u]);
+    return await Promise.race([fetch(e, s), u]);
   } finally {
-    o && clearTimeout(o);
+    n && clearTimeout(n);
   }
 }
 const H = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
@@ -287,13 +287,13 @@ class j {
    *
    * @param exchange - The fetch exchange containing the request information
    */
-  intercept(t) {
-    const e = t.request;
-    e.url = t.fetcher.urlBuilder.resolveRequestUrl(e);
+  intercept(e) {
+    const t = e.request;
+    t.url = e.fetcher.urlBuilder.resolveRequestUrl(t);
   }
 }
 var i = /* @__PURE__ */ ((r) => (r.GET = "GET", r.POST = "POST", r.PUT = "PUT", r.DELETE = "DELETE", r.PATCH = "PATCH", r.HEAD = "HEAD", r.OPTIONS = "OPTIONS", r))(i || {});
-const at = "Content-Type", d = class d {
+const ae = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
 let E = d;
@@ -339,13 +339,13 @@ class X {
    * // exchange.request.body will be '{"name":"John","age":30}'
    * // exchange.request.headers will include 'Content-Type: application/json'
    */
-  intercept(t) {
-    const e = t.request;
-    if (e.body === void 0 || e.body === null || typeof e.body != "object" || e.body instanceof ArrayBuffer || ArrayBuffer.isView(e.body) || // Includes TypedArray and DataView
-    e.body instanceof Blob || e.body instanceof File || e.body instanceof URLSearchParams || e.body instanceof FormData || e.body instanceof ReadableStream)
+  intercept(e) {
+    const t = e.request;
+    if (t.body === void 0 || t.body === null || typeof t.body != "object" || t.body instanceof ArrayBuffer || ArrayBuffer.isView(t.body) || // Includes TypedArray and DataView
+    t.body instanceof Blob || t.body instanceof File || t.body instanceof URLSearchParams || t.body instanceof FormData || t.body instanceof ReadableStream)
       return;
-    t.request.body = JSON.stringify(e.body);
-    const s = t.ensureRequestHeaders();
+    e.request.body = JSON.stringify(t.body);
+    const s = e.ensureRequestHeaders();
     s["Content-Type"] || (s["Content-Type"] = E.APPLICATION_JSON);
   }
 }
@@ -379,12 +379,12 @@ class k {
    * await fetchInterceptor.intercept(exchange);
    * console.log(exchange.response); // HTTP response object
    */
-  async intercept(t) {
-    t.response = await M(t.request);
+  async intercept(e) {
+    e.response = await x(e.request);
   }
 }
-function m(r, t) {
-  return t ? r.filter(t).sort((e, s) => e.order - s.order) : [...r].sort((e, s) => e.order - s.order);
+function m(r, e) {
+  return e ? r.filter(e).sort((t, s) => t.order - s.order) : [...r].sort((t, s) => t.order - s.order);
 }
 class T {
   /**
@@ -396,8 +396,8 @@ class T {
    * The provided interceptors will be sorted by their order property immediately
    * upon construction.
    */
-  constructor(t = []) {
-    this.sortedInterceptors = [], this.sortedInterceptors = m(t);
+  constructor(e = []) {
+    this.sortedInterceptors = [], this.sortedInterceptors = m(e);
   }
   /**
    * Gets the name of this interceptor registry.
@@ -434,10 +434,10 @@ class T {
    *
    * After adding, interceptors are automatically sorted by their order property.
    */
-  use(t) {
-    return this.sortedInterceptors.some((e) => e.name === t.name) ? !1 : (this.sortedInterceptors = m([
+  use(e) {
+    return this.sortedInterceptors.some((t) => t.name === e.name) ? !1 : (this.sortedInterceptors = m([
       ...this.sortedInterceptors,
-      t
+      e
     ]), !0);
   }
   /**
@@ -447,12 +447,12 @@ class T {
    * @returns True if an interceptor was removed, false if no interceptor with the
    *          given name was found
    */
-  eject(t) {
-    const e = this.sortedInterceptors;
+  eject(e) {
+    const t = this.sortedInterceptors;
     return this.sortedInterceptors = m(
-      e,
-      (s) => s.name !== t
-    ), e.length !== this.sortedInterceptors.length;
+      t,
+      (s) => s.name !== e
+    ), t.length !== this.sortedInterceptors.length;
   }
   /**
    * Removes all interceptors from this registry.
@@ -474,16 +474,16 @@ class T {
    * If any interceptor throws an error, the execution chain is broken and the error
    * is propagated to the caller.
    */
-  async intercept(t) {
-    for (const e of this.sortedInterceptors)
-      await e.intercept(t);
+  async intercept(e) {
+    for (const t of this.sortedInterceptors)
+      await t.intercept(e);
   }
 }
-class g extends l {
-  constructor(t) {
+class b extends l {
+  constructor(e) {
     super(
-      `Request failed with status code ${t.response?.status} for ${t.request.url}`
-    ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, g.prototype);
+      `Request failed with status code ${e.response?.status} for ${e.request.url}`
+    ), this.exchange = e, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, b.prototype);
   }
 }
 const Y = (r) => r >= 200 && r < 300, z = "ValidateStatusInterceptor", Q = Number.MAX_SAFE_INTEGER - 1e3;
@@ -493,8 +493,8 @@ class K {
    *
    * @param validateStatus - Function that determines if a status code is valid
    */
-  constructor(t = Y) {
-    this.validateStatus = t;
+  constructor(e = Y) {
+    this.validateStatus = e;
   }
   /**
    * Gets the name of this interceptor.
@@ -525,12 +525,12 @@ class K {
    * preventing other response handlers from attempting to process them. Valid responses
    * proceed through the rest of the response interceptor chain normally.
    */
-  intercept(t) {
-    if (!t.response)
+  intercept(e) {
+    if (!e.response)
       return;
-    const e = t.response.status;
-    if (!this.validateStatus(e))
-      throw new g(t);
+    const t = e.response.status;
+    if (!this.validateStatus(t))
+      throw new b(e);
   }
 }
 class R extends l {
@@ -540,9 +540,9 @@ class R extends l {
    * @param exchange - The FetchExchange object containing request/response/error information.
    * @param errorMsg - An optional error message.
    */
-  constructor(t, e) {
-    const s = e || t.error?.message || t.response?.statusText || `Request to ${t.request.url} failed during exchange`;
-    super(s, t.error), this.exchange = t, this.name = "ExchangeError", Object.setPrototypeOf(this, R.prototype);
+  constructor(e, t) {
+    const s = t || e.error?.message || e.response?.statusText || `Request to ${e.request.url} failed during exchange`;
+    super(s, e.error), this.exchange = e, this.name = "ExchangeError", Object.setPrototypeOf(this, R.prototype);
   }
 }
 class W {
@@ -641,19 +641,19 @@ class W {
    * const result = await fetcher.exchange(exchange);
    * ```
    */
-  async exchange(t) {
+  async exchange(e) {
     try {
-      return await this.request.intercept(t), await this.response.intercept(t), t;
-    } catch (e) {
-      if (t.error = e, await this.error.intercept(t), !t.hasError())
-        return t;
-      throw new R(t);
+      return await this.request.intercept(e), await this.response.intercept(e), e;
+    } catch (t) {
+      if (e.error = t, await this.error.intercept(e), !e.hasError())
+        return e;
+      throw new R(e);
     }
   }
 }
 class Z {
-  constructor(t, e, s, n) {
-    this.attributes = {}, this.fetcher = t, this.request = e, this.response = s, this.error = n;
+  constructor(e) {
+    this.fetcher = e.fetcher, this.request = e.request, this.attributes = e.attributes ?? {}, this.response = e.response, this.error = e.error;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -719,18 +719,18 @@ class Z {
     return this.response;
   }
 }
-const tt = (r) => r, et = (r) => r.requiredResponse, rt = (r) => r.requiredResponse.json(), st = (r) => r.requiredResponse.text(), O = {
-  Exchange: tt,
-  Response: et,
-  Json: rt,
-  Text: st
-}, A = {
+const ee = (r) => r, te = (r) => r.requiredResponse, re = (r) => r.requiredResponse.json(), se = (r) => r.requiredResponse.text(), f = {
+  Exchange: ee,
+  Response: te,
+  Json: re,
+  Text: se
+}, y = {
   "Content-Type": E.APPLICATION_JSON
 }, S = {
   baseURL: "",
-  headers: A
+  headers: y
 };
-class ot {
+class oe {
   /**
    * Initializes a new Fetcher instance with optional configuration.
    *
@@ -739,8 +739,8 @@ class ot {
    *
    * @param options - Configuration options for the Fetcher instance
    */
-  constructor(t = S) {
-    this.headers = A, this.urlBuilder = new x(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? A, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new W();
+  constructor(e = S) {
+    this.headers = y, this.urlBuilder = new G(e.baseURL, e.urlTemplateStyle), this.headers = e.headers ?? y, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new W();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -750,12 +750,15 @@ class ot {
    *
    * @param url - The URL path for the request (relative to baseURL if set)
    * @param request - Request configuration including headers, body, parameters, etc.
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    * @throws FetchError if the request fails and no response is generated
    */
-  async fetch(t, e = {}) {
-    const s = e;
-    return s.url = t, this.request(s, O.Response);
+  async fetch(e, t = {}, s) {
+    const o = t;
+    return o.url = e, this.request(o, f.Response, s);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -767,20 +770,66 @@ class ot {
    * @param request - Complete request configuration object
    * @param resultExtractor - Function to extract the desired result from the exchange.
    *                          Defaults to ExchangeResultExtractor which returns the entire exchange object.
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the extracted result based on resultExtractor
    * @throws Error if an unhandled error occurs during request processing
    */
-  // @ts-expect-error - Required to bypass type checking for resultExtractor default value assignment
-  async request(t, e = O.Exchange) {
-    const s = {
+  async request(e, t = f.Exchange, s) {
+    const o = {
       ...this.headers,
-      ...t.headers
+      ...e.headers
     }, n = {
-      ...t,
-      headers: s,
-      timeout: G(t.timeout, this.timeout)
-    }, o = new Z(this, n);
-    return await this.interceptors.exchange(o), e(o);
+      ...e,
+      headers: o,
+      timeout: M(e.timeout, this.timeout)
+    };
+    return this.exchange(
+      { request: n, attributes: s },
+      t
+    );
+  }
+  /**
+   * Executes an HTTP request exchange and processes the result using a result extractor.
+   *
+   * This method creates a FetchExchange object, runs it through the interceptor chain,
+   * and then applies a result extractor function to transform the exchange into the desired result type.
+   * It's the core method that powers all HTTP request functionality in the Fetcher.
+   *
+   * @template R - The type of result to return after processing the exchange
+   * @param exchangeInit - The initial configuration for the exchange, excluding fetcher, response, and error properties
+   * @param resultExtractor - A function that transforms the completed exchange into the desired result type.
+   *                          Defaults to returning the exchange object itself.
+   * @returns A Promise that resolves to the result of applying the resultExtractor to the completed exchange
+   *
+   * @example
+   * ```typescript
+   * // Basic usage with default result extractor (returns the exchange)
+   * const exchange = await fetcher.exchange({
+   *   request: { url: '/api/users', method: 'GET' }
+   * });
+   * console.log(exchange.response.status);
+   *
+   * // Using a custom result extractor to get the response object
+   * const response = await fetcher.exchange(
+   *   { request: { url: '/api/users', method: 'GET' } },
+   *   (exchange) => exchange.requiredResponse
+   * );
+   *
+   * // Using a built-in result extractor to get JSON data
+   * const users = await fetcher.exchange(
+   *   { request: { url: '/api/users', method: 'GET' } },
+   *   ResultExtractors.Json
+   * );
+   * ```
+   */
+  async exchange(e, t = f.Exchange) {
+    const s = new Z({
+      ...e,
+      fetcher: this
+    });
+    return await this.interceptors.exchange(s), t(s);
   }
   /**
    * Internal helper method for making HTTP requests with a specific method.
@@ -791,13 +840,20 @@ class ot {
    * @param method - The HTTP method to use for the request
    * @param url - The URL path for the request
    * @param request - Additional request options
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async methodFetch(t, e, s = {}) {
-    return this.fetch(e, {
-      ...s,
-      method: t
-    });
+  async methodFetch(e, t, s = {}, o) {
+    return this.fetch(
+      t,
+      {
+        ...s,
+        method: e
+      },
+      o
+    );
   }
   /**
    * Makes a GET HTTP request.
@@ -807,10 +863,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options excluding method and body
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async get(t, e = {}) {
-    return this.methodFetch(i.GET, t, e);
+  async get(e, t = {}, s) {
+    return this.methodFetch(i.GET, e, t, s);
   }
   /**
    * Makes a POST HTTP request.
@@ -819,10 +878,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options including body and other parameters
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async post(t, e = {}) {
-    return this.methodFetch(i.POST, t, e);
+  async post(e, t = {}, s) {
+    return this.methodFetch(i.POST, e, t, s);
   }
   /**
    * Makes a PUT HTTP request.
@@ -831,10 +893,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options including body and other parameters
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async put(t, e = {}) {
-    return this.methodFetch(i.PUT, t, e);
+  async put(e, t = {}, s) {
+    return this.methodFetch(i.PUT, e, t, s);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -843,10 +908,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options excluding method and body
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async delete(t, e = {}) {
-    return this.methodFetch(i.DELETE, t, e);
+  async delete(e, t = {}, s) {
+    return this.methodFetch(i.DELETE, e, t, s);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -855,10 +923,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options including body and other parameters
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async patch(t, e = {}) {
-    return this.methodFetch(i.PATCH, t, e);
+  async patch(e, t = {}, s) {
+    return this.methodFetch(i.PATCH, e, t, s);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -868,10 +939,13 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options excluding method and body
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async head(t, e = {}) {
-    return this.methodFetch(i.HEAD, t, e);
+  async head(e, t = {}, s) {
+    return this.methodFetch(i.HEAD, e, t, s);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -881,14 +955,17 @@ class ot {
    *
    * @param url - The URL path for the request
    * @param request - Request options excluding method and body
+   * @param attributes - Optional shared attributes that can be accessed by interceptors
+   *                     throughout the request lifecycle. These attributes allow passing
+   *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async options(t, e = {}) {
-    return this.methodFetch(i.OPTIONS, t, e);
+  async options(e, t = {}, s) {
+    return this.methodFetch(i.OPTIONS, e, t, s);
   }
 }
-const y = "default";
-class nt {
+const g = "default";
+class ne {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -901,8 +978,8 @@ class nt {
    * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
    * fetcherRegistrar.register('api', fetcher);
    */
-  register(t, e) {
-    this.registrar.set(t, e);
+  register(e, t) {
+    this.registrar.set(e, t);
   }
   /**
    * Unregister a Fetcher instance by name
@@ -915,8 +992,8 @@ class nt {
    *   console.log('Fetcher unregistered successfully');
    * }
    */
-  unregister(t) {
-    return this.registrar.delete(t);
+  unregister(e) {
+    return this.registrar.delete(e);
   }
   /**
    * Get a Fetcher instance by name
@@ -929,8 +1006,8 @@ class nt {
    *   // Use the fetcher
    * }
    */
-  get(t) {
-    return this.registrar.get(t);
+  get(e) {
+    return this.registrar.get(e);
   }
   /**
    * Get a Fetcher instance by name, throwing an error if not found
@@ -946,11 +1023,11 @@ class nt {
    *   console.error('Fetcher not found:', error.message);
    * }
    */
-  requiredGet(t) {
-    const e = this.get(t);
-    if (!e)
-      throw new Error(`Fetcher ${t} not found`);
-    return e;
+  requiredGet(e) {
+    const t = this.get(e);
+    if (!t)
+      throw new Error(`Fetcher ${e} not found`);
+    return t;
   }
   /**
    * Get the default Fetcher instance
@@ -961,7 +1038,7 @@ class nt {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(y);
+    return this.requiredGet(g);
   }
   /**
    * Set the default Fetcher instance
@@ -971,8 +1048,8 @@ class nt {
    * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
    * fetcherRegistrar.default = fetcher;
    */
-  set default(t) {
-    this.register(y, t);
+  set default(e) {
+    this.register(g, e);
   }
   /**
    * Get a copy of all registered fetchers
@@ -988,36 +1065,36 @@ class nt {
     return new Map(this.registrar);
   }
 }
-const it = new nt();
-function _(r, t) {
-  if (!(r === void 0 && t === void 0))
-    return t === void 0 ? r : r === void 0 ? t : { ...r, ...t };
+const ie = new ne();
+function _(r, e) {
+  if (!(r === void 0 && e === void 0))
+    return e === void 0 ? r : r === void 0 ? e : { ...r, ...e };
 }
-function ct(r, t) {
+function ce(r, e) {
   if (Object.keys(r).length === 0)
-    return t;
-  if (Object.keys(t).length === 0)
+    return e;
+  if (Object.keys(e).length === 0)
     return r;
-  const e = {
-    path: _(r.urlParams?.path, t.urlParams?.path),
-    query: _(r.urlParams?.query, t.urlParams?.query)
+  const t = {
+    path: _(r.urlParams?.path, e.urlParams?.path),
+    query: _(r.urlParams?.query, e.urlParams?.query)
   }, s = {
     ...r.headers,
-    ...t.headers
-  }, n = t.method ?? r.method, o = t.body ?? r.body, u = t.timeout ?? r.timeout, a = t.signal ?? r.signal, p = t.abortController ?? r.abortController;
+    ...e.headers
+  }, o = e.method ?? r.method, n = e.body ?? r.body, u = e.timeout ?? r.timeout, a = e.signal ?? r.signal, p = e.abortController ?? r.abortController;
   return {
     ...r,
-    ...t,
-    method: n,
-    urlParams: e,
+    ...e,
+    method: o,
+    urlParams: t,
     headers: s,
-    body: o,
+    body: n,
     timeout: u,
     signal: a,
     abortController: p
   };
 }
-class ut extends ot {
+class ue extends oe {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -1035,43 +1112,43 @@ class ut extends ot {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(t, e = S) {
-    super(e), this.name = t, it.register(t, this);
+  constructor(e, t = S) {
+    super(t), this.name = e, ie.register(e, this);
   }
 }
-const ht = new ut(y);
+const he = new ue(g);
 export {
-  at as CONTENT_TYPE_HEADER,
+  ae as CONTENT_TYPE_HEADER,
   E as ContentTypeValues,
-  y as DEFAULT_FETCHER_NAME,
+  g as DEFAULT_FETCHER_NAME,
   S as DEFAULT_OPTIONS,
   R as ExchangeError,
-  tt as ExchangeResultExtractor,
-  P as ExpressUrlTemplateResolver,
+  ee as ExchangeResultExtractor,
+  A as ExpressUrlTemplateResolver,
   V as FETCH_INTERCEPTOR_NAME,
   J as FETCH_INTERCEPTOR_ORDER,
   Z as FetchExchange,
   k as FetchInterceptor,
   I as FetchTimeoutError,
-  ot as Fetcher,
+  oe as Fetcher,
   l as FetcherError,
-  nt as FetcherRegistrar,
+  ne as FetcherRegistrar,
   i as HttpMethod,
-  g as HttpStatusValidationError,
+  b as HttpStatusValidationError,
   W as InterceptorManager,
   T as InterceptorRegistry,
-  rt as JsonResultExtractor,
-  ut as NamedFetcher,
+  re as JsonResultExtractor,
+  ue as NamedFetcher,
   B as REQUEST_BODY_INTERCEPTOR_NAME,
   $ as REQUEST_BODY_INTERCEPTOR_ORDER,
   X as RequestBodyInterceptor,
-  et as ResponseResultExtractor,
-  O as ResultExtractors,
-  st as TextResultExtractor,
+  te as ResponseResultExtractor,
+  f as ResultExtractors,
+  se as TextResultExtractor,
   H as URL_RESOLVE_INTERCEPTOR_NAME,
   N as URL_RESOLVE_INTERCEPTOR_ORDER,
-  f as UriTemplateResolver,
-  x as UrlBuilder,
+  P as UriTemplateResolver,
+  G as UrlBuilder,
   j as UrlResolveInterceptor,
   U as UrlTemplateStyle,
   z as VALIDATE_STATUS_INTERCEPTOR_NAME,
@@ -1079,14 +1156,14 @@ export {
   K as ValidateStatusInterceptor,
   C as combineURLs,
   v as expressUrlTemplateResolver,
-  ht as fetcher,
-  it as fetcherRegistrar,
+  he as fetcher,
+  ie as fetcherRegistrar,
   D as getUrlTemplateResolver,
   F as isAbsoluteURL,
   _ as mergeRecords,
-  ct as mergeRequest,
-  G as resolveTimeout,
-  M as timeoutFetch,
+  ce as mergeRequest,
+  M as resolveTimeout,
+  x as timeoutFetch,
   m as toSorted,
   L as uriTemplateResolver,
   w as urlTemplateRegexExtract,