@ahoo-wang/fetcher 1.3.2 → 1.3.5

package/dist/fetchRequest.d.ts

@@ -105,6 +105,28 @@ export interface FetchRequestInit extends TimeoutCapable, RequestHeadersCapable,
      * ```
      */
     body?: BodyInit | Record<string, any> | string | null;
+    /**
+     * AbortController for this request.
+     * Used to cancel the request if needed.
+     *
+     * In timeout scenarios, if this property is provided, it will be used instead of creating a new AbortController.
+     * This allows the caller to provide a custom AbortController for more advanced cancellation scenarios.
+     *
+     * @example
+     * ```typescript
+     * // Provide a custom AbortController
+     * const controller = new AbortController();
+     * const request: FetchRequest = {
+     *   url: 'https://api.example.com/data',
+     *   method: 'GET',
+     *   abortController: controller
+     * };
+     *
+     * // Later, cancel the request
+     * controller.abort();
+     * ```
+     */
+    abortController?: AbortController;
 }
 /**
  * Fetcher request interface

package/dist/fetchRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRequest.d.ts","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,gBAAgB,sBAAsB;IACtD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,uBAAuB;CACzD;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,gBACf,SAAQ,cAAc,EACpB,qBAAqB,EACrB,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;CACvD;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb"}
+{"version":3,"file":"fetchRequest.d.ts","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,gBAAgB,sBAAsB;IACtD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,uBAAuB;CACzD;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,gBACf,SAAQ,cAAc,EACpB,qBAAqB,EACrB,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IAEtD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb"}

package/dist/index.es.js

@@ -4,26 +4,26 @@ function S(r) {
 function F(r, e) {
   return S(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.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;
+var C = /* @__PURE__ */ ((r) => (r[r.UriTemplate = 0] = "UriTemplate", r[r.Express = 1] = "Express", r))(C || {});
+function U(r) {
+  return r === 1 ? L : D;
 }
 function _(r, e, t) {
   return t ? r.replace(e, (s, n) => {
-    const i = t[n];
-    if (i === void 0)
+    const o = t[n];
+    if (o === void 0)
       throw new Error(`Missing required path parameter: ${n}`);
-    return encodeURIComponent(i);
+    return encodeURIComponent(o);
   }) : r;
 }
-function g(r, e) {
+function b(r, e) {
   const t = [];
   let s;
   for (; (s = e.exec(r)) !== null; )
     t.push(s[1]);
   return t;
 }
-const a = class a {
+const c = class c {
   /**
    * Extracts path parameters from a URL string.
    *
@@ -48,9 +48,9 @@ const a = class a {
    * ```
    */
   extractPathParams(e) {
-    return g(
+    return b(
       e,
-      a.PATH_PARAM_REGEX
+      c.PATH_PARAM_REGEX
     );
   }
   /**
@@ -92,14 +92,14 @@ const a = class a {
   resolve(e, t) {
     return _(
       e,
-      a.PATH_PARAM_REGEX,
+      c.PATH_PARAM_REGEX,
       t
     );
   }
 };
-a.PATH_PARAM_REGEX = /{([^}]+)}/g;
-let T = a;
-const L = new T(), h = class h {
+c.PATH_PARAM_REGEX = /{([^}]+)}/g;
+let T = c;
+const D = new T(), h = class h {
   /**
    * Extracts path parameters from an Express-style URL string.
    *
@@ -120,7 +120,7 @@ const L = new T(), h = class h {
    * ```
    */
   extractPathParams(e) {
-    return g(
+    return b(
       e,
       h.PATH_PARAM_REGEX
     );
@@ -167,7 +167,7 @@ const L = new T(), h = class h {
 };
 h.PATH_PARAM_REGEX = /:([^/]+)/g;
 let f = h;
-const C = new f();
+const L = new f();
 class v {
   /**
    * Initializes a new UrlBuilder instance.
@@ -187,7 +187,7 @@ class v {
    * ```
    */
   constructor(e, t) {
-    this.baseURL = e, this.urlTemplateResolver = D(t);
+    this.baseURL = e, this.urlTemplateResolver = U(t);
   }
   /**
    * Builds a complete URL, including path parameter replacement and query parameter addition.
@@ -208,13 +208,13 @@ class v {
    * ```
    */
   build(e, t) {
-    const s = t?.path, n = t?.query, i = F(this.baseURL, e);
-    let o = this.urlTemplateResolver.resolve(i, s);
+    const s = t?.path, n = t?.query, o = F(this.baseURL, e);
+    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.
@@ -257,22 +257,22 @@ function G(r, e) {
 }
 async function M(r) {
   const e = r.url, t = r.timeout, s = r;
-  if (!t)
+  if (r.signal)
     return fetch(e, s);
-  const n = new AbortController(), i = {
-    ...s,
-    signal: n.signal
-  };
+  if (!t)
+    return r.abortController && (s.signal = r.abortController.signal), fetch(e, 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, N) => {
     o = setTimeout(() => {
       o && clearTimeout(o);
-      const q = new y(r);
-      n.abort(q), N(q);
+      const g = new y(r);
+      n.abort(g), N(g);
     }, t);
   });
   try {
-    return await Promise.race([fetch(e, i), c]);
+    return await Promise.race([fetch(e, s), u]);
   } finally {
     o && clearTimeout(o);
   }
@@ -292,8 +292,8 @@ class B {
     t.url = e.fetcher.urlBuilder.resolveRequestUrl(t);
   }
 }
-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 se = "Content-Type", E = class E {
 };
 E.APPLICATION_JSON = "application/json", E.TEXT_EVENT_STREAM = "text/event-stream";
 let d = E;
@@ -721,7 +721,7 @@ class W {
 }
 const P = {
   "Content-Type": d.APPLICATION_JSON
-}, b = {
+}, q = {
   baseURL: "",
   headers: P
 };
@@ -734,7 +734,7 @@ class Z {
    *
    * @param options - Configuration options for the Fetcher instance
    */
-  constructor(e = b) {
+  constructor(e = q) {
     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();
   }
   /**
@@ -802,7 +802,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async get(e, t = {}) {
-    return this.methodFetch(u.GET, e, t);
+    return this.methodFetch(i.GET, e, t);
   }
   /**
    * Makes a POST HTTP request.
@@ -814,7 +814,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async post(e, t = {}) {
-    return this.methodFetch(u.POST, e, t);
+    return this.methodFetch(i.POST, e, t);
   }
   /**
    * Makes a PUT HTTP request.
@@ -826,7 +826,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async put(e, t = {}) {
-    return this.methodFetch(u.PUT, e, t);
+    return this.methodFetch(i.PUT, e, t);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -838,7 +838,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async delete(e, t = {}) {
-    return this.methodFetch(u.DELETE, e, t);
+    return this.methodFetch(i.DELETE, e, t);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -850,7 +850,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async patch(e, t = {}) {
-    return this.methodFetch(u.PATCH, e, t);
+    return this.methodFetch(i.PATCH, e, t);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -863,7 +863,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async head(e, t = {}) {
-    return this.methodFetch(u.HEAD, e, t);
+    return this.methodFetch(i.HEAD, e, t);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -876,7 +876,7 @@ class Z {
    * @returns Promise that resolves to the HTTP response
    */
   async options(e, t = {}) {
-    return this.methodFetch(u.OPTIONS, e, t);
+    return this.methodFetch(i.OPTIONS, e, t);
   }
 }
 const A = "default";
@@ -985,7 +985,7 @@ function O(r, e) {
   if (!(r === void 0 && e === void 0))
     return e === void 0 ? r : r === void 0 ? e : { ...r, ...e };
 }
-function oe(r, e) {
+function ne(r, e) {
   if (Object.keys(r).length === 0)
     return e;
   if (Object.keys(e).length === 0)
@@ -996,16 +996,16 @@ function oe(r, e) {
   }, 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;
+  }, n = e.method ?? r.method, o = e.body ?? r.body, u = e.timeout ?? r.timeout, a = e.signal ?? r.signal;
   return {
     ...r,
     ...e,
     method: n,
     urlParams: t,
     headers: s,
-    body: i,
-    timeout: o,
-    signal: c
+    body: o,
+    timeout: u,
+    signal: a
   };
 }
 class re extends Z {
@@ -1026,16 +1026,16 @@ class re extends Z {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(e, t = b) {
+  constructor(e, t = q) {
     super(t), this.name = e, te.register(e, this);
   }
 }
-const ie = new re(A);
+const oe = new re(A);
 export {
-  ne as CONTENT_TYPE_HEADER,
+  se as CONTENT_TYPE_HEADER,
   d as ContentTypeValues,
   A as DEFAULT_FETCHER_NAME,
-  b as DEFAULT_OPTIONS,
+  q as DEFAULT_OPTIONS,
   m as ExchangeError,
   f as ExpressUrlTemplateResolver,
   x as FETCH_INTERCEPTOR_NAME,
@@ -1046,7 +1046,7 @@ export {
   Z as Fetcher,
   l as FetcherError,
   ee as FetcherRegistrar,
-  u as HttpMethod,
+  i as HttpMethod,
   I as HttpStatusValidationError,
   K as InterceptorManager,
   R as InterceptorRegistry,
@@ -1059,23 +1059,23 @@ export {
   T as UriTemplateResolver,
   v as UrlBuilder,
   B as UrlResolveInterceptor,
-  U as UrlTemplateStyle,
+  C 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,
+  L as expressUrlTemplateResolver,
+  oe as fetcher,
   te as fetcherRegistrar,
-  D as getUrlTemplateResolver,
+  U as getUrlTemplateResolver,
   S as isAbsoluteURL,
   O as mergeRecords,
-  oe as mergeRequest,
+  ne as mergeRequest,
   G as resolveTimeout,
   M as timeoutFetch,
   p as toSorted,
-  L as uriTemplateResolver,
-  g as urlTemplateRegexExtract,
+  D as uriTemplateResolver,
+  b as urlTemplateRegexExtract,
   _ as urlTemplateRegexResolve
 };
 //# sourceMappingURL=index.es.js.map