@whitesev/utils 1.0.8 → 1.1.0

package/dist/src/Event.d.ts

@@ -0,0 +1,156 @@
+/**
+ * 鼠标事件
+ * + 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 interface DOMUtils_KeyboardEvent {
+    keydown: KeyboardEvent;
+    keypress: KeyboardEvent;
+    keyup: 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 interface DOMUtils_FormEvent {
+    blur: Event;
+    change: Event;
+    focus: Event;
+    focusin: Event;
+    focusout: Event;
+    input: Event;
+    reset: Event;
+    search: Event;
+}
+/**
+ * 剪贴板事件
+ */
+declare interface DOMUtils_ClipboardEvent {
+    copy: ClipboardEvent;
+    cut: ClipboardEvent;
+    paste: ClipboardEvent;
+}
+/**
+ * 打印事件
+ */
+declare interface DOMUtils_PrintEvent {
+    afterprint: Event;
+    beforeprint: Event;
+}
+/**
+ * 拖动事件
+ */
+declare interface DOMUtils_DragEvent {
+    drag: DragEvent;
+    dragend: DragEvent;
+    dragenter: DragEvent;
+    dragleave: DragEvent;
+    dragover: DragEvent;
+    dragstart: DragEvent;
+    drop: 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 interface DOMUtils_AnimationEvent {
+    animationend: AnimationEvent;
+    animationiteration: AnimationEvent;
+    animationstart: AnimationEvent;
+}
+/**
+ * 过渡事件
+ */
+declare interface DOMUtils_TransitionEvent {
+    transitionend: TransitionEvent;
+}
+/**
+ * 触摸事件
+ */
+declare interface DOMUtils_TouchEvent {
+    touchstart: TouchEvent;
+    touchmove: TouchEvent;
+    touchend: TouchEvent;
+    touchcancel: TouchEvent;
+    touchenter: TouchEvent;
+    touchleave: 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;
+}
+/**
+ * 全部事件
+ */
+export 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;
+/**
+ * 事件类型
+ */
+export declare type DOMUtils_EventType = keyof DOMUtils_Event;
+export {};

package/dist/src/Httpx.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject } from ".";
+import { AnyObject } from "./Utils";
 /**
  * 状态码
  * + https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status

package/dist/src/Log.d.ts

@@ -1,4 +1,4 @@
-import type { AnyObject } from ".";
+import type { AnyObject } from "./Utils";
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
     /** 是否输出Tag，false的话其它的颜色也不输出，默认为true */
@@ -20,16 +20,17 @@ declare interface UtilsLogOptions {
 }
 declare class Log {
     #private;
+    /** 前面的TAG标志 */
     tag: string;
     /**
-     * @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;
         };
-    }, console?: Console);
+    } | string, console?: Console);
     /**
      * 解析Error的堆栈获取实际调用者的函数名及函数所在的位置
      * @param stack

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

@@ -10,6 +10,7 @@ import { LockFunction } from "./LockFunction";
 import { Log } from "./Log";
 import { Progress } from "./Progress";
 import { UtilsDictionary } from "./Dictionary";
+import type { DOMUtils_EventType } from "./Event";
 export declare var unsafeWindow: Window & typeof globalThis;
 export type JSTypeMap = {
     string: string;
@@ -25,8 +26,8 @@ export type JSTypeNames = keyof JSTypeMap;
 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;
@@ -50,161 +51,6 @@ export declare interface Vue2Context extends AnyObject {
     }) => void;
     $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 interface DOMUtils_KeyboardEvent {
-    keydown: KeyboardEvent;
-    keypress: KeyboardEvent;
-    keyup: 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 interface DOMUtils_FormEvent {
-    blur: Event;
-    change: Event;
-    focus: Event;
-    focusin: Event;
-    focusout: Event;
-    input: Event;
-    reset: Event;
-    search: Event;
-}
-/**
- * 剪贴板事件
- */
-declare interface DOMUtils_ClipboardEvent {
-    copy: ClipboardEvent;
-    cut: ClipboardEvent;
-    paste: ClipboardEvent;
-}
-/**
- * 打印事件
- */
-declare interface DOMUtils_PrintEvent {
-    afterprint: Event;
-    beforeprint: Event;
-}
-/**
- * 拖动事件
- */
-declare interface DOMUtils_DragEvent {
-    drag: DragEvent;
-    dragend: DragEvent;
-    dragenter: DragEvent;
-    dragleave: DragEvent;
-    dragover: DragEvent;
-    dragstart: DragEvent;
-    drop: 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 interface DOMUtils_AnimationEvent {
-    animationend: AnimationEvent;
-    animationiteration: AnimationEvent;
-    animationstart: AnimationEvent;
-}
-/**
- * 过渡事件
- */
-declare interface DOMUtils_TransitionEvent {
-    transitionend: TransitionEvent;
-}
-/**
- * 触摸事件
- */
-declare interface DOMUtils_TouchEvent {
-    touchstart: TouchEvent;
-    touchmove: TouchEvent;
-    touchend: TouchEvent;
-    touchcancel: TouchEvent;
-    touchenter: TouchEvent;
-    touchleave: 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_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;
 declare class Utils {
     /** 版本号 */
     version: string;
@@ -349,7 +195,7 @@ declare class Utils {
      * @example
      * Utils.dispatchEvent(document.querySelector("input","input"))
      */
-    dispatchEvent(element: HTMLElement | Document, eventName: DOMUtils_EventType | DOMUtils_EventType[], details?: UtilsNestedObjectWithToString<any>): void;
+    dispatchEvent(element: HTMLElement | Document, eventName: DOMUtils_EventType | DOMUtils_EventType[], details?: UtilsOwnObject<any>): void;
     /**
      * 主动触发事件
      * @param element 元素
@@ -360,7 +206,7 @@ declare class Utils {
      * @example
      * Utils.dispatchEvent(document.querySelector("input","input"))
      */
-    dispatchEvent(element: HTMLElement | Document, eventName: string, details?: UtilsNestedObjectWithToString<any>): void;
+    dispatchEvent(element: HTMLElement | Document, eventName: string, details?: UtilsOwnObject<any>): void;
     /**
      * 下载base64格式的数据
      * @param base64Data	需要转换的base64数据
@@ -572,7 +418,7 @@ declare class Utils {
      * Utils.getMaxValue({1:123,2:345,3:456},(key,value)=>{return parseInt(value)})
      * > 456
      */
-    getMaxValue(val: UtilsNestedObjectWithToString<number>, handler: (key: any, value: any) => number): number;
+    getMaxValue(val: UtilsOwnObject<number>, handler: (key: any, value: any) => number): number;
     /**
      * 获取页面中最大的z-index
      * @param deviation 获取最大的z-index值的偏移，默认是+1
@@ -601,14 +447,14 @@ declare class Utils {
      * Utils.getMinValue({1:123,2:345,3:456},(key,value)=>{return parseInt(value)})
      * > 123
      */
-    getMinValue(val: UtilsNestedObjectWithToString<number>, handler: (key: any, value: any) => number): number;
+    getMinValue(val: UtilsOwnObject<number>, handler: (key: any, value: any) => number): number;
     /**
      * 获取最小值
      * @example
      * Utils.getMinValue([{1:123},{2:345},{3:456}],(index,value)=>{return parseInt(index)})
      * > 0
      */
-    getMinValue(val: UtilsNestedObjectWithToString<number>[], handler: (index: number, value: any) => number): number;
+    getMinValue(val: UtilsOwnObject<number>[], handler: (index: number, value: any) => number): number;
     /**
      * 获取随机的安卓手机User-Agent
      * @example
@@ -632,7 +478,7 @@ declare 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
@@ -646,7 +492,7 @@ declare class Utils {
      * Utils.getRandomValue({1:1},{2:2})
      * > {1: 1}
      */
-    getRandomValue<T extends any>(val_1: UtilsNestedObjectWithToString<T>, val_2: UtilsNestedObjectWithToString<T>): T;
+    getRandomValue<T extends any>(val_1: UtilsOwnObject<T>, val_2: UtilsOwnObject<T>): T;
     /**
      * 获取随机的电脑端User-Agent
      * + Mozilla/5.0：以前用于Netscape浏览器，目前大多数浏览器UA都会带有
@@ -1544,9 +1390,9 @@ declare class Utils {
      * > ()=>{throw new Error('测试错误')}出现错误
      */
     tryCatch: (...args: any) => {
-        config(paramDetails: import("./tryCatch").UtilsTryCatchConfig): any;
+        config(paramDetails: import("./TryCatch").UtilsTryCatchConfig): any;
         error(handler: string | Function | ((...args: any[]) => any)): any;
-        run<A extends any[], R>(callback: string | Function | ((...args: A) => R), __context__?: any): import("./tryCatch").UtilsTryCatchType;
+        run<A extends any[], R>(callback: string | Function | ((...args: A) => R), __context__?: any): import("./TryCatch").UtilsTryCatchType;
     };
     /**
      * 数组去重，去除重复的值

package/dist/src/UtilsGMMenu.d.ts

@@ -40,13 +40,13 @@ declare interface UtilsGMMenuConstructorOptions {
     /** （可选）全局菜单点击菜单后自动刷新网页，默认为true */
     autoReload?: boolean;
     /**  油猴函数 @grant GM_getValue */
-    GM_getValue<T extends any>(name: string, defaultValue?: T): T;
+    GM_getValue: any;
     /**  油猴函数 @grant GM_setValue */
-    GM_setValue(name: string, value: any): Promise<undefined> | undefined;
+    GM_setValue: any;
     /**  油猴函数 @grant GM_registerMenuCommand */
-    GM_registerMenuCommand(name: string, listener: (event: PointerEvent | MouseEvent) => void, accessKey?: string): number;
+    GM_registerMenuCommand: any;
     /**  油猴函数 @grant GM_unregisterMenuCommand */
-    GM_unregisterMenuCommand(id: number): void;
+    GM_unregisterMenuCommand: any;
 }
 declare class GMMenu {
     private GM_Api;

package/index.ts

@@ -1,3 +1,3 @@
-import { Utils } from "./src";
+import { Utils } from "./src/Utils";
 
 export default Utils;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@whitesev/utils",
-	"version": "1.0.8",
+	"version": "1.1.0",
 	"description": "一个常用的工具库",
 	"main": "dist/index.cjs.js",
 	"module": "dist/node/index.esm.js",

package/src/Dictionary.ts

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 class UtilsDictionary<K extends PropertyKey, V extends any> {
 	#items: {

package/src/Event.ts

@@ -0,0 +1,189 @@
+/**
+ * 鼠标事件
+ * + 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;
+
+/**
+ * 全部事件
+ */
+export 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;
+
+/**
+ * 事件类型
+ */
+export declare type DOMUtils_EventType = keyof DOMUtils_Event;

package/src/GBKEncoder.ts

@@ -1,4 +1,4 @@
-import { type AnyObject } from ".";
+import { type AnyObject } from "./Utils";
 
 class GBKEncoder {
 	#data: RegExpMatchArray = [] as any;

package/src/Httpx.ts

@@ -1,4 +1,4 @@
-import { AnyObject, Utils } from ".";
+import { AnyObject, Utils } from "./Utils";
 
 /**
  * 状态码

package/src/LockFunction.ts

@@ -1,4 +1,4 @@
-import { Utils } from ".";
+import { Utils } from "./Utils";
 
 class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
 	#flag: boolean = false;