@whitesev/utils 1.5.1 → 1.5.3

package/dist/src/Httpx.d.ts

@@ -1139,7 +1139,7 @@ declare class Httpx {
              * 添加拦截器
              * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
              */
-            use(fn: <T = Required<HttpxDetails>>(details: T) => void | T): string | undefined;
+            use(fn: <T extends Required<HttpxDetails>>(details: T) => void | T): string | undefined;
             /**
              * 移除拦截器
              * @param id 通过use返回的id
@@ -1162,7 +1162,7 @@ declare class Httpx {
              * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
              * + 超出 2xx 范围的状态码都会触发该函数
              */
-            use(successFn?: (<T_1 = HttpxAsyncResultData<HttpxDetails>>(response: HttpxAsyncResultData) => void | T_1) | undefined, errorFn?: (<T_2 = HttpxHookErrorData>(data: T_2) => void | T_2) | undefined): string | undefined;
+            use(successFn?: (<T_1 extends HttpxAsyncResultData<HttpxDetails>>(response: HttpxAsyncResultData) => void | T_1) | undefined, errorFn?: (<T_2 extends HttpxHookErrorData>(data: T_2) => void | T_2) | undefined): string | undefined;
             /**
              * 移除拦截器
              * @param id 通过use返回的id

package/dist/src/Utils.d.ts

@@ -847,6 +847,7 @@ declare class Utils {
      * Utils.isNotNull("123");
      * > true
      */
+    isNotNull<T>(value: T | null): value is T;
     isNotNull(...args: any[]): boolean;
     /**
      * 判断对象或数据是否为空
@@ -893,6 +894,7 @@ declare class Utils {
       Utils.isNull(false,[123]);
       > false
      **/
+    isNull<T>(value: T | null): value is null;
     isNull(...args: any[]): boolean;
     /**
      * 判断浏览器主题是否是暗黑|深色模式
@@ -1732,11 +1734,23 @@ declare class Utils {
     /**
      * 将对象转换为FormData
      * @param data 待转换的对象
-     * @param isEncode 是否对值为string进行编码转换(encodeURIComponent)
+     * @param isEncode 是否对值为string进行编码转换(encodeURIComponent)，默认false
+     * @param valueAutoParseToStr 是否对值强制使用JSON.stringify()转换，默认false
+     * @example
+     * Utils.toFormData({
+     * 	test: "1",
+     *  666: 666,
+     * })
      */
     toFormData(data: {
         [key: string]: string | Blob | File | number;
-    }, isEncode?: boolean): FormData;
+    }, isEncode?: boolean, valueAutoParseToStr?: boolean): FormData;
+    /**
+     * 生成uuid
+     * @example
+     * Utils.generateUUID()
+     */
+    generateUUID(): string;
 }
 declare let utils: Utils;
 export { utils as Utils };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@whitesev/utils",
-	"version": "1.5.1",
+	"version": "1.5.3",
 	"description": "一个常用的工具库",
 	"main": "dist/index.cjs.js",
 	"module": "dist/node/index.esm.js",

package/src/Httpx.ts

@@ -2082,7 +2082,7 @@ class Httpx {
 			 * 添加拦截器
 			 * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
 			 */
-			use(fn: <T = Required<HttpxDetails>>(details: T) => void | T) {
+			use(fn: <T extends Required<HttpxDetails>>(details: T) => void | T) {
 				if (typeof fn !== "function") {
 					console.warn("[Httpx-interceptors-request] 请传入拦截器函数");
 					return;
@@ -2116,10 +2116,10 @@ class Httpx {
 			 * + 超出 2xx 范围的状态码都会触发该函数
 			 */
 			use(
-				successFn?: <T = HttpxAsyncResultData>(
+				successFn?: <T extends HttpxAsyncResultData>(
 					response: HttpxAsyncResultData
 				) => void | T,
-				errorFn?: <T = HttpxHookErrorData>(data: T) => void | T
+				errorFn?: <T extends HttpxHookErrorData>(data: T) => void | T
 			) {
 				if (typeof successFn !== "function" && typeof errorFn !== "function") {
 					console.warn("[Httpx-interceptors-response] 必须传入一个拦截器函数");

package/src/Utils.ts

@@ -1323,7 +1323,7 @@ class Utils {
 		];
 		let androidVersion = UtilsContext.getRandomValue(12, 14);
 		let randomMobile = UtilsContext.getRandomValue(mobileNameList);
-		let chromeVersion1 = UtilsContext.getRandomValue(115, 125);
+		let chromeVersion1 = UtilsContext.getRandomValue(115, 127);
 		let chromeVersion2 = UtilsContext.getRandomValue(0, 0);
 		let chromeVersion3 = UtilsContext.getRandomValue(2272, 6099);
 		let chromeVersion4 = UtilsContext.getRandomValue(1, 218);
@@ -1417,7 +1417,7 @@ class Utils {
 	 **/
 	getRandomPCUA(): string {
 		let UtilsContext = this;
-		let chromeVersion1 = UtilsContext.getRandomValue(115, 126);
+		let chromeVersion1 = UtilsContext.getRandomValue(115, 127);
 		let chromeVersion2 = UtilsContext.getRandomValue(0, 0);
 		let chromeVersion3 = UtilsContext.getRandomValue(2272, 6099);
 		let chromeVersion4 = UtilsContext.getRandomValue(1, 218);
@@ -2019,6 +2019,7 @@ class Utils {
 	 * Utils.isNotNull("123");
 	 * > true
 	 */
+	isNotNull<T>(value: T | null): value is T;
 	isNotNull(...args: any[]): boolean;
 	isNotNull(...args: any[]): boolean {
 		let UtilsContext = this;
@@ -2069,6 +2070,7 @@ class Utils {
       Utils.isNull(false,[123]);
       > false
      **/
+	isNull<T>(value: T | null): value is null;
 	isNull(...args: any[]): boolean;
 	isNull(...args: any[]): boolean {
 		let result = true;
@@ -4834,15 +4836,25 @@ class Utils {
 	/**
 	 * 将对象转换为FormData
 	 * @param data 待转换的对象
-	 * @param isEncode 是否对值为string进行编码转换(encodeURIComponent)
+	 * @param isEncode 是否对值为string进行编码转换(encodeURIComponent)，默认false
+	 * @param valueAutoParseToStr 是否对值强制使用JSON.stringify()转换，默认false
+	 * @example
+	 * Utils.toFormData({
+	 * 	test: "1",
+	 *  666: 666,
+	 * })
 	 */
 	toFormData(
 		data: { [key: string]: string | Blob | File | number },
-		isEncode: boolean = false
+		isEncode: boolean = false,
+		valueAutoParseToStr: boolean = false
 	) {
 		const formData = new FormData();
 		Object.keys(data).forEach((key) => {
 			let value = data[key];
+			if (valueAutoParseToStr) {
+				value = JSON.stringify(value);
+			}
 			if (typeof value === "number") {
 				value = value.toString();
 			}
@@ -4857,6 +4869,26 @@ class Utils {
 		});
 		return formData;
 	}
+	/**
+	 * 生成uuid
+	 * @example
+	 * Utils.generateUUID()
+	 */
+	generateUUID() {
+		if (typeof globalThis?.crypto?.randomUUID === "function") {
+			return globalThis.crypto.randomUUID();
+		} else {
+			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
+				/[xy]/g,
+				function (charStr) {
+					var randomValue = (Math.random() * 16) | 0,
+						randomCharValue =
+							charStr === "x" ? randomValue : (randomValue & 0x3) | 0x8;
+					return randomCharValue.toString(16);
+				}
+			);
+		}
+	}
 }
 
 let utils = new Utils();