@whitesev/utils 2.7.1 → 2.7.2

package/src/LockFunction.ts

@@ -1,4 +1,6 @@
-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 +62,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标志 */
@@ -273,5 +273,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元素节点
@@ -120,5 +120,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,9 @@ 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);
 		},
 	};
 

package/src/Utils.ts

@@ -177,7 +177,7 @@ class Utils {
 		canvasElement: HTMLCanvasElement,
 		clientX = 0,
 		clientY = 0,
-		view = globalThis
+		view = this.windowApi.window
 	) {
 		if (!(canvasElement instanceof HTMLCanvasElement)) {
 			throw new Error(
@@ -186,12 +186,13 @@ class Utils {
 		}
 		clientX = parseInt(clientX.toString());
 		clientY = parseInt(clientY.toString());
-		const eventInit: MouseEventInit = {
+		const eventInit: MouseEventInit & {
+			cancelBubble: boolean;
+		} = {
 			cancelBubble: true,
 			cancelable: true,
 			clientX: clientX,
 			clientY: clientY,
-			// @ts-ignore
 			view: view,
 			detail: 1,
 		};
@@ -1064,10 +1065,8 @@ class Utils {
 	getElementSelector(element: HTMLElement): string;
 	getElementSelector(element: HTMLElement): string {
 		let UtilsContext = this;
-		// @ts-ignore
-		if (!element) return;
-		// @ts-ignore
-		if (!element.parentElement) return;
+		if (!element) return void 0 as any as string;
+		if (!element.parentElement) return void 0 as any as string;
 		/* 如果元素有id属性，则直接返回id选择器 */
 		if (element.id) return "#" + element.id;
 
@@ -1122,8 +1121,7 @@ class Utils {
 		let result = [...args];
 		let newResult: number[] = [];
 		if (result.length === 0) {
-			// @ts-ignore
-			return;
+			return void 0 as any as number;
 		}
 		if (result.length > 1) {
 			if (
@@ -1194,8 +1192,7 @@ class Utils {
 		// 当前页面最大的z-index
 		let zIndex = 0;
 		// 当前的最大z-index的元素，调试使用
-		// @ts-ignore
-		let maxZIndexNode: Element = null;
+		let maxZIndexNode: Element | null = null;
 		/**
 		 * 元素是否可见
 		 * @param $css
@@ -1244,7 +1241,7 @@ class Utils {
 			zIndex = maxZIndexCompare;
 		}
 		return {
-			node: maxZIndexNode,
+			node: maxZIndexNode!,
 			zIndex: zIndex,
 		};
 	}
@@ -1311,8 +1308,7 @@ class Utils {
 		let result = [...args];
 		let newResult: number[] = [];
 		if (result.length === 0) {
-			// @ts-ignore
-			return;
+			return void 0 as any as number;
 		}
 		if (result.length > 1) {
 			if (
@@ -1905,7 +1901,6 @@ class Utils {
 	isJQuery(target: any): boolean;
 	isJQuery(target: any): boolean {
 		let result = false;
-		// @ts-ignore
 		if (typeof jQuery === "object" && target instanceof jQuery) {
 			result = true;
 		}
@@ -3060,31 +3055,27 @@ class Utils {
 		const originalListener = EventTarget.prototype.addEventListener;
 		EventTarget.prototype.addEventListener = function (...args) {
 			let type = args[0];
-			let callback = args[1];
-			// @ts-ignore
-			let options = args[2];
+			let callback: any = args[1];
+			// let options = args[2];
 			if (filter(type)) {
 				if (typeof callback === "function") {
 					args[1] = function (event) {
 						callback.call(this, trustEvent(event));
 					};
-				} else if (
-					typeof callback === "object" &&
-					"handleEvent" in (callback as any)
-				) {
-					let oldHandleEvent = (callback as any)["handleEvent"];
+				} else if (typeof callback === "object" && "handleEvent" in callback) {
+					let oldHandleEvent = callback["handleEvent"];
 
 					(args[1] as any)["handleEvent"] = function (event: Event) {
 						if (event == null) {
 							return;
 						}
 						try {
-							/* Proxy对象使用instanceof会报错 */
+							// Proxy对象使用instanceof会报错
+							// 这里故意尝试一下，如果报错，则说明是Proxy对象
 							event instanceof Proxy;
 							oldHandleEvent.call(this, trustEvent(event));
 						} catch (error) {
-							// @ts-ignore
-							event["isTrusted"] = isTrustValue;
+							Reflect.set(event, "isTrusted", isTrustValue);
 						}
 					};
 				}
@@ -3226,8 +3217,8 @@ class Utils {
 			}
 			async init() {
 				let copyStatus = false;
-				// @ts-ignore
 				let requestPermissionStatus = await this.requestClipboardPermission();
+				console.log(requestPermissionStatus);
 				if (
 					this.hasClipboard() &&
 					(this.hasClipboardWrite() || this.hasClipboardWriteText())
@@ -3245,12 +3236,9 @@ class Utils {
 				this.destroy();
 			}
 			destroy() {
-				// @ts-ignore
-				this.#resolve = null;
-				// @ts-ignore
+				this.#resolve = null as any;
 				this.#copyData = null;
-				// @ts-ignore
-				this.#copyDataType = null;
+				this.#copyDataType = null as any;
 			}
 			isText() {
 				return this.#copyDataType.includes("text");
@@ -3293,8 +3281,7 @@ class Utils {
 					if (navigator.permissions && navigator.permissions.query) {
 						navigator.permissions
 							.query({
-								// @ts-ignore
-								name: "clipboard-write",
+								name: "clipboard-write" as any as PermissionName,
 							})
 							.then((permissionStatus) => {
 								resolve(true);
@@ -3431,7 +3418,6 @@ class Utils {
 			offSetX: number,
 			offSetY: number
 		) {
-			// @ts-ignore
 			let win = typeof unsafeWindow === "undefined" ? globalThis : unsafeWindow;
 			let mouseEvent =
 				UtilsContext.windowApi.document.createEvent("MouseEvents");
@@ -3439,7 +3425,7 @@ class Utils {
 				eventName,
 				true,
 				true,
-				win,
+				win as Window,
 				0,
 				offSetX,
 				offSetY,
@@ -3668,7 +3654,6 @@ class Utils {
 		flags: "g" | "i" | "m" | "u" | "y" | string = "ig"
 	): RegExp {
 		let reg;
-		// @ts-ignore
 		flags = flags.toLowerCase();
 		if (typeof targetString === "string") {
 			reg = new RegExp(
@@ -3824,11 +3809,11 @@ class Utils {
 		searhParamsStr?: string | null | undefined
 	): T {
 		if (typeof searhParamsStr !== "string") {
-			// @ts-ignore
-			return {};
+			return {} as any as T;
 		}
-		// @ts-ignore
-		return Object.fromEntries(new URLSearchParams(searhParamsStr));
+		return Object.fromEntries(
+			new URLSearchParams(searhParamsStr) as any
+		) as any;
 	}
 	/**
 	 * 提供一个封装了 try-catch 的函数，可以执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
@@ -5137,8 +5122,7 @@ class Utils {
 			function requestPermissionsWithClipboard() {
 				navigator.permissions
 					.query({
-						// @ts-ignore
-						name: "clipboard-read",
+						name: "clipboard-read" as any as PermissionName,
 					})
 					.then((permissionStatus) => {
 						readClipboardText();

package/src/UtilsGMMenu.ts

@@ -5,7 +5,7 @@ import type {
 	UtilsGMMenuOptionData,
 } from "./types/UtilsGMMenu";
 
-class GMMenu {
+export class GMMenu {
 	private GM_Api = {
 		/**
 		 * 获取存储的数据
@@ -157,25 +157,24 @@ class GMMenu {
 			);
 			/** 油猴菜单上显示的文本 */
 			let showText = menuOption.showText(menuOption.text, defaultEnable);
-			// @ts-ignore
-			const GMMenuOptions = {
-				/**
-				 * 菜单的id
-				 */
-				id: menuOption.id,
-				/**
-				 * 点击菜单项后是否应关闭弹出菜单
-				 */
-				autoClose: menuOption.autoClose,
-				/**
-				 * 菜单项的可选访问键
-				 */
-				accessKey: menuOption.accessKey,
-				/**
-				 * 菜单项的鼠标悬浮上的工具提示
-				 */
-				title: menuOption.title,
-			};
+			// const GMMenuOptions = {
+			// 	/**
+			// 	 * 菜单的id
+			// 	 */
+			// 	id: menuOption.id,
+			// 	/**
+			// 	 * 点击菜单项后是否应关闭弹出菜单
+			// 	 */
+			// 	autoClose: menuOption.autoClose,
+			// 	/**
+			// 	 * 菜单项的可选访问键
+			// 	 */
+			// 	accessKey: menuOption.accessKey,
+			// 	/**
+			// 	 * 菜单项的鼠标悬浮上的工具提示
+			// 	 */
+			// 	title: menuOption.title,
+			// };
 			/* 点击菜单后触发callback后的网页是否刷新 */
 			menuOption.autoReload =
 				typeof menuOption.autoReload !== "boolean"
@@ -472,5 +471,3 @@ class GMMenu {
 		this.MenuHandle.$data.key = keyName;
 	}
 }
-
-export { GMMenu };

package/src/Vue.ts

@@ -37,11 +37,10 @@ class ReactiveEffect {
 	deps: any[] = [];
 	private active = true;
 	private fn;
-	// @ts-ignore
-	private scheduler;
+	// private scheduler;
 	constructor(fn: Function, scheduler: any) {
 		this.fn = fn;
-		this.scheduler = scheduler;
+		// this.scheduler = scheduler;
 	}
 	run(cb: (activeEffect: any) => void) {
 		if (!this.active) {
@@ -107,8 +106,7 @@ export class Vue {
 	reactive<T extends object>(target: T): T {
 		const that = this;
 		if (!(typeof target === "object" && target !== null)) {
-			// @ts-ignore
-			return;
+			return void 0 as any as T;
 		}
 		if (VueUtils.isReactive(target)) {
 			return target;
@@ -179,8 +177,7 @@ export class Vue {
 	toRefs(object: any) {
 		const result = VueUtils.isArray(object) ? new Array(object.length) : {};
 		for (let key in object) {
-            // @ts-ignore
-			result[key] = this.toRef(object, key);
+			(result as any)[key as any] = this.toRef(object, key);
 		}
 		return result;
 	}

package/src/WindowApi.ts

@@ -1,6 +1,6 @@
 import type { WindowApiOption } from "./types/WindowApi";
 
-class WindowApi {
+export class WindowApi {
 	/** 默认的配置 */
 	private defaultApi: Required<WindowApiOption> = {
 		document: document,
@@ -23,8 +23,7 @@ class WindowApi {
 		if (!option) {
 			option = Object.assign({}, this.defaultApi);
 		}
-		// @ts-ignore
-		this.api = Object.assign({}, option);
+		this.api = Object.assign({}, option as Required<WindowApiOption>);
 	}
 	get document() {
 		return this.api.document;
@@ -42,5 +41,3 @@ class WindowApi {
 		return this.api.top;
 	}
 }
-
-export { WindowApi };

package/src/indexedDB.ts

@@ -1,3 +1,6 @@
+/**
+ * indexedDB 错误结果
+ */
 declare interface UtilsIDBOpenErrorResult {
 	code: number;
 	msg: string;
@@ -6,13 +9,13 @@ declare interface UtilsIDBOpenErrorResult {
 		target: IDBRequest;
 	} & Event;
 }
-class indexedDB {
+
+export class indexedDB {
 	#dbName: string;
 	#storeName: string;
 	#dbVersion: number;
 	/* websql的版本号，由于ios的问题，版本号的写法不一样 */
-	// @ts-ignore
-	#slqVersion = "1";
+	// #slqVersion = "1";
 	/* 监听IndexDB */
 	#indexedDB =
 		window.indexedDB ||
@@ -23,8 +26,7 @@ class indexedDB {
 	#db: {
 		[key: string]: IDBDatabase;
 	} = {};
-	// @ts-ignore
-	#store: IDBObjectStore = null as any;
+	// #store: IDBObjectStore = null as any;
 	/** 状态码 */
 	#statusCode = {
 		operationSuccess: {
@@ -76,7 +78,7 @@ class indexedDB {
 		) as IDBTransaction;
 		/* IndexDB的读写权限 */
 		store = txn.objectStore(this.#storeName) as IDBObjectStore;
-		this.#store = store;
+		// this.#store = store;
 		return store;
 	}
 	/**
@@ -507,5 +509,3 @@ class indexedDB {
 		});
 	}
 }
-
-export { indexedDB };