@whitesev/utils 2.3.2 → 2.3.4

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

@@ -949,6 +949,26 @@ export declare interface HttpxDetails {
      * 自定义Cookie，可为空
      */
     cookie?: string;
+    /**
+     * TamperMonkey5.2+
+     *
+     * @link https://developer.mozilla.org/zh-CN/docs/Mozilla/Add-ons/WebExtensions/API/cookies#storage_partitioning
+     */
+    cookiePartition?: {
+        /**
+         * 设置顶级站点
+         *
+         * @example
+         * http://*.example.com/
+         *
+         * @example
+         * http://www.example.com/
+         *
+         * @example
+         * *://*.example.com/
+         */
+        topLevelSite?: string;
+    };
     /**
      * 以二进制模式发送数据字符串，可为空
      */
@@ -1206,68 +1226,98 @@ declare class Httpx {
     /**
      * GET 请求
      * @param url 网址
+     */
+    get(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * GET 请求
      * @param details 配置
      */
-    get<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    get(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * GET 请求
+     * @param url 网址
      * @param details 配置
      */
-    get<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    get(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * POST 请求
      * @param details 配置
      */
-    post<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    post(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * POST 请求
+     * @param url 网址
+     */
+    post(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * POST 请求
      * @param url 网址
      * @param details 配置
      */
-    post<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    post(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * HEAD 请求
      * @param details 配置
      */
-    head<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    head(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * HEAD 请求
+     * @param url 网址
+     */
+    head(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * HEAD 请求
      * @param url 网址
      * @param details 配置
      */
-    head<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    head(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * OPTIONS 请求
      * @param details 配置
      */
-    options<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    options(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * OPTIONS 请求
+     * @param url 网址
+     */
+    options(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * OPTIONS 请求
      * @param url 网址
      * @param details 配置
      */
-    options<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    options(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * DELETE 请求
      * @param details 配置
      */
-    delete<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    delete(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * DELETE 请求
+     * @param url 网址
+     */
+    delete(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * DELETE 请求
      * @param url 网址
      * @param details 配置
      */
-    delete<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    delete(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * PUT 请求
      * @param details 配置
      */
-    put<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    put(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * PUT 请求
+     * @param url 网址
+     */
+    put(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * PUT 请求
      * @param url 网址
      * @param details 配置
      */
-    put<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    put(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 }
 export { Httpx };

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

@@ -1,20 +1,20 @@
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
-    /** 是否输出Tag，false的话其它的颜色也不输出，默认为true */
+    /** 是否输出Tag，false的话其它的颜色也不输出 @default true */
     tag: boolean;
-    /** log.success的颜色，默认#0000FF */
+    /** log.success的颜色 @default "#0000FF" */
     successColor: string;
-    /** log.warn的颜色，默认0 */
+    /** log.warn的颜色 @default "0" */
     warnColor: string;
-    /** log.error的颜色，默认#FF0000 */
+    /** log.error的颜色 @default "#FF0000" */
     errorColor: string;
-    /** log.info的颜色，默认0 */
+    /** log.info的颜色 @default "0" */
     infoColor: string;
-    /** 是否开启debug模式，true会在控制台每次调用时输出调用函数的所在位置，false不会输出位置，默认false */
+    /** 是否开启debug模式，true会在控制台每次调用时输出调用函数的所在位置，false不会输出位置 @default false */
     debug: boolean;
-    /** 当console输出超过logMaxCount数量自动清理控制台，默认false */
+    /** 当console输出超过logMaxCount数量自动清理控制台 @default false */
     autoClearConsole: boolean;
-    /** console输出的最高数量，autoClearConsole开启则生效，默认999 */
+    /** console输出的最高数量，autoClearConsole开启则生效 @default 999 */
     logMaxCount: number;
 }
 declare class Log {
@@ -22,10 +22,10 @@ declare class Log {
     /** 前面的TAG标志 */
     tag: string;
     /**
-     * @param _GM_info_ 油猴管理器的API GM_info，或者是一个对象，如{"script":{name:"Utils.Log"}}，或者直接是一个字符串
+     * @param __GM_info 油猴管理器的API GM_info，或者是一个对象，如{"script":{name:"Utils.Log"}}，或者直接是一个字符串，用作tag名
      * @param console 可指定console对象为unsafeWindow下的console或者是油猴window下的console
      */
-    constructor(_GM_info_?: {
+    constructor(__GM_info?: {
         script: {
             name: string;
         };
@@ -48,41 +48,39 @@ declare class Log {
     private printContent;
     /**
      * 控制台-普通输出
-     * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-     * @param color 输出的颜色
-     * @param otherStyle 其它CSS
+     * @param args 需要输出的内容
+     * @example
+     * log.info("输出信息","输出信息2","输出信息3","输出")
      */
-    info(msg: any, color?: string, otherStyle?: string): void;
+    info(...args: any[]): void;
     /**
      * 控制台-警告输出
-     * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-     * @param color 输出的颜色
-     * @param otherStyle 其它CSS
+     * @param args 需要输出的内容
+     * @example
+     * log.warn("输出警告","输出警告2","输出警告3","输出警告4")
      */
-    warn(msg: any, color?: string, otherStyle?: string): void;
+    warn(...args: any[]): void;
     /**
      * 控制台-错误输出
-     * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-     * @param color 输出的颜色
-     * @param otherStyle 其它CSS
+     * @param args 需要输出的内容
+     * @example
+     * log.error("输出错误","输出错误2","输出错误3","输出错误4")
      */
-    error(msg: any, color?: string, otherStyle?: string): void;
+    error(...args: any[]): void;
     /**
      * 控制台-成功输出
-     * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-     * @param color 输出的颜色
-     * @param otherStyle 其它CSS
+     * @param args 需要输出的内容
+     * @example
+     * log.success("输出成功")
      */
-    success(msg: any, color?: string, otherStyle?: string): void;
+    success(...args: any[]): void;
     /**
      * 控制台-输出表格
-     * @param msg
-     * @param color 输出的颜色
-     * @param otherStyle 其它CSS
+     * @param msg 需要输出的内容
      * @example
      * log.table([{"名字":"example","值":"123"},{"名字":"example2","值":"345"}])
      */
-    table(msg: any[], color?: string, otherStyle?: string): void;
+    table(msg: any[]): void;
     /**
      * 配置Log对象的颜色
      * @param paramDetails 配置信息

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

@@ -23,7 +23,7 @@ export declare interface Vue2Object {
     $data: any;
     $isServer: boolean;
     $props: any;
-    $route: any & {
+    $route: {
         fullPath: string;
         hash: string;
         matched: any[];
@@ -33,13 +33,13 @@ export declare interface Vue2Object {
         path: string;
         query: any;
     };
-    $router: any & {
+    $router: {
         afterHooks: Function[];
         app: Vue2Object;
         apps: Vue2Object[];
         beforeHooks: Function[];
         fallback: boolean;
-        history: any & {
+        history: {
             base: string;
             current: any;
             listeners: any[];
@@ -66,7 +66,7 @@ export declare interface Vue2Object {
              */
             replace: (to: string, data?: any) => void;
         };
-        matcher: any & {
+        matcher: {
             addRoute: (...args: any[]) => any;
             addRoutes: (...args: any[]) => any;
             getRoutes: () => any;

package/package.json

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

package/src/Httpx.ts

@@ -1047,6 +1047,26 @@ export declare interface HttpxDetails {
 	 * 自定义Cookie，可为空
 	 */
 	cookie?: string;
+	/**
+	 * TamperMonkey5.2+
+	 *
+	 * @link https://developer.mozilla.org/zh-CN/docs/Mozilla/Add-ons/WebExtensions/API/cookies#storage_partitioning
+	 */
+	cookiePartition?: {
+		/**
+		 * 设置顶级站点
+		 *
+		 * @example
+		 * http://*.example.com/
+		 *
+		 * @example
+		 * http://www.example.com/
+		 *
+		 * @example
+		 * *://*.example.com/
+		 */
+		topLevelSite?: string;
+	};
 	/**
 	 * 以二进制模式发送数据字符串，可为空
 	 */
@@ -1509,6 +1529,9 @@ class Httpx {
 				data: details.data || this.context.#defaultDetails.data,
 				redirect: details.redirect || this.context.#defaultDetails.redirect,
 				cookie: details.cookie || this.context.#defaultDetails.cookie,
+				cookiePartition:
+					details.cookiePartition ||
+					this.context.#defaultDetails.cookiePartition,
 				binary: details.binary || this.context.#defaultDetails.binary,
 				nocache: details.nocache || this.context.#defaultDetails.nocache,
 				revalidate:
@@ -1661,6 +1684,20 @@ class Httpx {
 			} else {
 				(result as any).fetchInit = details.fetchInit;
 			}
+
+			// 处理新的cookiePartition
+			if (
+				typeof result.cookiePartition === "object" &&
+				result.cookiePartition != null
+			) {
+				if (
+					Reflect.has(result.cookiePartition, "topLevelSite") &&
+					typeof result.cookiePartition.topLevelSite !== "string"
+				) {
+					// topLevelSite必须是字符串
+					Reflect.deleteProperty(result.cookiePartition, "topLevelSite");
+				}
+			}
 			return result;
 		},
 		/**
@@ -2220,6 +2257,7 @@ class Httpx {
 		data: void 0,
 		redirect: void 0,
 		cookie: void 0,
+		cookiePartition: void 0,
 		binary: void 0,
 		nocache: void 0,
 		revalidate: void 0,
@@ -2362,26 +2400,33 @@ class Httpx {
 	/**
 	 * GET 请求
 	 * @param url 网址
+	 */
+	async get(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * GET 请求
 	 * @param details 配置
 	 */
-	async get<T extends HttpxDetails>(
-		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async get(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * GET 请求
+	 * @param url 网址
 	 * @param details 配置
 	 */
-	async get<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async get(
+		url: string,
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * GET 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
 	async get(
-		...args: (HttpxDetails | string)[] // @ts-ignore
+		...args: (string | HttpxDetails)[] // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<HttpxDetails>> {
 		let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
 		let abortFn: Function | null = null;
@@ -2420,18 +2465,24 @@ class Httpx {
 	 * POST 请求
 	 * @param details 配置
 	 */
-	async post<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async post(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * POST 请求
+	 * @param url 网址
+	 */
+	// @ts-ignore
+	async post(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * POST 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async post<T extends HttpxDetails>(
+	async post(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * POST 请求
 	 */
@@ -2474,18 +2525,25 @@ class Httpx {
 	 * HEAD 请求
 	 * @param details 配置
 	 */
-	async head<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async head(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * HEAD 请求
+	 * @param url 网址
+	 */
+	async head(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * HEAD 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async head<T extends HttpxDetails>(
+	async head(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * HEAD 请求
 	 */
@@ -2533,18 +2591,25 @@ class Httpx {
 	 * OPTIONS 请求
 	 * @param details 配置
 	 */
-	options<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	options(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * OPTIONS 请求
+	 * @param url 网址
+	 */
+	options(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * OPTIONS 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	options<T extends HttpxDetails>(
+	options(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * OPTIONS 请求
 	 */
@@ -2589,18 +2654,25 @@ class Httpx {
 	 * DELETE 请求
 	 * @param details 配置
 	 */
-	async delete<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async delete(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * DELETE 请求
+	 * @param url 网址
+	 */
+	async delete(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * DELETE 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async delete<T extends HttpxDetails>(
+	async delete(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * DELETE 请求
 	 */
@@ -2646,18 +2718,25 @@ class Httpx {
 	 * PUT 请求
 	 * @param details 配置
 	 */
-	async put<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async put(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * PUT 请求
+	 * @param url 网址
+	 */
+	async put(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * PUT 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async put<T extends HttpxDetails>(
+	async put(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * PUT 请求
 	 */