@ahoo-wang/fetcher 1.1.0 → 1.2.0

package/dist/index.es.js

@@ -1,10 +1,23 @@
-function g(r) {
+function _(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
 function b(r, t) {
-  return g(t) ? t : t ? r.replace(/\/?\/$/, "") + "/" + t.replace(/^\/+/, "") : r;
+  return _(t) ? t : t ? r.replace(/\/?\/$/, "") + "/" + t.replace(/^\/+/, "") : r;
 }
-class S {
+const A = /{([^}]+)}/g;
+function Q(r) {
+  const t = r.match(A);
+  return t ? t.map((e) => e.slice(1, -1)) : [];
+}
+function S(r, t) {
+  return t ? r.replace(A, (e, s) => {
+    const o = t[s];
+    if (o === void 0)
+      throw new Error(`Missing required path parameter: ${s}`);
+    return String(o);
+  }) : r;
+}
+class w {
   /**
    * Initializes a new UrlBuilder instance.
    *
@@ -37,11 +50,11 @@ class S {
    * ```
    */
   build(t, e) {
-    const s = e?.path, o = e?.query, i = b(this.baseURL, t);
-    let n = this.interpolateUrl(i, s);
+    const s = e?.path, o = e?.query, u = b(this.baseURL, t);
+    let n = S(u, s);
     if (o) {
-      const u = new URLSearchParams(o).toString();
-      u && (n += "?" + u);
+      const c = new URLSearchParams(o).toString();
+      c && (n += "?" + c);
     }
     return n;
   }
@@ -57,41 +70,6 @@ class S {
   resolveRequestUrl(t) {
     return this.build(t.url, t.urlParams);
   }
-  /**
-   * Replaces placeholders in the URL with path parameters.
-   *
-   * @param url - Path string containing placeholders, e.g., "http://localhost/users/{id}/posts/{postId}"
-   * @param path - Path parameter object used to replace placeholders in the URL
-   * @returns Path string with placeholders replaced
-   * @throws Error when required path parameters are missing
-   *
-   * @example
-   * ```typescript
-   * const urlBuilder = new UrlBuilder('https://api.example.com');
-   * const result = urlBuilder.interpolateUrl('/users/{id}/posts/{postId}', {
-   *   path: { id: 123, postId: 456 }
-   * });
-   * // Result: https://api.example.com/users/123/posts/456
-   * ```
-   *
-   * @example
-   * ```typescript
-   * // Missing required parameter throws an error
-   * try {
-   *   urlBuilder.interpolateUrl('/users/{id}', { name: 'John' });
-   * } catch (error) {
-   *   console.error(error.message); // "Missing required path parameter: id"
-   * }
-   * ```
-   */
-  interpolateUrl(t, e) {
-    return e ? t.replace(/{([^}]+)}/g, (s, o) => {
-      const i = e[o];
-      if (i === void 0)
-        throw new Error(`Missing required path parameter: ${o}`);
-      return String(i);
-    }) : t;
-  }
 }
 class a extends Error {
   /**
@@ -116,35 +94,35 @@ class R extends a {
     super(s), this.name = "FetchTimeoutError", this.request = t, Object.setPrototypeOf(this, R.prototype);
   }
 }
-function _(r, t) {
+function N(r, t) {
   return typeof r < "u" ? r : t;
 }
-async function w(r) {
+async function F(r) {
   const t = r.url, e = r.timeout, s = r;
   if (!e)
     return fetch(t, s);
-  const o = new AbortController(), i = {
+  const o = new AbortController(), u = {
     ...s,
     signal: o.signal
   };
   let n = null;
-  const u = new Promise((Y, P) => {
+  const c = new Promise((z, g) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
       const y = new R(r);
-      o.abort(y), P(y);
+      o.abort(y), g(y);
     }, e);
   });
   try {
-    return await Promise.race([fetch(t, i), u]);
+    return await Promise.race([fetch(t, u), c]);
   } finally {
     n && clearTimeout(n);
   }
 }
-const N = "UrlResolveInterceptor", O = Number.MIN_SAFE_INTEGER + 1e3;
-class F {
+const q = "UrlResolveInterceptor", P = Number.MIN_SAFE_INTEGER + 1e3;
+class U {
   constructor() {
-    this.name = N, this.order = O;
+    this.name = q, this.order = P;
   }
   /**
    * Resolves the final URL by combining the base URL, path parameters, and query parameters.
@@ -156,15 +134,15 @@ class F {
     e.url = t.fetcher.urlBuilder.resolveRequestUrl(e);
   }
 }
-var c = /* @__PURE__ */ ((r) => (r.GET = "GET", r.POST = "POST", r.PUT = "PUT", r.DELETE = "DELETE", r.PATCH = "PATCH", r.HEAD = "HEAD", r.OPTIONS = "OPTIONS", r))(c || {});
-const z = "Content-Type", d = class d {
+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 K = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
 let h = d;
-const q = "RequestBodyInterceptor", U = O + 1e3;
-class D {
+const D = "RequestBodyInterceptor", L = P + 1e3;
+class C {
   constructor() {
-    this.name = q, this.order = U;
+    this.name = D, this.order = L;
   }
   /**
    * Attempts to convert request body to a valid fetch API body type.
@@ -214,10 +192,10 @@ class D {
     o["Content-Type"] || (o["Content-Type"] = h.APPLICATION_JSON), t.request = s;
   }
 }
-const L = "FetchInterceptor", C = Number.MAX_SAFE_INTEGER - 1e3;
-class v {
+const v = "FetchInterceptor", G = Number.MAX_SAFE_INTEGER - 1e3;
+class M {
   constructor() {
-    this.name = L, this.order = C;
+    this.name = v, this.order = G;
   }
   /**
    * Intercept and process HTTP requests.
@@ -245,7 +223,7 @@ class v {
    * console.log(exchange.response); // HTTP response object
    */
   async intercept(t) {
-    t.response = await w(t.request);
+    t.response = await F(t.request);
   }
 }
 function E(r, t) {
@@ -351,8 +329,8 @@ class f extends a {
     ), this.exchange = t, this.name = "HttpStatusValidationError", Object.setPrototypeOf(this, f.prototype);
   }
 }
-const B = (r) => r >= 200 && r < 300, G = "ValidateStatusInterceptor", M = Number.MAX_SAFE_INTEGER - 1e3;
-class $ {
+const B = (r) => r >= 200 && r < 300, $ = "ValidateStatusInterceptor", j = Number.MAX_SAFE_INTEGER - 1e3;
+class H {
   /**
    * Creates a new ValidateStatusInterceptor instance.
    *
@@ -367,7 +345,7 @@ class $ {
    * @returns The name of this interceptor
    */
   get name() {
-    return G;
+    return $;
   }
   /**
    * Gets the order of this interceptor.
@@ -375,7 +353,7 @@ class $ {
    * @returns VALIDATE_STATUS_INTERCEPTOR_ORDER, indicating this interceptor should execute early
    */
   get order() {
-    return M;
+    return j;
   }
   /**
    * Validates the response status code.
@@ -410,14 +388,14 @@ class l extends a {
     super(s, t.error), this.exchange = t, this.name = "ExchangeError", Object.setPrototypeOf(this, l.prototype);
   }
 }
-class j {
+class V {
   constructor() {
     this.request = new p([
-      new F(),
-      new D(),
-      new v()
+      new U(),
+      new C(),
+      new M()
     ]), this.response = new p([
-      new $()
+      new H()
     ]), this.error = new p();
   }
   /**
@@ -516,7 +494,7 @@ class j {
     }
   }
 }
-class H {
+class k {
   constructor(t, e, s, o) {
     this.attributes = {}, this.fetcher = t, this.request = e, this.response = s, this.error = o;
   }
@@ -557,11 +535,11 @@ class H {
 }
 const m = {
   "Content-Type": h.APPLICATION_JSON
-}, A = {
+}, O = {
   baseURL: "",
   headers: m
 };
-class V {
+class J {
   /**
    * Initializes a new Fetcher instance with optional configuration.
    *
@@ -570,8 +548,8 @@ class V {
    *
    * @param options - Configuration options for the Fetcher instance
    */
-  constructor(t = A) {
-    this.headers = m, this.urlBuilder = new S(t.baseURL), this.headers = t.headers ?? m, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new j();
+  constructor(t = O) {
+    this.headers = m, this.urlBuilder = new w(t.baseURL), this.headers = t.headers ?? m, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new V();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -606,8 +584,8 @@ class V {
     }, s = {
       ...t,
       headers: e,
-      timeout: _(t.timeout, this.timeout)
-    }, o = new H(this, s);
+      timeout: N(t.timeout, this.timeout)
+    }, o = new k(this, s);
     return this.interceptors.exchange(o);
   }
   /**
@@ -638,7 +616,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async get(t, e = {}) {
-    return this.methodFetch(c.GET, t, e);
+    return this.methodFetch(i.GET, t, e);
   }
   /**
    * Makes a POST HTTP request.
@@ -650,7 +628,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async post(t, e = {}) {
-    return this.methodFetch(c.POST, t, e);
+    return this.methodFetch(i.POST, t, e);
   }
   /**
    * Makes a PUT HTTP request.
@@ -662,7 +640,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async put(t, e = {}) {
-    return this.methodFetch(c.PUT, t, e);
+    return this.methodFetch(i.PUT, t, e);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -674,7 +652,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async delete(t, e = {}) {
-    return this.methodFetch(c.DELETE, t, e);
+    return this.methodFetch(i.DELETE, t, e);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -686,7 +664,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async patch(t, e = {}) {
-    return this.methodFetch(c.PATCH, t, e);
+    return this.methodFetch(i.PATCH, t, e);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -699,7 +677,7 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async head(t, e = {}) {
-    return this.methodFetch(c.HEAD, t, e);
+    return this.methodFetch(i.HEAD, t, e);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -712,11 +690,11 @@ class V {
    * @returns Promise that resolves to the HTTP response
    */
   async options(t, e = {}) {
-    return this.methodFetch(c.OPTIONS, t, e);
+    return this.methodFetch(i.OPTIONS, t, e);
   }
 }
 const T = "default";
-class k {
+class X {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -816,12 +794,12 @@ class k {
     return new Map(this.registrar);
   }
 }
-const J = new k();
+const Y = new X();
 function I(r, t) {
   if (!(r === void 0 && t === void 0))
     return t === void 0 ? r : r === void 0 ? t : { ...r, ...t };
 }
-function Q(r, t) {
+function W(r, t) {
   if (Object.keys(r).length === 0)
     return t;
   if (Object.keys(t).length === 0)
@@ -832,19 +810,19 @@ function Q(r, t) {
   }, s = {
     ...r.headers,
     ...t.headers
-  }, o = t.method ?? r.method, i = t.body ?? r.body, n = t.timeout ?? r.timeout, u = t.signal ?? r.signal;
+  }, o = t.method ?? r.method, u = t.body ?? r.body, n = t.timeout ?? r.timeout, c = t.signal ?? r.signal;
   return {
     ...r,
     ...t,
     method: o,
     urlParams: e,
     headers: s,
-    body: i,
+    body: u,
     timeout: n,
-    signal: u
+    signal: c
   };
 }
-class X extends V {
+class x extends J {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -862,48 +840,50 @@ class X extends V {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(t, e = A) {
-    super(e), this.name = t, J.register(t, this);
+  constructor(t, e = O) {
+    super(e), this.name = t, Y.register(t, this);
   }
 }
-const x = new X(T);
+const Z = new x(T);
 export {
-  z as CONTENT_TYPE_HEADER,
+  K as CONTENT_TYPE_HEADER,
   h as ContentTypeValues,
   T as DEFAULT_FETCHER_NAME,
-  A as DEFAULT_OPTIONS,
+  O as DEFAULT_OPTIONS,
   l as ExchangeError,
-  L as FETCH_INTERCEPTOR_NAME,
-  C as FETCH_INTERCEPTOR_ORDER,
-  H as FetchExchange,
-  v as FetchInterceptor,
+  v as FETCH_INTERCEPTOR_NAME,
+  G as FETCH_INTERCEPTOR_ORDER,
+  k as FetchExchange,
+  M as FetchInterceptor,
   R as FetchTimeoutError,
-  V as Fetcher,
+  J as Fetcher,
   a as FetcherError,
-  k as FetcherRegistrar,
-  c as HttpMethod,
+  X as FetcherRegistrar,
+  i as HttpMethod,
   f as HttpStatusValidationError,
-  j as InterceptorManager,
+  V as InterceptorManager,
   p as InterceptorRegistry,
-  X as NamedFetcher,
-  q as REQUEST_BODY_INTERCEPTOR_NAME,
-  U as REQUEST_BODY_INTERCEPTOR_ORDER,
-  D as RequestBodyInterceptor,
-  N as URL_RESOLVE_INTERCEPTOR_NAME,
-  O as URL_RESOLVE_INTERCEPTOR_ORDER,
-  S as UrlBuilder,
-  F as UrlResolveInterceptor,
-  G as VALIDATE_STATUS_INTERCEPTOR_NAME,
-  M as VALIDATE_STATUS_INTERCEPTOR_ORDER,
-  $ as ValidateStatusInterceptor,
+  x as NamedFetcher,
+  D as REQUEST_BODY_INTERCEPTOR_NAME,
+  L as REQUEST_BODY_INTERCEPTOR_ORDER,
+  C as RequestBodyInterceptor,
+  q as URL_RESOLVE_INTERCEPTOR_NAME,
+  P as URL_RESOLVE_INTERCEPTOR_ORDER,
+  w as UrlBuilder,
+  U as UrlResolveInterceptor,
+  $ as VALIDATE_STATUS_INTERCEPTOR_NAME,
+  j as VALIDATE_STATUS_INTERCEPTOR_ORDER,
+  H as ValidateStatusInterceptor,
   b as combineURLs,
-  x as fetcher,
-  J as fetcherRegistrar,
-  g as isAbsoluteURL,
+  Q as extractPathParams,
+  Z as fetcher,
+  Y as fetcherRegistrar,
+  S as interpolateUrl,
+  _ as isAbsoluteURL,
   I as mergeRecords,
-  Q as mergeRequest,
-  _ as resolveTimeout,
-  w as timeoutFetch,
+  W as mergeRequest,
+  N as resolveTimeout,
+  F as timeoutFetch,
   E as toSorted
 };
 //# sourceMappingURL=index.es.js.map