fix: axios适配器不兼容foca-axios

foca-js · Oct 7, 2024 · f2057e9 · f2057e9
1 parent f1ce15f
commit f2057e9
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -105,7 +105,8 @@
     "@types/node": "^20.14.10",
     "@types/qs": "^6.9.15",
     "@vitest/coverage-v8": "^2.0.3",
-    "axios": "^1.7.2",
+    "axios": "^1.7.7",
+    "foca-axios": "^4.1.1",
     "husky": "^9.0.11",
     "only-allow": "^1.2.1",
     "release-it": "^17.6.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/adapters/axios.ts b/src/adapters/axios.ts
@@ -17,7 +17,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios';
  *
  */
 export const axiosAdapter = (
-  axios: { request: (config: AxiosRequestConfig) => Promise<AxiosResponse> },
+  axios: { request: (config: object) => Promise<AxiosResponse> },
   returningData: (response: AxiosResponse) => any = (response) => response.data,
 ): OpenapiClientAdapter<AxiosRequestConfig> => {
   return {

diff --git a/test/adapters/axios.test-d.ts b/test/adapters/axios.test-d.ts
@@ -0,0 +1,17 @@
+import axios, { Axios } from 'axios';
+import { axiosAdapter } from '../../src/adapters/axios';
+import * as focaAxios from 'foca-axios';
+
+// 原生axios
+{
+  axiosAdapter(axios);
+  axiosAdapter(axios.create());
+  axiosAdapter(new Axios({}));
+}
+
+// foca-axios
+{
+  axiosAdapter(focaAxios.axios);
+  axiosAdapter(focaAxios.default);
+  axiosAdapter(focaAxios.axios.create());
+}