@ahoo-wang/fetcher 1.8.5 → 1.8.6

package/dist/index.es.js

@@ -209,12 +209,12 @@ class j {
    */
   build(t, r) {
     const s = r?.path, o = r?.query, n = D(this.baseURL, t);
-    let u = this.urlTemplateResolver.resolve(n, s);
+    let i = this.urlTemplateResolver.resolve(n, s);
     if (o) {
       const c = new URLSearchParams(o).toString();
-      c && (u += "?" + c);
+      c && (i += "?" + c);
     }
-    return u;
+    return i;
   }
   /**
    * Resolves a complete URL from a FetchRequest.
@@ -262,9 +262,9 @@ async function $(e) {
   if (!r)
     return e.abortController && (s.signal = e.abortController.signal), fetch(t, s);
   const o = e.abortController ?? new AbortController();
-  s.signal = o.signal;
+  e.abortController = o, s.signal = o.signal;
   let n = null;
-  const u = new Promise((c, p) => {
+  const i = new Promise((c, p) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
       const I = new g(e);
@@ -272,7 +272,7 @@ async function $(e) {
     }, r);
   });
   try {
-    return await Promise.race([fetch(t, s), u]);
+    return await Promise.race([fetch(t, s), i]);
   } finally {
     n && clearTimeout(n);
   }
@@ -292,7 +292,7 @@ class V {
     r.url = t.fetcher.urlBuilder.resolveRequestUrl(r);
   }
 }
-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))(i || {});
+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))(u || {});
 const Et = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
@@ -651,17 +651,17 @@ class rt {
     }
   }
 }
-const st = (e) => e, ot = (e) => e.requiredResponse, nt = (e) => e.requiredResponse.json(), ut = (e) => e.requiredResponse.text(), O = {
+const st = (e) => e, ot = (e) => e.requiredResponse, nt = (e) => e.requiredResponse.json(), it = (e) => e.requiredResponse.text(), O = {
   Exchange: st,
   Response: ot,
   Json: nt,
-  Text: ut
+  Text: it
 };
 function q(e, t) {
   if (!(e === void 0 && t === void 0))
     return t === void 0 ? e : e === void 0 ? t : { ...e, ...t };
 }
-function it(e, t) {
+function ut(e, t) {
   if (t ??= /* @__PURE__ */ new Map(), !e)
     return t;
   if (e instanceof Map) {
@@ -675,7 +675,7 @@ function it(e, t) {
 }
 class ct {
   constructor(t) {
-    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? O.Exchange, this.attributes = it(t.attributes), this._response = t.response, this.error = t.error;
+    this.fetcher = t.fetcher, this.request = t.request, this.resultExtractor = t.resultExtractor ?? O.Exchange, this.attributes = ut(t.attributes), this._response = t.response, this.error = t.error;
   }
   /**
    * Ensures that request headers object exists, creating it if necessary.
@@ -779,7 +779,7 @@ function dt(e, t) {
   }, s = {
     ...e.headers,
     ...t.headers
-  }, o = t.method ?? e.method, n = t.body ?? e.body, u = t.timeout ?? e.timeout, c = t.signal ?? e.signal, p = t.abortController ?? e.abortController;
+  }, o = t.method ?? e.method, n = t.body ?? e.body, i = t.timeout ?? e.timeout, c = t.signal ?? e.signal, p = t.abortController ?? e.abortController;
   return {
     ...e,
     ...t,
@@ -787,7 +787,7 @@ function dt(e, t) {
     urlParams: r,
     headers: s,
     body: n,
-    timeout: u,
+    timeout: i,
     signal: c,
     abortController: p
   };
@@ -864,12 +864,12 @@ class U {
       timeout: B(t.timeout, this.timeout)
     }, {
       resultExtractor: n,
-      attributes: u
+      attributes: i
     } = w(C, r), c = new ct({
       fetcher: this,
       request: o,
       resultExtractor: n,
-      attributes: u
+      attributes: i
     });
     return this.interceptors.exchange(c);
   }
@@ -941,7 +941,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async get(t, r = {}, s) {
-    return this.methodFetch(i.GET, t, r, s);
+    return this.methodFetch(u.GET, t, r, s);
   }
   /**
    * Makes a PUT HTTP request.
@@ -960,7 +960,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async put(t, r = {}, s) {
-    return this.methodFetch(i.PUT, t, r, s);
+    return this.methodFetch(u.PUT, t, r, s);
   }
   /**
    * Makes a POST HTTP request.
@@ -979,7 +979,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async post(t, r = {}, s) {
-    return this.methodFetch(i.POST, t, r, s);
+    return this.methodFetch(u.POST, t, r, s);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -998,7 +998,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async patch(t, r = {}, s) {
-    return this.methodFetch(i.PATCH, t, r, s);
+    return this.methodFetch(u.PATCH, t, r, s);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -1017,7 +1017,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async delete(t, r = {}, s) {
-    return this.methodFetch(i.DELETE, t, r, s);
+    return this.methodFetch(u.DELETE, t, r, s);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -1037,7 +1037,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async head(t, r = {}, s) {
-    return this.methodFetch(i.HEAD, t, r, s);
+    return this.methodFetch(u.HEAD, t, r, s);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -1057,7 +1057,7 @@ class U {
    * @returns Promise that resolves to the HTTP response
    */
   async options(t, r = {}, s) {
-    return this.methodFetch(i.OPTIONS, t, r, s);
+    return this.methodFetch(u.OPTIONS, t, r, s);
   }
 }
 const y = "default";
@@ -1206,7 +1206,7 @@ export {
   U as Fetcher,
   l as FetcherError,
   ht as FetcherRegistrar,
-  i as HttpMethod,
+  u as HttpMethod,
   _ as HttpStatusValidationError,
   rt as InterceptorManager,
   f as InterceptorRegistry,
@@ -1217,7 +1217,7 @@ export {
   Q as RequestBodyInterceptor,
   ot as ResponseResultExtractor,
   O as ResultExtractors,
-  ut as TextResultExtractor,
+  it as TextResultExtractor,
   X as URL_RESOLVE_INTERCEPTOR_NAME,
   F as URL_RESOLVE_INTERCEPTOR_ORDER,
   m as UriTemplateResolver,
@@ -1234,7 +1234,7 @@ export {
   Rt as getFetcher,
   M as getUrlTemplateResolver,
   v as isAbsoluteURL,
-  it as mergeRecordToMap,
+  ut as mergeRecordToMap,
   q as mergeRecords,
   dt as mergeRequest,
   w as mergeRequestOptions,