@ahoo-wang/fetcher 1.5.6 → 1.5.8

package/dist/index.es.js

@@ -1,29 +1,29 @@
 function F(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
-function C(r, e) {
-  return F(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.replace(/^\/+/, "") : r;
+function C(r, t) {
+  return F(t) ? t : t ? r.replace(/\/?\/$/, "") + "/" + t.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, e, t) {
-  return t ? r.replace(e, (s, o) => {
-    const n = t[o];
+function q(r, t, e) {
+  return e ? r.replace(t, (s, o) => {
+    const n = e[o];
     if (n === void 0)
       throw new Error(`Missing required path parameter: ${o}`);
     return encodeURIComponent(n);
   }) : r;
 }
-function w(r, e) {
-  const t = [];
+function w(r, t) {
+  const e = [];
   let s;
-  for (; (s = e.exec(r)) !== null; )
-    t.push(s[1]);
-  return t;
+  for (; (s = t.exec(r)) !== null; )
+    e.push(s[1]);
+  return e;
 }
-const c = class c {
+const a = class a {
   /**
    * Extracts path parameters from a URL string.
    *
@@ -47,10 +47,10 @@ const c = class c {
    * // noParams = []
    * ```
    */
-  extractPathParams(e) {
+  extractPathParams(t) {
     return w(
-      e,
-      c.PATH_PARAM_REGEX
+      t,
+      a.PATH_PARAM_REGEX
     );
   }
   /**
@@ -89,16 +89,16 @@ const c = class c {
    * }
    * ```
    */
-  resolve(e, t) {
+  resolve(t, e) {
     return q(
-      e,
-      c.PATH_PARAM_REGEX,
-      t
+      t,
+      a.PATH_PARAM_REGEX,
+      e
     );
   }
 };
-c.PATH_PARAM_REGEX = /{([^}]+)}/g;
-let f = c;
+a.PATH_PARAM_REGEX = /{([^}]+)}/g;
+let f = a;
 const L = new f(), 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(e) {
+  extractPathParams(t) {
     return w(
-      e,
+      t,
       h.PATH_PARAM_REGEX
     );
   }
@@ -157,18 +157,18 @@ const L = new f(), h = class h {
    * }
    * ```
    */
-  resolve(e, t) {
+  resolve(t, e) {
     return q(
-      e,
+      t,
       h.PATH_PARAM_REGEX,
-      t
+      e
     );
   }
 };
 h.PATH_PARAM_REGEX = /:([^/]+)/g;
 let P = h;
 const v = new P();
-class G {
+class x {
   /**
    * Initializes a new UrlBuilder instance.
    *
@@ -186,8 +186,8 @@ class G {
    * const expressUrlBuilder = new UrlBuilder('https://api.example.com', UrlTemplateStyle.Express);
    * ```
    */
-  constructor(e, t) {
-    this.baseURL = e, this.urlTemplateResolver = D(t);
+  constructor(t, e) {
+    this.baseURL = t, this.urlTemplateResolver = D(e);
   }
   /**
    * Builds a complete URL, including path parameter replacement and query parameter addition.
@@ -207,12 +207,12 @@ class G {
    * // Result: https://api.example.com/users/123/posts/456?filter=active&limit=10
    * ```
    */
-  build(e, t) {
-    const s = t?.path, o = t?.query, n = C(this.baseURL, e);
+  build(t, e) {
+    const s = e?.path, o = e?.query, n = C(this.baseURL, t);
     let i = this.urlTemplateResolver.resolve(n, s);
     if (o) {
-      const a = new URLSearchParams(o).toString();
-      a && (i += "?" + a);
+      const c = new URLSearchParams(o).toString();
+      c && (i += "?" + c);
     }
     return i;
   }
@@ -225,8 +225,8 @@ class G {
    * @param request - The FetchRequest containing URL and URL parameters
    * @returns Complete resolved URL string
    */
-  resolveRequestUrl(e) {
-    return this.build(e.url, e.urlParams);
+  resolveRequestUrl(t) {
+    return this.build(t.url, t.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(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);
+  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);
   }
 }
 class I extends l {
@@ -247,53 +247,53 @@ class I extends l {
    *
    * @param request - The request options that timed out
    */
-  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);
+  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);
   }
 }
-function M(r, e) {
-  return typeof r < "u" ? r : e;
+function G(r, t) {
+  return typeof r < "u" ? r : t;
 }
-async function H(r) {
-  const e = r.url, t = r.timeout, s = r;
+async function M(r) {
+  const t = r.url, e = r.timeout, s = r;
   if (r.signal)
-    return fetch(e, s);
-  if (!t)
-    return r.abortController && (s.signal = r.abortController.signal), fetch(e, s);
+    return fetch(t, s);
+  if (!e)
+    return r.abortController && (s.signal = r.abortController.signal), fetch(t, s);
   const o = r.abortController ?? new AbortController();
   s.signal = o.signal;
   let n = null;
-  const i = new Promise((a, p) => {
+  const i = new Promise((c, p) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
-      const O = new I(r);
-      o.abort(O), p(O);
-    }, t);
+      const _ = new I(r);
+      o.abort(_), p(_);
+    }, e);
   });
   try {
-    return await Promise.race([fetch(e, s), i]);
+    return await Promise.race([fetch(t, s), i]);
   } finally {
     n && clearTimeout(n);
   }
 }
-const x = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
+const H = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
 class j {
   constructor() {
-    this.name = x, this.order = N;
+    this.name = H, this.order = N;
   }
   /**
    * Resolves the final URL by combining the base URL, path parameters, and query parameters.
    *
    * @param exchange - The fetch exchange containing the request information
    */
-  intercept(e) {
-    const t = e.request;
-    t.url = e.fetcher.urlBuilder.resolveRequestUrl(t);
+  intercept(t) {
+    const e = t.request;
+    e.url = t.fetcher.urlBuilder.resolveRequestUrl(e);
   }
 }
 var u = /* @__PURE__ */ ((r) => (r.GET = "GET", r.POST = "POST", r.PUT = "PUT", r.DELETE = "DELETE", r.PATCH = "PATCH", r.HEAD = "HEAD", r.OPTIONS = "OPTIONS", r))(u || {});
-const ae = "Content-Type", d = class d {
+const ct = "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(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)
+  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)
       return;
-    e.request.body = JSON.stringify(t.body);
-    const s = e.ensureRequestHeaders();
+    t.request.body = JSON.stringify(e.body);
+    const s = t.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(e) {
-    e.response = await H(e.request);
+  async intercept(t) {
+    t.response = await M(t.request);
   }
 }
-function m(r, e) {
-  return e ? r.filter(e).sort((t, s) => t.order - s.order) : [...r].sort((t, s) => t.order - s.order);
+function m(r, t) {
+  return t ? r.filter(t).sort((e, s) => e.order - s.order) : [...r].sort((e, s) => e.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(e = []) {
-    this.sortedInterceptors = [], this.sortedInterceptors = m(e);
+  constructor(t = []) {
+    this.sortedInterceptors = [], this.sortedInterceptors = m(t);
   }
   /**
    * Gets the name of this interceptor registry.
@@ -434,10 +434,10 @@ class T {
    *
    * After adding, interceptors are automatically sorted by their order property.
    */
-  use(e) {
-    return this.sortedInterceptors.some((t) => t.name === e.name) ? !1 : (this.sortedInterceptors = m([
+  use(t) {
+    return this.sortedInterceptors.some((e) => e.name === t.name) ? !1 : (this.sortedInterceptors = m([
       ...this.sortedInterceptors,
-      e
+      t
     ]), !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(e) {
-    const t = this.sortedInterceptors;
+  eject(t) {
+    const e = this.sortedInterceptors;
     return this.sortedInterceptors = m(
-      t,
-      (s) => s.name !== e
-    ), t.length !== this.sortedInterceptors.length;
+      e,
+      (s) => s.name !== t
+    ), e.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(e) {
-    for (const t of this.sortedInterceptors)
-      await t.intercept(e);
+  async intercept(t) {
+    for (const e of this.sortedInterceptors)
+      await e.intercept(t);
   }
 }
-class b extends l {
-  constructor(e) {
+class O extends l {
+  constructor(t) {
     super(
-      `Request failed with status code ${e.response?.status} for ${e.request.url}`
-    ), this.exchange = e, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, b.prototype);
+      `Request failed with status code ${t.response?.status} for ${t.request.url}`
+    ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, O.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(e = Y) {
-    this.validateStatus = e;
+  constructor(t = Y) {
+    this.validateStatus = t;
   }
   /**
    * 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(e) {
-    if (!e.response)
+  intercept(t) {
+    if (!t.response)
       return;
-    const t = e.response.status;
-    if (!this.validateStatus(t))
-      throw new b(e);
+    const e = t.response.status;
+    if (!this.validateStatus(e))
+      throw new O(t);
   }
 }
 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(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);
+  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);
   }
 }
 class W {
@@ -641,19 +641,25 @@ class W {
    * const result = await fetcher.exchange(exchange);
    * ```
    */
-  async exchange(e) {
+  async exchange(t) {
     try {
-      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);
+      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);
     }
   }
 }
-class Z {
-  constructor(e) {
-    this.fetcher = e.fetcher, this.request = e.request, this.attributes = e.attributes ?? {}, this.response = e.response, this.error = e.error;
+const Z = (r) => r, tt = (r) => r.requiredResponse, et = (r) => r.requiredResponse.json(), rt = (r) => r.requiredResponse.text(), A = {
+  Exchange: Z,
+  Response: tt,
+  Json: et,
+  Text: rt
+};
+class st {
+  constructor(t) {
+    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? A.Exchange, this.attributes = t.attributes ?? {}, this.response = t.response, this.error = t.error;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -718,19 +724,23 @@ class Z {
       );
     return this.response;
   }
+  /**
+   * Gets the extracted result by applying the result extractor to the exchange.
+   * The result is cached after the first computation.
+   *
+   * @returns The extracted result or null if extraction failed
+   */
+  typedExtractedResult() {
+    return this.cachedExtractedResult !== void 0 ? this.cachedExtractedResult : (this.cachedExtractedResult = this.resultExtractor(this), this.cachedExtractedResult);
+  }
 }
-const ee = (r) => r, te = (r) => r.requiredResponse, re = (r) => r.requiredResponse.json(), se = (r) => r.requiredResponse.text(), _ = {
-  Exchange: ee,
-  Response: te,
-  Json: re,
-  Text: se
-}, A = {
+const y = {
   "Content-Type": E.APPLICATION_JSON
 }, S = {
   baseURL: "",
-  headers: A
+  headers: y
 };
-class oe {
+class ot {
   /**
    * Initializes a new Fetcher instance with optional configuration.
    *
@@ -739,8 +749,8 @@ class oe {
    *
    * @param options - Configuration options for the Fetcher instance
    */
-  constructor(e = S) {
-    this.headers = A, this.urlBuilder = new G(e.baseURL, e.urlTemplateStyle), this.headers = e.headers ?? A, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new W();
+  constructor(t = S) {
+    this.headers = y, this.urlBuilder = new x(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? y, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new W();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -756,9 +766,9 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    * @throws FetchError if the request fails and no response is generated
    */
-  async fetch(e, t = {}, s) {
-    const o = t;
-    return o.url = e, this.request(o, _.Response, s);
+  async fetch(t, e = {}, s) {
+    const o = e;
+    return o.url = t, this.request(o, A.Response, s);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -776,20 +786,21 @@ class oe {
    * @returns Promise that resolves to the extracted result based on resultExtractor
    * @throws Error if an unhandled error occurs during request processing
    */
-  async request(e, t = _.Exchange, s) {
+  async request(t, e = A.Exchange, s) {
     const o = {
       ...this.headers,
-      ...e.headers
+      ...t.headers
     }, n = {
-      ...e,
+      ...t,
       headers: o,
-      timeout: M(e.timeout, this.timeout)
-    }, i = new Z({
+      timeout: G(t.timeout, this.timeout)
+    }, i = new st({
       fetcher: this,
       request: n,
+      resultExtractor: e,
       attributes: s
     });
-    return await this.interceptors.exchange(i), t(i);
+    return await this.interceptors.exchange(i), i.typedExtractedResult();
   }
   /**
    * Internal helper method for making HTTP requests with a specific method.
@@ -805,12 +816,12 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async methodFetch(e, t, s = {}, o) {
+  async methodFetch(t, e, s = {}, o) {
     return this.fetch(
-      t,
+      e,
       {
         ...s,
-        method: e
+        method: t
       },
       o
     );
@@ -828,8 +839,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async get(e, t = {}, s) {
-    return this.methodFetch(u.GET, e, t, s);
+  async get(t, e = {}, s) {
+    return this.methodFetch(u.GET, t, e, s);
   }
   /**
    * Makes a POST HTTP request.
@@ -843,8 +854,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async post(e, t = {}, s) {
-    return this.methodFetch(u.POST, e, t, s);
+  async post(t, e = {}, s) {
+    return this.methodFetch(u.POST, t, e, s);
   }
   /**
    * Makes a PUT HTTP request.
@@ -858,8 +869,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async put(e, t = {}, s) {
-    return this.methodFetch(u.PUT, e, t, s);
+  async put(t, e = {}, s) {
+    return this.methodFetch(u.PUT, t, e, s);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -873,8 +884,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async delete(e, t = {}, s) {
-    return this.methodFetch(u.DELETE, e, t, s);
+  async delete(t, e = {}, s) {
+    return this.methodFetch(u.DELETE, t, e, s);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -888,8 +899,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async patch(e, t = {}, s) {
-    return this.methodFetch(u.PATCH, e, t, s);
+  async patch(t, e = {}, s) {
+    return this.methodFetch(u.PATCH, t, e, s);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -904,8 +915,8 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async head(e, t = {}, s) {
-    return this.methodFetch(u.HEAD, e, t, s);
+  async head(t, e = {}, s) {
+    return this.methodFetch(u.HEAD, t, e, s);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -920,12 +931,12 @@ class oe {
    *                     custom data between different interceptors.
    * @returns Promise that resolves to the HTTP response
    */
-  async options(e, t = {}, s) {
-    return this.methodFetch(u.OPTIONS, e, t, s);
+  async options(t, e = {}, s) {
+    return this.methodFetch(u.OPTIONS, t, e, s);
   }
 }
-const y = "default";
-class ne {
+const b = "default";
+class nt {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -938,8 +949,8 @@ class ne {
    * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
    * fetcherRegistrar.register('api', fetcher);
    */
-  register(e, t) {
-    this.registrar.set(e, t);
+  register(t, e) {
+    this.registrar.set(t, e);
   }
   /**
    * Unregister a Fetcher instance by name
@@ -952,8 +963,8 @@ class ne {
    *   console.log('Fetcher unregistered successfully');
    * }
    */
-  unregister(e) {
-    return this.registrar.delete(e);
+  unregister(t) {
+    return this.registrar.delete(t);
   }
   /**
    * Get a Fetcher instance by name
@@ -966,8 +977,8 @@ class ne {
    *   // Use the fetcher
    * }
    */
-  get(e) {
-    return this.registrar.get(e);
+  get(t) {
+    return this.registrar.get(t);
   }
   /**
    * Get a Fetcher instance by name, throwing an error if not found
@@ -983,11 +994,11 @@ class ne {
    *   console.error('Fetcher not found:', error.message);
    * }
    */
-  requiredGet(e) {
-    const t = this.get(e);
-    if (!t)
-      throw new Error(`Fetcher ${e} not found`);
-    return t;
+  requiredGet(t) {
+    const e = this.get(t);
+    if (!e)
+      throw new Error(`Fetcher ${t} not found`);
+    return e;
   }
   /**
    * Get the default Fetcher instance
@@ -998,7 +1009,7 @@ class ne {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(y);
+    return this.requiredGet(b);
   }
   /**
    * Set the default Fetcher instance
@@ -1008,8 +1019,8 @@ class ne {
    * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
    * fetcherRegistrar.default = fetcher;
    */
-  set default(e) {
-    this.register(y, e);
+  set default(t) {
+    this.register(b, t);
   }
   /**
    * Get a copy of all registered fetchers
@@ -1025,36 +1036,36 @@ class ne {
     return new Map(this.registrar);
   }
 }
-const ie = new ne();
-function g(r, e) {
-  if (!(r === void 0 && e === void 0))
-    return e === void 0 ? r : r === void 0 ? e : { ...r, ...e };
+const it = new nt();
+function g(r, t) {
+  if (!(r === void 0 && t === void 0))
+    return t === void 0 ? r : r === void 0 ? t : { ...r, ...t };
 }
-function ce(r, e) {
+function at(r, t) {
   if (Object.keys(r).length === 0)
-    return e;
-  if (Object.keys(e).length === 0)
+    return t;
+  if (Object.keys(t).length === 0)
     return r;
-  const t = {
-    path: g(r.urlParams?.path, e.urlParams?.path),
-    query: g(r.urlParams?.query, e.urlParams?.query)
+  const e = {
+    path: g(r.urlParams?.path, t.urlParams?.path),
+    query: g(r.urlParams?.query, t.urlParams?.query)
   }, s = {
     ...r.headers,
-    ...e.headers
-  }, o = e.method ?? r.method, n = e.body ?? r.body, i = e.timeout ?? r.timeout, a = e.signal ?? r.signal, p = e.abortController ?? r.abortController;
+    ...t.headers
+  }, o = t.method ?? r.method, n = t.body ?? r.body, i = t.timeout ?? r.timeout, c = t.signal ?? r.signal, p = t.abortController ?? r.abortController;
   return {
     ...r,
-    ...e,
+    ...t,
     method: o,
-    urlParams: t,
+    urlParams: e,
     headers: s,
     body: n,
     timeout: i,
-    signal: a,
+    signal: c,
     abortController: p
   };
 }
-class ue extends oe {
+class ut extends ot {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -1072,43 +1083,43 @@ class ue extends oe {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(e, t = S) {
-    super(t), this.name = e, ie.register(e, this);
+  constructor(t, e = S) {
+    super(e), this.name = t, it.register(t, this);
   }
 }
-const he = new ue(y);
+const ht = new ut(b);
 export {
-  ae as CONTENT_TYPE_HEADER,
+  ct as CONTENT_TYPE_HEADER,
   E as ContentTypeValues,
-  y as DEFAULT_FETCHER_NAME,
+  b as DEFAULT_FETCHER_NAME,
   S as DEFAULT_OPTIONS,
   R as ExchangeError,
-  ee as ExchangeResultExtractor,
+  Z as ExchangeResultExtractor,
   P as ExpressUrlTemplateResolver,
   V as FETCH_INTERCEPTOR_NAME,
   J as FETCH_INTERCEPTOR_ORDER,
-  Z as FetchExchange,
+  st as FetchExchange,
   k as FetchInterceptor,
   I as FetchTimeoutError,
-  oe as Fetcher,
+  ot as Fetcher,
   l as FetcherError,
-  ne as FetcherRegistrar,
+  nt as FetcherRegistrar,
   u as HttpMethod,
-  b as HttpStatusValidationError,
+  O as HttpStatusValidationError,
   W as InterceptorManager,
   T as InterceptorRegistry,
-  re as JsonResultExtractor,
-  ue as NamedFetcher,
+  et as JsonResultExtractor,
+  ut as NamedFetcher,
   B as REQUEST_BODY_INTERCEPTOR_NAME,
   $ as REQUEST_BODY_INTERCEPTOR_ORDER,
   X as RequestBodyInterceptor,
-  te as ResponseResultExtractor,
-  _ as ResultExtractors,
-  se as TextResultExtractor,
-  x as URL_RESOLVE_INTERCEPTOR_NAME,
+  tt as ResponseResultExtractor,
+  A as ResultExtractors,
+  rt as TextResultExtractor,
+  H as URL_RESOLVE_INTERCEPTOR_NAME,
   N as URL_RESOLVE_INTERCEPTOR_ORDER,
   f as UriTemplateResolver,
-  G as UrlBuilder,
+  x as UrlBuilder,
   j as UrlResolveInterceptor,
   U as UrlTemplateStyle,
   z as VALIDATE_STATUS_INTERCEPTOR_NAME,
@@ -1116,14 +1127,14 @@ export {
   K as ValidateStatusInterceptor,
   C as combineURLs,
   v as expressUrlTemplateResolver,
-  he as fetcher,
-  ie as fetcherRegistrar,
+  ht as fetcher,
+  it as fetcherRegistrar,
   D as getUrlTemplateResolver,
   F as isAbsoluteURL,
   g as mergeRecords,
-  ce as mergeRequest,
-  M as resolveTimeout,
-  H as timeoutFetch,
+  at as mergeRequest,
+  G as resolveTimeout,
+  M as timeoutFetch,
   m as toSorted,
   L as uriTemplateResolver,
   w as urlTemplateRegexExtract,