@whitesev/utils 2.7.1 → 2.7.3

package/src/Dictionary.ts

@@ -1,17 +1,44 @@
 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 +138,7 @@ class UtilsDictionary<K, V> {
 	/**
 	 * 返回字典本身
 	 */
-	getItems(): UtilsDictionary<K, V> {
-		// @ts-ignore
+	getItems() {
 		return this.items;
 	}
 	/**
@@ -122,40 +148,13 @@ class UtilsDictionary<K, V> {
 	concat(data: UtilsDictionary<K, V>) {
 		this.items = CommonUtil.assign(this.items, data.getItems());
 	}
-	forEach(
-		callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void
-	) {
+	/**
+	 * 迭代字典
+	 * @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.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> = {};
@@ -13,12 +13,7 @@ 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) {
@@ -93,16 +88,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 +104,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
 	 */
@@ -15,10 +15,7 @@ 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;
 			}
@@ -82,5 +79,3 @@ class Hooks {
 		return true;
 	}
 }
-
-export { Hooks };