@whitesev/utils 2.7.0 → 2.7.2

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

@@ -18,11 +18,14 @@ export type ArgsType<T extends JSTypeNames[]> = {
 export declare interface UtilsOwnObject<V extends any> {
 	[key: string]: V | UtilsOwnObject<V>;
 }
+
 export declare interface AnyObject {
 	[key: string]: any | AnyObject;
 	toString(): string;
 }
+
 export type PartialKeys<T, K extends keyof T> = {
 	[P in K]?: T[P];
 };
+
 export type Values<T> = T[keyof T];

package/package.json

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

package/src/ColorConversion.ts

@@ -1,4 +1,4 @@
-class ColorConversion {
+export class ColorConversion {
 	/**
 	 * 判断是否是16进制颜色
 	 * @param str
@@ -15,14 +15,13 @@ class ColorConversion {
 	/**
 	 * 16进制颜色转rgba
 	 *
-	 * #ff0000 转 rgba(123,123,123, 0.4)
+	 * 例如：`#ff0000` 转为 `rgba(123,123,123, 0.4)`
 	 * @param hex
 	 * @param opacity
 	 */
 	hexToRgba(hex: string, opacity: number): string {
 		if (!this.isHex(hex)) {
-			// @ts-ignore
-			throw new TypeError("输入错误的hex", hex);
+			throw new TypeError("输入错误的hex：" + hex);
 		}
 		return hex && hex.replace(/\s+/g, "").length === 7
 			? "rgba(" +
@@ -39,20 +38,17 @@ class ColorConversion {
 	/**
 	 * hex转rgb
 	 * @param str
-	 * @returns
 	 */
 	hexToRgb(str: string) {
 		if (!this.isHex(str)) {
-			// @ts-ignore
-			throw new TypeError("输入错误的hex", str);
+			throw new TypeError("输入错误的hex：" + str);
 		}
 		/* replace替换查找的到的字符串 */
 		str = str.replace("#", "");
 		/* match得到查询数组 */
-		let hxs = str.match(/../g);
+		let hxs = str.match(/../g)!;
 		for (let index = 0; index < 3; index++) {
-			// @ts-ignore
-			hxs[index] = parseInt(hxs[index], 16);
+			(hxs as any)[index as any] = parseInt(hxs[index], 16);
 		}
 
 		return hxs;
@@ -62,7 +58,6 @@ class ColorConversion {
 	 * @param redValue
 	 * @param greenValue
 	 * @param blueValue
-	 * @returns
 	 */
 	rgbToHex(
 		redValue: string | number,
@@ -90,41 +85,35 @@ class ColorConversion {
 	 * 获取颜色变暗或亮
 	 * @param color 颜色
 	 * @param level 0~1.0
-	 * @returns
 	 */
 	getDarkColor(color: string, level: string): string {
 		if (!this.isHex(color)) {
-			// @ts-ignore
-			throw new TypeError("输入错误的hex", color);
+			throw new TypeError("输入错误的hex：" + color);
 		}
 		let rgbc = this.hexToRgb(color);
 		for (let index = 0; index < 3; index++) {
-			// @ts-ignore
-			rgbc[index] = Math.floor(rgbc[index] * (1 - level));
+			(rgbc as any)[index] = Math.floor(
+				(rgbc as any)[index] * (1 - (level as any))
+			);
 		}
 
-		// @ts-ignore
 		return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
 	}
 	/**
 	 * 获取颜色变亮
 	 * @param color 颜色
 	 * @param level 0~1.0
-	 * @returns
 	 */
 	getLightColor(color: string, level: number): string {
 		if (!this.isHex(color)) {
-			// @ts-ignore
-			throw new TypeError("输入错误的hex", color);
+			throw new TypeError("输入错误的hex：" + color);
 		}
 		let rgbc = this.hexToRgb(color);
 		for (let index = 0; index < 3; index++) {
-			// @ts-ignore
-			rgbc[index] = Math.floor((255 - rgbc[index]) * level + rgbc[index]);
+			(rgbc as any)[index] = Math.floor(
+				(255 - (rgbc as any)[index]) * (level as any) + (rgbc as any)[index]
+			);
 		}
-		// @ts-ignore
 		return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
 	}
 }
-
-export { ColorConversion };

package/src/DOMUtils.ts

@@ -88,10 +88,11 @@ class DOMUtils {
 			let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
 			let text = textMatch![2];
 			selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
-			return Array.from(parent.querySelectorAll<E>(selector)).filter(($ele) => {
-				// @ts-ignore
-				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)
@@ -107,10 +108,11 @@ class DOMUtils {
 			}
 			let regexp = new RegExp(pattern, flags);
 			selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
-			return Array.from(parent.querySelectorAll<E>(selector)).filter(($ele) => {
-				// @ts-ignore
-				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));
@@ -158,8 +160,7 @@ class DOMUtils {
 			let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
 			let text = textMatch![2];
 			selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
-			// @ts-ignore
-			let content = $el?.textContent || $el?.innerText;
+			let content = $el?.textContent || (<HTMLElement>$el)?.innerText;
 			if (typeof content !== "string") {
 				content = "";
 			}
@@ -179,8 +180,7 @@ class DOMUtils {
 			}
 			let regexp = new RegExp(pattern, flags);
 			selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
-			// @ts-ignore
-			let content = $el?.textContent || $el?.innerText;
+			let content = $el?.textContent || (<HTMLElement>$el)?.innerText;
 			if (typeof content !== "string") {
 				content = "";
 			}
@@ -243,8 +243,7 @@ class DOMUtils {
 			selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
 			let $closest = $el?.closest<E>(selector);
 			if ($closest) {
-				// @ts-ignore
-				let content = $el?.textContent || $el?.innerText;
+				let content = $el?.textContent || (<HTMLElement>$el)?.innerText;
 				if (typeof content === "string" && content.includes(text)) {
 					return $closest;
 				}
@@ -267,8 +266,7 @@ class DOMUtils {
 			selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
 			let $closest = $el?.closest<E>(selector);
 			if ($closest) {
-				// @ts-ignore
-				let content = $el?.textContent || $el?.innerText;
+				let content = $el?.textContent || (<HTMLElement>$el)?.innerText;
 				if (typeof content === "string" && content.match(regexp)) {
 					return $closest;
 				}

package/src/Dictionary.ts

@@ -1,17 +1,47 @@
 import { CommonUtil } from "./CommonUtil";
 
-class UtilsDictionary<K, V> {
+export class UtilsDictionary<
+	K extends string | number | symbol,
+	V extends unknown
+> {
 	private items: {
-		// @ts-ignore
-		[key: K]: V;
-	} = {};
+		[key: string | number | symbol]: V;
+	};
 	constructor();
 	constructor(key: K, value: V);
 	constructor(key?: K, value?: V) {
+		this.items = {};
 		if (key != null) {
 			this.set(key, value!);
 		}
 	}
+	/**
+	 * 获取字典的长度，同this.size
+	 */
+	get length() {
+		return this.size();
+	}
+	/**
+	 * 迭代器
+	 */
+	get entries() {
+		let that = this;
+		return function* (): IterableIterator<[K, V]> {
+			let itemKeys = Object.keys(that.getItems());
+			for (const keyName of itemKeys) {
+				yield [keyName as K, that.get(keyName as K) as V];
+			}
+		};
+	}
+	/**
+	 * 是否可遍历
+	 */
+	get [Symbol.iterator]() {
+		let that = this;
+		return function () {
+			return that.entries();
+		};
+	}
 	/**
 	 * 检查是否有某一个键
 	 * @param key 键
@@ -111,8 +141,7 @@ class UtilsDictionary<K, V> {
 	/**
 	 * 返回字典本身
 	 */
-	getItems(): UtilsDictionary<K, V> {
-		// @ts-ignore
+	getItems() {
 		return this.items;
 	}
 	/**
@@ -122,6 +151,10 @@ class UtilsDictionary<K, V> {
 	concat(data: UtilsDictionary<K, V>) {
 		this.items = CommonUtil.assign(this.items, data.getItems());
 	}
+	/**
+	 * 迭代字典
+	 * @param callbackfn 回调函数
+	 */
 	forEach(
 		callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void
 	) {
@@ -129,33 +162,4 @@ class UtilsDictionary<K, V> {
 			callbackfn(this.get(key as any) as V, key as K, this.getItems() as any);
 		}
 	}
-	/**
-	 * 获取字典的长度，同this.size
-	 */
-	get length() {
-		return this.size();
-	}
-	/**
-	 * 迭代器
-	 */
-	get entries() {
-		let that = this;
-		return function* (): IterableIterator<[K, V]> {
-			let itemKeys = Object.keys(that.getItems());
-			for (const keyName of itemKeys) {
-				yield [keyName as K, that.get(keyName as K) as V];
-			}
-		};
-	}
-	/**
-	 * 是否可遍历
-	 */
-	get [Symbol.iterator]() {
-		let that = this;
-		return function () {
-			return that.entries();
-		};
-	}
 }
-
-export { UtilsDictionary };

package/src/GBKEncoder.ts

@@ -1,6 +1,6 @@
 import type { UtilsOwnObject } from "./types/global";
 
-class GBKEncoder {
+export class GBKEncoder {
 	#data: RegExpMatchArray = [] as any;
 	#U2Ghash: UtilsOwnObject<string> = {};
 	#G2Uhash: UtilsOwnObject<string> = {};
@@ -93,16 +93,15 @@ class GBKEncoder {
 	 * @param str
 	 */
 	decode(str: string) {
-		var GBKMatcher = /%[0-9A-F]{2}%[0-9A-F]{2}/;
-		var UTFMatcher = /%[0-9A-F]{2}/;
-		// @ts-ignore
-		var gbk = true,
-			utf = true;
-		let that = this;
+		let GBKMatcher = /%[0-9A-F]{2}%[0-9A-F]{2}/;
+		let UTFMatcher = /%[0-9A-F]{2}/;
+		// let gbk = true;
+		let utf = true;
+		const that = this;
 		while (utf) {
 			let gbkMatch = str.match(GBKMatcher);
 			let utfMatch = str.match(UTFMatcher);
-			gbk = Boolean(gbkMatch);
+			// gbk = Boolean(gbkMatch);
 			utf = Boolean(utfMatch);
 			if (gbkMatch && (gbkMatch as any) in that.#G2Uhash) {
 				str = str.replace(
@@ -110,12 +109,9 @@ class GBKEncoder {
 					String.fromCharCode(("0x" + that.#G2Uhash[gbkMatch as any]) as any)
 				);
 			} else {
-				// @ts-ignore
-				str = str.replace(utfMatch, decodeURIComponent(utfMatch));
+				str = str.replace(utfMatch as any, decodeURIComponent(utfMatch as any));
 			}
 		}
 		return str;
 	}
 }
-
-export { GBKEncoder };

package/src/Hooks.ts

@@ -1,4 +1,4 @@
-class Hooks {
+export class Hooks {
 	/**
 	 * 在Function原型上添加自定义方法.hook和.unhook
 	 */
@@ -82,5 +82,3 @@ class Hooks {
 		return true;
 	}
 }
-
-export { Hooks };