@ruan-cat/utils 1.3.1 → 1.3.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ruan-cat/utils",
-  "version": "1.3.1",
-  "description": "阮喵喵工具集合。一个纯typescript库。",
+  "version": "1.3.3",
+  "description": "阮喵喵工具集合。一个纯typescript库，也提供纯js文件。",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -19,7 +19,8 @@
       "import": "./src/index.ts",
       "types": "./src/index.ts"
     },
-    "./src/*": "./src/*"
+    "./src/*": "./src/*",
+    "./dist/*": "./dist/*"
   },
   "keywords": [],
   "author": {
@@ -35,14 +36,17 @@
   },
   "files": [
     "src",
+    "dist",
     "!src/tests",
     "tsconfig.json"
   ],
+  "dependencies": {
+    "@vueuse/integrations": "^12.3.0",
+    "axios": "^1.7.9"
+  },
   "devDependencies": {
     "@antfu/utils": "^0.7.10",
     "@types/qs": "^6.9.17",
-    "@vueuse/integrations": "^12.1.0",
-    "axios": "^1.7.9",
     "qs": "^6.13.1",
     "tsup": "^8.3.5",
     "type-plus": "^7.6.2",
@@ -50,11 +54,9 @@
     "typedoc-plugin-markdown": "^4.3.0",
     "typescript": "5.7.2",
     "unplugin-vue-router": "^0.10.8",
-    "@ruan-cat/vuepress-preset-config": "^0.1.14"
+    "@ruan-cat/vuepress-preset-config": "^0.1.16"
   },
   "peerDependencies": {
-    "@vueuse/integrations": "^12",
-    "axios": "^1.7.x",
     "typescript": "5.7.2",
     "unplugin-vue-router": "^0.10.8"
   },
@@ -89,6 +91,7 @@
     "get-type": "pnpm clean:type && pnpm generate:type-3",
     "build:-try-1": "pnpm clean:type && vue-tsc -p tsconfig.build.json",
     "build:tsup": "tsup",
+    "build": "pnpm run build:tsup",
     "rm:node_modules": "rimraf node_modules"
   }
 }

package/src/vueuse/useAxios.ts

@@ -1,6 +1,10 @@
 import type { RequiredPick } from "type-plus";
 import type { AxiosRequestConfig, AxiosResponse, AxiosInstance } from "axios";
 import type { UseAxiosOptions, UseAxiosReturn } from "@vueuse/integrations/useAxios";
+import { useAxios } from "@vueuse/integrations/useAxios";
+
+/** 在封装函数时 需要使用该类型 */
+export { UseAxiosOptions };
 
 /** 拓展的类型参数 用于约束必填的字段 */
 export type KeyAxiosRequestConfig<D = any> = keyof AxiosRequestConfig<D>;
@@ -8,6 +12,8 @@ export type KeyAxiosRequestConfig<D = any> = keyof AxiosRequestConfig<D>;
 /** 填写key值的帮助类型 */
 export type KeyHelper<K extends KeyAxiosRequestConfig> = K;
 
+export type RemoveUrl<T extends KeyAxiosRequestConfig> = Exclude<T, "url">;
+
 /**
  * 创建 AxiosRequestConfig 的各种变种类型
  * @description
@@ -43,23 +49,25 @@ export interface StrictUseAxiosReturn<
 	) => Promise<StrictUseAxiosReturn<T, K, R, D>>;
 }
 
-/**
- * 拓展类型参数后的 useAxios 函数
- * @description
- * 在我们的封装中 使用本类型
- */
-export declare function useAxios<
-	T = any,
-	/** 拓展的类型参数 用于约束必填的字段 */
-	K extends KeyAxiosRequestConfig<D> = "url",
-	R = AxiosResponse<T>,
-	D = any,
->(
-	url: string,
-	config: AxiosRequestConfig<D>,
-	instance: AxiosInstance,
-	options?: UseAxiosOptions,
-): StrictUseAxiosReturn<T, K, R, D> & Promise<StrictUseAxiosReturn<T, K, R, D>>;
+declare module "@vueuse/integrations/useAxios" {
+	/**
+	 * 拓展类型参数后的 useAxios 函数
+	 * @description
+	 * 在我们的封装中 使用本类型
+	 */
+	function useAxios<
+		T = any,
+		/** 拓展的类型参数 用于约束必填的字段 */
+		K extends KeyAxiosRequestConfig<D> = "url",
+		R = AxiosResponse<T>,
+		D = any,
+	>(
+		url: string,
+		config: AxiosRequestConfig<D>,
+		instance: AxiosInstance,
+		options?: UseAxiosOptions,
+	): StrictUseAxiosReturn<T, K, R, D> & Promise<StrictUseAxiosReturn<T, K, R, D>>;
+}
 
 /** 包装器的参数 */
 export interface UseAxiosWrapperParams<
@@ -122,5 +130,9 @@ export function useAxiosWrapper<T, K extends KeyAxiosRequestConfig, D = any>(par
 		instance,
 		options,
 	} = params;
+	// 跳转到 vueuse 内的函数声明
+	// return useAxios<T, AxiosResponse<T>, D>(url, config, instance, options);
+
+	// 跳转到我们拓展的函数声明
 	return useAxios<T, K, AxiosResponse<T>, D>(url, config, instance, options);
 }