@whitesev/utils 2.7.2 → 2.7.3

package/dist/types/src/Utils.d.ts

@@ -1763,7 +1763,24 @@ declare class Utils {
      * @param target 待获取的对象
      * @param handler 获取属性的回调
      */
-    queryProperty(target: any, handler: (target: any) => {
+    queryProperty<T extends any = any>(target: any, handler: (target: T) => {
+        /**
+         * 是否是需要的属性
+         * + `true` 将目标值赋值给data
+         * + `false` 不是需要的，data为下一个处理的对象
+         */
+        isFind: boolean;
+        /**
+         * 对象/目标值
+         */
+        data: any;
+    }): any;
+    /**
+     * 异步-深度获取对象属性
+     * @param target 待获取的对象
+     * @param handler 获取属性的回调
+     */
+    asyncQueryProperty<T extends any = any>(target: any, handler: (target: T) => {
         /**
          * 是否是需要的属性
          * + true 将目标值赋值给data
@@ -1774,7 +1791,18 @@ declare class Utils {
          * 对象/目标值
          */
         data: any;
-    }): any;
+    } | Promise<{
+        /**
+         * 是否是需要的属性
+         * + true 将目标值赋值给data
+         * + false 不是需要的，data为下一个处理的对象
+         */
+        isFind: boolean;
+        /**
+         * 对象/目标值
+         */
+        data: any;
+    }>): Promise<Awaited<T>>;
     /**
      * 创建一个新的Utils实例
      * @param option

package/dist/types/src/types/Event.d.ts

@@ -40,8 +40,7 @@ declare interface DOMUtils_Frame_Object_Event {
 	scroll: Event;
 	unload: Event;
 }
-declare type DOMUtils_Frame_Object_EventType =
-	keyof DOMUtils_Frame_Object_Event;
+declare type DOMUtils_Frame_Object_EventType = keyof DOMUtils_Frame_Object_Event;
 /**
  * 表单事件
  */

package/dist/types/src/types/Httpx.d.ts

@@ -66,14 +66,7 @@ export type HttpxStatus =
  * HTTP WebDav的请求方法
  * + https://blog.csdn.net/weixin_48421613/article/details/128611546
  */
-export type HttpxWebDavMethod =
-	| "PROPFIND"
-	| "PROPPATCH"
-	| "MKCOL"
-	| "MOVE"
-	| "COPY"
-	| "LOCK"
-	| "UNLOCK";
+export type HttpxWebDavMethod = "PROPFIND" | "PROPPATCH" | "MKCOL" | "MOVE" | "COPY" | "LOCK" | "UNLOCK";
 
 /**
  * HTTP 请求方法
@@ -99,21 +92,12 @@ export type HttpxRedirect = "follow" | "error" | "manual";
 /**
  * 二进制数据
  */
-export type HttpxBinary =
-	| Uint8ArrayConstructor
-	| ArrayBufferConstructor
-	| DataViewConstructor
-	| Blob
-	| File;
+export type HttpxBinary = Uint8ArrayConstructor | ArrayBufferConstructor | DataViewConstructor | Blob | File;
 
 /**
  * 触发的响应函数名
  */
-export type HttpxResponseCallBackType =
-	| "onload"
-	| "onerror"
-	| "ontimeout"
-	| "onabort";
+export type HttpxResponseCallBackType = "onload" | "onerror" | "ontimeout" | "onabort";
 
 /**
  * 响应类型映射字典
@@ -1356,5 +1340,4 @@ export declare interface HttpxInitOption extends HttpxRequestOption {
 	logDetails?: boolean;
 }
 
-export declare interface HttpxRequestOptionWithDoubleParams
-	extends Omit<HttpxRequestOption, "url"> {}
+export declare interface HttpxRequestOptionWithDoubleParams extends Omit<HttpxRequestOption, "url"> {}

package/dist/types/src/types/ajaxHooker.d.ts

@@ -122,11 +122,7 @@ export declare interface UtilsAjaxHookResult {
             };
         });
      */
-	hook(
-		callback: (
-			request: UtilsAjaxHookRequestOptions
-		) => void | Promise<undefined>
-	): void;
+	hook(callback: (request: UtilsAjaxHookRequestOptions) => void | Promise<undefined>): void;
 	/**
      * 过滤
      * @example

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",

package/src/ColorConversion.ts

@@ -59,11 +59,7 @@ export class ColorConversion {
 	 * @param greenValue
 	 * @param blueValue
 	 */
-	rgbToHex(
-		redValue: string | number,
-		greenValue: string | number,
-		blueValue: string | number
-	): string {
+	rgbToHex(redValue: string | number, greenValue: string | number, blueValue: string | number): string {
 		/* 验证输入的rgb值是否合法 */
 		let validPattern = /^\d{1,3}$/;
 		if (
@@ -72,13 +68,8 @@ export class ColorConversion {
 			!validPattern.test(blueValue.toString())
 		)
 			throw new TypeError("输入错误的rgb颜色值");
-		let hexs = [
-			redValue.toString(16),
-			greenValue.toString(16),
-			blueValue.toString(16),
-		];
-		for (let index = 0; index < 3; index++)
-			if (hexs[index].length == 1) hexs[index] = "0" + hexs[index];
+		let hexs = [redValue.toString(16), greenValue.toString(16), blueValue.toString(16)];
+		for (let index = 0; index < 3; index++) if (hexs[index].length == 1) hexs[index] = "0" + hexs[index];
 		return "#" + hexs.join("");
 	}
 	/**
@@ -92,9 +83,7 @@ export class ColorConversion {
 		}
 		let rgbc = this.hexToRgb(color);
 		for (let index = 0; index < 3; index++) {
-			(rgbc as any)[index] = Math.floor(
-				(rgbc as any)[index] * (1 - (level as any))
-			);
+			(rgbc as any)[index] = Math.floor((rgbc as any)[index] * (1 - (level as any)));
 		}
 
 		return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
@@ -110,9 +99,7 @@ export class ColorConversion {
 		}
 		let rgbc = this.hexToRgb(color);
 		for (let index = 0; index < 3; index++) {
-			(rgbc as any)[index] = Math.floor(
-				(255 - (rgbc as any)[index]) * (level as any) + (rgbc as any)[index]
-			);
+			(rgbc as any)[index] = Math.floor((255 - (rgbc as any)[index]) * (level as any) + (rgbc as any)[index]);
 		}
 		return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
 	}

package/src/CommonUtil.ts

@@ -49,11 +49,7 @@ class CommonUtil {
 					!UtilsContext.isDOM(sourceValue)
 				) {
 					/* 源端的值是object类型，且不是元素节点 */
-					(target as any)[sourceKeyName] = UtilsContext.assign(
-						targetValue,
-						sourceValue,
-						isAdd
-					);
+					(target as any)[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
 					continue;
 				}
 				(target as any)[sourceKeyName] = sourceValue;
@@ -70,11 +66,7 @@ class CommonUtil {
 						Object.keys(sourceValue).length
 					) {
 						/* 源端的值是object类型，且不是元素节点 */
-						(target as any)[targetKeyName] = UtilsContext.assign(
-							targetValue,
-							sourceValue,
-							isAdd
-						);
+						(target as any)[targetKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
 						continue;
 					}
 					/* 直接赋值 */
@@ -153,10 +145,7 @@ class CommonUtil {
 						itemResult = objItem === 0;
 						break;
 					case "string":
-						itemResult =
-							objItem.trim() === "" ||
-							objItem === "null" ||
-							objItem === "undefined";
+						itemResult = objItem.trim() === "" || objItem === "null" || objItem === "undefined";
 						break;
 					case "boolean":
 						itemResult = !objItem;
@@ -164,9 +153,7 @@ class CommonUtil {
 					case "function":
 						let funcStr = objItem.toString().replace(/\s/g, "");
 						/* 排除()=>{}、(xxx="")=>{}、function(){}、function(xxx=""){} */
-						itemResult = Boolean(
-							funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/)
-						);
+						itemResult = Boolean(funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/));
 						break;
 				}
 			}
@@ -214,8 +201,7 @@ class CommonUtil {
 		if (obj === null) return null;
 		let clone = obj instanceof Array ? [] : {};
 		for (const [key, value] of Object.entries(obj)) {
-			(clone as any)[key] =
-				typeof value === "object" ? UtilsContext.deepClone(value) : value;
+			(clone as any)[key] = typeof value === "object" ? UtilsContext.deepClone(value) : value;
 		}
 		return clone;
 	}
@@ -243,14 +229,8 @@ class CommonUtil {
 	 * Utils.toJSON("{123:123}")
 	 * > {123:123}
 	 */
-	toJSON<T = any>(
-		data: string | null,
-		errorCallBack?: (error: Error) => void
-	): T;
-	toJSON<T = any>(
-		data: string | null,
-		errorCallBack?: (error: Error) => void
-	): T {
+	toJSON<T = any>(data: string | null, errorCallBack?: (error: Error) => void): T;
+	toJSON<T = any>(data: string | null, errorCallBack?: (error: Error) => void): T {
 		let result: any = {};
 		if (typeof data === "object") {
 			return data as any;
@@ -274,10 +254,7 @@ class CommonUtil {
 							/^[\],:{}\s]*$/.test(
 								data
 									.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-									.replace(
-										/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-										"]"
-									)
+									.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
 									.replace(/(?:^|:|,)(?:\s*\[)+/g, "")
 							)
 						) {

package/src/DOMUtils.ts

@@ -88,11 +88,9 @@ class DOMUtils {
 			let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
 			let text = textMatch![2];
 			selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
-			return Array.from(parent.querySelectorAll<HTMLElement>(selector)).filter(
-				($ele) => {
-					return ($ele?.textContent || $ele?.innerText)?.includes(text);
-				}
-			);
+			return Array.from(parent.querySelectorAll<HTMLElement>(selector)).filter(($ele) => {
+				return ($ele?.textContent || $ele?.innerText)?.includes(text);
+			});
 		} else if (
 			selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
 			selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)
@@ -108,11 +106,9 @@ class DOMUtils {
 			}
 			let regexp = new RegExp(pattern, flags);
 			selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
-			return Array.from(parent.querySelectorAll<HTMLElement>(selector)).filter(
-				($ele) => {
-					return Boolean(($ele?.textContent || $ele?.innerText)?.match(regexp));
-				}
-			);
+			return Array.from(parent.querySelectorAll<HTMLElement>(selector)).filter(($ele) => {
+				return Boolean(($ele?.textContent || $ele?.innerText)?.match(regexp));
+			});
 		} else {
 			// 普通语法
 			return Array.from(parent.querySelectorAll<E>(selector));
@@ -139,10 +135,7 @@ class DOMUtils {
 	 * DOMUtils.matches("div:regexp(/^xxx/ig)")
 	 * > false
 	 */
-	matches(
-		$el: HTMLElement | Element | null | undefined,
-		selector: string
-	): boolean {
+	matches($el: HTMLElement | Element | null | undefined, selector: string): boolean {
 		selector = selector.trim();
 		if ($el == null) {
 			return false;
@@ -215,14 +208,8 @@ class DOMUtils {
 		$el: HTMLElement | Element,
 		selector: string
 	): HTMLElementTagNameMap[K] | null;
-	closest<E extends Element = Element>(
-		$el: HTMLElement | Element,
-		selector: string
-	): E | null;
-	closest<E extends Element = Element>(
-		$el: HTMLElement | Element,
-		selector: string
-	): E | null {
+	closest<E extends Element = Element>($el: HTMLElement | Element, selector: string): E | null;
+	closest<E extends Element = Element>($el: HTMLElement | Element, selector: string): E | null {
 		selector = selector.trim();
 
 		if (selector.match(/[^\s]{1}:empty$/gi)) {

package/src/Dictionary.ts

@@ -1,9 +1,6 @@
 import { CommonUtil } from "./CommonUtil";
 
-export class UtilsDictionary<
-	K extends string | number | symbol,
-	V extends unknown
-> {
+export class UtilsDictionary<K extends string | number | symbol, V extends unknown> {
 	private items: {
 		[key: string | number | symbol]: V;
 	};
@@ -155,9 +152,7 @@ export class UtilsDictionary<
 	 * 迭代字典
 	 * @param callbackfn 回调函数
 	 */
-	forEach(
-		callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void
-	) {
+	forEach(callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void) {
 		for (const key in this.getItems()) {
 			callbackfn(this.get(key as any) as V, key as K, this.getItems() as any);
 		}

package/src/GBKEncoder.ts

@@ -13,12 +13,7 @@ export class GBKEncoder {
 		this.#data = dataText.match(/..../g) as RegExpMatchArray;
 		for (let i = 0x81; i <= 0xfe; i++) {
 			for (let j = 0x40; j <= 0xfe; j++) {
-				this.#U2Ghash[this.#data[index++]] = (
-					"%" +
-					i.toString(16) +
-					"%" +
-					j.toString(16)
-				).toUpperCase();
+				this.#U2Ghash[this.#data[index++]] = ("%" + i.toString(16) + "%" + j.toString(16)).toUpperCase();
 			}
 		}
 		for (let key in this.#U2Ghash) {

package/src/Hooks.ts

@@ -15,10 +15,7 @@ export class Hooks {
 			_funcName = getFuncName(this);
 			(_context as any)["realFunc_" + _funcName] = this;
 
-			if (
-				(_context[_funcName] as any).prototype &&
-				(_context[_funcName] as any).prototype.isHooked
-			) {
+			if ((_context[_funcName] as any).prototype && (_context[_funcName] as any).prototype.isHooked) {
 				console.log("Already has been hooked,unhook first");
 				return false;
 			}