@ahoo-wang/fetcher 1.3.3 → 1.5.0

package/dist/index.es.js

@@ -1,29 +1,29 @@
-function S(r) {
+function F(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
-function F(r, e) {
-  return S(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 ? C : L;
+  return r === 1 ? v : L;
 }
-function _(r, e, t) {
-  return t ? r.replace(e, (s, n) => {
-    const i = t[n];
-    if (i === void 0)
+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(i);
+    return encodeURIComponent(o);
   }) : r;
 }
-function q(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 a = class a {
+const c = class c {
   /**
    * Extracts path parameters from a URL string.
    *
@@ -47,10 +47,10 @@ const a = class a {
    * // noParams = []
    * ```
    */
-  extractPathParams(e) {
-    return q(
-      e,
-      a.PATH_PARAM_REGEX
+  extractPathParams(t) {
+    return w(
+      t,
+      c.PATH_PARAM_REGEX
     );
   }
   /**
@@ -89,17 +89,17 @@ const a = class a {
    * }
    * ```
    */
-  resolve(e, t) {
-    return _(
-      e,
-      a.PATH_PARAM_REGEX,
-      t
+  resolve(t, e) {
+    return q(
+      t,
+      c.PATH_PARAM_REGEX,
+      e
     );
   }
 };
-a.PATH_PARAM_REGEX = /{([^}]+)}/g;
-let T = a;
-const L = new T(), h = class h {
+c.PATH_PARAM_REGEX = /{([^}]+)}/g;
+let f = c;
+const L = new f(), h = class h {
   /**
    * Extracts path parameters from an Express-style URL string.
    *
@@ -119,9 +119,9 @@ const L = new T(), h = class h {
    * // noParams = []
    * ```
    */
-  extractPathParams(e) {
-    return q(
-      e,
+  extractPathParams(t) {
+    return w(
+      t,
       h.PATH_PARAM_REGEX
     );
   }
@@ -157,18 +157,18 @@ const L = new T(), h = class h {
    * }
    * ```
    */
-  resolve(e, t) {
-    return _(
-      e,
+  resolve(t, e) {
+    return q(
+      t,
       h.PATH_PARAM_REGEX,
-      t
+      e
     );
   }
 };
 h.PATH_PARAM_REGEX = /:([^/]+)/g;
-let f = h;
-const C = new f();
-class v {
+let P = h;
+const v = new P();
+class x {
   /**
    * Initializes a new UrlBuilder instance.
    *
@@ -186,8 +186,8 @@ class v {
    * 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,14 +207,14 @@ class v {
    * // Result: https://api.example.com/users/123/posts/456?filter=active&limit=10
    * ```
    */
-  build(e, t) {
-    const s = t?.path, n = t?.query, i = F(this.baseURL, e);
-    let o = this.urlTemplateResolver.resolve(i, s);
+  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 c = new URLSearchParams(n).toString();
-      c && (o += "?" + c);
+      const a = new URLSearchParams(n).toString();
+      a && (u += "?" + a);
     }
-    return o;
+    return u;
   }
   /**
    * Resolves a complete URL from a FetchRequest.
@@ -225,8 +225,8 @@ class v {
    * @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,71 +236,71 @@ 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 y extends l {
+class I extends l {
   /**
    * Creates a new FetchTimeoutError instance.
    *
    * @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, y.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 G(r, e) {
-  return typeof r < "u" ? r : e;
+function G(r, t) {
+  return typeof r < "u" ? r : t;
 }
 async function M(r) {
-  const e = r.url, t = r.timeout, s = r;
-  if (r.signal || !t)
-    return fetch(e, s);
-  const n = new AbortController(), i = {
-    ...s,
-    signal: n.signal
-  };
+  const t = r.url, e = 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;
-  const c = new Promise((se, N) => {
+  const u = new Promise((a, p) => {
     o = setTimeout(() => {
       o && clearTimeout(o);
-      const g = new y(r);
-      n.abort(g), N(g);
-    }, t);
+      const b = new I(r);
+      n.abort(b), p(b);
+    }, e);
   });
   try {
-    return await Promise.race([fetch(e, i), c]);
+    return await Promise.race([fetch(t, s), u]);
   } finally {
     o && clearTimeout(o);
   }
 }
-const H = "UrlResolveInterceptor", w = Number.MIN_SAFE_INTEGER + 1e3;
-class B {
+const H = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
+class j {
   constructor() {
-    this.name = H, this.order = w;
+    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 ne = "Content-Type", E = class E {
+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 {
 };
-E.APPLICATION_JSON = "application/json", E.TEXT_EVENT_STREAM = "text/event-stream";
-let d = E;
-const $ = "RequestBodyInterceptor", j = w + 1e3;
+d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
+let E = d;
+const B = "RequestBodyInterceptor", $ = N + 1e3;
 class X {
   constructor() {
-    this.name = $, this.order = j;
+    this.name = B, this.order = $;
   }
   /**
    * Attempts to convert request body to a valid fetch API body type.
@@ -339,20 +339,20 @@ 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();
-    s["Content-Type"] || (s["Content-Type"] = d.APPLICATION_JSON);
+    t.request.body = JSON.stringify(e.body);
+    const s = t.ensureRequestHeaders();
+    s["Content-Type"] || (s["Content-Type"] = E.APPLICATION_JSON);
   }
 }
-const x = "FetchInterceptor", V = Number.MAX_SAFE_INTEGER - 1e3;
+const V = "FetchInterceptor", J = Number.MAX_SAFE_INTEGER - 1e3;
 class k {
   constructor() {
-    this.name = x, this.order = V;
+    this.name = V, this.order = J;
   }
   /**
    * Intercept and process HTTP requests.
@@ -379,14 +379,14 @@ class k {
    * await fetchInterceptor.intercept(exchange);
    * console.log(exchange.response); // HTTP response object
    */
-  async intercept(e) {
-    e.response = await M(e.request);
+  async intercept(t) {
+    t.response = await M(t.request);
   }
 }
-function p(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 R {
+class T {
   /**
    * Initializes a new InterceptorRegistry instance.
    *
@@ -396,8 +396,8 @@ class R {
    * The provided interceptors will be sorted by their order property immediately
    * upon construction.
    */
-  constructor(e = []) {
-    this.sortedInterceptors = [], this.sortedInterceptors = p(e);
+  constructor(t = []) {
+    this.sortedInterceptors = [], this.sortedInterceptors = m(t);
   }
   /**
    * Gets the name of this interceptor registry.
@@ -434,10 +434,10 @@ class R {
    *
    * After adding, interceptors are automatically sorted by their order property.
    */
-  use(e) {
-    return this.sortedInterceptors.some((t) => t.name === e.name) ? !1 : (this.sortedInterceptors = p([
+  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 R {
    * @returns True if an interceptor was removed, false if no interceptor with the
    *          given name was found
    */
-  eject(e) {
-    const t = this.sortedInterceptors;
-    return this.sortedInterceptors = p(
-      t,
-      (s) => s.name !== e
-    ), t.length !== this.sortedInterceptors.length;
+  eject(t) {
+    const e = this.sortedInterceptors;
+    return this.sortedInterceptors = m(
+      e,
+      (s) => s.name !== t
+    ), e.length !== this.sortedInterceptors.length;
   }
   /**
    * Removes all interceptors from this registry.
@@ -474,27 +474,27 @@ class R {
    * 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 I extends l {
-  constructor(e) {
+class g 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, I.prototype);
+      `Request failed with status code ${t.response?.status} for ${t.request.url}`
+    ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, g.prototype);
   }
 }
-const J = (r) => r >= 200 && r < 300, Y = "ValidateStatusInterceptor", z = Number.MAX_SAFE_INTEGER - 1e3;
-class Q {
+const Y = (r) => r >= 200 && r < 300, z = "ValidateStatusInterceptor", Q = Number.MAX_SAFE_INTEGER - 1e3;
+class K {
   /**
    * Creates a new ValidateStatusInterceptor instance.
    *
    * @param validateStatus - Function that determines if a status code is valid
    */
-  constructor(e = J) {
-    this.validateStatus = e;
+  constructor(t = Y) {
+    this.validateStatus = t;
   }
   /**
    * Gets the name of this interceptor.
@@ -502,7 +502,7 @@ class Q {
    * @returns The name of this interceptor
    */
   get name() {
-    return Y;
+    return z;
   }
   /**
    * Gets the order of this interceptor.
@@ -510,7 +510,7 @@ class Q {
    * @returns VALIDATE_STATUS_INTERCEPTOR_ORDER, indicating this interceptor should execute early
    */
   get order() {
-    return z;
+    return Q;
   }
   /**
    * Validates the response status code.
@@ -525,35 +525,35 @@ class Q {
    * 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 I(e);
+    const e = t.response.status;
+    if (!this.validateStatus(e))
+      throw new g(t);
   }
 }
-class m extends l {
+class R extends l {
   /**
    * Creates a new ExchangeError instance.
    *
    * @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, m.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 K {
+class W {
   constructor() {
-    this.request = new R([
-      new B(),
+    this.request = new T([
+      new j(),
       new X(),
       new k()
-    ]), this.response = new R([
-      new Q()
-    ]), this.error = new R();
+    ]), this.response = new T([
+      new K()
+    ]), this.error = new T();
   }
   /**
    * Processes a FetchExchange through the interceptor pipeline.
@@ -641,19 +641,19 @@ class K {
    * 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 m(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 W {
-  constructor(e, t, s, n) {
-    this.attributes = {}, this.fetcher = e, this.request = t, this.response = s, this.error = n;
+class Z {
+  constructor(t, e, s, n) {
+    this.attributes = {}, this.fetcher = t, this.request = e, this.response = s, this.error = n;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -712,20 +712,25 @@ class W {
    */
   get requiredResponse() {
     if (!this.response)
-      throw new m(
+      throw new R(
         this,
         `Request to ${this.request.url} failed with no response`
       );
     return this.response;
   }
 }
-const P = {
-  "Content-Type": d.APPLICATION_JSON
-}, b = {
+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 = {
+  "Content-Type": E.APPLICATION_JSON
+}, S = {
   baseURL: "",
-  headers: P
+  headers: A
 };
-class Z {
+class ot {
   /**
    * Initializes a new Fetcher instance with optional configuration.
    *
@@ -734,8 +739,8 @@ class Z {
    *
    * @param options - Configuration options for the Fetcher instance
    */
-  constructor(e = b) {
-    this.headers = P, this.urlBuilder = new v(e.baseURL, e.urlTemplateStyle), this.headers = e.headers ?? P, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new K();
+  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();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -748,9 +753,9 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    * @throws FetchError if the request fails and no response is generated
    */
-  async fetch(e, t = {}) {
-    const s = t;
-    return s.url = e, (await this.request(s)).requiredResponse;
+  async fetch(t, e = {}) {
+    const s = e;
+    return s.url = t, this.request(s, O.Response);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -760,19 +765,22 @@ class Z {
    * for interceptor processing.
    *
    * @param request - Complete request configuration object
-   * @returns Promise that resolves to a FetchExchange containing request/response data
+   * @param resultExtractor - Function to extract the desired result from the exchange.
+   *                          Defaults to ExchangeResultExtractor which returns the entire exchange object.
+   * @returns Promise that resolves to the extracted result based on resultExtractor
    * @throws Error if an unhandled error occurs during request processing
    */
-  async request(e) {
-    const t = {
+  // @ts-expect-error - Required to bypass type checking for resultExtractor default value assignment
+  async request(t, e = O.Exchange) {
+    const s = {
       ...this.headers,
-      ...e.headers
-    }, s = {
-      ...e,
-      headers: t,
-      timeout: G(e.timeout, this.timeout)
-    }, n = new W(this, s);
-    return this.interceptors.exchange(n);
+      ...t.headers
+    }, n = {
+      ...t,
+      headers: s,
+      timeout: G(t.timeout, this.timeout)
+    }, o = new Z(this, n);
+    return await this.interceptors.exchange(o), e(o);
   }
   /**
    * Internal helper method for making HTTP requests with a specific method.
@@ -785,10 +793,10 @@ class Z {
    * @param request - Additional request options
    * @returns Promise that resolves to the HTTP response
    */
-  async methodFetch(e, t, s = {}) {
-    return this.fetch(t, {
+  async methodFetch(t, e, s = {}) {
+    return this.fetch(e, {
       ...s,
-      method: e
+      method: t
     });
   }
   /**
@@ -801,8 +809,8 @@ class Z {
    * @param request - Request options excluding method and body
    * @returns Promise that resolves to the HTTP response
    */
-  async get(e, t = {}) {
-    return this.methodFetch(u.GET, e, t);
+  async get(t, e = {}) {
+    return this.methodFetch(i.GET, t, e);
   }
   /**
    * Makes a POST HTTP request.
@@ -813,8 +821,8 @@ class Z {
    * @param request - Request options including body and other parameters
    * @returns Promise that resolves to the HTTP response
    */
-  async post(e, t = {}) {
-    return this.methodFetch(u.POST, e, t);
+  async post(t, e = {}) {
+    return this.methodFetch(i.POST, t, e);
   }
   /**
    * Makes a PUT HTTP request.
@@ -825,8 +833,8 @@ class Z {
    * @param request - Request options including body and other parameters
    * @returns Promise that resolves to the HTTP response
    */
-  async put(e, t = {}) {
-    return this.methodFetch(u.PUT, e, t);
+  async put(t, e = {}) {
+    return this.methodFetch(i.PUT, t, e);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -837,8 +845,8 @@ class Z {
    * @param request - Request options excluding method and body
    * @returns Promise that resolves to the HTTP response
    */
-  async delete(e, t = {}) {
-    return this.methodFetch(u.DELETE, e, t);
+  async delete(t, e = {}) {
+    return this.methodFetch(i.DELETE, t, e);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -849,8 +857,8 @@ class Z {
    * @param request - Request options including body and other parameters
    * @returns Promise that resolves to the HTTP response
    */
-  async patch(e, t = {}) {
-    return this.methodFetch(u.PATCH, e, t);
+  async patch(t, e = {}) {
+    return this.methodFetch(i.PATCH, t, e);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -862,8 +870,8 @@ class Z {
    * @param request - Request options excluding method and body
    * @returns Promise that resolves to the HTTP response
    */
-  async head(e, t = {}) {
-    return this.methodFetch(u.HEAD, e, t);
+  async head(t, e = {}) {
+    return this.methodFetch(i.HEAD, t, e);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -875,12 +883,12 @@ class Z {
    * @param request - Request options excluding method and body
    * @returns Promise that resolves to the HTTP response
    */
-  async options(e, t = {}) {
-    return this.methodFetch(u.OPTIONS, e, t);
+  async options(t, e = {}) {
+    return this.methodFetch(i.OPTIONS, t, e);
   }
 }
-const A = "default";
-class ee {
+const y = "default";
+class nt {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -893,8 +901,8 @@ class ee {
    * 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
@@ -907,8 +915,8 @@ class ee {
    *   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
@@ -921,8 +929,8 @@ class ee {
    *   // 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
@@ -938,11 +946,11 @@ class ee {
    *   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
@@ -953,7 +961,7 @@ class ee {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(A);
+    return this.requiredGet(y);
   }
   /**
    * Set the default Fetcher instance
@@ -963,8 +971,8 @@ class ee {
    * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
    * fetcherRegistrar.default = fetcher;
    */
-  set default(e) {
-    this.register(A, e);
+  set default(t) {
+    this.register(y, t);
   }
   /**
    * Get a copy of all registered fetchers
@@ -980,35 +988,36 @@ class ee {
     return new Map(this.registrar);
   }
 }
-const te = new ee();
-function O(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 _(r, t) {
+  if (!(r === void 0 && t === void 0))
+    return t === void 0 ? r : r === void 0 ? t : { ...r, ...t };
 }
-function oe(r, e) {
+function ct(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: O(r.urlParams?.path, e.urlParams?.path),
-    query: O(r.urlParams?.query, e.urlParams?.query)
+  const e = {
+    path: _(r.urlParams?.path, t.urlParams?.path),
+    query: _(r.urlParams?.query, t.urlParams?.query)
   }, s = {
     ...r.headers,
-    ...e.headers
-  }, n = e.method ?? r.method, i = e.body ?? r.body, o = e.timeout ?? r.timeout, c = e.signal ?? r.signal;
+    ...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;
   return {
     ...r,
-    ...e,
+    ...t,
     method: n,
-    urlParams: t,
+    urlParams: e,
     headers: s,
-    body: i,
-    timeout: o,
-    signal: c
+    body: o,
+    timeout: u,
+    signal: a,
+    abortController: p
   };
 }
-class re extends Z {
+class ut extends ot {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -1026,56 +1035,61 @@ class re extends Z {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(e, t = b) {
-    super(t), this.name = e, te.register(e, this);
+  constructor(t, e = S) {
+    super(e), this.name = t, it.register(t, this);
   }
 }
-const ie = new re(A);
+const ht = new ut(y);
 export {
-  ne as CONTENT_TYPE_HEADER,
-  d as ContentTypeValues,
-  A as DEFAULT_FETCHER_NAME,
-  b as DEFAULT_OPTIONS,
-  m as ExchangeError,
-  f as ExpressUrlTemplateResolver,
-  x as FETCH_INTERCEPTOR_NAME,
-  V as FETCH_INTERCEPTOR_ORDER,
-  W as FetchExchange,
+  at as CONTENT_TYPE_HEADER,
+  E as ContentTypeValues,
+  y as DEFAULT_FETCHER_NAME,
+  S as DEFAULT_OPTIONS,
+  R as ExchangeError,
+  tt as ExchangeResultExtractor,
+  P as ExpressUrlTemplateResolver,
+  V as FETCH_INTERCEPTOR_NAME,
+  J as FETCH_INTERCEPTOR_ORDER,
+  Z as FetchExchange,
   k as FetchInterceptor,
-  y as FetchTimeoutError,
-  Z as Fetcher,
+  I as FetchTimeoutError,
+  ot as Fetcher,
   l as FetcherError,
-  ee as FetcherRegistrar,
-  u as HttpMethod,
-  I as HttpStatusValidationError,
-  K as InterceptorManager,
-  R as InterceptorRegistry,
-  re as NamedFetcher,
-  $ as REQUEST_BODY_INTERCEPTOR_NAME,
-  j as REQUEST_BODY_INTERCEPTOR_ORDER,
+  nt as FetcherRegistrar,
+  i as HttpMethod,
+  g as HttpStatusValidationError,
+  W as InterceptorManager,
+  T as InterceptorRegistry,
+  rt as JsonResultExtractor,
+  ut 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,
   H as URL_RESOLVE_INTERCEPTOR_NAME,
-  w as URL_RESOLVE_INTERCEPTOR_ORDER,
-  T as UriTemplateResolver,
-  v as UrlBuilder,
-  B as UrlResolveInterceptor,
+  N as URL_RESOLVE_INTERCEPTOR_ORDER,
+  f as UriTemplateResolver,
+  x as UrlBuilder,
+  j as UrlResolveInterceptor,
   U as UrlTemplateStyle,
-  Y as VALIDATE_STATUS_INTERCEPTOR_NAME,
-  z as VALIDATE_STATUS_INTERCEPTOR_ORDER,
-  Q as ValidateStatusInterceptor,
-  F as combineURLs,
-  C as expressUrlTemplateResolver,
-  ie as fetcher,
-  te as fetcherRegistrar,
+  z as VALIDATE_STATUS_INTERCEPTOR_NAME,
+  Q as VALIDATE_STATUS_INTERCEPTOR_ORDER,
+  K as ValidateStatusInterceptor,
+  C as combineURLs,
+  v as expressUrlTemplateResolver,
+  ht as fetcher,
+  it as fetcherRegistrar,
   D as getUrlTemplateResolver,
-  S as isAbsoluteURL,
-  O as mergeRecords,
-  oe as mergeRequest,
+  F as isAbsoluteURL,
+  _ as mergeRecords,
+  ct as mergeRequest,
   G as resolveTimeout,
   M as timeoutFetch,
-  p as toSorted,
+  m as toSorted,
   L as uriTemplateResolver,
-  q as urlTemplateRegexExtract,
-  _ as urlTemplateRegexResolve
+  w as urlTemplateRegexExtract,
+  q as urlTemplateRegexResolve
 };
 //# sourceMappingURL=index.es.js.map