@whitesev/utils 2.7.1 → 2.7.3

package/src/LockFunction.ts

@@ -1,4 +1,4 @@
-class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
+export class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
 	#flag: boolean = false;
 	#delayTime: number = 0;
 	#callback: K;
@@ -60,5 +60,3 @@ class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
 		};
 	}
 }
-
-export { LockFunction };

package/src/Log.ts

@@ -1,6 +1,6 @@
 import type { UtilsLogOptions } from "./types/Log";
 
-class Log {
+export class Log {
 	/** 是否禁用输出的flag */
 	#disable: boolean = false;
 	/** 前面的TAG标志 */
@@ -45,10 +45,7 @@ class Log {
 	) {
 		if (typeof __GM_info === "string") {
 			this.tag = __GM_info;
-		} else if (
-			typeof __GM_info === "object" &&
-			typeof __GM_info?.script?.name === "string"
-		) {
+		} else if (typeof __GM_info === "object" && typeof __GM_info?.script?.name === "string") {
 			this.tag = __GM_info.script.name;
 		}
 		this.#console = console;
@@ -66,9 +63,7 @@ class Log {
 		for (let stackString of stack) {
 			stackString = stackString.trim();
 			let stackFunctionNameMatch = stackString.match(/^at[\s]+(.+?)[\s]+/i);
-			let stackFunctionNamePositionMatch = stackString.match(
-				/^at[\s]+.+[\s]+\((.+?)\)/i
-			);
+			let stackFunctionNamePositionMatch = stackString.match(/^at[\s]+.+[\s]+\((.+?)\)/i);
 			if (stackFunctionNameMatch == null) {
 				continue;
 			}
@@ -76,12 +71,9 @@ class Log {
 				continue;
 			}
 			/* 获取最后一个，因为第一个是包含了at  */
-			let stackFunctionName =
-				stackFunctionNameMatch[stackFunctionNameMatch.length - 1];
+			let stackFunctionName = stackFunctionNameMatch[stackFunctionNameMatch.length - 1];
 			let stackFunctionNamePosition =
-				stackFunctionNamePositionMatch[
-					stackFunctionNamePositionMatch.length - 1
-				];
+				stackFunctionNamePositionMatch[stackFunctionNamePositionMatch.length - 1];
 			if (
 				stackFunctionName === "" ||
 				stackFunctionName.match(
@@ -114,10 +106,7 @@ class Log {
 	 */
 	private checkClearConsole() {
 		this.#logCount++;
-		if (
-			this.#details.autoClearConsole &&
-			this.#logCount > this.#details.logMaxCount
-		) {
+		if (this.#details.autoClearConsole && this.#logCount > this.#details.logMaxCount) {
 			this.#console.clear();
 			this.#logCount = 0;
 		}
@@ -134,8 +123,7 @@ class Log {
 		otherStyle = otherStyle || "";
 		let stackSplit = new Error()!.stack!.split("\n");
 		stackSplit.splice(0, 2);
-		let { name: callerName, position: callerPosition } =
-			this.parseErrorStack(stackSplit);
+		let { name: callerName, position: callerPosition } = this.parseErrorStack(stackSplit);
 		let tagName = this.tag;
 		let that = this;
 
@@ -204,11 +192,7 @@ class Log {
 	 */
 	warn(...args: any[]) {
 		if (this.#disable) return;
-		this.printContent(
-			args,
-			this.#details.warnColor,
-			"background: #FEF6D5;padding: 4px 6px 4px 0px;"
-		);
+		this.printContent(args, this.#details.warnColor, "background: #FEF6D5;padding: 4px 6px 4px 0px;");
 	}
 	/**
 	 * 控制台-错误输出
@@ -273,5 +257,3 @@ class Log {
 		this.#disable = false;
 	}
 }
-
-export { Log };

package/src/Progress.ts

@@ -1,7 +1,7 @@
 import { CommonUtil } from "./CommonUtil";
 import type { ProgressParamConfig } from "./types/Progress";
 
-class Progress {
+export class Progress {
 	#config: ProgressParamConfig = {
 		/**
 		 * canvas元素节点
@@ -50,9 +50,7 @@ class Progress {
 	constructor(paramConfig: ProgressParamConfig) {
 		this.#config = CommonUtil.assign(this.#config, paramConfig);
 		if (!(this.#config.canvasNode instanceof HTMLCanvasElement)) {
-			throw new Error(
-				"Utils.Progress 参数 canvasNode 必须是 HTMLCanvasElement"
-			);
+			throw new Error("Utils.Progress 参数 canvasNode 必须是 HTMLCanvasElement");
 		}
 		this.init();
 	}
@@ -90,13 +88,7 @@ class Progress {
 		this.#ctx.clearRect(0, 0, this.#width, this.#height);
 		/* 开始绘制底圆 */
 		this.#ctx.beginPath();
-		this.#ctx.arc(
-			this.#width / 2,
-			this.#height / 2,
-			this.#config.circleRadius,
-			1,
-			8
-		);
+		this.#ctx.arc(this.#width / 2, this.#height / 2, this.#config.circleRadius, 1, 8);
 		this.#ctx.strokeStyle = this.#config.lineBgColor;
 		this.#ctx.stroke();
 		/* 开始绘制动态圆 */
@@ -120,5 +112,3 @@ class Progress {
 		this.#ctx.fillText(txt, this.#width / 2 - w / 2, this.#height / 2 + h / 2);
 	}
 }
-
-export { Progress };

package/src/TryCatch.ts

@@ -24,8 +24,7 @@ export const TryCatch = function (...args: any) {
 		 * @param handler
 		 */
 		error(handler: ((...args: any[]) => any) | string | Function) {
-			// @ts-ignore
-			handleError = handler;
+			handleError = handler as (error: Error) => void;
 			return TryCatchCore;
 		},
 		/**
@@ -42,8 +41,7 @@ export const TryCatch = function (...args: any) {
 			callbackFunction = callback;
 			context = __context__ || this;
 			let result = executeTryCatch(callbackFunction, handleError, context);
-			// @ts-ignore
-			return result !== void 0 ? result : TryCatchCore;
+			return result !== void 0 ? result : (TryCatchCore as any as UtilsTryCatchType);
 		},
 	};
 
@@ -69,19 +67,13 @@ export const TryCatch = function (...args: any) {
 		} catch (error) {
 			if (defaultDetails.log) {
 				callback = callback as Function;
-				console.log(
-					`%c ${callback?.name ? callback?.name : callback + "出现错误"} `,
-					"color: #f20000"
-				);
+				console.log(`%c ${callback?.name ? callback?.name : callback + "出现错误"} `, "color: #f20000");
 				console.log(`%c 错误原因：${error}`, "color: #f20000");
 				console.trace(callback);
 			}
 			if (handleErrorFunc) {
 				if (typeof handleErrorFunc === "string") {
-					result = new Function(handleErrorFunc).apply(funcThis, [
-						...args,
-						error,
-					]);
+					result = new Function(handleErrorFunc).apply(funcThis, [...args, error]);
 				} else {
 					result = handleErrorFunc.apply(funcThis, [...args, error]);
 				}