@whitesev/utils 1.0.8 → 1.1.0

package/src/Log.ts

@@ -1,4 +1,4 @@
-import type { AnyObject } from ".";
+import type { AnyObject } from "./Utils";
 
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
@@ -21,11 +21,15 @@ declare interface UtilsLogOptions {
 }
 
 class Log {
-	/** 前面的TAG标志 */
+	/** 是否禁用输出的flag */
 	#disable: boolean = false;
-	tag: string = "";
+	/** 前面的TAG标志 */
+	tag: string = "Utils.Log";
+	/* 使用的console函数 */
 	#console: Console = null as any;
+	/* 当前输出的数量 */
 	#logCount = 0;
+	/* 配置 */
 	#details: UtilsLogOptions = {
 		tag: true,
 		successColor: "#0000FF",
@@ -36,10 +40,6 @@ class Log {
 		autoClearConsole: false,
 		logMaxCount: 999,
 	};
-	/**
-	 * 待恢复的函数或对象
-	 */
-	#recoveryList = [];
 	#msgColorDetails = [
 		"font-weight: bold; color: cornflowerblue",
 		"font-weight: bold; color: cornflowerblue",
@@ -47,22 +47,27 @@ class Log {
 		"font-weight: bold; color: cornflowerblue",
 	];
 	/**
-	 * @param _GM_info_ 油猴管理器的API GM_info，或者是一个对象，如{"script":{name:"Utils.Log"}}
+	 * @param _GM_info_ 油猴管理器的API GM_info，或者是一个对象，如{"script":{name:"Utils.Log"}}，或者直接是一个字符串
 	 * @param console 可指定console对象为unsafeWindow下的console或者是油猴window下的console
 	 */
 	constructor(
-		_GM_info_: {
-			script: {
-				name: string;
-			};
-		} = {
-			script: {
-				name: "Utils.Log",
-			},
-		},
-		console: Console = global.console
+		_GM_info_?:
+			| {
+					script: {
+						name: string;
+					};
+			  }
+			| string,
+		console: Console = globalThis.console
 	) {
-		this.tag = _GM_info_.script.name;
+		if (typeof _GM_info_ === "string") {
+			this.tag = _GM_info_;
+		} else if (
+			typeof _GM_info_ === "object" &&
+			typeof _GM_info_?.script?.name === "string"
+		) {
+			this.tag = _GM_info_.script.name;
+		}
 		this.#console = console;
 	}
 
@@ -87,6 +92,7 @@ class Log {
 			if (stackFunctionNamePositionMatch == null) {
 				continue;
 			}
+			/* 获取最后一个，因为第一个是包含了at  */
 			let stackFunctionName =
 				stackFunctionNameMatch[stackFunctionNameMatch.length - 1];
 			let stackFunctionNamePosition =
@@ -96,10 +102,7 @@ class Log {
 			if (
 				stackFunctionName === "" ||
 				stackFunctionName.match(
-					new RegExp(
-						"(^Utils.Log.|.<anonymous>$|^Function.each|^NodeList.forEach|^k.fn.init.each)",
-						"g"
-					)
+					/^(Utils\.|)Log(\.|)|.<anonymous>$|^Function.each|^NodeList.forEach|^k.fn.init.each/g
 				)
 			) {
 				continue;
@@ -144,7 +147,7 @@ class Log {
 	 * @param otherStyle 其它CSS
 	 */
 	private printContent(msg: any, color: string, otherStyle?: string) {
-		this.checkClearConsole.apply(this);
+		this.checkClearConsole();
 		otherStyle = otherStyle || "";
 		let stackSplit = new Error()!.stack!.split("\n");
 		stackSplit.splice(0, 2);
@@ -244,7 +247,7 @@ class Log {
 	 */
 	table(msg: AnyObject[], color = this.#details.infoColor, otherStyle = "") {
 		if (this.#disable) return;
-		this.checkClearConsole.apply(this);
+		this.checkClearConsole();
 		let stack = new Error()!.stack!.split("\n");
 		stack.splice(0, 1);
 		let errorStackParse = this.parseErrorStack(stack);

package/src/Progress.ts

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 declare interface ProgressParamConfig {
 	/** canvas元素节点 */

package/src/{tryCatch.ts → TryCatch.ts}

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 export declare interface UtilsTryCatchConfig {
 	log: boolean;

package/src/{index.ts → Utils.ts}

@@ -11,8 +11,9 @@ import { indexedDB } from "./indexedDB";
 import { LockFunction } from "./LockFunction";
 import { Log } from "./Log";
 import { Progress } from "./Progress";
-import { TryCatch } from "./tryCatch";
+import { TryCatch } from "./TryCatch";
 import { UtilsDictionary } from "./Dictionary";
+import type { DOMUtils_EventType } from "./Event";
 
 export declare var unsafeWindow: Window & typeof globalThis;
 
@@ -33,8 +34,8 @@ export type ArgsType<T extends JSTypeNames[]> = {
 	[I in keyof T]: JSTypeMap[T[I]];
 };
 
-export declare interface UtilsNestedObjectWithToString<V extends any> {
-	[key: string]: V | UtilsNestedObjectWithToString<V>;
+export declare interface UtilsOwnObject<V extends any> {
+	[key: string]: V | UtilsOwnObject<V>;
 }
 export declare interface AnyObject {
 	[key: string]: any | AnyObject;
@@ -64,199 +65,9 @@ export declare interface Vue2Context extends AnyObject {
 	$el: Element;
 }
 
-/**
- * 鼠标事件
- * + https://blog.csdn.net/weixin_68658847/article/details/126939879
- */
-
-declare interface DOMUtils_MouseEvent {
-	click: MouseEvent | PointerEvent;
-	contextmenu: MouseEvent | PointerEvent;
-	dblclick: MouseEvent | PointerEvent;
-	mousedown: MouseEvent | PointerEvent;
-	mouseenter: MouseEvent | PointerEvent;
-	mouseleave: MouseEvent | PointerEvent;
-	mousemove: MouseEvent | PointerEvent;
-	mouseover: MouseEvent | PointerEvent;
-	mouseout: MouseEvent | PointerEvent;
-	mouseup: MouseEvent | PointerEvent;
-}
-declare type DOMUtils_MouseEventType = keyof DOMUtils_MouseEvent;
-/**
- * 鼠标事件
- */
-declare interface DOMUtils_KeyboardEvent {
-	keydown: KeyboardEvent;
-	keypress: KeyboardEvent;
-	keyup: KeyboardEvent;
-}
-declare type DOMUtils_KeyboardEventType = keyof DOMUtils_KeyboardEvent;
-/**
- * 框架/对象事件
- */
-declare interface DOMUtils_Frame_Object_Event {
-	abort: Event;
-	beforeunload: Event;
-	error: Event;
-	hashchange: Event;
-	load: Event;
-	pageshow: Event;
-	pagehide: Event;
-	resize: Event;
-	scroll: Event;
-	unload: Event;
-}
-declare type DOMUtils_Frame_Object_EventType =
-	keyof DOMUtils_Frame_Object_Event;
-/**
- * 表单事件
- */
-declare interface DOMUtils_FormEvent {
-	blur: Event;
-	change: Event;
-	focus: Event;
-	focusin: Event;
-	focusout: Event;
-	input: Event;
-	reset: Event;
-	search: Event;
-}
-declare type DOMUtils_FormEventType = keyof DOMUtils_FormEvent;
-
-/**
- * 剪贴板事件
- */
-declare interface DOMUtils_ClipboardEvent {
-	copy: ClipboardEvent;
-	cut: ClipboardEvent;
-	paste: ClipboardEvent;
-}
-declare type DOMUtils_ClipboardEventType = keyof DOMUtils_ClipboardEvent;
-
-/**
- * 打印事件
- */
-declare interface DOMUtils_PrintEvent {
-	afterprint: Event;
-	beforeprint: Event;
-}
-declare type DOMUtils_PrintEventType = keyof DOMUtils_PrintEvent;
-
-/**
- * 拖动事件
- */
-declare interface DOMUtils_DragEvent {
-	drag: DragEvent;
-	dragend: DragEvent;
-	dragenter: DragEvent;
-	dragleave: DragEvent;
-	dragover: DragEvent;
-	dragstart: DragEvent;
-	drop: DragEvent;
-}
-declare type DOMUtils_DragEventType = keyof DOMUtils_DragEvent;
-
-/**
- * 多媒体（Media）事件
- */
-declare interface DOMUtils_MediaEvent {
-	abort: Event;
-	canplay: Event;
-	canplaythrough: Event;
-	durationchange: Event;
-	emptied: Event;
-	ended: Event;
-	error: Event;
-	loadeddata: Event;
-	loadedmetadata: Event;
-	loadstart: Event;
-	pause: Event;
-	play: Event;
-	playing: Event;
-	progress: Event;
-	ratechange: Event;
-	seeked: Event;
-	seeking: Event;
-	stalled: Event;
-	suspend: Event;
-	timeupdate: Event;
-	volumechange: Event;
-	waiting: Event;
-}
-declare type DOMUtils_MediaEventType = keyof DOMUtils_MediaEvent;
-
-/**
- * 动画事件
- */
-declare interface DOMUtils_AnimationEvent {
-	animationend: AnimationEvent;
-	animationiteration: AnimationEvent;
-	animationstart: AnimationEvent;
-}
-declare type DOMUtils_AnimationEventType = keyof DOMUtils_AnimationEvent;
-
-/**
- * 过渡事件
- */
-declare interface DOMUtils_TransitionEvent {
-	transitionend: TransitionEvent;
-}
-declare type DOMUtils_TransitionEventType = keyof DOMUtils_TransitionEvent;
-
-/**
- * 触摸事件
- */
-declare interface DOMUtils_TouchEvent {
-	touchstart: TouchEvent;
-	touchmove: TouchEvent;
-	touchend: TouchEvent;
-	touchcancel: TouchEvent;
-	touchenter: TouchEvent;
-	touchleave: TouchEvent;
-}
-declare type DOMUtils_TouchEventType = keyof DOMUtils_TouchEvent;
-/**
- * 其它事件
- */
-declare interface DOMUtils_OtherEvent {
-	message: Event;
-	online: Event;
-	offline: Event;
-	popstate: Event;
-	show: Event;
-	storage: Event;
-	toggle: Event;
-	wheel: Event;
-	propertychange: Event;
-	fullscreenchange: Event;
-	DOMContentLoaded: Event;
-}
-declare type DOMUtils_OtherEventType = keyof DOMUtils_OtherEvent;
-
-/**
- * 全部事件
- */
-declare type DOMUtils_Event = DOMUtils_MouseEvent &
-	DOMUtils_KeyboardEvent &
-	DOMUtils_Frame_Object_Event &
-	DOMUtils_FormEvent &
-	DOMUtils_ClipboardEvent &
-	DOMUtils_PrintEvent &
-	DOMUtils_DragEvent &
-	DOMUtils_MediaEvent &
-	DOMUtils_AnimationEvent &
-	DOMUtils_TransitionEvent &
-	DOMUtils_TouchEvent &
-	DOMUtils_OtherEvent;
-
-/**
- * 事件类型
- */
-declare type DOMUtils_EventType = keyof DOMUtils_Event;
-
 class Utils {
 	/** 版本号 */
-	version = "2024.5.25";
+	version = "2024.5.28";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -697,7 +508,7 @@ class Utils {
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: DOMUtils_EventType | DOMUtils_EventType[],
-		details?: UtilsNestedObjectWithToString<any>
+		details?: UtilsOwnObject<any>
 	): void;
 	/**
 	 * 主动触发事件
@@ -712,12 +523,12 @@ class Utils {
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: string,
-		details?: UtilsNestedObjectWithToString<any>
+		details?: UtilsOwnObject<any>
 	): void;
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: DOMUtils_EventType | DOMUtils_EventType[] | string,
-		details?: UtilsNestedObjectWithToString<any>
+		details?: UtilsOwnObject<any>
 	) {
 		let eventNameList: string[] = [];
 		if (typeof eventName === "string") {
@@ -926,7 +737,7 @@ class Utils {
 		}
 		let result = 0;
 		let resultType = "KB";
-		let sizeData: UtilsNestedObjectWithToString<number> = {};
+		let sizeData: UtilsOwnObject<number> = {};
 		sizeData.B = 1;
 		sizeData.KB = 1024;
 		sizeData.MB = sizeData.KB * sizeData.KB;
@@ -1341,7 +1152,7 @@ class Utils {
 	 * > 456
 	 */
 	getMaxValue(
-		val: UtilsNestedObjectWithToString<number>,
+		val: UtilsOwnObject<number>,
 		handler: (key: any, value: any) => number
 	): number;
 	/**
@@ -1431,7 +1242,7 @@ class Utils {
 	 * > 123
 	 */
 	getMinValue(
-		val: UtilsNestedObjectWithToString<number>,
+		val: UtilsOwnObject<number>,
 		handler: (key: any, value: any) => number
 	): number;
 	/**
@@ -1441,7 +1252,7 @@ class Utils {
 	 * > 0
 	 */
 	getMinValue(
-		val: UtilsNestedObjectWithToString<number>[],
+		val: UtilsOwnObject<number>[],
 		handler: (index: number, value: any) => number
 	): number;
 	getMinValue(...args: any[]): number {
@@ -1528,7 +1339,7 @@ class Utils {
 	 * Utils.getRandomValue({1:"结果1",2:"结果2",3:"结果3"}})
 	 * > 结果2
 	 */
-	getRandomValue<T extends any>(val: T[] | UtilsNestedObjectWithToString<T>): T;
+	getRandomValue<T extends any>(val: T[] | UtilsOwnObject<T>): T;
 	/**
 	 * 获取两个数之间随机值
 	 * @example
@@ -1543,8 +1354,8 @@ class Utils {
 	 * > {1: 1}
 	 */
 	getRandomValue<T extends any>(
-		val_1: UtilsNestedObjectWithToString<T>,
-		val_2: UtilsNestedObjectWithToString<T>
+		val_1: UtilsOwnObject<T>,
+		val_2: UtilsOwnObject<T>
 	): T;
 	getRandomValue(...args: any[]): any {
 		let result = [...args];
@@ -2174,7 +1985,7 @@ class Utils {
 			return false;
 		}
 		targetStr = targetStr.toLowerCase();
-		const targetCharMap: UtilsNestedObjectWithToString<string> = {};
+		const targetCharMap: UtilsOwnObject<string> = {};
 		let targetStrLength = 0;
 		for (const char of targetStr) {
 			if (Reflect.has(targetCharMap, char)) {

package/src/UtilsGMCookie.ts

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 declare interface UtilsGMCookieListResult {
 	/** 为 window.location.hostname */

package/src/UtilsGMMenu.ts

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 declare interface UtilsGMMenuClickCallBackData {
 	/** 菜单键名 */

package/src/indexedDB.ts

@@ -1,5 +1,3 @@
-import type { AnyObject } from ".";
-
 declare interface UtilsIDBOpenErrorResult {
 	code: number;
 	msg: string;
@@ -104,14 +102,14 @@ class indexedDB {
 			};
 			request.onsuccess = function (event: Event) {
 				if (!that.#db[dbName]) {
-                    let target = event.target as IDBRequest;
+					let target = event.target as IDBRequest;
 					that.#db[dbName] = target.result;
 				}
 				let store = that.createStore(dbName);
 				callback(store, true);
 			};
 			request.onupgradeneeded = function (event: Event) {
-                let target = event.target as IDBRequest;
+				let target = event.target as IDBRequest;
 				that.#db[dbName] = target.result;
 				let store = that.#db[dbName].createObjectStore(that.#storeName, {
 					keyPath: "key",