@ahoo-wang/fetcher 2.8.1 → 2.8.3

package/dist/index.es.js

@@ -1,14 +1,14 @@
-function L(e) {
+function M(e) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(e);
 }
-function B(e, t) {
-  return L(t) ? t : t ? e.replace(/\/?\/$/, "") + "/" + t.replace(/^\/+/, "") : e;
+function G(e, t) {
+  return M(t) ? t : t ? e.replace(/\/?\/$/, "") + "/" + t.replace(/^\/+/, "") : e;
 }
-var M = /* @__PURE__ */ ((e) => (e[e.UriTemplate = 0] = "UriTemplate", e[e.Express = 1] = "Express", e))(M || {});
-function G(e) {
-  return e === 1 ? j : H;
+var H = /* @__PURE__ */ ((e) => (e[e.UriTemplate = 0] = "UriTemplate", e[e.Express = 1] = "Express", e))(H || {});
+function j(e) {
+  return e === 1 ? X : $;
 }
-function x(e, t, r) {
+function C(e, t, r) {
   return r ? e.replace(t, (s, o) => {
     const n = r[o];
     if (n === void 0)
@@ -16,7 +16,7 @@ function x(e, t, r) {
     return encodeURIComponent(n);
   }) : e;
 }
-function F(e, t) {
+function U(e, t) {
   const r = [];
   let s;
   for (; (s = t.exec(e)) !== null; )
@@ -48,7 +48,7 @@ const h = class h {
    * ```
    */
   extractPathParams(t) {
-    return F(
+    return U(
       t,
       h.PATH_PARAM_REGEX
     );
@@ -90,7 +90,7 @@ const h = class h {
    * ```
    */
   resolve(t, r) {
-    return x(
+    return C(
       t,
       h.PATH_PARAM_REGEX,
       r
@@ -99,7 +99,7 @@ const h = class h {
 };
 h.PATH_PARAM_REGEX = /{([^}]+)}/g;
 let P = h;
-const H = new P(), l = class l {
+const $ = new P(), l = class l {
   /**
    * Extracts path parameters from an Express-style URL string.
    *
@@ -120,7 +120,7 @@ const H = new P(), l = class l {
    * ```
    */
   extractPathParams(t) {
-    return F(
+    return U(
       t,
       l.PATH_PARAM_REGEX
     );
@@ -158,7 +158,7 @@ const H = new P(), l = class l {
    * ```
    */
   resolve(t, r) {
-    return x(
+    return C(
       t,
       l.PATH_PARAM_REGEX,
       r
@@ -167,8 +167,8 @@ const H = new P(), l = class l {
 };
 l.PATH_PARAM_REGEX = /:([^/]+)/g;
 let y = l;
-const j = new y();
-class $ {
+const X = new y();
+class V {
   /**
    * Initializes a new UrlBuilder instance.
    *
@@ -187,7 +187,7 @@ class $ {
    * ```
    */
   constructor(t, r) {
-    this.baseURL = t, this.urlTemplateResolver = G(r);
+    this.baseURL = t, this.urlTemplateResolver = j(r);
   }
   /**
    * Builds a complete URL, including path parameter replacement and query parameter addition.
@@ -208,13 +208,13 @@ class $ {
    * ```
    */
   build(t, r) {
-    const s = r?.path, o = r?.query, n = B(this.baseURL, t);
-    let a = this.urlTemplateResolver.resolve(n, s);
+    const s = r?.path, o = r?.query, n = G(this.baseURL, t);
+    let u = this.urlTemplateResolver.resolve(n, s);
     if (o) {
-      const u = new URLSearchParams(o).toString();
-      u && (a += "?" + u);
+      const a = new URLSearchParams(o).toString();
+      a && (u += "?" + a);
     }
-    return a;
+    return u;
   }
   /**
    * Resolves a complete URL from a FetchRequest.
@@ -253,7 +253,7 @@ class E extends p {
     super(s, t.error), this.exchange = t, this.name = "ExchangeError", Object.setPrototypeOf(this, E.prototype);
   }
 }
-class O extends p {
+class _ extends p {
   /**
    * Creates a new FetchTimeoutError instance.
    *
@@ -261,13 +261,13 @@ class O extends p {
    */
   constructor(t) {
     const r = t.method || "GET", s = `Request timeout of ${t.timeout}ms exceeded for ${r} ${t.url}`;
-    super(s), this.name = "FetchTimeoutError", this.request = t, Object.setPrototypeOf(this, O.prototype);
+    super(s), this.name = "FetchTimeoutError", this.request = t, Object.setPrototypeOf(this, _.prototype);
   }
 }
-function X(e, t) {
+function k(e, t) {
   return typeof e < "u" ? e : t;
 }
-async function V(e) {
+async function J(e) {
   const t = e.url, r = e.timeout, s = e;
   if (e.signal)
     return await fetch(t, s);
@@ -276,54 +276,54 @@ async function V(e) {
   const o = e.abortController ?? new AbortController();
   e.abortController = o, s.signal = o.signal;
   let n = null;
-  const a = new Promise((u, T) => {
+  const u = new Promise((a, T) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
-      const I = new O(e);
+      const I = new _(e);
       o.abort(I), T(I);
     }, r);
   });
   try {
-    return await Promise.race([fetch(t, s), a]);
+    return await Promise.race([fetch(t, s), u]);
   } finally {
     n && clearTimeout(n);
   }
 }
-const k = (e) => e, J = (e) => e.requiredResponse, Q = (e) => e.requiredResponse.json(), Y = (e) => e.requiredResponse.text(), z = (e) => e.requiredResponse.blob(), K = (e) => e.requiredResponse.arrayBuffer(), W = (e) => e.requiredResponse.bytes(), q = {
+const Q = (e) => e, Y = (e) => e.requiredResponse, z = (e) => e.requiredResponse.json(), K = (e) => e.requiredResponse.text(), W = (e) => e.requiredResponse.blob(), Z = (e) => e.requiredResponse.arrayBuffer(), tt = (e) => e.requiredResponse.bytes(), q = {
   /**
    * Returns the original FetchExchange object
    */
-  Exchange: k,
+  Exchange: Q,
   /**
    * Extracts the raw Response object
    */
-  Response: J,
+  Response: Y,
   /**
    * Parses and returns response body as JSON
    */
-  Json: Q,
+  Json: z,
   /**
    * Returns response body as text
    */
-  Text: Y,
+  Text: K,
   /**
    * Returns response body as a Blob
    */
-  Blob: z,
+  Blob: W,
   /**
    * Returns response body as an ArrayBuffer
    */
-  ArrayBuffer: K,
+  ArrayBuffer: Z,
   /**
    * Returns response body as a Uint8Array
    */
-  Bytes: W
+  Bytes: tt
 };
 function S(e, t) {
   if (!(e === void 0 && t === void 0))
     return t === void 0 ? e : e === void 0 ? t : { ...e, ...t };
 }
-function Z(e, t) {
+function et(e, t) {
   if (t ??= /* @__PURE__ */ new Map(), !e)
     return t;
   if (e instanceof Map) {
@@ -335,9 +335,9 @@ function Z(e, t) {
     t.set(r, s);
   return t;
 }
-class tt {
+class rt {
   constructor(t) {
-    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? q.Exchange, this.attributes = Z(t.attributes), this._response = t.response, this.error = t.error;
+    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? q.Exchange, this.attributes = et(t.attributes), this._response = t.response, this.error = t.error;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -435,10 +435,10 @@ const c = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
 let R = d;
-const et = "UrlResolveInterceptor", C = Number.MIN_SAFE_INTEGER + 1e3;
-class rt {
+const st = "UrlResolveInterceptor", D = Number.MIN_SAFE_INTEGER + 1e3;
+class ot {
   constructor() {
-    this.name = et, this.order = C;
+    this.name = st, this.order = D;
   }
   /**
    * Resolves the final URL by combining the base URL, path parameters, and query parameters.
@@ -450,10 +450,10 @@ class rt {
     r.url = t.fetcher.urlBuilder.resolveRequestUrl(r);
   }
 }
-const st = "RequestBodyInterceptor", ot = C + 1e3;
-class nt {
+const nt = "RequestBodyInterceptor", it = D + 1e3;
+class ut {
   constructor() {
-    this.name = st, this.order = ot;
+    this.name = nt, this.order = it;
   }
   /**
    * Checks if the provided body is of a supported complex type that doesn't require JSON serialization.
@@ -526,10 +526,10 @@ class nt {
     this.isSupportedComplexBodyType(r.body) || (t.request.body = JSON.stringify(r.body), s[c] || (s[c] = R.APPLICATION_JSON));
   }
 }
-const it = "FetchInterceptor", at = Number.MAX_SAFE_INTEGER - 1e3;
-class ut {
+const at = "FetchInterceptor", ct = Number.MAX_SAFE_INTEGER - 1e3;
+class ht {
   constructor() {
-    this.name = it, this.order = at;
+    this.name = at, this.order = ct;
   }
   /**
    * Intercept and process HTTP requests.
@@ -557,11 +557,15 @@ class ut {
    * console.log(exchange.response); // HTTP response object
    */
   async intercept(t) {
-    t.response = await V(t.request);
+    t.response = await J(t.request);
   }
 }
+const N = 0;
+function x(e, t) {
+  return (e.order ?? N) - (t.order ?? N);
+}
 function f(e, t) {
-  return t ? e.filter(t).sort((r, s) => r.order - s.order) : [...e].sort((r, s) => r.order - s.order);
+  return t ? e.filter(t).sort(x) : [...e].sort(x);
 }
 class m {
   /**
@@ -664,14 +668,14 @@ class b extends E {
     ), this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, b.prototype);
   }
 }
-const ct = (e) => e >= 200 && e < 300, ht = "ValidateStatusInterceptor", lt = Number.MAX_SAFE_INTEGER - 1e3;
-class Et {
+const lt = (e) => e >= 200 && e < 300, Et = "ValidateStatusInterceptor", Rt = Number.MAX_SAFE_INTEGER - 1e3;
+class dt {
   /**
    * Creates a new ValidateStatusInterceptor instance.
    *
    * @param validateStatus - Function that determines if a status code is valid
    */
-  constructor(t = ct) {
+  constructor(t = lt) {
     this.validateStatus = t;
   }
   /**
@@ -680,7 +684,7 @@ class Et {
    * @returns The name of this interceptor
    */
   get name() {
-    return ht;
+    return Et;
   }
   /**
    * Gets the order of this interceptor.
@@ -688,7 +692,7 @@ class Et {
    * @returns VALIDATE_STATUS_INTERCEPTOR_ORDER, indicating this interceptor should execute early
    */
   get order() {
-    return lt;
+    return Rt;
   }
   /**
    * Validates the response status code.
@@ -711,14 +715,14 @@ class Et {
       throw new b(t);
   }
 }
-class Rt {
+class pt {
   constructor() {
     this.request = new m([
-      new rt(),
-      new nt(),
-      new ut()
+      new ot(),
+      new ut(),
+      new ht()
     ]), this.response = new m([
-      new Et()
+      new dt()
     ]), this.error = new m();
   }
   /**
@@ -817,7 +821,7 @@ class Rt {
     }
   }
 }
-function Tt(e, t) {
+function mt(e, t) {
   if (Object.keys(e).length === 0)
     return t;
   if (Object.keys(t).length === 0)
@@ -828,7 +832,7 @@ function Tt(e, t) {
   }, s = {
     ...e.headers,
     ...t.headers
-  }, o = t.method ?? e.method, n = t.body ?? e.body, a = t.timeout ?? e.timeout, u = t.signal ?? e.signal, T = t.abortController ?? e.abortController;
+  }, o = t.method ?? e.method, n = t.body ?? e.body, u = t.timeout ?? e.timeout, a = t.signal ?? e.signal, T = t.abortController ?? e.abortController;
   return {
     ...e,
     ...t,
@@ -836,8 +840,8 @@ function Tt(e, t) {
     urlParams: r,
     headers: s,
     body: n,
-    timeout: a,
-    signal: u,
+    timeout: u,
+    signal: a,
     abortController: T
   };
 }
@@ -849,15 +853,15 @@ function A(e, t) {
 }
 const w = {
   [c]: R.APPLICATION_JSON
-}, U = {
+}, L = {
   baseURL: "",
   headers: w
 }, v = {
   resultExtractor: q.Exchange
-}, N = {
+}, F = {
   resultExtractor: q.Response
 };
-class D {
+class B {
   /**
    * Initializes a new Fetcher instance with optional configuration.
    *
@@ -871,8 +875,8 @@ class D {
    * @param options.urlTemplateStyle - Style for URL template parameter interpolation.
    * @param options.interceptors - Interceptor manager for processing requests and responses.
    */
-  constructor(t = U) {
-    this.headers = w, this.urlBuilder = new $(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? w, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new Rt();
+  constructor(t = L) {
+    this.headers = w, this.urlBuilder = new V(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? w, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new pt();
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -891,17 +895,17 @@ class D {
     }, o = {
       ...t,
       headers: s,
-      timeout: X(t.timeout, this.timeout)
-    }, { resultExtractor: n, attributes: a } = A(
+      timeout: k(t.timeout, this.timeout)
+    }, { resultExtractor: n, attributes: u } = A(
       v,
       r
-    ), u = new tt({
+    ), a = new rt({
       fetcher: this,
       request: o,
       resultExtractor: n,
-      attributes: a
+      attributes: u
     });
-    return await this.interceptors.exchange(u);
+    return await this.interceptors.exchange(a);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -949,7 +953,7 @@ class D {
     };
     return await this.request(
       o,
-      A(N, s)
+      A(F, s)
     );
   }
   /**
@@ -978,7 +982,7 @@ class D {
     };
     return await this.request(
       n,
-      A(N, o)
+      A(F, o)
     );
   }
   /**
@@ -1137,7 +1141,7 @@ class D {
   }
 }
 const g = "default";
-class dt {
+class Tt {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -1237,11 +1241,11 @@ class dt {
     return new Map(this.registrar);
   }
 }
-const _ = new dt();
-function ft(e, t) {
-  return e ? e instanceof D ? e : _.requiredGet(e) : t ?? _.default;
+const O = new Tt();
+function At(e, t) {
+  return e ? e instanceof B ? e : O.requiredGet(e) : t ?? O.default;
 }
-class pt extends D {
+class ft extends B {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -1259,69 +1263,70 @@ class pt extends D {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(t, r = U) {
-    super(r), this.name = t, _.register(t, this);
+  constructor(t, r = L) {
+    super(r), this.name = t, O.register(t, this);
   }
 }
-const mt = new pt(g);
+const Pt = new ft(g);
 export {
-  K as ArrayBufferResultExtractor,
-  z as BlobResultExtractor,
-  W as BytesResultExtractor,
+  Z as ArrayBufferResultExtractor,
+  W as BlobResultExtractor,
+  tt as BytesResultExtractor,
   c as CONTENT_TYPE_HEADER,
   R as ContentTypeValues,
   g as DEFAULT_FETCHER_NAME,
-  N as DEFAULT_FETCH_OPTIONS,
-  U as DEFAULT_OPTIONS,
+  F as DEFAULT_FETCH_OPTIONS,
+  L as DEFAULT_OPTIONS,
   v as DEFAULT_REQUEST_OPTIONS,
   E as ExchangeError,
-  k as ExchangeResultExtractor,
+  Q as ExchangeResultExtractor,
   y as ExpressUrlTemplateResolver,
-  it as FETCH_INTERCEPTOR_NAME,
-  at as FETCH_INTERCEPTOR_ORDER,
-  tt as FetchExchange,
-  ut as FetchInterceptor,
-  O as FetchTimeoutError,
-  D as Fetcher,
+  at as FETCH_INTERCEPTOR_NAME,
+  ct as FETCH_INTERCEPTOR_ORDER,
+  rt as FetchExchange,
+  ht as FetchInterceptor,
+  _ as FetchTimeoutError,
+  B as Fetcher,
   p as FetcherError,
-  dt as FetcherRegistrar,
+  Tt as FetcherRegistrar,
   i as HttpMethod,
   b as HttpStatusValidationError,
-  Rt as InterceptorManager,
+  pt as InterceptorManager,
   m as InterceptorRegistry,
-  Q as JsonResultExtractor,
-  pt as NamedFetcher,
-  st as REQUEST_BODY_INTERCEPTOR_NAME,
-  ot as REQUEST_BODY_INTERCEPTOR_ORDER,
-  nt as RequestBodyInterceptor,
-  J as ResponseResultExtractor,
+  z as JsonResultExtractor,
+  ft as NamedFetcher,
+  nt as REQUEST_BODY_INTERCEPTOR_NAME,
+  it as REQUEST_BODY_INTERCEPTOR_ORDER,
+  ut as RequestBodyInterceptor,
+  Y as ResponseResultExtractor,
   q as ResultExtractors,
-  Y as TextResultExtractor,
-  et as URL_RESOLVE_INTERCEPTOR_NAME,
-  C as URL_RESOLVE_INTERCEPTOR_ORDER,
+  K as TextResultExtractor,
+  st as URL_RESOLVE_INTERCEPTOR_NAME,
+  D as URL_RESOLVE_INTERCEPTOR_ORDER,
   P as UriTemplateResolver,
-  $ as UrlBuilder,
-  rt as UrlResolveInterceptor,
-  M as UrlTemplateStyle,
-  ht as VALIDATE_STATUS_INTERCEPTOR_NAME,
-  lt as VALIDATE_STATUS_INTERCEPTOR_ORDER,
-  Et as ValidateStatusInterceptor,
-  B as combineURLs,
-  j as expressUrlTemplateResolver,
-  mt as fetcher,
-  _ as fetcherRegistrar,
-  ft as getFetcher,
-  G as getUrlTemplateResolver,
-  L as isAbsoluteURL,
-  Z as mergeRecordToMap,
+  V as UrlBuilder,
+  ot as UrlResolveInterceptor,
+  H as UrlTemplateStyle,
+  Et as VALIDATE_STATUS_INTERCEPTOR_NAME,
+  Rt as VALIDATE_STATUS_INTERCEPTOR_ORDER,
+  dt as ValidateStatusInterceptor,
+  G as combineURLs,
+  X as expressUrlTemplateResolver,
+  Pt as fetcher,
+  O as fetcherRegistrar,
+  At as getFetcher,
+  j as getUrlTemplateResolver,
+  M as isAbsoluteURL,
+  et as mergeRecordToMap,
   S as mergeRecords,
-  Tt as mergeRequest,
+  mt as mergeRequest,
   A as mergeRequestOptions,
-  X as resolveTimeout,
-  V as timeoutFetch,
+  k as resolveTimeout,
+  x as sortOrder,
+  J as timeoutFetch,
   f as toSorted,
-  H as uriTemplateResolver,
-  F as urlTemplateRegexExtract,
-  x as urlTemplateRegexResolve
+  $ as uriTemplateResolver,
+  U as urlTemplateRegexExtract,
+  C as urlTemplateRegexResolve
 };
 //# sourceMappingURL=index.es.js.map