@whitesev/utils 2.7.1 → 2.7.3

package/dist/types/src/ColorConversion.d.ts

@@ -1,4 +1,4 @@
-declare class ColorConversion {
+export declare class ColorConversion {
     /**
      * 判断是否是16进制颜色
      * @param str
@@ -7,7 +7,7 @@ declare class ColorConversion {
     /**
      * 16进制颜色转rgba
      *
-     * #ff0000 转 rgba(123,123,123, 0.4)
+     * 例如：`#ff0000` 转为 `rgba(123,123,123, 0.4)`
      * @param hex
      * @param opacity
      */
@@ -15,30 +15,25 @@ declare class ColorConversion {
     /**
      * hex转rgb
      * @param str
-     * @returns
      */
-    hexToRgb(str: string): RegExpMatchArray | null;
+    hexToRgb(str: string): RegExpMatchArray;
     /**
      * rgb转hex
      * @param redValue
      * @param greenValue
      * @param blueValue
-     * @returns
      */
     rgbToHex(redValue: string | number, greenValue: string | number, blueValue: string | number): string;
     /**
      * 获取颜色变暗或亮
      * @param color 颜色
      * @param level 0~1.0
-     * @returns
      */
     getDarkColor(color: string, level: string): string;
     /**
      * 获取颜色变亮
      * @param color 颜色
      * @param level 0~1.0
-     * @returns
      */
     getLightColor(color: string, level: number): string;
 }
-export { ColorConversion };

package/dist/types/src/Dictionary.d.ts

@@ -1,7 +1,19 @@
-declare class UtilsDictionary<K, V> {
+export declare class UtilsDictionary<K extends string | number | symbol, V extends unknown> {
     private items;
     constructor();
     constructor(key: K, value: V);
+    /**
+     * 获取字典的长度，同this.size
+     */
+    get length(): number;
+    /**
+     * 迭代器
+     */
+    get entries(): () => IterableIterator<[K, V]>;
+    /**
+     * 是否可遍历
+     */
+    get [Symbol.iterator](): () => IterableIterator<[K, V]>;
     /**
      * 检查是否有某一个键
      * @param key 键
@@ -54,24 +66,19 @@ declare class UtilsDictionary<K, V> {
     /**
      * 返回字典本身
      */
-    getItems(): UtilsDictionary<K, V>;
+    getItems(): {
+        [key: string]: V;
+        [key: number]: V;
+        [key: symbol]: V;
+    };
     /**
      * 合并另一个字典
      * @param data 需要合并的字典
      */
     concat(data: UtilsDictionary<K, V>): void;
-    forEach(callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void): void;
-    /**
-     * 获取字典的长度，同this.size
-     */
-    get length(): number;
-    /**
-     * 迭代器
-     */
-    get entries(): () => IterableIterator<[K, V]>;
     /**
-     * 是否可遍历
+     * 迭代字典
+     * @param callbackfn 回调函数
      */
-    get [Symbol.iterator](): () => IterableIterator<[K, V]>;
+    forEach(callbackfn: (value: V, key: K, dictionary: UtilsDictionary<K, V>) => void): void;
 }
-export { UtilsDictionary };

package/dist/types/src/GBKEncoder.d.ts

@@ -1,4 +1,4 @@
-declare class GBKEncoder {
+export declare class GBKEncoder {
     #private;
     constructor();
     private handleText;
@@ -14,4 +14,3 @@ declare class GBKEncoder {
      */
     decode(str: string): string;
 }
-export { GBKEncoder };

package/dist/types/src/Hooks.d.ts

@@ -1,4 +1,4 @@
-declare class Hooks {
+export declare class Hooks {
     /**
      * 在Function原型上添加自定义方法.hook和.unhook
      */
@@ -8,4 +8,3 @@ declare class Hooks {
      */
     cleanEnv(): boolean;
 }
-export { Hooks };

package/dist/types/src/Httpx.d.ts

@@ -1,11 +1,11 @@
 import type { HttpxHookErrorData, HttpxRequestOption, HttpxResponse, HttpxResponseData, HttpxPromise, HttpxInitOption } from "./types/Httpx";
-declare class Httpx {
+export declare class Httpx {
     #private;
     private GM_Api;
     private HttpxRequestHook;
     private HttpxResponseHook;
     private HttpxRequestOption;
-    private HttpxCallBack;
+    private HttpxResponseCallBack;
     private HttpxRequest;
     /**
      * 实例化
@@ -70,11 +70,6 @@ declare class Httpx {
      * @param httpRequest 网络请求函数
      */
     setXMLHttpRequest(httpRequest: Function): void;
-    /**
-     * GET 请求
-     * @param url 网址
-     */
-    get<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
     /**
      * GET 请求
      * @param details 配置
@@ -82,26 +77,31 @@ declare class Httpx {
     get<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * GET 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    get<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    get<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * POST 请求
      * @param details 配置
      */
-    post<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * POST 请求
-     * @param url 网址
-     */
-    post<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
+    post<T extends HttpxRequestOption>(details?: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * POST 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    post<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    post<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * HEAD 请求
      * @param details 配置
@@ -109,15 +109,15 @@ declare class Httpx {
     head<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * HEAD 请求
-     * @param url 网址
-     */
-    head<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * HEAD 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    head<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    head<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * OPTIONS 请求
      * @param details 配置
@@ -125,15 +125,15 @@ declare class Httpx {
     options<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * OPTIONS 请求
-     * @param url 网址
-     */
-    options<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * OPTIONS 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    options<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    options<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * DELETE 请求
      * @param details 配置
@@ -141,15 +141,15 @@ declare class Httpx {
     delete<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * DELETE 请求
-     * @param url 网址
-     */
-    delete<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * DELETE 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    delete<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    delete<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * PUT 请求
      * @param details 配置
@@ -157,15 +157,15 @@ declare class Httpx {
     put<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
     /**
      * PUT 请求
-     * @param url 网址
-     */
-    put<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * PUT 请求
-     * @param url 网址
+     * @param url 请求的url
      * @param details 配置
      */
-    put<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    put<T extends Omit<HttpxRequestOption, "url">>(url: string, details?: T): HttpxPromise<HttpxResponse<T & {
+        /**
+         * 请求的url
+         */
+        url: string;
+    }>>;
     /**
      * 发送请求
      * @param details 配置
@@ -173,4 +173,3 @@ declare class Httpx {
      */
     request<T extends HttpxRequestOption>(details: T, beforeRequestOption?: (option: Required<T>) => void): HttpxPromise<HttpxResponse<T>>;
 }
-export { Httpx };

package/dist/types/src/LockFunction.d.ts

@@ -1,4 +1,4 @@
-declare class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
+export declare class LockFunction<K extends (...args: any[]) => any | Promise<any> | void> {
     #private;
     lock: () => void;
     unlock: () => void;
@@ -16,4 +16,3 @@ declare class LockFunction<K extends (...args: any[]) => any | Promise<any> | vo
      */
     constructor(callback: K, context?: any, delayTime?: number);
 }
-export { LockFunction };

package/dist/types/src/Log.d.ts

@@ -1,5 +1,5 @@
 import type { UtilsLogOptions } from "./types/Log";
-declare class Log {
+export declare class Log {
     #private;
     /** 前面的TAG标志 */
     tag: string;
@@ -73,4 +73,3 @@ declare class Log {
     /** 恢复输出 */
     recovery(): void;
 }
-export { Log };

package/dist/types/src/Progress.d.ts

@@ -1,5 +1,5 @@
 import type { ProgressParamConfig } from "./types/Progress";
-declare class Progress {
+export declare class Progress {
     #private;
     /**
      *
@@ -15,4 +15,3 @@ declare class Progress {
      */
     draw(): void;
 }
-export { Progress };

package/dist/types/src/Utils.d.ts

@@ -1763,7 +1763,24 @@ declare class Utils {
      * @param target 待获取的对象
      * @param handler 获取属性的回调
      */
-    queryProperty(target: any, handler: (target: any) => {
+    queryProperty<T extends any = any>(target: any, handler: (target: T) => {
+        /**
+         * 是否是需要的属性
+         * + `true` 将目标值赋值给data
+         * + `false` 不是需要的，data为下一个处理的对象
+         */
+        isFind: boolean;
+        /**
+         * 对象/目标值
+         */
+        data: any;
+    }): any;
+    /**
+     * 异步-深度获取对象属性
+     * @param target 待获取的对象
+     * @param handler 获取属性的回调
+     */
+    asyncQueryProperty<T extends any = any>(target: any, handler: (target: T) => {
         /**
          * 是否是需要的属性
          * + true 将目标值赋值给data
@@ -1774,7 +1791,18 @@ declare class Utils {
          * 对象/目标值
          */
         data: any;
-    }): any;
+    } | Promise<{
+        /**
+         * 是否是需要的属性
+         * + true 将目标值赋值给data
+         * + false 不是需要的，data为下一个处理的对象
+         */
+        isFind: boolean;
+        /**
+         * 对象/目标值
+         */
+        data: any;
+    }>): Promise<Awaited<T>>;
     /**
      * 创建一个新的Utils实例
      * @param option

package/dist/types/src/UtilsGMMenu.d.ts

@@ -1,5 +1,5 @@
 import type { UtilsGMMenuConstructorOptions, UtilsGMMenuOption } from "./types/UtilsGMMenu";
-declare class GMMenu {
+export declare class GMMenu {
     private GM_Api;
     private MenuHandle;
     constructor(details: UtilsGMMenuConstructorOptions);
@@ -118,4 +118,3 @@ declare class GMMenu {
      */
     setLocalStorageKeyName(keyName: string): void;
 }
-export { GMMenu };

package/dist/types/src/WindowApi.d.ts

@@ -1,5 +1,5 @@
 import type { WindowApiOption } from "./types/WindowApi";
-declare class WindowApi {
+export declare class WindowApi {
     /** 默认的配置 */
     private defaultApi;
     /** 使用的配置 */
@@ -11,4 +11,3 @@ declare class WindowApi {
     get self(): Window & typeof globalThis;
     get top(): Window;
 }
-export { WindowApi };

package/dist/types/src/indexedDB.d.ts

@@ -1,4 +1,4 @@
-declare class indexedDB {
+export declare class indexedDB {
     #private;
     /**
      * @param dbName 数据存储名，默认为：default_db
@@ -129,4 +129,3 @@ declare class indexedDB {
         } & Event;
     }>;
 }
-export { indexedDB };

package/dist/types/src/types/Event.d.ts

@@ -40,8 +40,7 @@ declare interface DOMUtils_Frame_Object_Event {
 	scroll: Event;
 	unload: Event;
 }
-declare type DOMUtils_Frame_Object_EventType =
-	keyof DOMUtils_Frame_Object_Event;
+declare type DOMUtils_Frame_Object_EventType = keyof DOMUtils_Frame_Object_Event;
 /**
  * 表单事件
  */