@whitesev/utils 2.3.2 → 2.3.4

package/dist/index.system.js

@@ -1758,6 +1758,8 @@ System.register('Utils', [], (function (exports) {
                             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: details.revalidate || this.context.#defaultDetails.revalidate,
@@ -1859,6 +1861,15 @@ System.register('Utils', [], (function (exports) {
                         else {
                             result.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;
                     },
                     /**
@@ -2348,6 +2359,7 @@ System.register('Utils', [], (function (exports) {
                     data: void 0,
                     redirect: void 0,
                     cookie: void 0,
+                    cookiePartition: void 0,
                     binary: void 0,
                     nocache: void 0,
                     revalidate: void 0,
@@ -3107,6 +3119,9 @@ System.register('Utils', [], (function (exports) {
                     autoClearConsole: false,
                     logMaxCount: 999,
                 };
+                /**
+                 * 颜色配置
+                 */
                 #msgColorDetails = [
                     "font-weight: bold; color: cornflowerblue",
                     "font-weight: bold; color: cornflowerblue",
@@ -3114,16 +3129,16 @@ System.register('Utils', [], (function (exports) {
                     "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"}}，或者直接是一个字符串，用作tag名
                  * @param console 可指定console对象为unsafeWindow下的console或者是油猴window下的console
                  */
-                constructor(_GM_info_, console = window.console) {
-                    if (typeof _GM_info_ === "string") {
-                        this.tag = _GM_info_;
+                constructor(__GM_info, console = window.console) {
+                    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;
+                    else if (typeof __GM_info === "object" &&
+                        typeof __GM_info?.script?.name === "string") {
+                        this.tag = __GM_info.script.name;
                     }
                     this.#console = console;
                 }
@@ -3198,24 +3213,33 @@ System.register('Utils', [], (function (exports) {
                     let { name: callerName, position: callerPosition } = this.parseErrorStack(stackSplit);
                     let tagName = this.tag;
                     let that = this;
-                    function consoleMsg(_msg_) {
-                        if (typeof _msg_ === "string") {
-                            that.#console.log(`%c[${tagName}%c-%c${callerName}%c]%c %s`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, _msg_);
+                    /** tag的html输出格式 */
+                    let tagNameHTML = `%c[${tagName}%c`;
+                    /** 调用的函数名的html输出格式 */
+                    let callerNameHTML = `%c${callerName}%c]%c`;
+                    callerName.trim() !== "" && (callerNameHTML = "-" + callerNameHTML);
+                    /**
+                     * 输出消息到控制台
+                     * @param message
+                     */
+                    function consoleMsg(message) {
+                        if (typeof message === "string") {
+                            that.#console.log(`${tagNameHTML}${callerNameHTML} %s`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, message);
                         }
-                        else if (typeof _msg_ === "number") {
-                            that.#console.log(`%c[${tagName}%c-%c${callerName}%c]%c %d`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, _msg_);
+                        else if (typeof message === "number") {
+                            that.#console.log(`${tagNameHTML}${callerNameHTML} %d`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, message);
                         }
-                        else if (typeof _msg_ === "object") {
-                            that.#console.log(`%c[${tagName}%c-%c${callerName}%c]%c %o`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, _msg_);
+                        else if (typeof message === "object") {
+                            that.#console.log(`${tagNameHTML}${callerNameHTML} %o`, ...that.#msgColorDetails, `color: ${color};${otherStyle}`, message);
                         }
                         else {
-                            that.#console.log(_msg_);
+                            that.#console.log(message);
                         }
                     }
                     if (Array.isArray(msg)) {
-                        msg.forEach((item) => {
-                            consoleMsg(item);
-                        });
+                        for (let index = 0; index < msg.length; index++) {
+                            consoleMsg(msg[index]);
+                        }
                     }
                     else {
                         consoleMsg(msg);
@@ -3227,67 +3251,67 @@ System.register('Utils', [], (function (exports) {
                 }
                 /**
                  * 控制台-普通输出
-                 * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-                 * @param color 输出的颜色
-                 * @param otherStyle 其它CSS
+                 * @param args 需要输出的内容
+                 * @example
+                 * log.info("输出信息","输出信息2","输出信息3","输出")
                  */
-                info(msg, color = this.#details.infoColor, otherStyle) {
+                info(...args) {
                     if (this.#disable)
                         return;
-                    this.printContent.call(this, msg, color, otherStyle);
+                    this.printContent(args, this.#details.infoColor);
                 }
                 /**
                  * 控制台-警告输出
-                 * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-                 * @param color 输出的颜色
-                 * @param otherStyle 其它CSS
+                 * @param args 需要输出的内容
+                 * @example
+                 * log.warn("输出警告","输出警告2","输出警告3","输出警告4")
                  */
-                warn(msg, color = this.#details.warnColor, otherStyle = "background: #FEF6D5;padding: 4px 6px 4px 0px;") {
+                warn(...args) {
                     if (this.#disable)
                         return;
-                    this.printContent.call(this, msg, color, otherStyle);
+                    this.printContent(args, this.#details.warnColor, "background: #FEF6D5;padding: 4px 6px 4px 0px;");
                 }
                 /**
                  * 控制台-错误输出
-                 * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-                 * @param color 输出的颜色
-                 * @param otherStyle 其它CSS
+                 * @param args 需要输出的内容
+                 * @example
+                 * log.error("输出错误","输出错误2","输出错误3","输出错误4")
                  */
-                error(msg, color = this.#details.errorColor, otherStyle) {
+                error(...args) {
                     if (this.#disable)
                         return;
-                    this.printContent.call(this, msg, color, otherStyle);
+                    this.printContent(args, this.#details.errorColor);
                 }
                 /**
                  * 控制台-成功输出
-                 * @param msg 需要输出的内容，如果想输出多个，修改成数组，且数组内的长度最大值为4个
-                 * @param color 输出的颜色
-                 * @param otherStyle 其它CSS
+                 * @param args 需要输出的内容
+                 * @example
+                 * log.success("输出成功")
                  */
-                success(msg, color = this.#details.successColor, otherStyle) {
+                success(...args) {
                     if (this.#disable)
                         return;
-                    this.printContent.call(this, msg, color, otherStyle);
+                    this.printContent(args, this.#details.successColor);
                 }
                 /**
                  * 控制台-输出表格
-                 * @param msg
-                 * @param color 输出的颜色
-                 * @param otherStyle 其它CSS
+                 * @param msg 需要输出的内容
                  * @example
                  * log.table([{"名字":"example","值":"123"},{"名字":"example2","值":"345"}])
                  */
-                table(msg, color = this.#details.infoColor, otherStyle = "") {
+                table(msg) {
                     if (this.#disable)
                         return;
                     this.checkClearConsole();
                     let stack = new Error().stack.split("\n");
                     stack.splice(0, 1);
                     let errorStackParse = this.parseErrorStack(stack);
+                    /** 堆栈函数名 */
                     let stackFunctionName = errorStackParse.name;
+                    /** 堆栈位置 */
                     let stackFunctionNamePosition = errorStackParse.position;
                     let callerName = stackFunctionName;
-                    this.#console.log(`%c[${this.tag}%c-%c${callerName}%c]%c`, ...this.#msgColorDetails, `color: ${color};${otherStyle}`);
+                    this.#console.log(`%c[${this.tag}%c-%c${callerName}%c]%c`, ...this.#msgColorDetails, `color: ${this.#details.infoColor};`);
                     this.#console.table(msg);
                     if (this.#details.debug) {
                         this.#console.log(stackFunctionNamePosition);
@@ -3931,7 +3955,7 @@ System.register('Utils', [], (function (exports) {
                     this.windowApi = new WindowApi(option);
                 }
                 /** 版本号 */
-                version = "2024.9.10";
+                version = "2024.9.28";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");