@ahoo-wang/fetcher 0.1.6 → 0.2.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@ahoo-wang/fetcher.svg)](https://www.npmjs.com/package/@ahoo-wang/fetcher)
 [![Build Status](https://github.com/Ahoo-Wang/fetcher/actions/workflows/ci.yml/badge.svg)](https://github.com/Ahoo-Wang/fetcher/actions)
-[![codecov](https://codecov.io/gh/Ahoo-Wang/Fetcher/graph/badge.svg?token=CUPgk8DmH5)](https://codecov.io/gh/Ahoo-Wang/Fetcher)
+[![codecov](https://codecov.io/gh/Ahoo-Wang/fetcher/graph/badge.svg?token=JGiWZ52CvJ)](https://codecov.io/gh/Ahoo-Wang/fetcher)
 [![License](https://img.shields.io/npm/l/@ahoo-wang/fetcher.svg)](https://github.com/Ahoo-Wang/fetcher/blob/main/LICENSE)
 [![npm downloads](https://img.shields.io/npm/dm/@ahoo-wang/fetcher.svg)](https://www.npmjs.com/package/@ahoo-wang/fetcher)
 
@@ -87,13 +87,16 @@ const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
 
 // Add request interceptor
 const requestInterceptorId = fetcher.interceptors.request.use({
-  intercept(request) {
+  intercept(exchange) {
     // Modify request configuration, e.g., add auth header
     return {
-      ...request,
-      headers: {
-        ...request.headers,
-        Authorization: 'Bearer token',
+      ...exchange,
+      request: {
+        ...exchange.request,
+        headers: {
+          ...exchange.request.headers,
+          Authorization: 'Bearer token',
+        },
       },
     };
   },
@@ -101,18 +104,18 @@ const requestInterceptorId = fetcher.interceptors.request.use({
 
 // Add response interceptor
 const responseInterceptorId = fetcher.interceptors.response.use({
-  intercept(response) {
+  intercept(exchange) {
     // Process response data, e.g., parse JSON
-    return response;
+    return exchange;
   },
 });
 
 // Add error interceptor
 const errorInterceptorId = fetcher.interceptors.error.use({
-  intercept(error) {
+  intercept(exchange) {
     // Handle errors, e.g., log them
-    console.error('Request failed:', error);
-    return error;
+    console.error('Request failed:', exchange.error);
+    return exchange;
   },
 });
 ```
@@ -160,10 +163,10 @@ Interceptor manager for managing multiple interceptors of the same type.
 
 #### Methods
 
-- `use(interceptor: T): number` - Add interceptor, returns interceptor ID
+- `use(interceptor: Interceptor): number` - Add interceptor, returns interceptor ID
 - `eject(index: number): void` - Remove interceptor by ID
 - `clear(): void` - Clear all interceptors
-- `intercept(data: R): Promise<R>` - Execute all interceptors sequentially
+- `intercept(exchange: FetchExchange): Promise<FetchExchange>` - Execute all interceptors sequentially
 
 ### FetcherInterceptors Class
 
@@ -171,9 +174,9 @@ Fetcher interceptor collection, including request, response, and error intercept
 
 #### Properties
 
-- `request: RequestInterceptorManager` - Request interceptor manager
-- `response: ResponseInterceptorManager` - Response interceptor manager
-- `error: ErrorInterceptorManager` - Error interceptor manager
+- `request: InterceptorManager` - Request interceptor manager
+- `response: InterceptorManager` - Response interceptor manager
+- `error: InterceptorManager` - Error interceptor manager
 
 ## Complete Example
 
@@ -191,38 +194,37 @@ const fetcher = new Fetcher({
 
 // Add request interceptor - Add auth header
 fetcher.interceptors.request.use({
-  intercept(request) {
+  intercept(exchange) {
     return {
-      ...request,
-      headers: {
-        ...request.headers,
-        Authorization: 'Bearer ' + getAuthToken(),
+      ...exchange,
+      request: {
+        ...exchange.request,
+        headers: {
+          ...exchange.request.headers,
+          Authorization: 'Bearer ' + getAuthToken(),
+        },
       },
     };
   },
 });
 
-// Add response interceptor - Auto-parse JSON
+// Add response interceptor - Process response
 fetcher.interceptors.response.use({
-  intercept(response) {
-    if (response.headers.get('content-type')?.includes('application/json')) {
-      return response.json().then(data => {
-        return new Response(JSON.stringify(data), response);
-      });
-    }
-    return response;
+  intercept(exchange) {
+    // Note: Response processing would typically happen after the response is received
+    return exchange;
   },
 });
 
 // Add error interceptor - Unified error handling
 fetcher.interceptors.error.use({
-  intercept(error) {
-    if (error.name === 'FetchTimeoutError') {
-      console.error('Request timeout:', error.message);
+  intercept(exchange) {
+    if (exchange.error?.name === 'FetchTimeoutError') {
+      console.error('Request timeout:', exchange.error.message);
     } else {
-      console.error('Network error:', error.message);
+      console.error('Network error:', exchange.error?.message);
     }
-    return error;
+    return exchange;
   },
 });
 

package/README.zh-CN.md

@@ -0,0 +1,260 @@
+# @ahoo-wang/fetcher
+
+[![npm version](https://img.shields.io/npm/v/@ahoo-wang/fetcher.svg)](https://www.npmjs.com/package/@ahoo-wang/fetcher)
+[![Build Status](https://github.com/Ahoo-Wang/fetcher/actions/workflows/ci.yml/badge.svg)](https://github.com/Ahoo-Wang/fetcher/actions)
+[![codecov](https://codecov.io/gh/Ahoo-Wang/fetcher/graph/badge.svg?token=JGiWZ52CvJ)](https://codecov.io/gh/Ahoo-Wang/fetcher)
+[![License](https://img.shields.io/npm/l/@ahoo-wang/fetcher.svg)](https://github.com/Ahoo-Wang/fetcher/blob/main/LICENSE)
+[![npm downloads](https://img.shields.io/npm/dm/@ahoo-wang/fetcher.svg)](https://www.npmjs.com/package/@ahoo-wang/fetcher)
+
+一个基于 Fetch API 的现代 HTTP 客户端库，旨在简化和优化与后端 RESTful API 的交互。它提供了类似 Axios 的 API，支持路径参数、查询参数、超时设置和请求/响应拦截器。
+
+## 特性
+
+- **Fetch API 兼容**：Fetcher 的 API 与原生 Fetch API 完全兼容，易于上手。
+- **路径和查询参数**：支持请求中的路径参数和查询参数，路径参数用 `{}` 包装。
+- **超时设置**：可以配置请求超时。
+- **请求拦截器**：支持在发送请求前修改请求。
+- **响应拦截器**：支持在返回响应后处理响应。
+- **错误拦截器**：支持在请求生命周期中处理错误。
+- **模块化设计**：代码结构清晰，易于维护和扩展。
+- **自动请求体转换**：自动将普通对象转换为 JSON 并设置适当的 Content-Type 头部。
+- **TypeScript 支持**：完整的 TypeScript 类型定义。
+
+## 安装
+
+使用 pnpm：
+
+```bash
+pnpm add @ahoo-wang/fetcher
+```
+
+使用 npm：
+
+```bash
+npm install @ahoo-wang/fetcher
+```
+
+使用 yarn：
+
+```bash
+yarn add @ahoo-wang/fetcher
+```
+
+## 使用
+
+### 基本用法
+
+```typescript
+import { Fetcher } from '@ahoo-wang/fetcher';
+
+const fetcher = new Fetcher({
+  baseURL: 'https://api.example.com',
+  timeout: 5000,
+});
+
+// 带路径参数和查询参数的 GET 请求
+fetcher
+  .get('/users/{id}', {
+    pathParams: { id: 123 },
+    queryParams: { include: 'profile' },
+  })
+  .then(response => {
+    console.log(response.data);
+  })
+  .catch(error => {
+    console.error(error);
+  });
+
+// 带 JSON 体的 POST 请求（自动转换为 JSON 字符串）
+fetcher
+  .post('/users', {
+    body: { name: 'John Doe', email: 'john@example.com' },
+  })
+  .then(response => {
+    console.log(response.data);
+  })
+  .catch(error => {
+    console.error(error);
+  });
+```
+
+### 拦截器用法
+
+```typescript
+import { Fetcher } from '@ahoo-wang/fetcher';
+
+const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
+
+// 添加请求拦截器
+const requestInterceptorId = fetcher.interceptors.request.use({
+  intercept(exchange) {
+    // 修改请求配置，例如添加认证头部
+    return {
+      ...exchange,
+      request: {
+        ...exchange.request,
+        headers: {
+          ...exchange.request.headers,
+          Authorization: 'Bearer token',
+        },
+      },
+    };
+  },
+});
+
+// 添加响应拦截器
+const responseInterceptorId = fetcher.interceptors.response.use({
+  intercept(exchange) {
+    // 处理响应数据，例如解析 JSON
+    return exchange;
+  },
+});
+
+// 添加错误拦截器
+const errorInterceptorId = fetcher.interceptors.error.use({
+  intercept(exchange) {
+    // 处理错误，例如记录日志
+    console.error('请求失败:', exchange.error);
+    return exchange;
+  },
+});
+```
+
+## API 参考
+
+### Fetcher 类
+
+提供各种 HTTP 方法的核心 HTTP 客户端类。
+
+#### 构造函数
+
+```typescript
+new Fetcher(options?: FetcherOptions)
+```
+
+**参数：**
+
+- `options.baseURL`：基础 URL
+- `options.timeout`：以毫秒为单位的请求超时
+- `options.headers`：默认请求头部
+
+#### 方法
+
+- `fetch(url: string, request?: FetcherRequest): Promise<Response>` - 通用 HTTP 请求方法
+- `get(url: string, request?: Omit<FetcherRequest, 'method' | 'body'>): Promise<Response>` - GET 请求
+- `post(url: string, request?: Omit<FetcherRequest, 'method'>): Promise<Response>` - POST 请求
+- `put(url: string, request?: Omit<FetcherRequest, 'method'>): Promise<Response>` - PUT 请求
+- `delete(url: string, request?: Omit<FetcherRequest, 'method'>): Promise<Response>` - DELETE 请求
+- `patch(url: string, request?: Omit<FetcherRequest, 'method'>): Promise<Response>` - PATCH 请求
+- `head(url: string, request?: Omit<FetcherRequest, 'method' | 'body'>): Promise<Response>` - HEAD 请求
+- `options(url: string, request?: Omit<FetcherRequest, 'method' | 'body'>): Promise<Response>` - OPTIONS 请求
+
+### UrlBuilder 类
+
+用于构建带参数的完整 URL 的 URL 构建器。
+
+#### 方法
+
+- `build(path: string, pathParams?: Record<string, any>, queryParams?: Record<string, any>): string` - 构建完整 URL
+
+### InterceptorManager 类
+
+用于管理同一类型多个拦截器的拦截器管理器。
+
+#### 方法
+
+- `use(interceptor: Interceptor): number` - 添加拦截器，返回拦截器 ID
+- `eject(index: number): void` - 按 ID 移除拦截器
+- `clear(): void` - 清除所有拦截器
+- `intercept(exchange: FetchExchange): Promise<FetchExchange>` - 顺序执行所有拦截器
+
+### FetcherInterceptors 类
+
+Fetcher 拦截器集合，包括请求、响应和错误拦截器管理器。
+
+#### 属性
+
+- `request: InterceptorManager` - 请求拦截器管理器
+- `response: InterceptorManager` - 响应拦截器管理器
+- `error: InterceptorManager` - 错误拦截器管理器
+
+## 完整示例
+
+```typescript
+import { Fetcher } from '@ahoo-wang/fetcher';
+
+// 创建 fetcher 实例
+const fetcher = new Fetcher({
+  baseURL: 'https://api.example.com',
+  timeout: 10000,
+  headers: {
+    'Content-Type': 'application/json',
+  },
+});
+
+// 添加请求拦截器 - 添加认证头部
+fetcher.interceptors.request.use({
+  intercept(exchange) {
+    return {
+      ...exchange,
+      request: {
+        ...exchange.request,
+        headers: {
+          ...exchange.request.headers,
+          Authorization: 'Bearer ' + getAuthToken(),
+        },
+      },
+    };
+  },
+});
+
+// 添加响应拦截器 - 处理响应
+fetcher.interceptors.response.use({
+  intercept(exchange) {
+    // 注意：响应处理通常在收到响应后进行
+    return exchange;
+  },
+});
+
+// 添加错误拦截器 - 统一错误处理
+fetcher.interceptors.error.use({
+  intercept(exchange) {
+    if (exchange.error?.name === 'FetchTimeoutError') {
+      console.error('请求超时:', exchange.error.message);
+    } else {
+      console.error('网络错误:', exchange.error?.message);
+    }
+    return exchange;
+  },
+});
+
+// 使用 fetcher 发起请求
+fetcher
+  .get('/users/{id}', {
+    pathParams: { id: 123 },
+    queryParams: { include: 'profile,posts' },
+  })
+  .then(response => response.json())
+  .then(data => {
+    console.log('用户数据:', data);
+  })
+  .catch(error => {
+    console.error('获取用户失败:', error);
+  });
+```
+
+## 测试
+
+运行测试：
+
+```bash
+pnpm test
+```
+
+## 贡献
+
+欢迎任何形式的贡献！请查看 [贡献指南](https://github.com/Ahoo-Wang/fetcher/blob/main/CONTRIBUTING.md) 了解更多详情。
+
+## 许可证
+
+本项目采用 [Apache-2.0 许可证](https://opensource.org/licenses/Apache-2.0)。

package/dist/fetcher.d.ts

@@ -1,13 +1,13 @@
 import { TimeoutCapable } from './timeout';
 import { BaseURLCapable, HeadersCapable, RequestField } from './types';
-import { FetcherInterceptors } from './interceptor';
+import { FetcherInterceptors, FetchExchange } from './interceptor';
 /**
- * Fetcher配置选项接口
+ * Fetcher configuration options interface
  */
 export interface FetcherOptions extends BaseURLCapable, HeadersCapable, TimeoutCapable {
 }
 /**
- * Fetcher请求选项接口
+ * Fetcher request options interface
  */
 export interface FetcherRequest extends TimeoutCapable, Omit<RequestInit, 'body'> {
     pathParams?: Record<string, any>;
@@ -15,7 +15,7 @@ export interface FetcherRequest extends TimeoutCapable, Omit<RequestInit, 'body'
     body?: BodyInit | Record<string, any> | null;
 }
 /**
- * HTTP请求客户端类，支持URL构建、超时控制等功能
+ * HTTP client class that supports URL building, timeout control, and more
  *
  * @example
  * const fetcher = new Fetcher({ baseURL: 'https://api.example.com' });
@@ -31,85 +31,104 @@ export declare class Fetcher implements HeadersCapable, TimeoutCapable {
     private urlBuilder;
     interceptors: FetcherInterceptors;
     /**
-     * 创建Fetcher实例
+     * Create a Fetcher instance
      *
-     * @param options - Fetcher配置选项
+     * @param options - Fetcher configuration options
      */
     constructor(options?: FetcherOptions);
     /**
-     * 发起HTTP请求
+     * Make an HTTP request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @param request - Request options, including path parameters, query parameters, etc.
+     * @returns Promise<Response> HTTP response
      */
     fetch(url: string, request?: FetcherRequest): Promise<Response>;
     /**
-     * 带超时控制的HTTP请求方法
+     * Send an HTTP request
      *
-     * 该方法使用Promise.race来实现超时控制，同时发起fetch请求和超时Promise，
-     * 当任一Promise完成时，会返回其结果或抛出异常。
+     * @param url - Request URL address, supports path parameter placeholders
+     * @param request - Request configuration object, including method, headers, body, etc.
+     * @returns Promise that resolves to a FetchExchange object containing request and response information
      *
-     * @param url - 请求的URL地址
-     * @param request - 请求选项，包括method、headers、body等fetch API支持的选项
-     * @returns Promise<Response> HTTP响应Promise
-     * @throws FetchTimeoutError 当请求超时时抛出
+     * @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>;
+    /**
+     * HTTP request method with timeout control
+     *
+     * This method uses Promise.race to implement timeout control, initiating both
+     * fetch request and timeout Promise simultaneously. When either Promise completes,
+     * it returns the result or throws an exception.
+     *
+     * @param exchange - The exchange containing request information
+     * @returns Promise<Response> HTTP response Promise
+     * @throws FetchTimeoutError Thrown when the request times out
      */
     private timeoutFetch;
     /**
-     * 发起GET请求
+     * Make an HTTP request with the specified method
+     *
+     * @param method - HTTP method to use
+     * @param url - Request URL path
+     * @param request - Request options
+     * @returns Promise<Response> HTTP response
+     */
+    private methodFetch;
+    /**
+     * Make a GET request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起POST请求
+     * Make a POST request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数、请求体等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起PUT请求
+     * Make a PUT request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数、请求体等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起DELETE请求
+     * Make a DELETE request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起PATCH请求
+     * Make a PATCH request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数、请求体等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起HEAD请求
+     * Make a HEAD request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
     /**
-     * 发起OPTIONS请求
+     * Make an OPTIONS request
      *
-     * @param url - 请求URL路径
-     * @param request - 请求选项，包括路径参数、查询参数等
-     * @returns Promise<Response> HTTP响应
+     * @param url - Request URL path
+     * @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>;
 }

package/dist/fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,cAAc,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,EACL,cAAc,EAGd,cAAc,EAEd,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGpD;;GAEG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,cAAc,EACd,cAAc;CAAG;AAWrB;;GAEG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;CAC9C;AAED;;;;;;;;;;GAUG;AACH,qBAAa,OAAQ,YAAW,cAAc,EAAE,cAAc;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAkB;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,UAAU,CAAa;IAC/B,YAAY,EAAE,mBAAmB,CAA6B;IAE9D;;;;OAIG;gBACS,OAAO,GAAE,cAA+B;IASpD;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAyCzE;;;;;;;;;;OAUG;YACW,YAAY;IA4C1B;;;;;;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;IAOpB;;;;;;OAMG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;OAMG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;OAMG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;OAMG;IACG,KAAK,CACT,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAM,GACtD,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;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;IAOpB;;;;;;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;CAMrB"}
+{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../src/fetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,cAAc,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,EACL,cAAc,EAGd,cAAc,EAEd,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnE;;GAEG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,cAAc,EACd,cAAc;CACjB;AAWD;;GAEG;AACH,MAAM,WAAW,cACf,SAAQ,cAAc,EACpB,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;CAC9C;AAED;;;;;;;;;;GAUG;AACH,qBAAa,OAAQ,YAAW,cAAc,EAAE,cAAc;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAkB;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,UAAU,CAAa;IAC/B,YAAY,EAAE,mBAAmB,CAA6B;IAE9D;;;;OAIG;gBACS,OAAO,GAAE,cAA+B;IASpD;;;;;;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;IA0CzB;;;;;;;;;;OAUG;YACW,YAAY;IA2C1B;;;;;;;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"}

package/dist/index.es.js

@@ -1,10 +1,10 @@
-function T(r) {
+function b(r) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(r);
 }
-function b(r, e) {
-  return T(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.replace(/^\/+/, "") : r;
+function E(r, e) {
+  return b(e) ? e : e ? r.replace(/\/?\/$/, "") + "/" + e.replace(/^\/+/, "") : r;
 }
-class E {
+class w {
   /**
    * 创建UrlBuilder实例
    *
@@ -22,13 +22,13 @@ class E {
    * @returns 完整的URL字符串
    * @throws 当路径参数中缺少必需的占位符时抛出错误
    */
-  build(e, t, n) {
-    let s = b(this.baseURL, e), o = this.interpolateUrl(s, t);
-    if (n) {
-      const a = new URLSearchParams(n).toString();
-      a && (o += "?" + a);
+  build(e, t, s) {
+    let o = E(this.baseURL, e), i = this.interpolateUrl(o, t);
+    if (s) {
+      const n = new URLSearchParams(s).toString();
+      n && (i += "?" + n);
     }
-    return o;
+    return i;
   }
   /**
    * 替换url中的占位符参数
@@ -39,26 +39,26 @@ class E {
    * @throws 当路径参数中缺少必需的占位符时抛出错误
    */
   interpolateUrl(e, t) {
-    return t ? e.replace(/{([^}]+)}/g, (n, s) => {
-      const o = t[s];
-      if (o === void 0)
-        throw new Error(`Missing required path parameter: ${s}`);
-      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 P(r, e) {
   return typeof r < "u" ? r : e;
 }
-class f extends Error {
-  constructor(e, t, n) {
-    const s = `Request timeout of ${n}ms exceeded for ${t?.method || "GET"} ${e}`;
-    super(s), this.name = "FetchTimeoutError", this.url = e, this.request = t, Object.setPrototypeOf(this, f.prototype);
+class l extends Error {
+  constructor(e, t) {
+    const s = e.request?.method || "GET", o = `Request timeout of ${t}ms exceeded for ${s} ${e.url}`;
+    super(o), this.name = "FetchTimeoutError", this.exchange = e, Object.setPrototypeOf(this, l.prototype);
   }
 }
 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 || {}), O = /* @__PURE__ */ ((r) => (r.METHOD = "method", r.BODY = "body", r))(O || {});
 const d = "Content-Type";
-var u = /* @__PURE__ */ ((r) => (r.APPLICATION_JSON = "application/json", r.TEXT_EVENT_STREAM = "text/event-stream", r))(u || {});
+var f = /* @__PURE__ */ ((r) => (r.APPLICATION_JSON = "application/json", r.TEXT_EVENT_STREAM = "text/event-stream", r))(f || {});
 class h {
   constructor() {
     this.interceptors = [];
@@ -87,22 +87,22 @@ class h {
   }
   /**
    * 依次执行所有拦截器对数据的处理
-   * @param data - 需要处理的数据
+   * @param exchange - 需要处理的数据
    * @returns 经过所有拦截器处理后的数据
    */
   async intercept(e) {
     let t = e;
-    for (let n of this.interceptors)
-      n && (t = await n.intercept(t));
+    for (let s of this.interceptors)
+      s && (t = await s.intercept(t));
     return t;
   }
 }
-class w {
+class A {
   constructor() {
     this.request = new h(), this.response = new h(), this.error = new h();
   }
 }
-class A {
+class S {
   /**
    * 尝试转换请求体为合法的 fetch API body 类型
    *
@@ -122,206 +122,216 @@ class A {
    *
    * 对于不支持的 object 类型（如普通对象），将自动转换为 JSON 字符串
    *
-   * @param request 请求参数
+   * @param exchange
    * @returns 转换后的请求
    */
   intercept(e) {
-    if (e.body === void 0 || e.body === null || typeof e.body != "object" || e.body instanceof ArrayBuffer || ArrayBuffer.isView(e.body) || // 包括 TypedArray 和 DataView
-    e.body instanceof Blob || e.body instanceof File || e.body instanceof URLSearchParams || e.body instanceof FormData || e.body instanceof ReadableStream)
+    const t = e.request;
+    if (t.body === void 0 || t.body === null || typeof t.body != "object" || t.body instanceof ArrayBuffer || ArrayBuffer.isView(t.body) || // 包括 TypedArray 和 DataView
+    t.body instanceof Blob || t.body instanceof File || t.body instanceof URLSearchParams || t.body instanceof FormData || t.body instanceof ReadableStream)
       return e;
-    const t = { ...e };
-    t.body = JSON.stringify(e.body), t.headers || (t.headers = {});
-    const n = t.headers;
-    return n[d] || (n[d] = u.APPLICATION_JSON), t;
+    const s = { ...t };
+    s.body = JSON.stringify(t.body), s.headers || (s.headers = {});
+    const o = s.headers;
+    return o[d] || (o[d] = f.APPLICATION_JSON), { ...e, request: s };
   }
 }
-const p = {
-  [d]: u.APPLICATION_JSON
-}, S = {
+const m = {
+  [d]: f.APPLICATION_JSON
+}, q = {
   baseURL: "",
-  headers: p
+  headers: m
 };
 class I {
   /**
-   * 创建Fetcher实例
+   * Create a Fetcher instance
    *
-   * @param options - Fetcher配置选项
+   * @param options - Fetcher configuration options
    */
-  constructor(e = S) {
-    this.headers = p, this.interceptors = new w(), this.urlBuilder = new E(e.baseURL), e.headers !== void 0 && (this.headers = e.headers), this.timeout = e.timeout, this.interceptors.request.use(new A());
+  constructor(e = q) {
+    this.headers = m, this.interceptors = new A(), this.urlBuilder = new w(e.baseURL), e.headers !== void 0 && (this.headers = e.headers), this.timeout = e.timeout, this.interceptors.request.use(new S());
   }
   /**
-   * 发起HTTP请求
+   * Make an HTTP request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, etc.
+   * @returns Promise<Response> HTTP response
    */
   async fetch(e, t = {}) {
-    const n = {
+    const s = await this.request(e, t);
+    if (!s.response)
+      throw new Error(`Request to ${s.url} failed with no response`);
+    return s.response;
+  }
+  /**
+   * Send an HTTP request
+   *
+   * @param url - Request URL address, supports path parameter placeholders
+   * @param request - Request configuration object, including 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 || {}
-    };
-    let s = {
+    }, o = {
       ...t,
-      headers: Object.keys(n).length > 0 ? n : void 0
+      headers: Object.keys(s).length > 0 ? s : void 0
+    }, i = this.urlBuilder.build(
+      e,
+      t.pathParams,
+      t.queryParams
+    );
+    let n = {
+      fetcher: this,
+      url: i,
+      request: o,
+      response: void 0,
+      error: void 0
     };
     try {
-      s = await this.interceptors.request.intercept(s);
-      const o = this.urlBuilder.build(
-        e,
-        t.pathParams,
-        t.queryParams
-      ), a = {
-        ...s,
-        body: s.body
-      };
-      let i = await this.timeoutFetch(o, a);
-      return i = await this.interceptors.response.intercept(i), i;
-    } catch (o) {
-      throw await this.interceptors.error.intercept(o);
+      return n = await this.interceptors.request.intercept(n), n.response = await this.timeoutFetch(n), n = await this.interceptors.response.intercept(n), n;
+    } catch (u) {
+      if (n.error = u, n = await this.interceptors.error.intercept(n), n.response)
+        return n;
+      throw n.error;
     }
   }
   /**
-   * 带超时控制的HTTP请求方法
+   * HTTP request method with timeout control
    *
-   * 该方法使用Promise.race来实现超时控制，同时发起fetch请求和超时Promise，
-   * 当任一Promise完成时，会返回其结果或抛出异常。
+   * This method uses Promise.race to implement timeout control, initiating both
+   * fetch request and timeout Promise simultaneously. When either Promise completes,
+   * it returns the result or throws an exception.
    *
-   * @param url - 请求的URL地址
-   * @param request - 请求选项，包括method、headers、body等fetch API支持的选项
-   * @returns Promise<Response> HTTP响应Promise
-   * @throws FetchTimeoutError 当请求超时时抛出
+   * @param exchange - The exchange containing request information
+   * @returns Promise<Response> HTTP response Promise
+   * @throws FetchTimeoutError Thrown when the request times out
    */
-  async timeoutFetch(e, t) {
-    const n = t.timeout, s = P(n, this.timeout);
-    if (!s)
-      return fetch(e, t);
-    const o = new AbortController(), a = {
-      ...t,
-      signal: o.signal
+  async timeoutFetch(e) {
+    const t = e.url, s = e.request, o = s.timeout, i = P(o, this.timeout);
+    if (!i)
+      return fetch(t, s);
+    const n = new AbortController(), u = {
+      ...s,
+      signal: n.signal
     };
-    let i = null;
-    const m = new Promise((g, y) => {
-      i = setTimeout(() => {
-        i && clearTimeout(i);
-        const l = new f(
-          e,
-          t,
-          s
-        );
-        o.abort(l), y(l);
-      }, s);
+    let a = null;
+    const y = new Promise((F, T) => {
+      a = setTimeout(() => {
+        a && clearTimeout(a);
+        const p = new l(e, i);
+        n.abort(p), T(p);
+      }, i);
     });
     try {
-      return await Promise.race([fetch(e, a), m]);
+      return await Promise.race([
+        fetch(t, u),
+        y
+      ]);
     } finally {
-      i && clearTimeout(i);
+      a && clearTimeout(a);
     }
   }
   /**
-   * 发起GET请求
+   * Make an HTTP request with the specified method
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数等
-   * @returns Promise<Response> HTTP响应
+   * @param method - HTTP method to use
+   * @param url - Request URL path
+   * @param request - Request options
+   * @returns Promise<Response> HTTP response
    */
-  async get(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.GET
+  async methodFetch(e, t, s = {}) {
+    return this.fetch(t, {
+      ...s,
+      method: e
     });
   }
   /**
-   * 发起POST请求
+   * Make a GET request
+   *
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, etc.
+   * @returns Promise<Response> HTTP response
+   */
+  async get(e, t = {}) {
+    return this.methodFetch(c.GET, e, t);
+  }
+  /**
+   * Make a POST request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数、请求体等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, request body, etc.
+   * @returns Promise<Response> HTTP response
    */
   async post(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.POST
-    });
+    return this.methodFetch(c.POST, e, t);
   }
   /**
-   * 发起PUT请求
+   * Make a PUT request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数、请求体等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, request body, etc.
+   * @returns Promise<Response> HTTP response
    */
   async put(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.PUT
-    });
+    return this.methodFetch(c.PUT, e, t);
   }
   /**
-   * 发起DELETE请求
+   * Make a DELETE request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, etc.
+   * @returns Promise<Response> HTTP response
    */
   async delete(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.DELETE
-    });
+    return this.methodFetch(c.DELETE, e, t);
   }
   /**
-   * 发起PATCH请求
+   * Make a PATCH request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数、请求体等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, request body, etc.
+   * @returns Promise<Response> HTTP response
    */
   async patch(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.PATCH
-    });
+    return this.methodFetch(c.PATCH, e, t);
   }
   /**
-   * 发起HEAD请求
+   * Make a HEAD request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, etc.
+   * @returns Promise<Response> HTTP response
    */
   async head(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.HEAD
-    });
+    return this.methodFetch(c.HEAD, e, t);
   }
   /**
-   * 发起OPTIONS请求
+   * Make an OPTIONS request
    *
-   * @param url - 请求URL路径
-   * @param request - 请求选项，包括路径参数、查询参数等
-   * @returns Promise<Response> HTTP响应
+   * @param url - Request URL path
+   * @param request - Request options, including path parameters, query parameters, etc.
+   * @returns Promise<Response> HTTP response
    */
   async options(e, t = {}) {
-    return this.fetch(e, {
-      ...t,
-      method: c.OPTIONS
-    });
+    return this.methodFetch(c.OPTIONS, e, t);
   }
 }
 export {
   d as ContentTypeHeader,
-  u as ContentTypeValues,
-  f as FetchTimeoutError,
+  f as ContentTypeValues,
+  l as FetchTimeoutError,
   I as Fetcher,
-  w as FetcherInterceptors,
+  A as FetcherInterceptors,
   c as HttpMethod,
   h as InterceptorManager,
   O as RequestField,
-  E as UrlBuilder,
-  b as combineURLs,
-  T as isAbsoluteURL,
+  w as UrlBuilder,
+  E as combineURLs,
+  b as isAbsoluteURL,
   P as resolveTimeout
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(n,d){typeof exports=="object"&&typeof module<"u"?d(exports):typeof define=="function"&&define.amd?define(["exports"],d):(n=typeof globalThis<"u"?globalThis:n||self,d(n.Fetcher={}))})(this,(function(n){"use strict";function d(r){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(r)}function y(r,e){return d(e)?e:e?r.replace(/\/?\/$/,"")+"/"+e.replace(/^\/+/,""):r}class p{constructor(e){this.baseURL=e}build(e,t,i){let o=y(this.baseURL,e),s=this.interpolateUrl(o,t);if(i){const h=new URLSearchParams(i).toString();h&&(s+="?"+h)}return s}interpolateUrl(e,t){return t?e.replace(/{([^}]+)}/g,(i,o)=>{const s=t[o];if(s===void 0)throw new Error(`Missing required path parameter: ${o}`);return String(s)}):e}}function T(r,e){return typeof r<"u"?r:e}class u extends Error{constructor(e,t,i){const o=`Request timeout of ${i}ms exceeded for ${t?.method||"GET"} ${e}`;super(o),this.name="FetchTimeoutError",this.url=e,this.request=t,Object.setPrototypeOf(this,u.prototype)}}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||{}),b=(r=>(r.METHOD="method",r.BODY="body",r))(b||{});const f="Content-Type";var l=(r=>(r.APPLICATION_JSON="application/json",r.TEXT_EVENT_STREAM="text/event-stream",r))(l||{});class m{constructor(){this.interceptors=[]}use(e){const t=this.interceptors.length;return this.interceptors.push(e),t}eject(e){this.interceptors[e]&&(this.interceptors[e]=null)}clear(){this.interceptors=[]}async intercept(e){let t=e;for(let i of this.interceptors)i&&(t=await i.intercept(t));return t}}class E{constructor(){this.request=new m,this.response=new m,this.error=new m}}class w{intercept(e){if(e.body===void 0||e.body===null||typeof e.body!="object"||e.body instanceof ArrayBuffer||ArrayBuffer.isView(e.body)||e.body instanceof Blob||e.body instanceof File||e.body instanceof URLSearchParams||e.body instanceof FormData||e.body instanceof ReadableStream)return e;const t={...e};t.body=JSON.stringify(e.body),t.headers||(t.headers={});const i=t.headers;return i[f]||(i[f]=l.APPLICATION_JSON),t}}const P={[f]:l.APPLICATION_JSON},S={baseURL:"",headers:P};class A{constructor(e=S){this.headers=P,this.interceptors=new E,this.urlBuilder=new p(e.baseURL),e.headers!==void 0&&(this.headers=e.headers),this.timeout=e.timeout,this.interceptors.request.use(new w)}async fetch(e,t={}){const i={...this.headers||{},...t.headers||{}};let o={...t,headers:Object.keys(i).length>0?i:void 0};try{o=await this.interceptors.request.intercept(o);const s=this.urlBuilder.build(e,t.pathParams,t.queryParams),h={...o,body:o.body};let a=await this.timeoutFetch(s,h);return a=await this.interceptors.response.intercept(a),a}catch(s){throw await this.interceptors.error.intercept(s)}}async timeoutFetch(e,t){const i=t.timeout,o=T(i,this.timeout);if(!o)return fetch(e,t);const s=new AbortController,h={...t,signal:s.signal};let a=null;const g=new Promise((I,U)=>{a=setTimeout(()=>{a&&clearTimeout(a);const O=new u(e,t,o);s.abort(O),U(O)},o)});try{return await Promise.race([fetch(e,h),g])}finally{a&&clearTimeout(a)}}async get(e,t={}){return this.fetch(e,{...t,method:c.GET})}async post(e,t={}){return this.fetch(e,{...t,method:c.POST})}async put(e,t={}){return this.fetch(e,{...t,method:c.PUT})}async delete(e,t={}){return this.fetch(e,{...t,method:c.DELETE})}async patch(e,t={}){return this.fetch(e,{...t,method:c.PATCH})}async head(e,t={}){return this.fetch(e,{...t,method:c.HEAD})}async options(e,t={}){return this.fetch(e,{...t,method:c.OPTIONS})}}n.ContentTypeHeader=f,n.ContentTypeValues=l,n.FetchTimeoutError=u,n.Fetcher=A,n.FetcherInterceptors=E,n.HttpMethod=c,n.InterceptorManager=m,n.RequestField=b,n.UrlBuilder=p,n.combineURLs=y,n.isAbsoluteURL=d,n.resolveTimeout=T,Object.defineProperty(n,Symbol.toStringTag,{value:"Module"})}));
+(function(i,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(i=typeof globalThis<"u"?globalThis:i||self,a(i.Fetcher={}))})(this,(function(i){"use strict";function a(r){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(r)}function y(r,e){return a(e)?e:e?r.replace(/\/?\/$/,"")+"/"+e.replace(/^\/+/,""):r}class T{constructor(e){this.baseURL=e}build(e,t,s){let o=y(this.baseURL,e),c=this.interpolateUrl(o,t);if(s){const n=new URLSearchParams(s).toString();n&&(c+="?"+n)}return c}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 b(r,e){return typeof r<"u"?r:e}class d extends Error{constructor(e,t){const s=e.request?.method||"GET",o=`Request timeout of ${t}ms exceeded for ${s} ${e.url}`;super(o),this.name="FetchTimeoutError",this.exchange=e,Object.setPrototypeOf(this,d.prototype)}}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||{}),E=(r=>(r.METHOD="method",r.BODY="body",r))(E||{});const l="Content-Type";var f=(r=>(r.APPLICATION_JSON="application/json",r.TEXT_EVENT_STREAM="text/event-stream",r))(f||{});class m{constructor(){this.interceptors=[]}use(e){const t=this.interceptors.length;return this.interceptors.push(e),t}eject(e){this.interceptors[e]&&(this.interceptors[e]=null)}clear(){this.interceptors=[]}async intercept(e){let t=e;for(let s of this.interceptors)s&&(t=await s.intercept(t));return t}}class P{constructor(){this.request=new m,this.response=new m,this.error=new m}}class F{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]=f.APPLICATION_JSON),{...e,request:s}}}const w={[l]:f.APPLICATION_JSON},S={baseURL:"",headers:w};class A{constructor(e=S){this.headers=w,this.interceptors=new P,this.urlBuilder=new T(e.baseURL),e.headers!==void 0&&(this.headers=e.headers),this.timeout=e.timeout,this.interceptors.request.use(new F)}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||{}},o={...t,headers:Object.keys(s).length>0?s:void 0},c=this.urlBuilder.build(e,t.pathParams,t.queryParams);let n={fetcher:this,url:c,request:o,response:void 0,error:void 0};try{return n=await this.interceptors.request.intercept(n),n.response=await this.timeoutFetch(n),n=await this.interceptors.response.intercept(n),n}catch(p){if(n.error=p,n=await this.interceptors.error.intercept(n),n.response)return n;throw n.error}}async timeoutFetch(e){const t=e.url,s=e.request,o=s.timeout,c=b(o,this.timeout);if(!c)return fetch(t,s);const n=new AbortController,p={...s,signal:n.signal};let h=null;const q=new Promise((I,U)=>{h=setTimeout(()=>{h&&clearTimeout(h);const O=new d(e,c);n.abort(O),U(O)},c)});try{return await Promise.race([fetch(t,p),q])}finally{h&&clearTimeout(h)}}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)}}i.ContentTypeHeader=l,i.ContentTypeValues=f,i.FetchTimeoutError=d,i.Fetcher=A,i.FetcherInterceptors=P,i.HttpMethod=u,i.InterceptorManager=m,i.RequestField=E,i.UrlBuilder=T,i.combineURLs=y,i.isAbsoluteURL=a,i.resolveTimeout=b,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})}));

package/dist/interceptor.d.ts

@@ -1,44 +1,34 @@
-import { FetcherRequest } from './fetcher';
+import { Fetcher, FetcherRequest } from './fetcher';
+export interface FetchExchange {
+    fetcher: Fetcher;
+    url: string;
+    request: FetcherRequest;
+    response: Response | undefined;
+    error: Error | any | undefined;
+}
 /**
  * 拦截器接口，定义了拦截器的基本结构
  * @template T - 拦截器处理的数据类型
  */
-export interface Interceptor<T> {
+export interface Interceptor {
     /**
      * 拦截并处理数据
-     * @param data - 需要处理的数据
+     * @param exchange - 需要处理的数据
      * @returns 处理后的数据，可以是同步或异步返回
      */
-    intercept(data: T): T | Promise<T>;
-}
-/**
- * 请求拦截器接口，专门用于处理请求数据
- */
-export interface RequestInterceptor extends Interceptor<FetcherRequest> {
-}
-/**
- * 响应拦截器接口，专门用于处理响应数据
- */
-export interface ResponseInterceptor extends Interceptor<Response> {
-}
-/**
- * 错误拦截器接口，专门用于处理错误数据
- */
-export interface ErrorInterceptor extends Interceptor<any> {
+    intercept(exchange: FetchExchange): FetchExchange | Promise<FetchExchange>;
 }
 /**
  * 拦截器管理器类，用于管理同一类型的多个拦截器
- * @template R - 拦截器处理的数据类型
- * @template T - 拦截器类型
  */
-export declare class InterceptorManager<R, T extends Interceptor<R>> implements Interceptor<R> {
+export declare class InterceptorManager implements Interceptor {
     private interceptors;
     /**
      * 添加拦截器到管理器中
      * @param interceptor - 要添加的拦截器
      * @returns 拦截器在管理器中的索引位置
      */
-    use(interceptor: T): number;
+    use(interceptor: Interceptor): number;
     /**
      * 根据索引移除拦截器
      * @param index - 要移除的拦截器索引
@@ -50,23 +40,11 @@ export declare class InterceptorManager<R, T extends Interceptor<R>> implements
     clear(): void;
     /**
      * 依次执行所有拦截器对数据的处理
-     * @param data - 需要处理的数据
+     * @param exchange - 需要处理的数据
      * @returns 经过所有拦截器处理后的数据
      */
-    intercept(data: R): Promise<R>;
+    intercept(exchange: FetchExchange): Promise<FetchExchange>;
 }
-/**
- * 请求拦截器管理器类型定义
- */
-export type RequestInterceptorManager = InterceptorManager<FetcherRequest, RequestInterceptor>;
-/**
- * 响应拦截器管理器类型定义
- */
-export type ResponseInterceptorManager = InterceptorManager<Response, ResponseInterceptor>;
-/**
- * 错误拦截器管理器类型定义
- */
-export type ErrorInterceptorManager = InterceptorManager<any, ErrorInterceptor>;
 /**
  * Fetcher拦截器集合类，包含请求、响应和错误拦截器管理器
  */
@@ -74,14 +52,14 @@ export declare class FetcherInterceptors {
     /**
      * 请求拦截器管理器
      */
-    request: RequestInterceptorManager;
+    request: InterceptorManager;
     /**
      * 响应拦截器管理器
      */
-    response: ResponseInterceptorManager;
+    response: InterceptorManager;
     /**
      * 错误拦截器管理器
      */
-    error: ErrorInterceptorManager;
+    error: InterceptorManager;
 }
 //# sourceMappingURL=interceptor.d.ts.map

package/dist/interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../src/interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;;GAGG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW,CAAC,cAAc,CAAC;CAAG;AAE1E;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,WAAW,CAAC,QAAQ,CAAC;CAAG;AAErE;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,WAAW,CAAC,GAAG,CAAC;CAAG;AAE7D;;;;GAIG;AACH,qBAAa,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,CAAC,CAAC,CAAC,CACzD,YAAW,WAAW,CAAC,CAAC,CAAC;IAEzB,OAAO,CAAC,YAAY,CAAuB;IAE3C;;;;OAIG;IACH,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,MAAM;IAM3B;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM1B;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACG,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAUrC;AAED;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CACxD,cAAc,EACd,kBAAkB,CACnB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,CACzD,QAAQ,EACR,mBAAmB,CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAEhF;;GAEG;AACH,qBAAa,mBAAmB;IAC9B;;OAEG;IACH,OAAO,EAAE,yBAAyB,CAG9B;IAEJ;;OAEG;IACH,QAAQ,EAAE,0BAA0B,CAGhC;IAEJ;;OAEG;IACH,KAAK,EAAE,uBAAuB,CAG1B;CACL"}
+{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../src/interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,KAAK,GAAG,GAAG,GAAG,SAAS,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC5E;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,WAAW;IACpD,OAAO,CAAC,YAAY,CAAiC;IAErD;;;;OAIG;IACH,GAAG,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM;IAMrC;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM1B;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACG,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CAUjE;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAC9B;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAA4B;IAEvD;;OAEG;IACH,QAAQ,EAAE,kBAAkB,CAA4B;IAExD;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAA4B;CACtD"}

package/dist/requestBodyInterceptor.d.ts

@@ -1,9 +1,8 @@
-import { RequestInterceptor } from './interceptor';
-import { FetcherRequest } from './fetcher';
+import { FetchExchange, Interceptor } from './interceptor';
 /**
  * 请求体拦截器，负责将普通对象转换为JSON字符串
  */
-export declare class RequestBodyInterceptor implements RequestInterceptor {
+export declare class RequestBodyInterceptor implements Interceptor {
     /**
      * 尝试转换请求体为合法的 fetch API body 类型
      *
@@ -23,9 +22,9 @@ export declare class RequestBodyInterceptor implements RequestInterceptor {
      *
      * 对于不支持的 object 类型（如普通对象），将自动转换为 JSON 字符串
      *
-     * @param request 请求参数
+     * @param exchange
      * @returns 转换后的请求
      */
-    intercept(request: FetcherRequest): FetcherRequest;
+    intercept(exchange: FetchExchange): FetchExchange;
 }
 //# sourceMappingURL=requestBodyInterceptor.d.ts.map

package/dist/requestBodyInterceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestBodyInterceptor.d.ts","sourceRoot":"","sources":["../src/requestBodyInterceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C;;GAEG;AACH,qBAAa,sBAAuB,YAAW,kBAAkB;IAC/D;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc;CA0CnD"}
+{"version":3,"file":"requestBodyInterceptor.d.ts","sourceRoot":"","sources":["../src/requestBodyInterceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG3D;;GAEG;AACH,qBAAa,sBAAuB,YAAW,WAAW;IACxD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA2ClD"}

package/dist/timeout.d.ts

@@ -1,4 +1,4 @@
-import { FetcherRequest } from './fetcher';
+import { FetchExchange } from './interceptor';
 /**
  * 定义具有超时能力的接口
  */
@@ -22,8 +22,7 @@ export declare function resolveTimeout(requestTimeout?: number, optionsTimeout?:
  * 当HTTP请求超时时抛出此异常
  */
 export declare class FetchTimeoutError extends Error {
-    url: string;
-    request: FetcherRequest;
-    constructor(url: string, request: FetcherRequest, timeout: number);
+    exchange: FetchExchange;
+    constructor(exchange: FetchExchange, timeout: number);
 }
 //# 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,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,cAAc,CAAC,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAKpB;AAED;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,cAAc,CAAC;gBAEZ,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM;CAUlE"}
+{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../src/timeout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,cAAc,CAAC,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAKpB;AAED;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,EAAE,aAAa,CAAC;gBAEZ,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM;CAUrD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahoo-wang/fetcher",
-  "version": "0.1.6",
+  "version": "0.2.2",
   "description": "Core library providing basic HTTP client functionality for Fetcher",
   "keywords": [
     "fetch",
@@ -24,9 +24,9 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.es.js",
-      "require": "./dist/index.umd.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.umd.js"
     }
   },
   "files": [