@ahoo-wang/fetcher 0.8.3 → 0.8.5

package/README.md

@@ -51,8 +51,10 @@ const fetcher = new Fetcher({
 
 // GET request with path and query parameters
 const response = await fetcher.get('/users/{id}', {
-  path: { id: 123 },
-  query: { include: 'profile' },
+  urlParams: {
+    path: { id: 123 },
+    query: { include: 'profile' },
+  },
 });
 const userData = await response.json<User>();
 

package/README.zh-CN.md

@@ -50,8 +50,10 @@ const fetcher = new Fetcher({
 
 // 带路径和查询参数的 GET 请求
 const response = await fetcher.get('/users/{id}', {
-  path: { id: 123 },
-  query: { include: 'profile' },
+  urlParams: {
+    path: { id: 123 },
+    query: { include: 'profile' },
+  },
 });
 const userData = await response.json<User>();
 

package/dist/fetchExchange.d.ts

@@ -1,89 +1,5 @@
 import { Fetcher } from './fetcher';
-import { HeadersCapable } from './types';
-import { TimeoutCapable } from './timeout';
-/**
- * Fetcher request configuration interface
- *
- * This interface defines all the configuration options available for making HTTP requests
- * with the Fetcher client. It extends the standard RequestInit interface while adding
- * Fetcher-specific features like path parameters, query parameters, and timeout control.
- *
- * @example
- * ```typescript
- * const request: FetcherRequest = {
- *   method: 'GET',
- *   path: { id: 123 },
- *   query: { include: 'profile' },
- *   headers: { 'Authorization': 'Bearer token' },
- *   timeout: 5000
- * };
- *
- * const response = await fetcher.fetch('/users/{id}', request);
- * ```
- */
-export interface FetcherRequest extends TimeoutCapable, HeadersCapable, Omit<RequestInit, 'body' | 'headers'> {
-    /**
-     * Path parameters for URL templating
-     *
-     * An object containing key-value pairs that will be used to replace placeholders
-     * in the URL path. Placeholders are specified using curly braces, e.g., '/users/{id}'.
-     *
-     * @example
-     * ```typescript
-     * // With URL '/users/{id}/posts/{postId}'
-     * const request = {
-     *   path: { id: 123, postId: 456 }
-     * };
-     * // Results in URL: '/users/123/posts/456'
-     * ```
-     */
-    path?: Record<string, any>;
-    /**
-     * Query parameters for URL query string
-     *
-     * An object containing key-value pairs that will be serialized and appended
-     * to the URL as query parameters. Arrays are serialized as multiple parameters
-     * with the same name, and objects are JSON-stringified.
-     *
-     * @example
-     * ```typescript
-     * const request = {
-     *   query: {
-     *     limit: 10,
-     *     filter: 'active',
-     *     tags: ['important', 'urgent']
-     *   }
-     * };
-     * // Results in query string: '?limit=10&filter=active&tags=important&tags=urgent'
-     * ```
-     */
-    query?: Record<string, any>;
-    /**
-     * Request body
-     *
-     * The body of the request. Can be a string, Blob, ArrayBuffer, FormData,
-     * URLSearchParams, or a plain object. Plain objects are automatically
-     * converted to JSON and the appropriate Content-Type header is set.
-     *
-     * @example
-     * ```typescript
-     * // Plain object (automatically converted to JSON)
-     * const request = {
-     *   method: 'POST',
-     *   body: { name: 'John', email: 'john@example.com' }
-     * };
-     *
-     * // FormData
-     * const formData = new FormData();
-     * formData.append('name', 'John');
-     * const request = {
-     *   method: 'POST',
-     *   body: formData
-     * };
-     * ```
-     */
-    body?: BodyInit | Record<string, any> | null;
-}
+import { FetchRequest } from './fetchRequest';
 /**
  * FetchExchange Interface
  *
@@ -129,13 +45,9 @@ export interface FetchExchange {
      */
     fetcher: Fetcher;
     /**
-     * The URL for this request
-     */
-    url: string;
-    /**
-     * The request configuration including method, headers, body, etc.
+     * The request configuration including url, method, headers, body, etc.
      */
-    request: FetcherRequest;
+    request: FetchRequest;
     /**
      * The response object, undefined until the request completes successfully
      */

package/dist/fetchExchange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchExchange.d.ts","sourceRoot":"","sources":["../src/fetchExchange.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,cAAc,EACd,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE5B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;CAC9C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;OAEG;IACH,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,KAAK,EAAE,KAAK,GAAG,GAAG,GAAG,SAAS,CAAC;IAE/B;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC"}
+{"version":3,"file":"fetchExchange.d.ts","sourceRoot":"","sources":["../src/fetchExchange.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IAEtB;;OAEG;IACH,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,KAAK,EAAE,KAAK,GAAG,GAAG,GAAG,SAAS,CAAC;IAE/B;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC"}

package/dist/fetchInterceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchInterceptor.d.ts","sourceRoot":"","sources":["../src/fetchInterceptor.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;GAYG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IAClD;;;;;;OAMG;IACH,IAAI,SAAsB;IAE1B;;;;;;;;;OASG;IACH,KAAK,SAAiC;IAEtC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CAQjE"}
+{"version":3,"file":"fetchInterceptor.d.ts","sourceRoot":"","sources":["../src/fetchInterceptor.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;GAYG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IAClD;;;;;;OAMG;IACH,IAAI,SAAsB;IAE1B;;;;;;;;;OASG;IACH,KAAK,SAAiC;IAEtC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CAIjE"}

package/dist/fetchRequest.d.ts

@@ -0,0 +1,60 @@
+import { TimeoutCapable } from './timeout';
+import { HeadersCapable } from './types';
+import { UrlParams } from './urlBuilder';
+/**
+ * Fetcher request configuration interface
+ *
+ * This interface defines all the configuration options available for making HTTP requests
+ * with the Fetcher client. It extends the standard RequestInit interface while adding
+ * Fetcher-specific features like path parameters, query parameters, and timeout control.
+ *
+ * @example
+ * ```typescript
+ * const request: FetchRequestInit = {
+ *   method: 'GET',
+ *   urlParams: {
+ *     path: { id: 123 },
+ *     query: { include: 'profile' }
+ *   },
+ *   headers: { 'Authorization': 'Bearer token' },
+ *   timeout: 5000
+ * };
+ *
+ * const response = await fetcher.fetch('/users/{id}', request);
+ * ```
+ */
+export interface FetchRequestInit extends TimeoutCapable, HeadersCapable, Omit<RequestInit, 'body' | 'headers'> {
+    urlParams?: UrlParams;
+    /**
+     * Request body
+     *
+     * The body of the request. Can be a string, Blob, ArrayBuffer, FormData,
+     * URLSearchParams, or a plain object. Plain objects are automatically
+     * converted to JSON and the appropriate Content-Type header is set.
+     *
+     * @example
+     * ```typescript
+     * // Plain object (automatically converted to JSON)
+     * const request = {
+     *   method: 'POST',
+     *   body: { name: 'John', email: 'john@example.com' }
+     * };
+     *
+     * // FormData
+     * const formData = new FormData();
+     * formData.append('name', 'John');
+     * const request = {
+     *   method: 'POST',
+     *   body: formData
+     * };
+     * ```
+     */
+    body?: BodyInit | Record<string, any> | string | null;
+}
+export interface FetchRequest extends FetchRequestInit {
+    /**
+     * The URL for this request
+     */
+    url: string;
+}
+//# sourceMappingURL=fetchRequest.d.ts.map

package/dist/fetchRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchRequest.d.ts","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,gBACf,SAAQ,cAAc,EACpB,cAAc,EACd,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,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb"}

package/dist/fetcher.d.ts

@@ -1,10 +1,21 @@
 import { UrlBuilder, UrlBuilderCapable } from './urlBuilder';
 import { TimeoutCapable } from './timeout';
-import { BaseURLCapable, HeadersCapable, RequestField } from './types';
+import { BaseURLCapable, HeadersCapable } from './types';
 import { FetcherInterceptors } from './interceptor';
-import { FetcherRequest, FetchExchange } from './fetchExchange';
+import { FetchExchange } from './fetchExchange';
+import { FetchRequest, FetchRequestInit } from './fetchRequest';
 /**
  * Fetcher configuration options interface
+ *
+ * @example
+ * ```typescript
+ * const options: FetcherOptions = {
+ *   baseURL: 'https://api.example.com',
+ *   headers: { 'Content-Type': 'application/json' },
+ *   timeout: 5000,
+ *   interceptors: new FetcherInterceptors()
+ * };
+ * ```
  */
 export interface FetcherOptions extends BaseURLCapable, HeadersCapable, TimeoutCapable {
     interceptors?: FetcherInterceptors;
@@ -14,12 +25,16 @@ export declare const DEFAULT_OPTIONS: FetcherOptions;
  * HTTP client class that supports URL building, timeout control, and more
  *
  * @example
+ * ```typescript
  * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
  * const response = await fetcher.fetch('/users/{id}', {
- *   pathParams: { id: 123 },
- *   queryParams: { filter: 'active' },
+ *   urlParams: {
+ *     path: { id: 123 },
+ *     query: { filter: 'active' }
+ *   },
  *   timeout: 5000
  * });
+ * ```
  */
 export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, TimeoutCapable {
     urlBuilder: UrlBuilder;
@@ -39,17 +54,16 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, etc.
      * @returns Promise<Response> HTTP response
      */
-    fetch(url: string, request?: FetcherRequest): Promise<Response>;
+    fetch(url: string, request?: FetchRequestInit): Promise<Response>;
     /**
      * Send an HTTP request
      *
-     * @param url - Request URL address, supports path parameter placeholders
-     * @param request - Request configuration object, including method, headers, body, etc.
+     * @param request - Request configuration object, including url, method, headers, body, etc.
      * @returns Promise that resolves to a FetchExchange object containing request and response information
      *
      * @throws Throws an exception when an error occurs during the request and is not handled by error interceptors
      */
-    request(url: string, request?: FetcherRequest): Promise<FetchExchange>;
+    request(request: FetchRequest): Promise<FetchExchange>;
     /**
      * Process a fetch exchange through the interceptor chain
      *
@@ -83,7 +97,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, etc.
      * @returns Promise<Response> HTTP response
      */
-    get(url: string, request?: Omit<FetcherRequest, RequestField.METHOD | RequestField.BODY>): Promise<Response>;
+    get(url: string, request?: Omit<FetchRequestInit, 'method' | 'body'>): Promise<Response>;
     /**
      * Make a POST request
      *
@@ -91,7 +105,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, request body, etc.
      * @returns Promise<Response> HTTP response
      */
-    post(url: string, request?: Omit<FetcherRequest, RequestField.METHOD>): Promise<Response>;
+    post(url: string, request?: Omit<FetchRequestInit, 'method'>): Promise<Response>;
     /**
      * Make a PUT request
      *
@@ -99,7 +113,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, request body, etc.
      * @returns Promise<Response> HTTP response
      */
-    put(url: string, request?: Omit<FetcherRequest, RequestField.METHOD>): Promise<Response>;
+    put(url: string, request?: Omit<FetchRequestInit, 'method'>): Promise<Response>;
     /**
      * Make a DELETE request
      *
@@ -107,7 +121,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, etc.
      * @returns Promise<Response> HTTP response
      */
-    delete(url: string, request?: Omit<FetcherRequest, RequestField.METHOD>): Promise<Response>;
+    delete(url: string, request?: Omit<FetchRequestInit, 'method'>): Promise<Response>;
     /**
      * Make a PATCH request
      *
@@ -115,7 +129,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, request body, etc.
      * @returns Promise<Response> HTTP response
      */
-    patch(url: string, request?: Omit<FetcherRequest, RequestField.METHOD>): Promise<Response>;
+    patch(url: string, request?: Omit<FetchRequestInit, 'method'>): Promise<Response>;
     /**
      * Make a HEAD request
      *
@@ -123,7 +137,7 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, etc.
      * @returns Promise<Response> HTTP response
      */
-    head(url: string, request?: Omit<FetcherRequest, RequestField.METHOD | RequestField.BODY>): Promise<Response>;
+    head(url: string, request?: Omit<FetchRequestInit, 'method' | 'body'>): Promise<Response>;
     /**
      * Make an OPTIONS request
      *
@@ -131,6 +145,6 @@ export declare class Fetcher implements UrlBuilderCapable, HeadersCapable, Timeo
      * @param request - Request options, including path parameters, query parameters, etc.
      * @returns Promise<Response> HTTP response
      */
-    options(url: string, request?: Omit<FetcherRequest, RequestField.METHOD | RequestField.BODY>): Promise<Response>;
+    options(url: string, request?: Omit<FetchRequestInit, 'method' | 'body'>): Promise<Response>;
 }
 //# sourceMappingURL=fetcher.d.ts.map

package/dist/fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAkB,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EACL,cAAc,EAGd,cAAc,EAEd,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,cAAc,EACd,cAAc;IAChB,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAMD,eAAO,MAAM,eAAe,EAAE,cAG7B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,qBAAa,OAAQ,YAAW,iBAAiB,EAAE,cAAc,EAAE,cAAc;IAC/E,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAmB;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,mBAAmB,CAAC;IAElC;;;;OAIG;gBACS,OAAO,GAAE,cAAgC;IAOrD;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAQzE;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAwBzB;;;;;;;;;;;;;;;OAeG;IACG,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBpE;;;;;;;OAOG;YACW,WAAW;IAWzB;;;;;;OAMG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAM,GAC1E,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,KAAK,CACT,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAM,GAC1E,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAM,GAC1E,OAAO,CAAC,QAAQ,CAAC;CAGrB"}
+{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAkB,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EACL,cAAc,EAGd,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGhE;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,cAAc,EACd,cAAc;IAChB,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAMD,eAAO,MAAM,eAAe,EAAE,cAG7B,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,OACX,YAAW,iBAAiB,EAAE,cAAc,EAAE,cAAc;IAE5D,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAmB;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,mBAAmB,CAAC;IAElC;;;;OAIG;gBACS,OAAO,GAAE,cAAgC;IAOrD;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU3E;;;;;;;OAOG;IACG,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAmB5D;;;;;;;;;;;;;;;OAeG;IACG,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBpE;;;;;;;OAOG;YACW,WAAW;IAWzB;;;;;;OAMG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAM,GAC7C,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAM,GAC7C,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAM,GAC7C,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,KAAK,CACT,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAM,GAC7C,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAIpB;;;;;;OAMG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;CAGrB"}

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './fetcher';
 export * from './fetcherRegistrar';
 export * from './fetchExchange';
 export * from './fetchInterceptor';
+export * from './fetchRequest';
 export * from './interceptor';
 export * from './mergeRequest';
 export * from './namedFetcher';
@@ -12,4 +13,5 @@ export * from './types';
 export * from './urlBuilder';
 export * from './urlResolveInterceptor';
 export * from './urls';
+export * from './utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/index.es.js

@@ -1,14 +1,19 @@
 function E(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
-function I(r, e) {
+function w(r, e) {
   return E(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.replace(/^\/+/, "") : r;
 }
-class w {
+class P {
   /**
    * Creates a UrlBuilder instance
    *
    * @param baseURL - Base URL that all constructed URLs will be based on
+   *
+   * @example
+   * ```typescript
+   * const urlBuilder = new UrlBuilder('https://api.example.com');
+   * ```
    */
   constructor(e) {
     this.baseURL = e;
@@ -16,30 +21,41 @@ class w {
   /**
    * Builds a complete URL, including path parameter replacement and query parameter addition
    *
-   * @param url - URL path to build
-   * @param path - Path parameter object used to replace placeholders in the URL (e.g., {id})
-   * @param query - Query parameter object to be added to the URL query string
-   * @returns Complete URL string
+   * @param url - URL path to build (e.g., '/users/{id}/posts')
+   * @param params - URL parameters including path and query parameters
+   * @returns Complete URL string with base URL, path parameters interpolated, and query string appended
    * @throws Error when required path parameters are missing
    *
    * @example
    * ```typescript
    * const urlBuilder = new UrlBuilder('https://api.example.com');
-   * const url = urlBuilder.build('/users/{id}/posts/{postId}',
-   *   { id: 123, postId: 456 },
-   *   { filter: 'active', limit: 10 }
-   * );
+   * const url = urlBuilder.build('/users/{id}/posts/{postId}', {
+   *   path: { id: 123, postId: 456 },
+   *   query: { filter: 'active', limit: 10 }
+   * });
    * // Result: https://api.example.com/users/123/posts/456?filter=active&limit=10
    * ```
    */
-  build(e, t, s) {
-    const n = I(this.baseURL, e);
-    let o = this.interpolateUrl(n, t);
-    if (s) {
-      const c = new URLSearchParams(s).toString();
-      c && (o += "?" + c);
+  build(e, t) {
+    const s = t?.path, o = t?.query, i = w(this.baseURL, e);
+    let n = this.interpolateUrl(i, s);
+    if (o) {
+      const c = new URLSearchParams(o).toString();
+      c && (n += "?" + c);
     }
-    return o;
+    return n;
+  }
+  /**
+   * Resolves a complete URL from a FetchRequest
+   *
+   * This method is used internally by the Fetcher to build the final URL for a request
+   * by combining the request URL with its URL parameters using this UrlBuilder.
+   *
+   * @param request - The FetchRequest containing URL and URL parameters
+   * @returns Complete resolved URL string
+   */
+  resolveRequestUrl(e) {
+    return this.build(e.url, e.urlParams);
   }
   /**
    * Replaces placeholders in the URL with path parameters
@@ -52,66 +68,74 @@ class w {
    * @example
    * ```typescript
    * const urlBuilder = new UrlBuilder('https://api.example.com');
-   * const result = urlBuilder.interpolateUrl('/users/{id}/posts/{postId}', { id: 123, postId: 456 });
-   * // Result: /users/123/posts/456
+   * 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(e, t) {
-    return t ? e.replace(/{([^}]+)}/g, (s, n) => {
-      const o = t[n];
-      if (o === void 0)
-        throw new Error(`Missing required path parameter: ${n}`);
-      return String(o);
+    return t ? e.replace(/{([^}]+)}/g, (s, o) => {
+      const i = t[o];
+      if (i === void 0)
+        throw new Error(`Missing required path parameter: ${o}`);
+      return String(i);
     }) : e;
   }
 }
-function A(r, e) {
+function R(r, e) {
   return typeof r < "u" ? r : e;
 }
-class p extends Error {
+class f extends Error {
   /**
    * Creates a new FetchTimeoutError instance
    *
-   * @param url - The URL that timed out
    * @param request - The request options that timed out
-   * @param timeout - The timeout value in milliseconds
    */
-  constructor(e, t, s) {
-    const n = t.method || "GET", o = `Request timeout of ${s}ms exceeded for ${n} ${e}`;
-    super(o), this.name = "FetchTimeoutError", this.url = e, this.request = t, this.timeout = s, Object.setPrototypeOf(this, p.prototype);
+  constructor(e) {
+    const t = e.method || "GET", s = `Request timeout of ${e.timeout}ms exceeded for ${t} ${e.url}`;
+    super(s), this.name = "FetchTimeoutError", this.request = e, Object.setPrototypeOf(this, f.prototype);
   }
 }
-async function F(r, e, t) {
+async function A(r) {
+  const e = r.url, t = r.timeout, s = r;
   if (!t)
-    return fetch(r, e);
-  const s = new AbortController(), n = {
-    ...e,
-    signal: s.signal
+    return fetch(e, s);
+  const o = new AbortController(), i = {
+    ...s,
+    signal: o.signal
   };
-  let o = null;
-  const c = new Promise((y, u) => {
-    o = setTimeout(() => {
-      o && clearTimeout(o);
-      const T = new p(r, e, t);
-      s.abort(T), u(T);
+  let n = null;
+  const c = new Promise((v, b) => {
+    n = setTimeout(() => {
+      n && clearTimeout(n);
+      const T = new f(r);
+      o.abort(T), b(T);
     }, t);
   });
   try {
-    return await Promise.race([
-      fetch(r, n),
-      c
-    ]);
+    return await Promise.race([fetch(e, i), c]);
   } finally {
-    o && clearTimeout(o);
+    n && clearTimeout(n);
   }
 }
-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 || {}), N = /* @__PURE__ */ ((r) => (r.METHOD = "method", r.BODY = "body", r))(N || {});
+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 d = "Content-Type";
-var f = /* @__PURE__ */ ((r) => (r.APPLICATION_JSON = "application/json", r.TEXT_EVENT_STREAM = "text/event-stream", r))(f || {});
+var y = /* @__PURE__ */ ((r) => (r.APPLICATION_JSON = "application/json", r.TEXT_EVENT_STREAM = "text/event-stream", r))(y || {});
 function a(r, e) {
   return e ? r.filter(e).sort((t, s) => t.order - s.order) : [...r].sort((t, s) => t.order - s.order);
 }
-class O {
+class F {
   constructor() {
     this.name = "RequestBodyInterceptor", this.order = Number.MIN_SAFE_INTEGER + 200;
   }
@@ -158,11 +182,11 @@ class O {
       return e;
     const s = { ...t };
     s.body = JSON.stringify(t.body), s.headers || (s.headers = {});
-    const n = s.headers;
-    return n[d] || (n[d] = f.APPLICATION_JSON), e.request = s, e;
+    const o = s.headers;
+    return o[d] || (o[d] = y.APPLICATION_JSON), e.request = s, e;
   }
 }
-class P {
+class g {
   constructor() {
     this.name = "FetchInterceptor", this.order = Number.MAX_SAFE_INTEGER - 100;
   }
@@ -191,14 +215,10 @@ class P {
    * console.log(result.response); // HTTP response object
    */
   async intercept(e) {
-    return e.response = await F(
-      e.url,
-      e.request,
-      e.request.timeout
-    ), e;
+    return e.response = await A(e.request), e;
   }
 }
-class R {
+class N {
   constructor() {
     this.name = "UrlResolveInterceptor", this.order = Number.MIN_SAFE_INTEGER + 100;
   }
@@ -209,11 +229,8 @@ class R {
    * @returns The modified exchange with the resolved URL
    */
   intercept(e) {
-    return e.url = e.fetcher.urlBuilder.build(
-      e.url,
-      e.request.path,
-      e.request.query
-    ), e;
+    const t = e.request;
+    return t.url = e.fetcher.urlBuilder.resolveRequestUrl(t), e;
   }
 }
 class h {
@@ -308,26 +325,30 @@ class h {
 class S {
   constructor() {
     this.request = new h([
-      new R(),
-      new O(),
-      new P()
+      new N(),
+      new F(),
+      new g()
     ]), this.response = new h(), this.error = new h();
   }
 }
-const l = {
-  [d]: f.APPLICATION_JSON
-}, b = {
+function l(r, e) {
+  if (!(r === void 0 && e === void 0))
+    return e === void 0 ? r : r === void 0 ? e : { ...r, ...e };
+}
+const m = {
+  [d]: y.APPLICATION_JSON
+}, I = {
   baseURL: "",
-  headers: l
+  headers: m
 };
-class g {
+class q {
   /**
    * Create a Fetcher instance
    *
    * @param options - Fetcher configuration options
    */
-  constructor(e = b) {
-    this.headers = l, this.urlBuilder = new w(e.baseURL), this.headers = e.headers ?? l, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new S();
+  constructor(e = I) {
+    this.headers = m, this.urlBuilder = new P(e.baseURL), this.headers = e.headers ?? m, this.timeout = e.timeout, this.interceptors = e.interceptors ?? new S();
   }
   /**
    * Make an HTTP request
@@ -337,32 +358,29 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async fetch(e, t = {}) {
-    const s = await this.request(e, t);
-    if (!s.response)
+    const s = t;
+    s.url = e;
+    const o = await this.request(s);
+    if (!o.response)
       throw new Error(`Request to ${s.url} failed with no response`);
-    return s.response;
+    return o.response;
   }
   /**
    * Send an HTTP request
    *
-   * @param url - Request URL address, supports path parameter placeholders
-   * @param request - Request configuration object, including method, headers, body, etc.
+   * @param request - Request configuration object, including url, method, headers, body, etc.
    * @returns Promise that resolves to a FetchExchange object containing request and response information
    *
    * @throws Throws an exception when an error occurs during the request and is not handled by error interceptors
    */
-  async request(e, t = {}) {
-    const s = {
-      ...this.headers || {},
-      ...t.headers || {}
-    }, n = {
-      ...t,
-      headers: Object.keys(s).length > 0 ? s : void 0,
-      timeout: A(t.timeout, this.timeout)
+  async request(e) {
+    const t = l(e.headers, this.headers), s = {
+      ...e,
+      headers: t,
+      timeout: R(e.timeout, this.timeout)
     }, o = {
       fetcher: this,
-      url: e,
-      request: n,
+      request: s,
       response: void 0,
       error: void 0,
       attributes: {}
@@ -416,7 +434,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async get(e, t = {}) {
-    return this.methodFetch(i.GET, e, t);
+    return this.methodFetch(u.GET, e, t);
   }
   /**
    * Make a POST request
@@ -426,7 +444,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async post(e, t = {}) {
-    return this.methodFetch(i.POST, e, t);
+    return this.methodFetch(u.POST, e, t);
   }
   /**
    * Make a PUT request
@@ -436,7 +454,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async put(e, t = {}) {
-    return this.methodFetch(i.PUT, e, t);
+    return this.methodFetch(u.PUT, e, t);
   }
   /**
    * Make a DELETE request
@@ -446,7 +464,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async delete(e, t = {}) {
-    return this.methodFetch(i.DELETE, e, t);
+    return this.methodFetch(u.DELETE, e, t);
   }
   /**
    * Make a PATCH request
@@ -456,7 +474,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async patch(e, t = {}) {
-    return this.methodFetch(i.PATCH, e, t);
+    return this.methodFetch(u.PATCH, e, t);
   }
   /**
    * Make a HEAD request
@@ -466,7 +484,7 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async head(e, t = {}) {
-    return this.methodFetch(i.HEAD, e, t);
+    return this.methodFetch(u.HEAD, e, t);
   }
   /**
    * Make an OPTIONS request
@@ -476,11 +494,11 @@ class g {
    * @returns Promise<Response> HTTP response
    */
   async options(e, t = {}) {
-    return this.methodFetch(i.OPTIONS, e, t);
+    return this.methodFetch(u.OPTIONS, e, t);
   }
 }
-const m = "default";
-class q {
+const p = "default";
+class O {
   constructor() {
     this.registrar = /* @__PURE__ */ new Map();
   }
@@ -553,7 +571,7 @@ class q {
    * const defaultFetcher = fetcherRegistrar.default;
    */
   get default() {
-    return this.requiredGet(m);
+    return this.requiredGet(p);
   }
   /**
    * Set the default Fetcher instance
@@ -564,7 +582,7 @@ class q {
    * fetcherRegistrar.default = fetcher;
    */
   set default(e) {
-    this.register(m, e);
+    this.register(p, e);
   }
   /**
    * Get a copy of all registered fetchers
@@ -580,35 +598,31 @@ class q {
     return new Map(this.registrar);
   }
 }
-const _ = new q();
+const U = new O();
 function L(r, e) {
   if (Object.keys(r).length === 0)
     return e;
   if (Object.keys(e).length === 0)
     return r;
   const t = {
-    ...r.path,
-    ...e.path
+    path: l(r.urlParams?.path, e.urlParams?.path),
+    query: l(r.urlParams?.query, e.urlParams?.query)
   }, s = {
-    ...r.query,
-    ...e.query
-  }, n = {
     ...r.headers,
     ...e.headers
-  }, o = e.method ?? r.method, c = e.body ?? r.body, y = e.timeout ?? r.timeout, u = e.signal ?? r.signal;
+  }, o = e.method ?? r.method, i = e.body ?? r.body, n = e.timeout ?? r.timeout, c = e.signal ?? r.signal;
   return {
     ...r,
     ...e,
     method: o,
-    path: t,
-    query: s,
-    headers: n,
-    body: c,
-    timeout: y,
-    signal: u
+    urlParams: t,
+    headers: s,
+    body: i,
+    timeout: n,
+    signal: c
   };
 }
-class U extends g {
+class _ extends q {
   /**
    * Create a NamedFetcher instance and automatically register it with the global fetcherRegistrar
    *
@@ -626,34 +640,34 @@ class U extends g {
    *   headers: { 'Authorization': 'Bearer token' }
    * });
    */
-  constructor(e, t = b) {
-    super(t), this.name = e, _.register(e, this);
+  constructor(e, t = I) {
+    super(t), this.name = e, U.register(e, this);
   }
 }
-const D = new U(m);
+const D = new _(p);
 export {
   d as ContentTypeHeader,
-  f as ContentTypeValues,
-  m as DEFAULT_FETCHER_NAME,
-  b as DEFAULT_OPTIONS,
-  P as FetchInterceptor,
-  p as FetchTimeoutError,
-  g as Fetcher,
+  y as ContentTypeValues,
+  p as DEFAULT_FETCHER_NAME,
+  I as DEFAULT_OPTIONS,
+  g as FetchInterceptor,
+  f as FetchTimeoutError,
+  q as Fetcher,
   S as FetcherInterceptors,
-  q as FetcherRegistrar,
-  i as HttpMethod,
+  O as FetcherRegistrar,
+  u as HttpMethod,
   h as InterceptorManager,
-  U as NamedFetcher,
-  O as RequestBodyInterceptor,
-  N as RequestField,
-  w as UrlBuilder,
-  R as UrlResolveInterceptor,
-  I as combineURLs,
+  _ as NamedFetcher,
+  F as RequestBodyInterceptor,
+  P as UrlBuilder,
+  N as UrlResolveInterceptor,
+  w as combineURLs,
   D as fetcher,
-  _ as fetcherRegistrar,
+  U as fetcherRegistrar,
   E as isAbsoluteURL,
+  l as mergeRecords,
   L as mergeRequest,
-  A as resolveTimeout,
-  F as timeoutFetch,
+  R as resolveTimeout,
+  A as timeoutFetch,
   a as toSorted
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(n,u){typeof exports=="object"&&typeof module<"u"?u(exports):typeof define=="function"&&define.amd?define(["exports"],u):(n=typeof globalThis<"u"?globalThis:n||self,u(n.Fetcher={}))})(this,(function(n){"use strict";function u(r){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(r)}function E(r,e){return u(e)?e:e?r.replace(/\/?\/$/,"")+"/"+e.replace(/^\/+/,""):r}class I{constructor(e){this.baseURL=e}build(e,t,s){const i=E(this.baseURL,e);let o=this.interpolateUrl(i,t);if(s){const a=new URLSearchParams(s).toString();a&&(o+="?"+a)}return o}interpolateUrl(e,t){return t?e.replace(/{([^}]+)}/g,(s,i)=>{const o=t[i];if(o===void 0)throw new Error(`Missing required path parameter: ${i}`);return String(o)}):e}}function F(r,e){return typeof r<"u"?r:e}class h extends Error{constructor(e,t,s){const i=t.method||"GET",o=`Request timeout of ${s}ms exceeded for ${i} ${e}`;super(o),this.name="FetchTimeoutError",this.url=e,this.request=t,this.timeout=s,Object.setPrototypeOf(this,h.prototype)}}async function R(r,e,t){if(!t)return fetch(r,e);const s=new AbortController,i={...e,signal:s.signal};let o=null;const a=new Promise((_,b)=>{o=setTimeout(()=>{o&&clearTimeout(o);const L=new h(r,e,t);s.abort(L),b(L)},t)});try{return await Promise.race([fetch(r,i),a])}finally{o&&clearTimeout(o)}}var c=(r=>(r.GET="GET",r.POST="POST",r.PUT="PUT",r.DELETE="DELETE",r.PATCH="PATCH",r.HEAD="HEAD",r.OPTIONS="OPTIONS",r))(c||{}),w=(r=>(r.METHOD="method",r.BODY="body",r))(w||{});const d="Content-Type";var l=(r=>(r.APPLICATION_JSON="application/json",r.TEXT_EVENT_STREAM="text/event-stream",r))(l||{});function m(r,e){return e?r.filter(e).sort((t,s)=>t.order-s.order):[...r].sort((t,s)=>t.order-s.order)}class A{constructor(){this.name="RequestBodyInterceptor",this.order=Number.MIN_SAFE_INTEGER+200}intercept(e){const t=e.request;if(t.body===void 0||t.body===null||typeof t.body!="object"||t.body instanceof ArrayBuffer||ArrayBuffer.isView(t.body)||t.body instanceof Blob||t.body instanceof File||t.body instanceof URLSearchParams||t.body instanceof FormData||t.body instanceof ReadableStream)return e;const s={...t};s.body=JSON.stringify(t.body),s.headers||(s.headers={});const i=s.headers;return i[d]||(i[d]=l.APPLICATION_JSON),e.request=s,e}}class N{constructor(){this.name="FetchInterceptor",this.order=Number.MAX_SAFE_INTEGER-100}async intercept(e){return e.response=await R(e.url,e.request,e.request.timeout),e}}class O{constructor(){this.name="UrlResolveInterceptor",this.order=Number.MIN_SAFE_INTEGER+100}intercept(e){return e.url=e.fetcher.urlBuilder.build(e.url,e.request.path,e.request.query),e}}class f{constructor(e=[]){this.sortedInterceptors=[],this.sortedInterceptors=m(e)}get name(){return this.constructor.name}get order(){return Number.MIN_SAFE_INTEGER}use(e){return this.sortedInterceptors.some(t=>t.name===e.name)?!1:(this.sortedInterceptors=m([...this.sortedInterceptors,e]),!0)}eject(e){const t=this.sortedInterceptors;return this.sortedInterceptors=m(t,s=>s.name!==e),t.length!==this.sortedInterceptors.length}clear(){this.sortedInterceptors=[]}async intercept(e){let t=e;for(const s of this.sortedInterceptors)t=await s.intercept(t);return t}}class S{constructor(){this.request=new f([new O,new A,new N]),this.response=new f,this.error=new f}}const T={[d]:l.APPLICATION_JSON},p={baseURL:"",headers:T};class g{constructor(e=p){this.headers=T,this.urlBuilder=new I(e.baseURL),this.headers=e.headers??T,this.timeout=e.timeout,this.interceptors=e.interceptors??new S}async fetch(e,t={}){const s=await this.request(e,t);if(!s.response)throw new Error(`Request to ${s.url} failed with no response`);return s.response}async request(e,t={}){const s={...this.headers||{},...t.headers||{}},i={...t,headers:Object.keys(s).length>0?s:void 0,timeout:F(t.timeout,this.timeout)},o={fetcher:this,url:e,request:i,response:void 0,error:void 0,attributes:{}};return this.exchange(o)}async exchange(e){try{return e=await this.interceptors.request.intercept(e),e=await this.interceptors.response.intercept(e),e}catch(t){if(e.error=t,e=await this.interceptors.error.intercept(e),e.response)return e;throw e.error}}async methodFetch(e,t,s={}){return this.fetch(t,{...s,method:e})}async get(e,t={}){return this.methodFetch(c.GET,e,t)}async post(e,t={}){return this.methodFetch(c.POST,e,t)}async put(e,t={}){return this.methodFetch(c.PUT,e,t)}async delete(e,t={}){return this.methodFetch(c.DELETE,e,t)}async patch(e,t={}){return this.methodFetch(c.PATCH,e,t)}async head(e,t={}){return this.methodFetch(c.HEAD,e,t)}async options(e,t={}){return this.methodFetch(c.OPTIONS,e,t)}}const y="default";class P{constructor(){this.registrar=new Map}register(e,t){this.registrar.set(e,t)}unregister(e){return this.registrar.delete(e)}get(e){return this.registrar.get(e)}requiredGet(e){const t=this.get(e);if(!t)throw new Error(`Fetcher ${e} not found`);return t}get default(){return this.requiredGet(y)}set default(e){this.register(y,e)}get fetchers(){return new Map(this.registrar)}}const q=new P;function D(r,e){if(Object.keys(r).length===0)return e;if(Object.keys(e).length===0)return r;const t={...r.path,...e.path},s={...r.query,...e.query},i={...r.headers,...e.headers},o=e.method??r.method,a=e.body??r.body,_=e.timeout??r.timeout,b=e.signal??r.signal;return{...r,...e,method:o,path:t,query:s,headers:i,body:a,timeout:_,signal:b}}class U extends g{constructor(e,t=p){super(t),this.name=e,q.register(e,this)}}const v=new U(y);n.ContentTypeHeader=d,n.ContentTypeValues=l,n.DEFAULT_FETCHER_NAME=y,n.DEFAULT_OPTIONS=p,n.FetchInterceptor=N,n.FetchTimeoutError=h,n.Fetcher=g,n.FetcherInterceptors=S,n.FetcherRegistrar=P,n.HttpMethod=c,n.InterceptorManager=f,n.NamedFetcher=U,n.RequestBodyInterceptor=A,n.RequestField=w,n.UrlBuilder=I,n.UrlResolveInterceptor=O,n.combineURLs=E,n.fetcher=v,n.fetcherRegistrar=q,n.isAbsoluteURL=u,n.mergeRequest=D,n.resolveTimeout=F,n.timeoutFetch=R,n.toSorted=m,Object.defineProperty(n,Symbol.toStringTag,{value:"Module"})}));
+(function(n,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(n=typeof globalThis<"u"?globalThis:n||self,a(n.Fetcher={}))})(this,(function(n){"use strict";function a(r){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(r)}function b(r,e){return a(e)?e:e?r.replace(/\/?\/$/,"")+"/"+e.replace(/^\/+/,""):r}class F{constructor(e){this.baseURL=e}build(e,t){const s=t?.path,o=t?.query,c=b(this.baseURL,e);let i=this.interpolateUrl(c,s);if(o){const h=new URLSearchParams(o).toString();h&&(i+="?"+h)}return i}resolveRequestUrl(e){return this.build(e.url,e.urlParams)}interpolateUrl(e,t){return t?e.replace(/{([^}]+)}/g,(s,o)=>{const c=t[o];if(c===void 0)throw new Error(`Missing required path parameter: ${o}`);return String(c)}):e}}function R(r,e){return typeof r<"u"?r:e}class d extends Error{constructor(e){const t=e.method||"GET",s=`Request timeout of ${e.timeout}ms exceeded for ${t} ${e.url}`;super(s),this.name="FetchTimeoutError",this.request=e,Object.setPrototypeOf(this,d.prototype)}}async function g(r){const e=r.url,t=r.timeout,s=r;if(!t)return fetch(e,s);const o=new AbortController,c={...s,signal:o.signal};let i=null;const h=new Promise((C,D)=>{i=setTimeout(()=>{i&&clearTimeout(i);const _=new d(r);o.abort(_),D(_)},t)});try{return await Promise.race([fetch(e,c),h])}finally{i&&clearTimeout(i)}}var u=(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 l="Content-Type";var m=(r=>(r.APPLICATION_JSON="application/json",r.TEXT_EVENT_STREAM="text/event-stream",r))(m||{});function f(r,e){return e?r.filter(e).sort((t,s)=>t.order-s.order):[...r].sort((t,s)=>t.order-s.order)}class P{constructor(){this.name="RequestBodyInterceptor",this.order=Number.MIN_SAFE_INTEGER+200}intercept(e){const t=e.request;if(t.body===void 0||t.body===null||typeof t.body!="object"||t.body instanceof ArrayBuffer||ArrayBuffer.isView(t.body)||t.body instanceof Blob||t.body instanceof File||t.body instanceof URLSearchParams||t.body instanceof FormData||t.body instanceof ReadableStream)return e;const s={...t};s.body=JSON.stringify(t.body),s.headers||(s.headers={});const o=s.headers;return o[l]||(o[l]=m.APPLICATION_JSON),e.request=s,e}}class w{constructor(){this.name="FetchInterceptor",this.order=Number.MAX_SAFE_INTEGER-100}async intercept(e){return e.response=await g(e.request),e}}class A{constructor(){this.name="UrlResolveInterceptor",this.order=Number.MIN_SAFE_INTEGER+100}intercept(e){const t=e.request;return t.url=e.fetcher.urlBuilder.resolveRequestUrl(t),e}}class y{constructor(e=[]){this.sortedInterceptors=[],this.sortedInterceptors=f(e)}get name(){return this.constructor.name}get order(){return Number.MIN_SAFE_INTEGER}use(e){return this.sortedInterceptors.some(t=>t.name===e.name)?!1:(this.sortedInterceptors=f([...this.sortedInterceptors,e]),!0)}eject(e){const t=this.sortedInterceptors;return this.sortedInterceptors=f(t,s=>s.name!==e),t.length!==this.sortedInterceptors.length}clear(){this.sortedInterceptors=[]}async intercept(e){let t=e;for(const s of this.sortedInterceptors)t=await s.intercept(t);return t}}class N{constructor(){this.request=new y([new A,new P,new w]),this.response=new y,this.error=new y}}function T(r,e){if(!(r===void 0&&e===void 0))return e===void 0?r:r===void 0?e:{...r,...e}}const I={[l]:m.APPLICATION_JSON},E={baseURL:"",headers:I};class S{constructor(e=E){this.headers=I,this.urlBuilder=new F(e.baseURL),this.headers=e.headers??I,this.timeout=e.timeout,this.interceptors=e.interceptors??new N}async fetch(e,t={}){const s=t;s.url=e;const o=await this.request(s);if(!o.response)throw new Error(`Request to ${s.url} failed with no response`);return o.response}async request(e){const t=T(e.headers,this.headers),s={...e,headers:t,timeout:R(e.timeout,this.timeout)},o={fetcher:this,request:s,response:void 0,error:void 0,attributes:{}};return this.exchange(o)}async exchange(e){try{return e=await this.interceptors.request.intercept(e),e=await this.interceptors.response.intercept(e),e}catch(t){if(e.error=t,e=await this.interceptors.error.intercept(e),e.response)return e;throw e.error}}async methodFetch(e,t,s={}){return this.fetch(t,{...s,method:e})}async get(e,t={}){return this.methodFetch(u.GET,e,t)}async post(e,t={}){return this.methodFetch(u.POST,e,t)}async put(e,t={}){return this.methodFetch(u.PUT,e,t)}async delete(e,t={}){return this.methodFetch(u.DELETE,e,t)}async patch(e,t={}){return this.methodFetch(u.PATCH,e,t)}async head(e,t={}){return this.methodFetch(u.HEAD,e,t)}async options(e,t={}){return this.methodFetch(u.OPTIONS,e,t)}}const p="default";class q{constructor(){this.registrar=new Map}register(e,t){this.registrar.set(e,t)}unregister(e){return this.registrar.delete(e)}get(e){return this.registrar.get(e)}requiredGet(e){const t=this.get(e);if(!t)throw new Error(`Fetcher ${e} not found`);return t}get default(){return this.requiredGet(p)}set default(e){this.register(p,e)}get fetchers(){return new Map(this.registrar)}}const O=new q;function v(r,e){if(Object.keys(r).length===0)return e;if(Object.keys(e).length===0)return r;const t={path:T(r.urlParams?.path,e.urlParams?.path),query:T(r.urlParams?.query,e.urlParams?.query)},s={...r.headers,...e.headers},o=e.method??r.method,c=e.body??r.body,i=e.timeout??r.timeout,h=e.signal??r.signal;return{...r,...e,method:o,urlParams:t,headers:s,body:c,timeout:i,signal:h}}class U extends S{constructor(e,t=E){super(t),this.name=e,O.register(e,this)}}const L=new U(p);n.ContentTypeHeader=l,n.ContentTypeValues=m,n.DEFAULT_FETCHER_NAME=p,n.DEFAULT_OPTIONS=E,n.FetchInterceptor=w,n.FetchTimeoutError=d,n.Fetcher=S,n.FetcherInterceptors=N,n.FetcherRegistrar=q,n.HttpMethod=u,n.InterceptorManager=y,n.NamedFetcher=U,n.RequestBodyInterceptor=P,n.UrlBuilder=F,n.UrlResolveInterceptor=A,n.combineURLs=b,n.fetcher=L,n.fetcherRegistrar=O,n.isAbsoluteURL=a,n.mergeRecords=T,n.mergeRequest=v,n.resolveTimeout=R,n.timeoutFetch=g,n.toSorted=f,Object.defineProperty(n,Symbol.toStringTag,{value:"Module"})}));

package/dist/mergeRequest.d.ts

@@ -1,4 +1,4 @@
-import { FetcherRequest } from './fetchExchange';
+import { FetchRequestInit } from './fetchRequest';
 /**
  * Merges two FetcherRequest objects into one.
  *
@@ -15,21 +15,27 @@ import { FetcherRequest } from './fetchExchange';
  * ```typescript
  * const request1 = {
  *   method: 'GET',
- *   path: { id: 1 },
+ *   urlParams: {
+ *     path: { id: 1 }
+ *   },
  *   headers: { 'Content-Type': 'application/json' }
  * };
  *
  * const request2 = {
  *   method: 'POST',
- *   query: { filter: 'active' },
+ *   urlParams: {
+ *     query: { filter: 'active' }
+ *   },
  *   headers: { 'Authorization': 'Bearer token' }
  * };
  *
  * const merged = mergeRequest(request1, request2);
  * // Result: {
  * //   method: 'POST',
- * //   path: { id: 1 },
- * //   query: { filter: 'active' },
+ * //   urlParams: {
+ * //     path: { id: 1 },
+ * //     query: { filter: 'active' }
+ * //   },
  * //   headers: {
  * //     'Content-Type': 'application/json',
  * //     'Authorization': 'Bearer token'
@@ -37,5 +43,5 @@ import { FetcherRequest } from './fetchExchange';
  * // }
  * ```
  */
-export declare function mergeRequest(first: FetcherRequest, second: FetcherRequest): FetcherRequest;
+export declare function mergeRequest(first: FetchRequestInit, second: FetchRequestInit): FetchRequestInit;
 //# sourceMappingURL=mergeRequest.d.ts.map

package/dist/mergeRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeRequest.d.ts","sourceRoot":"","sources":["../src/mergeRequest.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,cAAc,GACrB,cAAc,CA6ChB"}
+{"version":3,"file":"mergeRequest.d.ts","sourceRoot":"","sources":["../src/mergeRequest.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIlD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,gBAAgB,GACvB,gBAAgB,CAuClB"}

package/dist/timeout.d.ts

@@ -1,3 +1,4 @@
+import { FetchRequest } from './fetchRequest';
 /**
  * TimeoutCapable Interface
  *
@@ -42,26 +43,16 @@ export declare function resolveTimeout(requestTimeout?: number, optionsTimeout?:
  * ```
  */
 export declare class FetchTimeoutError extends Error {
-    /**
-     * The URL that timed out
-     */
-    url: string;
     /**
      * The request options that timed out
      */
-    request: RequestInit;
-    /**
-     * The timeout value in milliseconds
-     */
-    timeout: number;
+    request: FetchRequest;
     /**
      * Creates a new FetchTimeoutError instance
      *
-     * @param url - The URL that timed out
      * @param request - The request options that timed out
-     * @param timeout - The timeout value in milliseconds
      */
-    constructor(url: string, request: RequestInit, timeout: number);
+    constructor(request: FetchRequest);
 }
 /**
  * HTTP request method with timeout control
@@ -70,7 +61,6 @@ export declare class FetchTimeoutError extends Error {
  * fetch request and timeout Promise simultaneously. When either Promise completes,
  * it returns the result or throws an exception.
  *
- * @param url - The URL to fetch
  * @param request - The request initialization options
  * @param timeout - Optional timeout in milliseconds
  * @returns Promise<Response> HTTP response Promise
@@ -92,5 +82,5 @@ export declare class FetchTimeoutError extends Error {
  * const response = await timeoutFetch('https://api.example.com/users', { method: 'GET' });
  * ```
  */
-export declare function timeoutFetch(url: string, request: RequestInit, timeout?: number): Promise<Response>;
+export declare function timeoutFetch(request: FetchRequest): Promise<Response>;
 //# sourceMappingURL=timeout.d.ts.map

package/dist/timeout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../src/timeout.ts"],"names":[],"mappings":"AAaA;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAC5B,cAAc,CAAC,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAKpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,OAAO,EAAE,WAAW,CAAC;IAErB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;gBACS,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM;CAW/D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,CAyCnB"}
+{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../src/timeout.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAC5B,cAAc,CAAC,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAKpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IAEtB;;;;OAIG;gBACS,OAAO,EAAE,YAAY;CASlC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyC3E"}

package/dist/types.d.ts

@@ -23,10 +23,6 @@ export declare enum HttpMethod {
     HEAD = "HEAD",
     OPTIONS = "OPTIONS"
 }
-export declare enum RequestField {
-    METHOD = "method",
-    BODY = "body"
-}
 export declare const ContentTypeHeader = "Content-Type";
 export declare enum ContentTypeValues {
     APPLICATION_JSON = "application/json",

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;GAEG;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,oBAAY,YAAY;IACtB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD,oBAAY,iBAAiB;IAC3B,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,QAAQ;QAChB;;;;WAIG;QACH,IAAI,CAAC,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;KAC7B;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;GAEG;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;AAGD,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD,oBAAY,iBAAiB;IAC3B,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,QAAQ;QAChB;;;;WAIG;QACH,IAAI,CAAC,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;KAC7B;CACF"}

package/dist/urlBuilder.d.ts

@@ -1,48 +1,96 @@
 import { BaseURLCapable } from './types';
+import { FetchRequest } from './fetchRequest';
 /**
- * UrlBuilder Class
+ * Interface for URL parameters including path and query parameters
+ */
+export interface UrlParams {
+    /**
+     * Path parameter object used to replace placeholders in the URL (e.g., {id})
+     *
+     * @example
+     * ```typescript
+     * // For URL template '/users/{id}/posts/{postId}'
+     * const path = { id: 123, postId: 456 };
+     * ```
+     */
+    path?: Record<string, any>;
+    /**
+     * Query parameter object to be added to the URL query string
+     *
+     * @example
+     * ```typescript
+     * const query = { filter: 'active', page: 1, limit: 10 };
+     * // Results in query string: ?filter=active&page=1&limit=10
+     * ```
+     */
+    query?: Record<string, any>;
+}
+/**
+ * URL Builder class for constructing complete URLs with path parameters and query parameters
  *
- * URL builder class for constructing complete URLs with path parameters and query parameters.
  * This class handles URL composition, path parameter interpolation, and query string generation.
+ * It combines a base URL with a path, replaces path placeholders with actual values, and appends
+ * query parameters to create a complete URL.
  *
  * @example
  * ```typescript
  * const urlBuilder = new UrlBuilder('https://api.example.com');
- * const url = urlBuilder.build('/users/{id}', { id: 123 }, { filter: 'active' });
+ * const url = urlBuilder.build('/users/{id}', {
+ *   urlParams: {
+ *     path: { id: 123 },
+ *     query: { filter: 'active' }
+ *   }
+ * });
  * // Result: https://api.example.com/users/123?filter=active
  * ```
  */
 export declare class UrlBuilder implements BaseURLCapable {
     /**
      * Base URL that all constructed URLs will be based on
+     *
+     * This is typically the root of your API endpoint (e.g., 'https://api.example.com')
      */
     baseURL: string;
     /**
      * Creates a UrlBuilder instance
      *
      * @param baseURL - Base URL that all constructed URLs will be based on
+     *
+     * @example
+     * ```typescript
+     * const urlBuilder = new UrlBuilder('https://api.example.com');
+     * ```
      */
     constructor(baseURL: string);
     /**
      * Builds a complete URL, including path parameter replacement and query parameter addition
      *
-     * @param url - URL path to build
-     * @param path - Path parameter object used to replace placeholders in the URL (e.g., {id})
-     * @param query - Query parameter object to be added to the URL query string
-     * @returns Complete URL string
+     * @param url - URL path to build (e.g., '/users/{id}/posts')
+     * @param params - URL parameters including path and query parameters
+     * @returns Complete URL string with base URL, path parameters interpolated, and query string appended
      * @throws Error when required path parameters are missing
      *
      * @example
      * ```typescript
      * const urlBuilder = new UrlBuilder('https://api.example.com');
-     * const url = urlBuilder.build('/users/{id}/posts/{postId}',
-     *   { id: 123, postId: 456 },
-     *   { filter: 'active', limit: 10 }
-     * );
+     * const url = urlBuilder.build('/users/{id}/posts/{postId}', {
+     *   path: { id: 123, postId: 456 },
+     *   query: { filter: 'active', limit: 10 }
+     * });
      * // Result: https://api.example.com/users/123/posts/456?filter=active&limit=10
      * ```
      */
-    build(url: string, path?: Record<string, any>, query?: Record<string, any>): string;
+    build(url: string, params?: UrlParams): string;
+    /**
+     * Resolves a complete URL from a FetchRequest
+     *
+     * This method is used internally by the Fetcher to build the final URL for a request
+     * by combining the request URL with its URL parameters using this UrlBuilder.
+     *
+     * @param request - The FetchRequest containing URL and URL parameters
+     * @returns Complete resolved URL string
+     */
+    resolveRequestUrl(request: FetchRequest): string;
     /**
      * Replaces placeholders in the URL with path parameters
      *
@@ -54,13 +102,31 @@ export declare class UrlBuilder implements BaseURLCapable {
      * @example
      * ```typescript
      * const urlBuilder = new UrlBuilder('https://api.example.com');
-     * const result = urlBuilder.interpolateUrl('/users/{id}/posts/{postId}', { id: 123, postId: 456 });
-     * // Result: /users/123/posts/456
+     * 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(url: string, path?: Record<string, any>): string;
+    interpolateUrl(url: string, path?: Record<string, any> | null): string;
 }
+/**
+ * Interface for objects that have a UrlBuilder capability
+ */
 export interface UrlBuilderCapable {
+    /**
+     * The UrlBuilder instance
+     */
     urlBuilder: UrlBuilder;
 }
 //# sourceMappingURL=urlBuilder.d.ts.map

package/dist/urlBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"urlBuilder.d.ts","sourceRoot":"","sources":["../src/urlBuilder.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC;;;;;;;;;;;;GAYG;AACH,qBAAa,UAAW,YAAW,cAAc;IAC/C;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;gBACS,OAAO,EAAE,MAAM;IAI3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CACH,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,MAAM;IAYT;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;CAWhE;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,UAAU,CAAC;CACxB"}
+{"version":3,"file":"urlBuilder.d.ts","sourceRoot":"","sources":["../src/urlBuilder.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE3B;;;;;;;;OAQG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,UAAW,YAAW,cAAc;IAC/C;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;OASG;gBACS,OAAO,EAAE,MAAM;IAI3B;;;;;;;;;;;;;;;;;OAiBG;IACH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM;IAc9C;;;;;;;;OAQG;IACH,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAIhD;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,MAAM;CAWvE;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB"}

package/dist/urlResolveInterceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"urlResolveInterceptor.d.ts","sourceRoot":"","sources":["../src/urlResolveInterceptor.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,qBAAsB,YAAW,WAAW;IACvD;;OAEG;IACH,IAAI,SAA2B;IAE/B;;;;;;;;OAQG;IACH,KAAK,SAAiC;IAEtC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAQlD"}
+{"version":3,"file":"urlResolveInterceptor.d.ts","sourceRoot":"","sources":["../src/urlResolveInterceptor.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,qBAAsB,YAAW,WAAW;IACvD;;OAEG;IACH,IAAI,SAA2B;IAE/B;;;;;;;;OAQG;IACH,KAAK,SAAiC;IAEtC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAKlD"}

package/dist/utils.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Merges two record objects, giving precedence to the second record for overlapping keys.
+ *
+ * This utility function is used to merge configuration objects where the second object
+ * takes precedence over the first when there are conflicting keys.
+ *
+ * @template V - The type of values in the records
+ * @param first - The first record to merge (lower precedence)
+ * @param second - The second record to merge (higher precedence)
+ * @returns A new merged record, or undefined if both inputs are undefined
+ *
+ * @example
+ * ```typescript
+ * // Merge two objects
+ * const defaults = { timeout: 5000, retries: 3 };
+ * const overrides = { timeout: 10000 };
+ * const result = mergeRecords(defaults, overrides);
+ * // Result: { timeout: 10000, retries: 3 }
+ *
+ * // Handle undefined values
+ * const result2 = mergeRecords(undefined, { timeout: 5000 });
+ * // Result: { timeout: 5000 }
+ *
+ * // Return undefined when both are undefined
+ * const result3 = mergeRecords(undefined, undefined);
+ * // Result: undefined
+ * ```
+ */
+export declare function mergeRecords<V>(first?: Record<string, V>, second?: Record<string, V>): Record<string, V> | undefined;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAkB/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahoo-wang/fetcher",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Ultra-lightweight (1.9kB) HTTP client with built-in path parameters and Axios-like API",
   "keywords": [
     "fetch",