@whitesev/utils 2.6.2 → 2.6.4

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

@@ -2,6 +2,10 @@ import type { UtilsGMCookieDeleteOptions, UtilsGMCookieListOptions, UtilsGMCooki
 export declare class UtilsGMCookie {
     private windowApi;
     constructor(windowApiOption?: WindowApiOption);
+    /**
+     * 获取Cookie分组
+     */
+    private getCookiesList;
     /**
      * 获取单个cookie
      * @param cookieName cookie名

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

@@ -41,7 +41,8 @@ export interface UtilsGMCookieSetOptions {
 	url?: string;
 	/**
 	 * Cookie所在域
-	 * @default window.location.hostname
+	 *
+	 * 不填的话会默认在window.location.hostname的前面加上.
 	 */
 	domain?: string;
 	/** 需要检索的Cookie的名字 */
@@ -82,7 +83,6 @@ export interface UtilsGMCookieDeleteOptions {
 	path?: string;
 	/**
 	 * Cookie所在域
-	 * @default window.location.hostname
 	 */
 	firstPartyDomain?: string;
 }

package/package.json

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

package/src/Utils.ts

@@ -31,7 +31,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2025.3.24";
+	version = "2025.3.25";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个

package/src/UtilsGMCookie.ts

@@ -17,6 +17,15 @@ export class UtilsGMCookie {
 			this.windowApi = Object.assign({}, windowApiOption);
 		}
 	}
+	/**
+	 * 获取Cookie分组
+	 */
+	private getCookiesList() {
+		if (this.windowApi.document.cookie.trim() === "") {
+			return [];
+		}
+		return this.windowApi.document.cookie.split(";");
+	}
 	/**
 	 * 获取单个cookie
 	 * @param cookieName cookie名
@@ -25,8 +34,7 @@ export class UtilsGMCookie {
 		if (typeof cookieName !== "string") {
 			throw new TypeError("Utils.GMCookie.get 参数cookieName 必须为字符串");
 		}
-
-		let cookies = this.windowApi.document.cookie.split(";");
+		let cookies = this.getCookiesList();
 		let findValue: UtilsGMCookieResult | undefined = void 0;
 		for (const cookieItem of cookies) {
 			let item = cookieItem.trim();
@@ -75,7 +83,7 @@ export class UtilsGMCookie {
 				path: "/",
 			};
 			defaultOption = Utils.assign(defaultOption, option);
-			let cookies = this.windowApi.document.cookie.split(";");
+			let cookies = this.getCookiesList();
 			cookies.forEach((item) => {
 				item = item.trim();
 				let itemSplit = item.split("=");
@@ -126,7 +134,7 @@ export class UtilsGMCookie {
 			path: "/",
 		};
 		defaultOption = Utils.assign(defaultOption, option);
-		let cookies = this.windowApi.document.cookie.split(";");
+		let cookies = this.getCookiesList();
 		cookies.forEach((item) => {
 			item = item.trim();
 			let itemSplit = item.split("=");
@@ -166,7 +174,7 @@ export class UtilsGMCookie {
 				url: this.windowApi.window.location.href,
 				name: "",
 				value: "",
-				domain: this.windowApi.window.location.hostname,
+				domain: "",
 				path: "/",
 				secure: true,
 				httpOnly: false,
@@ -186,6 +194,9 @@ export class UtilsGMCookie {
 				";expires=" +
 				(new Date(life) as any).toGMTString() +
 				"; path=/";
+			if (Utils.isNotNull(defaultOption.domain)) {
+				cookieStr += "; domain=" + defaultOption.domain;
+			}
 			this.windowApi.document.cookie = cookieStr;
 		} catch (error: any) {
 			errorInfo = error;
@@ -210,10 +221,13 @@ export class UtilsGMCookie {
 				url: this.windowApi.window.location.href,
 				name: "",
 				path: "/",
-				firstPartyDomain: this.windowApi.window.location.hostname,
+				firstPartyDomain: "",
 			};
 			defaultOption = Utils.assign(defaultOption, option);
-			let cookieStr = `${defaultOption.name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=${defaultOption.path}; domain=${defaultOption.firstPartyDomain};`;
+			let cookieStr = `${defaultOption.name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=${defaultOption.path}`;
+			if (Utils.isNotNull(defaultOption.firstPartyDomain)) {
+				cookieStr += `; domain=${defaultOption.firstPartyDomain};`;
+			}
 			this.windowApi.document.cookie = cookieStr;
 		} catch (error: any) {
 			errorInfo = error;
@@ -229,6 +243,9 @@ export class UtilsGMCookie {
 	 * @param cookieStr
 	 */
 	parseCookie(cookieStr: string) {
+		if (cookieStr.trim() === "") {
+			return [];
+		}
 		let cookies = cookieStr.split(";");
 		let result: { key: string; value: string }[] = [];
 		for (const cookieItem of cookies) {

package/src/types/UtilsGMCookie.d.ts

@@ -41,7 +41,8 @@ export interface UtilsGMCookieSetOptions {
 	url?: string;
 	/**
 	 * Cookie所在域
-	 * @default window.location.hostname
+	 *
+	 * 不填的话会默认在window.location.hostname的前面加上.
 	 */
 	domain?: string;
 	/** 需要检索的Cookie的名字 */
@@ -82,7 +83,6 @@ export interface UtilsGMCookieDeleteOptions {
 	path?: string;
 	/**
 	 * Cookie所在域
-	 * @default window.location.hostname
 	 */
 	firstPartyDomain?: string;
 }