@whitesev/utils 1.5.2 → 1.5.4

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,31 @@ 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;
+    /**
+     * 将链接转为URL对象，自动补充URL的protocol或者origin
+     * @param text 需要转换的链接字符串
+     * @example
+     * Utils.toUrl("//www.baidu.com/s?word=666");
+     * Utils.toUrl("/s?word=666");
+     */
+    toUrl(text: string): URL;
+    /**
+     * 生成uuid
+     * @example
+     * Utils.generateUUID()
+     */
+    generateUUID(): string;
 }
 declare let utils: Utils;
 export { utils as Utils };

package/dist/src/VueObject.d.ts

@@ -105,3 +105,6 @@ export declare interface Vue2Object extends AnyObject {
         deep?: boolean;
     }) => void;
 }
+export declare interface HTMLVue2DivElement extends HTMLDivElement {
+    __vue__: Vue2Object;
+}

package/package.json

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

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,52 @@ class Utils {
 		});
 		return formData;
 	}
+	/**
+	 * 将链接转为URL对象，自动补充URL的protocol或者origin
+	 * @param text 需要转换的链接字符串
+	 * @example
+	 * Utils.toUrl("//www.baidu.com/s?word=666");
+	 * Utils.toUrl("/s?word=666");
+	 */
+	toUrl(text: string) {
+		if (typeof text !== "string") {
+			throw new TypeError("toUrl: text must be string");
+		}
+		text = text.trim();
+		if (text === "") {
+			throw new TypeError("toUrl: text must not be empty");
+		}
+		if (text.startsWith("//")) {
+			/* //www.baidu.com/xxxxxxx */
+			/* 没有protocol，加上 */
+			text = UtilsCore.globalThis.location.protocol + text;
+		} else if (text.startsWith("/")) {
+			/* /xxx/info?xxx=xxx */
+			/* 没有Origin，加上 */
+			text = UtilsCore.globalThis.location.origin + text;
+		}
+		return new URL(text);
+	}
+	/**
+	 * 生成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();

package/src/VueObject.ts

@@ -122,3 +122,7 @@ export declare interface Vue2Object extends AnyObject {
 		}
 	) => void;
 }
+
+export declare interface HTMLVue2DivElement extends HTMLDivElement {
+	__vue__: Vue2Object;
+}