@ahoo-wang/fetcher 1.5.3 → 1.5.6

package/dist/fetcher.d.ts

@@ -1,6 +1,6 @@
 import { UrlBuilder, UrlBuilderCapable } from './urlBuilder';
 import { TimeoutCapable } from './timeout';
-import { FetchExchange, FetchExchangeInit } from './fetchExchange';
+import { FetchExchange } from './fetchExchange';
 import { BaseURLCapable, FetchRequest, FetchRequestInit, RequestHeaders, RequestHeadersCapable } from './fetchRequest';
 import { InterceptorManager } from './interceptorManager';
 import { UrlTemplateStyle } from './urlTemplateResolver';
@@ -92,41 +92,6 @@ export declare class Fetcher implements UrlBuilderCapable, RequestHeadersCapable
      * @throws Error if an unhandled error occurs during request processing
      */
     request<R = FetchExchange>(request: FetchRequest, resultExtractor?: ResultExtractor<R>, attributes?: Record<string, any>): Promise<R>;
-    /**
-     * Executes an HTTP request exchange and processes the result using a result extractor.
-     *
-     * This method creates a FetchExchange object, runs it through the interceptor chain,
-     * and then applies a result extractor function to transform the exchange into the desired result type.
-     * It's the core method that powers all HTTP request functionality in the Fetcher.
-     *
-     * @template R - The type of result to return after processing the exchange
-     * @param exchangeInit - The initial configuration for the exchange, excluding fetcher, response, and error properties
-     * @param resultExtractor - A function that transforms the completed exchange into the desired result type.
-     *                          Defaults to returning the exchange object itself.
-     * @returns A Promise that resolves to the result of applying the resultExtractor to the completed exchange
-     *
-     * @example
-     * ```typescript
-     * // Basic usage with default result extractor (returns the exchange)
-     * const exchange = await fetcher.exchange({
-     *   request: { url: '/api/users', method: 'GET' }
-     * });
-     * console.log(exchange.response.status);
-     *
-     * // Using a custom result extractor to get the response object
-     * const response = await fetcher.exchange(
-     *   { request: { url: '/api/users', method: 'GET' } },
-     *   (exchange) => exchange.requiredResponse
-     * );
-     *
-     * // Using a built-in result extractor to get JSON data
-     * const users = await fetcher.exchange(
-     *   { request: { url: '/api/users', method: 'GET' } },
-     *   ResultExtractors.Json
-     * );
-     * ```
-     */
-    exchange<R>(exchangeInit: Omit<FetchExchangeInit, 'fetcher'>, resultExtractor?: ResultExtractor<R>): Promise<R>;
     /**
      * Internal helper method for making HTTP requests with a specific method.
      *

package/dist/fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"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"}

package/dist/index.es.js

@@ -98,8 +98,8 @@ const c = class c {
   }
 };
 c.PATH_PARAM_REGEX = /{([^}]+)}/g;
-let P = c;
-const L = new P(), h = class h {
+let f = c;
+const L = new f(), h = class h {
   /**
    * Extracts path parameters from an Express-style URL string.
    *
@@ -166,8 +166,8 @@ const L = new P(), h = class h {
   }
 };
 h.PATH_PARAM_REGEX = /:([^/]+)/g;
-let A = h;
-const v = new A();
+let P = h;
+const v = new P();
 class G {
   /**
    * Initializes a new UrlBuilder instance.
@@ -209,12 +209,12 @@ class G {
    */
   build(e, t) {
     const s = t?.path, o = t?.query, n = C(this.baseURL, e);
-    let u = this.urlTemplateResolver.resolve(n, s);
+    let i = this.urlTemplateResolver.resolve(n, s);
     if (o) {
       const a = new URLSearchParams(o).toString();
-      a && (u += "?" + a);
+      a && (i += "?" + a);
     }
-    return u;
+    return i;
   }
   /**
    * Resolves a complete URL from a FetchRequest.
@@ -255,7 +255,7 @@ class I extends l {
 function M(r, e) {
   return typeof r < "u" ? r : e;
 }
-async function x(r) {
+async function H(r) {
   const e = r.url, t = r.timeout, s = r;
   if (r.signal)
     return fetch(e, s);
@@ -264,7 +264,7 @@ async function x(r) {
   const o = r.abortController ?? new AbortController();
   s.signal = o.signal;
   let n = null;
-  const u = new Promise((a, p) => {
+  const i = new Promise((a, p) => {
     n = setTimeout(() => {
       n && clearTimeout(n);
       const O = new I(r);
@@ -272,15 +272,15 @@ async function x(r) {
     }, t);
   });
   try {
-    return await Promise.race([fetch(e, s), u]);
+    return await Promise.race([fetch(e, s), i]);
   } finally {
     n && clearTimeout(n);
   }
 }
-const H = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
+const x = "UrlResolveInterceptor", N = Number.MIN_SAFE_INTEGER + 1e3;
 class j {
   constructor() {
-    this.name = H, this.order = N;
+    this.name = x, this.order = N;
   }
   /**
    * Resolves the final URL by combining the base URL, path parameters, and query parameters.
@@ -292,7 +292,7 @@ class j {
     t.url = e.fetcher.urlBuilder.resolveRequestUrl(t);
   }
 }
-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 || {});
+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 ae = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
@@ -380,7 +380,7 @@ class k {
    * console.log(exchange.response); // HTTP response object
    */
   async intercept(e) {
-    e.response = await x(e.request);
+    e.response = await H(e.request);
   }
 }
 function m(r, e) {
@@ -719,16 +719,16 @@ class Z {
     return this.response;
   }
 }
-const ee = (r) => r, te = (r) => r.requiredResponse, re = (r) => r.requiredResponse.json(), se = (r) => r.requiredResponse.text(), f = {
+const ee = (r) => r, te = (r) => r.requiredResponse, re = (r) => r.requiredResponse.json(), se = (r) => r.requiredResponse.text(), _ = {
   Exchange: ee,
   Response: te,
   Json: re,
   Text: se
-}, y = {
+}, A = {
   "Content-Type": E.APPLICATION_JSON
 }, S = {
   baseURL: "",
-  headers: y
+  headers: A
 };
 class oe {
   /**
@@ -740,7 +740,7 @@ class oe {
    * @param options - Configuration options for the Fetcher instance
    */
   constructor(e = S) {
-    this.headers = y, this.urlBuilder = new G(e.baseURL, e.urlTemplateStyle), this.headers = e.headers ?? y, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new W();
+    this.headers = A, this.urlBuilder = new G(e.baseURL, e.urlTemplateStyle), this.headers = e.headers ?? A, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new W();
   }
   /**
    * Executes an HTTP request with the specified URL and options.
@@ -758,7 +758,7 @@ class oe {
    */
   async fetch(e, t = {}, s) {
     const o = t;
-    return o.url = e, this.request(o, f.Response, s);
+    return o.url = e, this.request(o, _.Response, s);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -776,7 +776,7 @@ class oe {
    * @returns Promise that resolves to the extracted result based on resultExtractor
    * @throws Error if an unhandled error occurs during request processing
    */
-  async request(e, t = f.Exchange, s) {
+  async request(e, t = _.Exchange, s) {
     const o = {
       ...this.headers,
       ...e.headers
@@ -784,52 +784,12 @@ class oe {
       ...e,
       headers: o,
       timeout: M(e.timeout, this.timeout)
-    };
-    return this.exchange(
-      { request: n, attributes: s },
-      t
-    );
-  }
-  /**
-   * Executes an HTTP request exchange and processes the result using a result extractor.
-   *
-   * This method creates a FetchExchange object, runs it through the interceptor chain,
-   * and then applies a result extractor function to transform the exchange into the desired result type.
-   * It's the core method that powers all HTTP request functionality in the Fetcher.
-   *
-   * @template R - The type of result to return after processing the exchange
-   * @param exchangeInit - The initial configuration for the exchange, excluding fetcher, response, and error properties
-   * @param resultExtractor - A function that transforms the completed exchange into the desired result type.
-   *                          Defaults to returning the exchange object itself.
-   * @returns A Promise that resolves to the result of applying the resultExtractor to the completed exchange
-   *
-   * @example
-   * ```typescript
-   * // Basic usage with default result extractor (returns the exchange)
-   * const exchange = await fetcher.exchange({
-   *   request: { url: '/api/users', method: 'GET' }
-   * });
-   * console.log(exchange.response.status);
-   *
-   * // Using a custom result extractor to get the response object
-   * const response = await fetcher.exchange(
-   *   { request: { url: '/api/users', method: 'GET' } },
-   *   (exchange) => exchange.requiredResponse
-   * );
-   *
-   * // Using a built-in result extractor to get JSON data
-   * const users = await fetcher.exchange(
-   *   { request: { url: '/api/users', method: 'GET' } },
-   *   ResultExtractors.Json
-   * );
-   * ```
-   */
-  async exchange(e, t = f.Exchange) {
-    const s = new Z({
-      ...e,
-      fetcher: this
+    }, i = new Z({
+      fetcher: this,
+      request: n,
+      attributes: s
     });
-    return await this.interceptors.exchange(s), t(s);
+    return await this.interceptors.exchange(i), t(i);
   }
   /**
    * Internal helper method for making HTTP requests with a specific method.
@@ -869,7 +829,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async get(e, t = {}, s) {
-    return this.methodFetch(i.GET, e, t, s);
+    return this.methodFetch(u.GET, e, t, s);
   }
   /**
    * Makes a POST HTTP request.
@@ -884,7 +844,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async post(e, t = {}, s) {
-    return this.methodFetch(i.POST, e, t, s);
+    return this.methodFetch(u.POST, e, t, s);
   }
   /**
    * Makes a PUT HTTP request.
@@ -899,7 +859,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async put(e, t = {}, s) {
-    return this.methodFetch(i.PUT, e, t, s);
+    return this.methodFetch(u.PUT, e, t, s);
   }
   /**
    * Makes a DELETE HTTP request.
@@ -914,7 +874,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async delete(e, t = {}, s) {
-    return this.methodFetch(i.DELETE, e, t, s);
+    return this.methodFetch(u.DELETE, e, t, s);
   }
   /**
    * Makes a PATCH HTTP request.
@@ -929,7 +889,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async patch(e, t = {}, s) {
-    return this.methodFetch(i.PATCH, e, t, s);
+    return this.methodFetch(u.PATCH, e, t, s);
   }
   /**
    * Makes a HEAD HTTP request.
@@ -945,7 +905,7 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async head(e, t = {}, s) {
-    return this.methodFetch(i.HEAD, e, t, s);
+    return this.methodFetch(u.HEAD, e, t, s);
   }
   /**
    * Makes an OPTIONS HTTP request.
@@ -961,10 +921,10 @@ class oe {
    * @returns Promise that resolves to the HTTP response
    */
   async options(e, t = {}, s) {
-    return this.methodFetch(i.OPTIONS, e, t, s);
+    return this.methodFetch(u.OPTIONS, e, t, s);
   }
 }
-const g = "default";
+const y = "default";
 class ne {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
@@ -1038,7 +998,7 @@ class ne {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(g);
+    return this.requiredGet(y);
   }
   /**
    * Set the default Fetcher instance
@@ -1049,7 +1009,7 @@ class ne {
    * fetcherRegistrar.default = fetcher;
    */
   set default(e) {
-    this.register(g, e);
+    this.register(y, e);
   }
   /**
    * Get a copy of all registered fetchers
@@ -1066,7 +1026,7 @@ class ne {
   }
 }
 const ie = new ne();
-function _(r, e) {
+function g(r, e) {
   if (!(r === void 0 && e === void 0))
     return e === void 0 ? r : r === void 0 ? e : { ...r, ...e };
 }
@@ -1076,12 +1036,12 @@ function ce(r, e) {
   if (Object.keys(e).length === 0)
     return r;
   const t = {
-    path: _(r.urlParams?.path, e.urlParams?.path),
-    query: _(r.urlParams?.query, e.urlParams?.query)
+    path: g(r.urlParams?.path, e.urlParams?.path),
+    query: g(r.urlParams?.query, e.urlParams?.query)
   }, s = {
     ...r.headers,
     ...e.headers
-  }, o = e.method ?? r.method, n = e.body ?? r.body, u = e.timeout ?? r.timeout, a = e.signal ?? r.signal, p = e.abortController ?? r.abortController;
+  }, o = e.method ?? r.method, n = e.body ?? r.body, i = e.timeout ?? r.timeout, a = e.signal ?? r.signal, p = e.abortController ?? r.abortController;
   return {
     ...r,
     ...e,
@@ -1089,7 +1049,7 @@ function ce(r, e) {
     urlParams: t,
     headers: s,
     body: n,
-    timeout: u,
+    timeout: i,
     signal: a,
     abortController: p
   };
@@ -1116,15 +1076,15 @@ class ue extends oe {
     super(t), this.name = e, ie.register(e, this);
   }
 }
-const he = new ue(g);
+const he = new ue(y);
 export {
   ae as CONTENT_TYPE_HEADER,
   E as ContentTypeValues,
-  g as DEFAULT_FETCHER_NAME,
+  y as DEFAULT_FETCHER_NAME,
   S as DEFAULT_OPTIONS,
   R as ExchangeError,
   ee as ExchangeResultExtractor,
-  A as ExpressUrlTemplateResolver,
+  P as ExpressUrlTemplateResolver,
   V as FETCH_INTERCEPTOR_NAME,
   J as FETCH_INTERCEPTOR_ORDER,
   Z as FetchExchange,
@@ -1133,7 +1093,7 @@ export {
   oe as Fetcher,
   l as FetcherError,
   ne as FetcherRegistrar,
-  i as HttpMethod,
+  u as HttpMethod,
   b as HttpStatusValidationError,
   W as InterceptorManager,
   T as InterceptorRegistry,
@@ -1143,11 +1103,11 @@ export {
   $ as REQUEST_BODY_INTERCEPTOR_ORDER,
   X as RequestBodyInterceptor,
   te as ResponseResultExtractor,
-  f as ResultExtractors,
+  _ as ResultExtractors,
   se as TextResultExtractor,
-  H as URL_RESOLVE_INTERCEPTOR_NAME,
+  x as URL_RESOLVE_INTERCEPTOR_NAME,
   N as URL_RESOLVE_INTERCEPTOR_ORDER,
-  P as UriTemplateResolver,
+  f as UriTemplateResolver,
   G as UrlBuilder,
   j as UrlResolveInterceptor,
   U as UrlTemplateStyle,
@@ -1160,10 +1120,10 @@ export {
   ie as fetcherRegistrar,
   D as getUrlTemplateResolver,
   F as isAbsoluteURL,
-  _ as mergeRecords,
+  g as mergeRecords,
   ce as mergeRequest,
   M as resolveTimeout,
-  x as timeoutFetch,
+  H as timeoutFetch,
   m as toSorted,
   L as uriTemplateResolver,
   w as urlTemplateRegexExtract,