@ahoo-wang/fetcher 2.9.1 → 2.9.3

package/dist/fetcher.d.ts

@@ -80,6 +80,27 @@ export declare class Fetcher implements UrlBuilderCapable, RequestHeadersCapable
      * @param options.interceptors - Interceptor manager for processing requests and responses.
      */
     constructor(options?: FetcherOptions);
+    /**
+     * Resolves a FetchRequest and RequestOptions into a FetchExchange object.
+     *
+     * This internal method prepares a complete FetchExchange by merging headers,
+     * resolving timeout settings, and combining request options. It serves as the
+     * preparation step before passing the exchange through the interceptor chain.
+     *
+     * The resolution process includes:
+     * - Merging default headers with request-level headers (request headers take precedence)
+     * - Resolving timeout settings (request timeout takes precedence over fetcher timeout)
+     * - Merging request options with defaults
+     * - Creating the final FetchExchange object with all resolved configuration
+     *
+     * @param request - The HTTP request configuration to resolve
+     * @param options - Optional request options including result extractor and attributes
+     * @returns A new FetchExchange object with fully resolved configuration
+     *
+     * @internal This method is used internally by the exchange method and should not
+     *           be called directly by external consumers.
+     */
+    resolveExchange(request: FetchRequest, options?: RequestOptions): FetchExchange;
     /**
      * Processes an HTTP request through the Fetcher's internal workflow.
      *

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

@@ -435,10 +435,10 @@ const c = "Content-Type", d = class d {
 };
 d.APPLICATION_JSON = "application/json", d.TEXT_EVENT_STREAM = "text/event-stream";
 let R = d;
-const st = "UrlResolveInterceptor", D = Number.MIN_SAFE_INTEGER + 1e3;
+const st = "UrlResolveInterceptor", v = Number.MIN_SAFE_INTEGER + 1e3;
 class ot {
   constructor() {
-    this.name = st, this.order = D;
+    this.name = st, this.order = v;
   }
   /**
    * Resolves the final URL by combining the base URL, path parameters, and query parameters.
@@ -450,7 +450,7 @@ class ot {
     r.url = t.fetcher.urlBuilder.resolveRequestUrl(r);
   }
 }
-const nt = "RequestBodyInterceptor", it = D + 1e3;
+const nt = "RequestBodyInterceptor", it = v + 1e3;
 class ut {
   constructor() {
     this.name = nt, this.order = it;
@@ -560,12 +560,12 @@ class ht {
     t.response = await J(t.request);
   }
 }
-const N = 0;
-function x(e, t) {
-  return (e.order ?? N) - (t.order ?? N);
+const x = 0;
+function N(e, t) {
+  return (e.order ?? x) - (t.order ?? x);
 }
 function f(e, t) {
-  return t ? e.filter(t).sort(x) : [...e].sort(x);
+  return t ? e.filter(t).sort(N) : [...e].sort(N);
 }
 class m {
   /**
@@ -847,16 +847,16 @@ function mt(e, t) {
 }
 function A(e, t) {
   return t && t.resultExtractor && t.attributes ? t : {
-    resultExtractor: t?.resultExtractor ?? e?.resultExtractor ?? v.resultExtractor,
+    resultExtractor: t?.resultExtractor ?? e?.resultExtractor ?? L.resultExtractor,
     attributes: t?.attributes ?? e?.attributes
   };
 }
 const w = {
   [c]: R.APPLICATION_JSON
-}, L = {
+}, D = {
   baseURL: "",
   headers: w
-}, v = {
+}, L = {
   resultExtractor: q.Exchange
 }, F = {
   resultExtractor: q.Response
@@ -875,20 +875,30 @@ class B {
    * @param options.urlTemplateStyle - Style for URL template parameter interpolation.
    * @param options.interceptors - Interceptor manager for processing requests and responses.
    */
-  constructor(t = L) {
+  constructor(t = D) {
     this.headers = w, this.urlBuilder = new V(t.baseURL, t.urlTemplateStyle), this.headers = t.headers ?? w, this.timeout = t.timeout, this.interceptors = t.interceptors ?? new pt();
   }
   /**
-   * Processes an HTTP request through the Fetcher's internal workflow.
+   * Resolves a FetchRequest and RequestOptions into a FetchExchange object.
    *
-   * This method creates a FetchExchange object and passes it through the interceptor chain.
-   * It handles header merging, timeout resolution, and result extractor configuration.
+   * This internal method prepares a complete FetchExchange by merging headers,
+   * resolving timeout settings, and combining request options. It serves as the
+   * preparation step before passing the exchange through the interceptor chain.
    *
-   * @param request - The HTTP request configuration to process
+   * The resolution process includes:
+   * - Merging default headers with request-level headers (request headers take precedence)
+   * - Resolving timeout settings (request timeout takes precedence over fetcher timeout)
+   * - Merging request options with defaults
+   * - Creating the final FetchExchange object with all resolved configuration
+   *
+   * @param request - The HTTP request configuration to resolve
    * @param options - Optional request options including result extractor and attributes
-   * @returns Promise that resolves to the processed FetchExchange object
+   * @returns A new FetchExchange object with fully resolved configuration
+   *
+   * @internal This method is used internally by the exchange method and should not
+   *           be called directly by external consumers.
    */
-  async exchange(t, r) {
+  resolveExchange(t, r) {
     const s = {
       ...this.headers,
       ...t.headers
@@ -897,15 +907,29 @@ class B {
       headers: s,
       timeout: k(t.timeout, this.timeout)
     }, { resultExtractor: n, attributes: u } = A(
-      v,
+      L,
       r
-    ), a = new rt({
+    );
+    return new rt({
       fetcher: this,
       request: o,
       resultExtractor: n,
       attributes: u
     });
-    return await this.interceptors.exchange(a);
+  }
+  /**
+   * Processes an HTTP request through the Fetcher's internal workflow.
+   *
+   * This method creates a FetchExchange object and passes it through the interceptor chain.
+   * It handles header merging, timeout resolution, and result extractor configuration.
+   *
+   * @param request - The HTTP request configuration to process
+   * @param options - Optional request options including result extractor and attributes
+   * @returns Promise that resolves to the processed FetchExchange object
+   */
+  async exchange(t, r) {
+    const s = this.resolveExchange(t, r);
+    return await this.interceptors.exchange(s);
   }
   /**
    * Processes an HTTP request through the Fetcher's internal workflow.
@@ -1263,7 +1287,7 @@ class ft extends B {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(t, r = L) {
+  constructor(t, r = D) {
     super(r), this.name = t, O.register(t, this);
   }
 }
@@ -1276,8 +1300,8 @@ export {
   R as ContentTypeValues,
   g as DEFAULT_FETCHER_NAME,
   F as DEFAULT_FETCH_OPTIONS,
-  L as DEFAULT_OPTIONS,
-  v as DEFAULT_REQUEST_OPTIONS,
+  D as DEFAULT_OPTIONS,
+  L as DEFAULT_REQUEST_OPTIONS,
   E as ExchangeError,
   Q as ExchangeResultExtractor,
   y as ExpressUrlTemplateResolver,
@@ -1302,7 +1326,7 @@ export {
   q as ResultExtractors,
   K as TextResultExtractor,
   st as URL_RESOLVE_INTERCEPTOR_NAME,
-  D as URL_RESOLVE_INTERCEPTOR_ORDER,
+  v as URL_RESOLVE_INTERCEPTOR_ORDER,
   P as UriTemplateResolver,
   V as UrlBuilder,
   ot as UrlResolveInterceptor,
@@ -1322,7 +1346,7 @@ export {
   mt as mergeRequest,
   A as mergeRequestOptions,
   k as resolveTimeout,
-  x as sortOrder,
+  N as sortOrder,
   J as timeoutFetch,
   f as toSorted,
   $ as uriTemplateResolver,