@whitesev/utils 2.7.4 → 2.7.6

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

@@ -1,4 +1,4 @@
-export declare class UtilsDictionary<K extends string | number | symbol, V extends unknown> {
+export declare class UtilsDictionary<K extends unknown, V extends any> {
     private items;
     constructor();
     constructor(key: K, value: V);
@@ -20,15 +20,12 @@ export declare class UtilsDictionary<K extends string | number | symbol, V exten
      */
     has(key: K): boolean;
     /**
-     * 检查已有的键中是否以xx开头
-     * @param key 需要匹配的键
-     */
-    startsWith(key: K): boolean;
-    /**
-     * 获取以xx开头的键的值
-     * @param key 需要匹配的键
+     * 获取某个键的值
+     * https://github.com/microsoft/TypeScript/issues/9619
+     * 微软到现在都没有实现has和get的联动
+     * @param key 键
      */
-    getStartsWith(key: K): V | undefined;
+    get(key: K): V;
     /**
      * 为字典添加某一个值
      * @param key 键
@@ -38,15 +35,15 @@ export declare class UtilsDictionary<K extends string | number | symbol, V exten
     /**
      * 删除某一个键
      * @param key 键
+     * @returns
+     * + true：键存在且成功删除
+     * + false：键不存在
      */
     delete(key: K): boolean;
     /**
-     * 获取某个键的值
-     * https://github.com/microsoft/TypeScript/issues/9619
-     * 微软到现在都没有修复has和get的联动
-     * @param key 键
+     * 获取字典所有的键
      */
-    get(key: K): V;
+    keys(): K[];
     /**
      * 返回字典中的所有值
      */
@@ -59,18 +56,10 @@ export declare class UtilsDictionary<K extends string | number | symbol, V exten
      * 获取字典的长度
      */
     size(): number;
-    /**
-     * 获取字典所有的键
-     */
-    keys(): (string | symbol)[];
     /**
      * 返回字典本身
      */
-    getItems(): {
-        [key: string]: V;
-        [key: number]: V;
-        [key: symbol]: V;
-    };
+    getItems(): Map<K, V>;
     /**
      * 合并另一个字典
      * @param data 需要合并的字典
@@ -81,4 +70,14 @@ export declare class UtilsDictionary<K extends string | number | symbol, V exten
      * @param callbackfn 回调函数
      */
     forEach(callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void): void;
+    /**
+     * 检查已有的键中是否以xx开头
+     * @param key 需要匹配的键
+     */
+    startsWith(key: string): boolean;
+    /**
+     * 获取以xx开头的键的值
+     * @param key 需要匹配的键
+     */
+    getStartsWith(key: K): V | undefined;
 }

package/package.json

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

package/src/Dictionary.ts

@@ -1,13 +1,9 @@
-import { CommonUtil } from "./CommonUtil";
-
-export class UtilsDictionary<K extends string | number | symbol, V extends unknown> {
-	private items: {
-		[key: string | number | symbol]: V;
-	};
+export class UtilsDictionary<K extends unknown, V extends any> {
+	private items: Map<K, V>;
 	constructor();
 	constructor(key: K, value: V);
 	constructor(key?: K, value?: V) {
-		this.items = {};
+		this.items = new Map();
 		if (key != null) {
 			this.set(key, value!);
 		}
@@ -44,35 +40,16 @@ export class UtilsDictionary<K extends string | number | symbol, V extends unkno
 	 * @param key 键
 	 */
 	has(key: K): boolean {
-		return Reflect.has(this.items, key as PropertyKey);
+		return this.items.has(key);
 	}
 	/**
-	 * 检查已有的键中是否以xx开头
-	 * @param key 需要匹配的键
-	 */
-	startsWith(key: K): boolean {
-		let allKeys = this.keys();
-		for (const keyName of allKeys) {
-			if (String(keyName).startsWith(String(key))) {
-				return true;
-			}
-		}
-		return false;
-	}
-	/**
-	 * 获取以xx开头的键的值
-	 * @param key 需要匹配的键
+	 * 获取某个键的值
+	 * https://github.com/microsoft/TypeScript/issues/9619
+	 * 微软到现在都没有实现has和get的联动
+	 * @param key 键
 	 */
-	getStartsWith(key: K): V | undefined {
-		let allKeys = this.keys();
-		let result: V | undefined = void 0;
-		for (const keyName of allKeys) {
-			if (String(keyName).startsWith(String(key))) {
-				result = this.get(keyName as K)!;
-				break;
-			}
-		}
-		return result;
+	get(key: K): V {
+		return this.items.get(key) as V;
 	}
 	/**
 	 * 为字典添加某一个值
@@ -83,57 +60,44 @@ export class UtilsDictionary<K extends string | number | symbol, V extends unkno
 		if (key === void 0) {
 			throw new Error("Utils.Dictionary().set 参数 key 不能为空");
 		}
-		Reflect.set(this.items, key as PropertyKey, val);
+		this.items.set(key, val);
 	}
 	/**
 	 * 删除某一个键
 	 * @param key 键
+	 * @returns
+	 * + true：键存在且成功删除
+	 * + false：键不存在
 	 */
 	delete(key: K): boolean {
 		if (this.has(key)) {
-			return Reflect.deleteProperty(this.items, key as string);
+			return this.items.delete(key);
 		}
 		return false;
 	}
 	/**
-	 * 获取某个键的值
-	 * https://github.com/microsoft/TypeScript/issues/9619
-	 * 微软到现在都没有修复has和get的联动
-	 * @param key 键
+	 * 获取字典所有的键
 	 */
-	get(key: K): V {
-		return Reflect.get(this.items, key as PropertyKey) as V;
+	keys(): K[] {
+		return this.items.keys().toArray();
 	}
 	/**
 	 * 返回字典中的所有值
 	 */
 	values(): V[] {
-		let resultList: V[] = [];
-		for (let prop in this.getItems()) {
-			if (this.has(prop as K)) {
-				resultList.push(this.get(prop as K)!);
-			}
-		}
-		return resultList;
+		return this.items.values().toArray();
 	}
 	/**
 	 * 清空字典
 	 */
 	clear() {
-		this.items = null as any;
-		this.items = {};
+		this.items.clear();
 	}
 	/**
 	 * 获取字典的长度
 	 */
 	size(): number {
-		return Object.keys(this.getItems()).length;
-	}
-	/**
-	 * 获取字典所有的键
-	 */
-	keys(): (string | symbol)[] {
-		return Reflect.ownKeys(this.items);
+		return this.items.size;
 	}
 	/**
 	 * 返回字典本身
@@ -146,15 +110,45 @@ export class UtilsDictionary<K extends string | number | symbol, V extends unkno
 	 * @param data 需要合并的字典
 	 */
 	concat(data: UtilsDictionary<K, V>) {
-		this.items = CommonUtil.assign(this.items, data.getItems());
+		data.forEach((value, key) => {
+			this.items.set(key, value);
+		});
 	}
 	/**
 	 * 迭代字典
 	 * @param callbackfn 回调函数
 	 */
 	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);
+		this.items.forEach((value, key, self) => {
+			callbackfn(value, key, this);
+		});
+	}
+	/**
+	 * 检查已有的键中是否以xx开头
+	 * @param key 需要匹配的键
+	 */
+	startsWith(key: string): boolean {
+		const keys = this.keys();
+		for (const keyName of keys) {
+			if (String(keyName).startsWith(key)) {
+				return true;
+			}
 		}
+		return false;
+	}
+	/**
+	 * 获取以xx开头的键的值
+	 * @param key 需要匹配的键
+	 */
+	getStartsWith(key: K): V | undefined {
+		let result: V | undefined = void 0;
+		const keys = this.keys();
+		for (const keyName of keys) {
+			if (String(keyName).startsWith(String(key))) {
+				result = this.get(keyName as K);
+				break;
+			}
+		}
+		return result;
 	}
 }

package/src/Utils.ts

@@ -35,7 +35,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2025.8.21";
+	version = "2025.9.8";
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
 	 * @param cssText css字符串
@@ -462,7 +462,6 @@ class Utils {
 			linkElement.click();
 		}
 	}
-
 	/**
 	 * 选中页面中的文字，类似Ctrl+F的选中
 	 * @param str （可选）需要寻找的字符串，默认为空
@@ -532,28 +531,28 @@ class Utils {
 		filter?: (element: T) => boolean
 	) {
 		let that = this;
-		if ((element as HTMLElement).outerHTML.includes(text)) {
-			if ((element as HTMLElement).children.length === 0) {
+		if ((<HTMLElement>element).outerHTML.includes(text)) {
+			if ((<HTMLElement>element).children.length === 0) {
 				let filterResult = typeof filter === "function" ? filter(element) : false;
 				if (!filterResult) {
 					yield element as any;
 				}
 			} else {
 				let textElement = Array.from(element.childNodes).filter((ele) => ele.nodeType === Node.TEXT_NODE);
-				for (let ele of textElement) {
-					if ((ele as any).textContent.includes(text)) {
+				for (let $child of textElement) {
+					if ((<HTMLElement>$child).textContent.includes(text)) {
 						let filterResult = typeof filter === "function" ? filter(element) : false;
 						if (!filterResult) {
-							yield ele;
+							yield $child;
 						}
 					}
 				}
 			}
 		}
 
-		for (let index = 0; index < (element as HTMLElement).children.length; index++) {
-			let childElement = (element as HTMLElement).children[index] as any;
-			yield* that.findElementsWithText(childElement, text, filter);
+		for (let index = 0; index < (<HTMLElement>element).children.length; index++) {
+			let $child = (<HTMLElement>element).children[index] as any;
+			yield* that.findElementsWithText($child, text, filter);
 		}
 	}
 	/**

package/src/WindowApi.ts

@@ -8,10 +8,10 @@ export class WindowApi {
 		globalThis: globalThis,
 		self: self,
 		top: top!,
-		setTimeout: globalThis.setTimeout,
-		setInterval: globalThis.setInterval,
-		clearTimeout: globalThis.clearTimeout,
-		clearInterval: globalThis.clearInterval,
+		setTimeout: globalThis.setTimeout.bind(globalThis),
+		setInterval: globalThis.setInterval.bind(globalThis),
+		clearTimeout: globalThis.clearTimeout.bind(globalThis),
+		clearInterval: globalThis.clearInterval.bind(globalThis),
 	};
 	/** 使用的配置 */
 	private api: Required<WindowApiOption>;