@ahoo-wang/fetcher 2.6.8 → 2.6.10

package/dist/fetchExchange.d.ts

@@ -188,6 +188,6 @@ export declare class FetchExchange implements RequiredBy<FetchExchangeInit, 'att
      *
      * @returns The extracted result
      */
-    extractResult<R>(): R | Promise<R>;
+    extractResult<R>(): Promise<R>;
 }
 //# sourceMappingURL=fetchExchange.d.ts.map

package/dist/fetchExchange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchExchange.d.ts","sourceRoot":"","sources":["../src/fetchExchange.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AAGtE,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,qBAAa,aACX,YAAW,UAAU,CAAC,iBAAiB,EAAE,YAAY,CAAC;IACtD;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IAEtB;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IACtC;;OAEG;IACH,OAAO,CAAC,SAAS,CAAC,CAAW;IAE7B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAAC,CAAqB;IACnD;;;;;;;;;;;;;OAaG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEjB,YAAY,EAAE,iBAAiB;IAU3C;;;;;;;;OAQG;IACH,oBAAoB,IAAI,cAAc;IAOtC;;;;;;;;;;OAUG;IACH,sBAAsB,IAAI,QAAQ,CAAC,SAAS,CAAC;IAgB7C;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;;;;;OAMG;IACH,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAG1C;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,QAAQ,GAAG,SAAS,CAEnC;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAItB;;;;;;;;;OASG;IACH,IAAI,gBAAgB,IAAI,QAAQ,CAQ/B;IAED;;;;;OAKG;IACH,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAOnC"}
+{"version":3,"file":"fetchExchange.d.ts","sourceRoot":"","sources":["../src/fetchExchange.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AAGtE,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,qBAAa,aACX,YAAW,UAAU,CAAC,iBAAiB,EAAE,YAAY,CAAC;IACtD;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IAEtB;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IACtC;;OAEG;IACH,OAAO,CAAC,SAAS,CAAC,CAAW;IAE7B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAAC,CAAqB;IACnD;;;;;;;;;;;;;OAaG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEjB,YAAY,EAAE,iBAAiB;IAU3C;;;;;;;;OAQG;IACH,oBAAoB,IAAI,cAAc;IAOtC;;;;;;;;;;OAUG;IACH,sBAAsB,IAAI,QAAQ,CAAC,SAAS,CAAC;IAgB7C;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;;;;;OAMG;IACH,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAG1C;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,QAAQ,GAAG,SAAS,CAEnC;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAItB;;;;;;;;;OASG;IACH,IAAI,gBAAgB,IAAI,QAAQ,CAQ/B;IAED;;;;;OAKG;IACG,aAAa,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;CAOrC"}

package/dist/index.es.js

@@ -209,12 +209,12 @@ class $ {
    */
   build(t, r) {
     const s = r?.path, o = r?.query, n = B(this.baseURL, t);
-    let i = this.urlTemplateResolver.resolve(n, s);
+    let a = this.urlTemplateResolver.resolve(n, s);
     if (o) {
-      const a = new URLSearchParams(o).toString();
-      a && (i += "?" + a);
+      const u = new URLSearchParams(o).toString();
+      u && (a += "?" + u);
     }
-    return i;
+    return a;
   }
   /**
    * Resolves a complete URL from a FetchRequest.
@@ -241,7 +241,7 @@ class E extends Error {
     super(s), this.cause = r, this.name = "FetcherError", r?.stack && (this.stack = r.stack), Object.setPrototypeOf(this, E.prototype);
   }
 }
-class q extends E {
+class O extends E {
   /**
    * Creates a new FetchTimeoutError instance.
    *
@@ -249,7 +249,7 @@ class q extends E {
    */
   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, q.prototype);
+    super(s), this.name = "FetchTimeoutError", this.request = t, Object.setPrototypeOf(this, O.prototype);
   }
 }
 function X(e, t) {
@@ -264,15 +264,15 @@ async function V(e) {
   const o = e.abortController ?? new AbortController();
   e.abortController = o, s.signal = o.signal;
   let n = null;
-  const i = new Promise((a, T) => {
+  const a = new Promise((u, T) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
-      const w = new q(e);
-      o.abort(w), T(w);
+      const I = new O(e);
+      o.abort(I), T(I);
     }, r);
   });
   try {
-    return await Promise.race([fetch(t, s), i]);
+    return await Promise.race([fetch(t, s), a]);
   } finally {
     n && clearTimeout(n);
   }
@@ -292,7 +292,7 @@ class J {
     r.url = t.fetcher.urlBuilder.resolveRequestUrl(r);
   }
 }
-var u = /* @__PURE__ */ ((e) => (e.GET = "GET", e.POST = "POST", e.PUT = "PUT", e.DELETE = "DELETE", e.PATCH = "PATCH", e.HEAD = "HEAD", e.OPTIONS = "OPTIONS", e.TRACE = "TRACE", e))(u || {});
+var i = /* @__PURE__ */ ((e) => (e.GET = "GET", e.POST = "POST", e.PUT = "PUT", e.DELETE = "DELETE", e.PATCH = "PATCH", e.HEAD = "HEAD", e.OPTIONS = "OPTIONS", e.TRACE = "TRACE", e))(i || {});
 const c = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
@@ -503,11 +503,11 @@ class m {
       await r.intercept(t);
   }
 }
-class b extends E {
+class q extends E {
   constructor(t) {
     super(
       `Request failed with status code ${t.response?.status} for ${t.request.url}`
-    ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, b.prototype);
+    ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, q.prototype);
   }
 }
 const tt = (e) => e >= 200 && e < 300, et = "ValidateStatusInterceptor", rt = Number.MAX_SAFE_INTEGER - 1e3;
@@ -554,7 +554,7 @@ class st {
       return;
     const r = t.response.status;
     if (!this.validateStatus(r))
-      throw new b(t);
+      throw new q(t);
   }
 }
 class p extends E {
@@ -675,7 +675,7 @@ class ot {
     }
   }
 }
-const nt = (e) => e, ut = (e) => e.requiredResponse, it = (e) => e.requiredResponse.json(), at = (e) => e.requiredResponse.text(), ct = (e) => e.requiredResponse.blob(), ht = (e) => e.requiredResponse.arrayBuffer(), lt = (e) => e.requiredResponse.bytes(), I = {
+const nt = (e) => e, it = (e) => e.requiredResponse, at = (e) => e.requiredResponse.json(), ut = (e) => e.requiredResponse.text(), ct = (e) => e.requiredResponse.blob(), ht = (e) => e.requiredResponse.arrayBuffer(), lt = (e) => e.requiredResponse.bytes(), b = {
   /**
    * Returns the original FetchExchange object
    */
@@ -683,15 +683,15 @@ const nt = (e) => e, ut = (e) => e.requiredResponse, it = (e) => e.requiredRespo
   /**
    * Extracts the raw Response object
    */
-  Response: ut,
+  Response: it,
   /**
    * Parses and returns response body as JSON
    */
-  Json: it,
+  Json: at,
   /**
    * Returns response body as text
    */
-  Text: at,
+  Text: ut,
   /**
    * Returns response body as a Blob
    */
@@ -723,7 +723,7 @@ function Et(e, t) {
 }
 class Rt {
   constructor(t) {
-    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? I.Exchange, this.attributes = Et(t.attributes), this._response = t.response, this.error = t.error;
+    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? b.Exchange, this.attributes = Et(t.attributes), this._response = t.response, this.error = t.error;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -812,8 +812,8 @@ class Rt {
    *
    * @returns The extracted result
    */
-  extractResult() {
-    return this.cachedExtractedResult !== void 0 ? this.cachedExtractedResult : (this.cachedExtractedResult = this.resultExtractor(this), this.cachedExtractedResult);
+  async extractResult() {
+    return this.cachedExtractedResult !== void 0 ? await this.cachedExtractedResult : (this.cachedExtractedResult = this.resultExtractor(this), await this.cachedExtractedResult);
   }
 }
 function Tt(e, t) {
@@ -827,7 +827,7 @@ function Tt(e, t) {
   }, s = {
     ...e.headers,
     ...t.headers
-  }, o = t.method ?? e.method, n = t.body ?? e.body, i = t.timeout ?? e.timeout, a = t.signal ?? e.signal, T = t.abortController ?? e.abortController;
+  }, 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;
   return {
     ...e,
     ...t,
@@ -835,8 +835,8 @@ function Tt(e, t) {
     urlParams: r,
     headers: s,
     body: n,
-    timeout: i,
-    signal: a,
+    timeout: a,
+    signal: u,
     abortController: T
   };
 }
@@ -846,15 +846,15 @@ function A(e, t) {
     attributes: t?.attributes ?? e?.attributes
   };
 }
-const g = {
+const w = {
   [c]: R.APPLICATION_JSON
 }, U = {
   baseURL: "",
-  headers: g
+  headers: w
 }, v = {
-  resultExtractor: I.Exchange
+  resultExtractor: b.Exchange
 }, N = {
-  resultExtractor: I.Response
+  resultExtractor: b.Response
 };
 class D {
   /**
@@ -871,7 +871,7 @@ class D {
    * @param options.interceptors - Interceptor manager for processing requests and responses.
    */
   constructor(t = U) {
-    this.headers = g, this.urlBuilder = new $(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? g, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new ot();
+    this.headers = w, this.urlBuilder = new $(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? w, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new ot();
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -891,16 +891,16 @@ class D {
       ...t,
       headers: s,
       timeout: X(t.timeout, this.timeout)
-    }, { resultExtractor: n, attributes: i } = A(
+    }, { resultExtractor: n, attributes: a } = A(
       v,
       r
-    ), a = new Rt({
+    ), u = new Rt({
       fetcher: this,
       request: o,
       resultExtractor: n,
-      attributes: i
+      attributes: a
     });
-    return this.interceptors.exchange(a);
+    return await this.interceptors.exchange(u);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -921,7 +921,7 @@ class D {
    * @throws Error if an unhandled error occurs during request processing
    */
   async request(t, r) {
-    return (await this.exchange(t, r)).extractResult();
+    return await (await this.exchange(t, r)).extractResult();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -946,7 +946,7 @@ class D {
       ...r,
       url: t
     };
-    return this.request(
+    return await this.request(
       o,
       A(N, s)
     );
@@ -975,7 +975,7 @@ class D {
       url: r,
       method: t
     };
-    return this.request(
+    return await this.request(
       n,
       A(N, o)
     );
@@ -998,7 +998,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async get(t, r = {}, s) {
-    return this.methodFetch(u.GET, t, r, s);
+    return await this.methodFetch(i.GET, t, r, s);
   }
   /**
    * Makes a PUT HTTP request.
@@ -1017,7 +1017,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async put(t, r = {}, s) {
-    return this.methodFetch(u.PUT, t, r, s);
+    return await this.methodFetch(i.PUT, t, r, s);
   }
   /**
    * Makes a POST HTTP request.
@@ -1036,7 +1036,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async post(t, r = {}, s) {
-    return this.methodFetch(u.POST, t, r, s);
+    return await this.methodFetch(i.POST, t, r, s);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -1055,7 +1055,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async patch(t, r = {}, s) {
-    return this.methodFetch(u.PATCH, t, r, s);
+    return await this.methodFetch(i.PATCH, t, r, s);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -1074,7 +1074,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async delete(t, r = {}, s) {
-    return this.methodFetch(u.DELETE, t, r, s);
+    return await this.methodFetch(i.DELETE, t, r, s);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -1094,7 +1094,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async head(t, r = {}, s) {
-    return this.methodFetch(u.HEAD, t, r, s);
+    return await this.methodFetch(i.HEAD, t, r, s);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -1114,7 +1114,7 @@ class D {
    * @returns Promise that resolves to the HTTP response
    */
   async options(t, r = {}, s) {
-    return this.methodFetch(u.OPTIONS, t, r, s);
+    return await this.methodFetch(i.OPTIONS, t, r, s);
   }
   /**
    * Sends an HTTP TRACE request to the specified URL and returns the response.
@@ -1132,10 +1132,10 @@ class D {
    *          The response contains status, headers, and body data from the TRACE request.
    */
   async trace(t, r = {}, s) {
-    return this.methodFetch(u.TRACE, t, r, s);
+    return await this.methodFetch(i.TRACE, t, r, s);
   }
 }
-const _ = "default";
+const g = "default";
 class dt {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
@@ -1209,7 +1209,7 @@ class dt {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(_);
+    return this.requiredGet(g);
   }
   /**
    * Set the default Fetcher instance
@@ -1220,7 +1220,7 @@ class dt {
    * fetcherRegistrar.default = fetcher;
    */
   set default(t) {
-    this.register(_, t);
+    this.register(g, t);
   }
   /**
    * Get a copy of all registered fetchers
@@ -1236,9 +1236,9 @@ class dt {
     return new Map(this.registrar);
   }
 }
-const O = new dt();
+const _ = new dt();
 function ft(e, t) {
-  return e ? e instanceof D ? e : O.requiredGet(e) : t ?? O.default;
+  return e ? e instanceof D ? e : _.requiredGet(e) : t ?? _.default;
 }
 class pt extends D {
   /**
@@ -1259,17 +1259,17 @@ class pt extends D {
    * });
    */
   constructor(t, r = U) {
-    super(r), this.name = t, O.register(t, this);
+    super(r), this.name = t, _.register(t, this);
   }
 }
-const mt = new pt(_);
+const mt = new pt(g);
 export {
   ht as ArrayBufferResultExtractor,
   ct as BlobResultExtractor,
   lt as BytesResultExtractor,
   c as CONTENT_TYPE_HEADER,
   R as ContentTypeValues,
-  _ as DEFAULT_FETCHER_NAME,
+  g as DEFAULT_FETCHER_NAME,
   N as DEFAULT_FETCH_OPTIONS,
   U as DEFAULT_OPTIONS,
   v as DEFAULT_REQUEST_OPTIONS,
@@ -1280,22 +1280,22 @@ export {
   W as FETCH_INTERCEPTOR_ORDER,
   Rt as FetchExchange,
   Z as FetchInterceptor,
-  q as FetchTimeoutError,
+  O as FetchTimeoutError,
   D as Fetcher,
   E as FetcherError,
   dt as FetcherRegistrar,
-  u as HttpMethod,
-  b as HttpStatusValidationError,
+  i as HttpMethod,
+  q as HttpStatusValidationError,
   ot as InterceptorManager,
   m as InterceptorRegistry,
-  it as JsonResultExtractor,
+  at as JsonResultExtractor,
   pt as NamedFetcher,
   Q as REQUEST_BODY_INTERCEPTOR_NAME,
   Y as REQUEST_BODY_INTERCEPTOR_ORDER,
   z as RequestBodyInterceptor,
-  ut as ResponseResultExtractor,
-  I as ResultExtractors,
-  at as TextResultExtractor,
+  it as ResponseResultExtractor,
+  b as ResultExtractors,
+  ut as TextResultExtractor,
   k as URL_RESOLVE_INTERCEPTOR_NAME,
   C as URL_RESOLVE_INTERCEPTOR_ORDER,
   P as UriTemplateResolver,
@@ -1308,7 +1308,7 @@ export {
   B as combineURLs,
   j as expressUrlTemplateResolver,
   mt as fetcher,
-  O as fetcherRegistrar,
+  _ as fetcherRegistrar,
   ft as getFetcher,
   G as getUrlTemplateResolver,
   L as isAbsoluteURL,