From c487d7ce37fac4028d694e297e99124cd16d4cdf Mon Sep 17 00:00:00 2001
From: early-autumn <954270063@qq.com>
Date: Sat, 2 May 2020 15:47:38 +0800
Subject: [PATCH] no message

---
 .idea/.gitignore                             |  2 ++
 .idea/axios-miniprogram.iml                  |  9 +++++++++
 .idea/inspectionProfiles/Project_Default.xml |  6 ++++++
 .idea/misc.xml                               |  6 ++++++
 .idea/modules.xml                            |  8 ++++++++
 .idea/vcs.xml                                |  6 ++++++
 README.md                                    | 12 ++++++------
 rollup.config.js                             |  2 +-
 src/adaptive.ts                              |  6 ++----
 src/cancel/Cancel.ts                         |  4 ++--
 src/cancel/CancelToken.ts                    |  4 ++--
 src/core/Axios.ts                            |  4 ++--
 src/core/InterceptorManager.ts               |  2 +-
 src/core/createError.ts                      |  4 ++--
 src/core/dispatchRequest.ts                  |  4 ++--
 src/core/request.ts                          |  8 ++++----
 src/core/transformData.ts                    |  8 ++++----
 src/core/transformRequest.ts                 |  5 ++++-
 src/core/transformResponse.ts                |  5 +++--
 src/index.ts                                 |  2 +-
 src/types.ts                                 |  8 ++++----
 21 files changed, 77 insertions(+), 38 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/axios-miniprogram.iml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..e7e9d11
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
diff --git a/.idea/axios-miniprogram.iml b/.idea/axios-miniprogram.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/axios-miniprogram.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..be0275a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/axios-miniprogram.iml" filepath="$PROJECT_DIR$/.idea/axios-miniprogram.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 2c4817d..b020248 100644
--- a/README.md
+++ b/README.md
@@ -259,9 +259,9 @@ axios('/test', {
 ```typescript
 axios.defaults.adapter = function adapter(adapterConfig) {
   const {
-    // 接口地址
+    // 请求地址
     url,
-    // HTTP 请求方法
+    // 请求方法
     method,
     // 请求数据
     data,
@@ -269,9 +269,9 @@ axios.defaults.adapter = function adapter(adapterConfig) {
     header,
     // 请求头 同 header
     headers,
-    // 返回的数据格式
+    // 响应数据格式
     dataType,
-    // 响应的数据类型
+    // 响应数据类型
     responseType,
     // 超时时间
     timeout,
@@ -283,9 +283,9 @@ axios.defaults.adapter = function adapter(adapterConfig) {
     enableCache,
     // 验证 ssl 证书
     sslVerify,
-    // 成功的响应函数
+    // 成功的回调函数
     success,
-    // 失败的响应函数
+    // 失败的回调函数
     fail
   } = adapterConfig;
 
diff --git a/rollup.config.js b/rollup.config.js
index 41094ae..d2ea093 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-03-06 20:40:30
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-22 09:50:55
+ * @LastEditTime: 2020-04-28 13:18:34
  */
 import fs from 'fs';
 import path from 'path';
diff --git a/src/adaptive.ts b/src/adaptive.ts
index d1cc299..6a8b7f4 100644
--- a/src/adaptive.ts
+++ b/src/adaptive.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-17 12:18:25
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-24 09:30:33
+ * @LastEditTime: 2020-04-25 19:10:04
  */
 import { Adapter, Platform } from './types';
 
@@ -22,7 +22,7 @@ declare let qq: Platform;
 /**
  * 自适应当前平台
  */
-function adaptive(): Adapter | undefined {
+export default function adaptive(): Adapter | undefined {
   const stack = [
     () => uni.request,
     () => wx.request,
@@ -42,5 +42,3 @@ function adaptive(): Adapter | undefined {
 
   return adapter;
 }
-
-export default adaptive;
diff --git a/src/cancel/Cancel.ts b/src/cancel/Cancel.ts
index 99bbb2f..abd24c1 100644
--- a/src/cancel/Cancel.ts
+++ b/src/cancel/Cancel.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-13 21:14:53
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 20:56:34
+ * @LastEditTime: 2020-04-25 09:26:10
  */
 import { Cancel } from '../types';
 
@@ -10,7 +10,7 @@ export default class CancelStatic implements Cancel {
   /**
    * @param message 取消信息
    */
-  constructor(public message?: string) {}
+  public constructor(public message?: string) {}
 
   public toString() {
     const message = this.message ? `: ${this.message}` : '';
diff --git a/src/cancel/CancelToken.ts b/src/cancel/CancelToken.ts
index d6ca2d4..cd66c86 100644
--- a/src/cancel/CancelToken.ts
+++ b/src/cancel/CancelToken.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-13 20:00:08
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-22 17:39:44
+ * @LastEditTime: 2020-04-25 09:22:56
  */
 import { CancelToken, CancelAction, CancelExecutor, CancelTokenSource } from '../types';
 import Cancel from './Cancel';
@@ -15,7 +15,7 @@ export default class CancelTokenStatic implements CancelToken {
 
   public listener: Promise<Cancel>;
 
-  constructor(executor: CancelExecutor) {
+  public constructor(executor: CancelExecutor) {
     let action!: CancelAction;
 
     this.listener = new Promise<Cancel>((resolve) => {
diff --git a/src/core/Axios.ts b/src/core/Axios.ts
index 2362802..3899ca0 100644
--- a/src/core/Axios.ts
+++ b/src/core/Axios.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-13 18:00:27
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 23:43:00
+ * @LastEditTime: 2020-04-25 09:23:14
  */
 import { Method, Params, Data, Interceptors, AxiosRequestConfig, AxiosResponse, Axios } from '../types';
 import buildURL from '../helpers/buildURL';
@@ -22,7 +22,7 @@ export default class AxiosStatic implements Axios {
   /**
    * @param defaults 自定义默认配置
    */
-  constructor(public defaults: AxiosRequestConfig = {}) {}
+  public constructor(public defaults: AxiosRequestConfig = {}) {}
 
   /**
    * 根据配置中的 url 和 params 生成一个 URI
diff --git a/src/core/InterceptorManager.ts b/src/core/InterceptorManager.ts
index 84a58a2..31eed26 100644
--- a/src/core/InterceptorManager.ts
+++ b/src/core/InterceptorManager.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-15 17:50:50
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 20:54:24
+ * @LastEditTime: 2020-05-02 14:30:56
  */
 import {
   InterceptorResolved,
diff --git a/src/core/createError.ts b/src/core/createError.ts
index 57c92c4..5f89b9e 100644
--- a/src/core/createError.ts
+++ b/src/core/createError.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-14 22:23:39
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 23:47:26
+ * @LastEditTime: 2020-04-25 09:23:40
  */
 import { AxiosRequestConfig, RequestConfig, AxiosResponse } from '../types';
 
@@ -21,7 +21,7 @@ class AxiosError extends Error {
    * @param request  通用请求配置
    * @param response Axios 响应体
    */
-  constructor(
+  public constructor(
     message: string,
     public config: AxiosRequestConfig,
     public request: RequestConfig,
diff --git a/src/core/dispatchRequest.ts b/src/core/dispatchRequest.ts
index fd17975..9636519 100644
--- a/src/core/dispatchRequest.ts
+++ b/src/core/dispatchRequest.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-13 18:01:16
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 09:31:00
+ * @LastEditTime: 2020-04-25 09:24:20
  */
 import { AxiosRequestConfig, AxiosResponse } from '../types';
 import isCancel from '../cancel/isCancel';
@@ -50,7 +50,7 @@ export default function dispatchRequest(config: AxiosRequestConfig): Promise<Axi
       }
     }
 
-    return config.errorHandler !== undefined ? config.errorHandler(reason) : Promise.reject(reason);
+    return config.errorHandler?.(reason) ?? Promise.reject(reason);
   }
 
   return request(config).then(onResolved, onRejected);
diff --git a/src/core/request.ts b/src/core/request.ts
index 03c05cd..6ec22b0 100644
--- a/src/core/request.ts
+++ b/src/core/request.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-16 00:48:45
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-22 16:02:22
+ * @LastEditTime: 2020-05-02 14:33:49
  */
 import { AxiosRequestConfig, AxiosResponse, Response } from '../types';
 import transformRequest from './transformRequest';
@@ -17,7 +17,7 @@ import createError from './createError';
 export default function request(config: AxiosRequestConfig): Promise<AxiosResponse> {
   return new Promise(function dispatchAdapter(resolve, reject): void {
     const { adapter, cancelToken } = config;
-    const request = transformRequest(config);
+    const requestConfig = transformRequest(config);
 
     /**
      * 捕获错误
@@ -30,7 +30,7 @@ export default function request(config: AxiosRequestConfig): Promise<AxiosRespon
         message = '配置不正确或者网络异常';
       }
 
-      reject(createError(message, config, request, response));
+      reject(createError(message, config, requestConfig, response));
     }
 
     if (adapter === undefined) {
@@ -56,7 +56,7 @@ export default function request(config: AxiosRequestConfig): Promise<AxiosRespon
 
     // 使用适配器发送请求
     const task = adapter({
-      ...request,
+      ...requestConfig,
       success: handleResponse,
       fail: catchError,
     });
diff --git a/src/core/transformData.ts b/src/core/transformData.ts
index 926efe1..38a3e49 100644
--- a/src/core/transformData.ts
+++ b/src/core/transformData.ts
@@ -2,16 +2,16 @@
  * @Author: early-autumn
  * @Date: 2020-04-16 22:37:44
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 23:09:24
+ * @LastEditTime: 2020-04-25 09:30:42
  */
 import { Data, Headers, TransformData } from '../types';
 
 /**
  * 转换数据
  *
- * @param data       请求数据或响应数据
- * @param headers    请求头或响应头
- * @param transforms 请求数据转换函数或响应数据转换函数
+ * @param data       请求数据/响应数据
+ * @param headers    请求头/响应头
+ * @param transforms 请求数据转换函数/响应数据转换函数
  */
 export default function transformData(data: Data, headers: Headers, transforms?: TransformData | TransformData[]) {
   if (transforms === undefined) {
diff --git a/src/core/transformRequest.ts b/src/core/transformRequest.ts
index d4fde41..4219c7d 100644
--- a/src/core/transformRequest.ts
+++ b/src/core/transformRequest.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-17 15:05:43
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-24 08:53:57
+ * @LastEditTime: 2020-04-25 09:27:30
  */
 import { AxiosRequestConfig, RequestConfig } from '../types';
 import { pick } from '../helpers/utils';
@@ -33,8 +33,11 @@ function transformURL(config: AxiosRequestConfig): string {
 export default function transformRequest(config: AxiosRequestConfig): RequestConfig {
   return {
     url: transformURL(config),
+
     method: methodToUppercase(config.method),
+
     header: config.headers,
+
     ...pick(
       config,
       'data',
diff --git a/src/core/transformResponse.ts b/src/core/transformResponse.ts
index 6b2df21..32d02c2 100644
--- a/src/core/transformResponse.ts
+++ b/src/core/transformResponse.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-17 14:09:16
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-24 08:54:42
+ * @LastEditTime: 2020-04-25 09:29:50
  */
 import { AxiosRequestConfig, AxiosResponse, Response } from '../types';
 import { pick } from '../helpers/utils';
@@ -13,12 +13,13 @@ import { pick } from '../helpers/utils';
  * 抹平差异
  *
  * @param response 通用响应体
- * @param request  通用请求配置
  * @param config   Axios 请求配置
  */
 export default function transformResponse(response: Response, config: AxiosRequestConfig): AxiosResponse {
   const status = response.statusCode ?? response.status ?? 400;
+
   const headers = response.header ?? response.headers ?? {};
+
   const statusText = status === 200 ? 'OK' : status === 400 ? 'Bad Adapter' : '';
 
   return {
diff --git a/src/index.ts b/src/index.ts
index 2ef21b4..6a57b26 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-14 23:22:52
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-23 10:31:27
+ * @LastEditTime: 2020-04-28 13:06:14
  */
 import axios from './axios';
 
diff --git a/src/types.ts b/src/types.ts
index 37e8b64..b35c330 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -2,7 +2,7 @@
  * @Author: early-autumn
  * @Date: 2020-04-13 15:23:53
  * @LastEditors: early-autumn
- * @LastEditTime: 2020-04-24 09:00:02
+ * @LastEditTime: 2020-05-02 14:37:02
  */
 
 /**
@@ -181,7 +181,7 @@ export declare interface AdapterRequestTask {
  * 适配器
  */
 export declare interface Adapter {
-  (config: AdapterRequestConfig): AdapterRequestTask | void;
+  (config: AdapterRequestConfig): AdapterRequestTask | undefined;
 }
 
 /**
@@ -419,12 +419,12 @@ export declare interface InterceptorManager<T = any> {
  */
 export declare interface Interceptors {
   /**
-   * request 请求前置拦截器
+   * request 请求拦截器
    */
   request: InterceptorManager<AxiosRequestConfig>;
 
   /**
-   * response 请求后置拦截器
+   * response 响应拦截器
    */
   response: InterceptorManager<AxiosResponse>;
 }