@whitesev/utils 2.0.1 → 2.1.0

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

@@ -10,9 +10,9 @@ import { Log } from "./Log";
 import { Progress } from "./Progress";
 import { UtilsDictionary } from "./Dictionary";
 import type { DOMUtils_EventType } from "./Event";
-import type { UtilsCoreOption } from "./UtilsCore";
 import type { Vue2Object } from "./VueObject";
 import type { UtilsAjaxHookResult } from "./AjaxHookerType";
+import { type UtilsWindowApiOption } from "./UtilsWindowApi";
 export declare var unsafeWindow: Window & typeof globalThis;
 export type JSTypeMap = {
     string: string;
@@ -38,7 +38,8 @@ export declare interface AnyObject {
 export declare interface Vue2Context extends Vue2Object {
 }
 declare class Utils {
-    constructor(option?: UtilsCoreOption);
+    private windowApi;
+    constructor(option?: UtilsWindowApiOption);
     /** 版本号 */
     version: string;
     /**
@@ -1099,7 +1100,7 @@ declare class Utils {
      * let utils = Utils.noConflict();
      * > ...
      */
-    noConflict: () => Utils;
+    noConflict(): Utils;
     /**
      * 恢复/释放该对象内的为function，让它无效/有效
      * @param needReleaseObject 需要操作的对象
@@ -1730,7 +1731,7 @@ declare class Utils {
      * @param option
      * @returns
      */
-    createUtils(option?: UtilsCoreOption): Utils;
+    createUtils(option?: UtilsWindowApiOption): Utils;
     /**
      * 将对象转换为FormData
      * @param data 待转换的对象

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

@@ -45,7 +45,13 @@ declare interface UtilsGMCookieDeleteOptions {
     /** 需要检索的Cookie的名字 */
     name: string;
 }
+interface WindowApiOption {
+    window: Window & typeof globalThis;
+    document: Document;
+}
 declare class UtilsGMCookie {
+    private windowApi;
+    constructor(windowApiOption?: WindowApiOption);
     /**
      * 获取单个cookie
      * @param cookieName cookie名

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

@@ -0,0 +1,22 @@
+/**
+ * 配置类型
+ */
+export type UtilsWindowApiOption = {
+    document: Document;
+    window: Window & typeof globalThis;
+    globalThis: typeof globalThis | Window;
+    self: Window & typeof globalThis;
+    top: Window;
+};
+export declare class UtilsWindowApi {
+    /** 默认的配置 */
+    private defaultApi;
+    /** 使用的配置 */
+    private api;
+    constructor(option?: UtilsWindowApiOption);
+    get document(): Document;
+    get window(): Window & typeof globalThis;
+    get globalThis(): typeof globalThis | Window;
+    get self(): Window & typeof globalThis;
+    get top(): Window;
+}

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

@@ -0,0 +1 @@
+declare var GM_xmlhttpRequest: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/utils",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -8,6 +8,7 @@
   "jsdelivr": "dist/index.umd.js",
   "exports": {
     "./package.json": "./package.json",
+    "./dist/*": "./dist/*",
     ".": {
       "import": "./dist/index.esm.js",
       "require": "./dist/index.cjs.js",

package/src/Httpx.ts

@@ -1,6 +1,5 @@
 import { AnyObject, Utils } from "./Utils";
 import { GenerateUUID } from "./UtilsCommon";
-import { UtilsCore } from "./UtilsCore";
 
 /**
  * 状态码
@@ -1681,12 +1680,11 @@ class Httpx {
 				new URL(details.url);
 			} catch (error) {
 				if (details.url.startsWith("//")) {
-					details.url = UtilsCore.globalThis.location.protocol + details.url;
+					details.url = window.location.protocol + details.url;
 				} else if (details.url.startsWith("/")) {
-					details.url = UtilsCore.globalThis.location.origin + details.url;
+					details.url = window.location.origin + details.url;
 				} else {
-					details.url =
-						UtilsCore.globalThis.location.origin + "/" + details.url;
+					details.url = window.location.origin + "/" + details.url;
 				}
 			}
 			return details;

package/src/Log.ts

@@ -1,5 +1,4 @@
 import type { AnyObject } from "./Utils";
-import { UtilsCore } from "./UtilsCore";
 
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
@@ -59,7 +58,7 @@ class Log {
 					};
 			  }
 			| string,
-		console: Console = UtilsCore.window.console
+		console: Console = window.console
 	) {
 		if (typeof _GM_info_ === "string") {
 			this.tag = _GM_info_;

package/src/Progress.ts

@@ -1,5 +1,4 @@
 import { Utils } from "./Utils";
-import { UtilsCore } from "./UtilsCore";
 
 declare interface ProgressParamConfig {
 	/** canvas元素节点 */
@@ -91,17 +90,12 @@ class Progress {
 		/* 元素高度 */
 		this.#height = this.#config.canvasNode.height;
 		/* 清除锯齿 */
-		if (UtilsCore.window.devicePixelRatio) {
+		if (window.devicePixelRatio) {
 			this.#config.canvasNode.style.width = this.#width + "px";
 			this.#config.canvasNode.style.height = this.#height + "px";
-			this.#config.canvasNode.height =
-				this.#height * UtilsCore.window.devicePixelRatio;
-			this.#config.canvasNode.width =
-				this.#width * UtilsCore.window.devicePixelRatio;
-			this.#ctx.scale(
-				UtilsCore.window.devicePixelRatio,
-				UtilsCore.window.devicePixelRatio
-			);
+			this.#config.canvasNode.height = this.#height * window.devicePixelRatio;
+			this.#config.canvasNode.width = this.#width * window.devicePixelRatio;
+			this.#ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
 		}
 		/* 设置线宽 */
 		this.#ctx.lineWidth = this.#config.lineWidth;