@whitesev/utils 1.1.4 → 1.1.6

package/dist/src/UtilsGMCookie.d.ts

@@ -1,4 +1,4 @@
-declare interface UtilsGMCookieListResult {
+declare interface UtilsGMCookieResult {
     /** 为 window.location.hostname */
     domain: string;
     expirationDate: null;
@@ -26,18 +26,7 @@ declare class UtilsGMCookie {
      * 获取单个cookie
      * @param cookieName cookie名
      */
-    get(cookieName: string): {
-        domain: string;
-        expirationDate: null;
-        hostOnly: boolean;
-        httpOnly: boolean;
-        name: string;
-        path: string;
-        sameSite: string;
-        secure: boolean;
-        session: boolean;
-        value: string;
-    } | undefined;
+    get(cookieName: string): UtilsGMCookieResult | undefined;
     /**
      *  获取多组Cookie
      * @param paramDetails
@@ -45,12 +34,12 @@ declare class UtilsGMCookie {
      * + cookies object[]
      * + error string|undefined
      **/
-    list(paramDetails: Partial<UtilsGMCookieListOptions>, callback?: (data: UtilsGMCookieListResult[], error?: Error) => void): void;
+    list(paramDetails: Partial<UtilsGMCookieListOptions>, callback?: (data: UtilsGMCookieResult[], error?: Error) => void): void;
     /**
      *  获取多组Cookie
      * @param paramDetails
      **/
-    getList(paramDetails: Partial<UtilsGMCookieListOptions>): UtilsGMCookieListResult[];
+    getList(paramDetails: Partial<UtilsGMCookieListOptions>): UtilsGMCookieResult[];
     /**
      * 设置Cookie
      * @param paramDetails

package/package.json

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

package/src/UtilsGMCookie.ts

@@ -1,6 +1,6 @@
 import { Utils } from "./Utils";
 
-declare interface UtilsGMCookieListResult {
+declare interface UtilsGMCookieResult {
 	/** 为 window.location.hostname */
 	domain: string;
 	expirationDate: null;
@@ -62,28 +62,30 @@ class UtilsGMCookie {
 		}
 
 		let cookies = document.cookie.split(";");
-		let findCookie = cookies.find((item) => {
-			item = item.trimStart();
-			let itemName = item.split("=")[0];
-			let itemValue = item.replace(new RegExp("^" + itemName + "="), "");
+		let findValue: UtilsGMCookieResult | undefined = void 0;
+		for (const cookieItem of cookies) {
+			let item = cookieItem.trim();
+			let itemSplit = item.split("=");
+			let itemName = itemSplit[0];
+			itemSplit.splice(0, 1);
+			let itemValue = decodeURIComponent(itemSplit.join(""));
 			if (itemName === cookieName) {
-				return itemValue;
+				findValue = {
+					domain: globalThis.location.hostname,
+					expirationDate: null,
+					hostOnly: true,
+					httpOnly: false,
+					name: cookieName,
+					path: "/",
+					sameSite: "unspecified",
+					secure: true,
+					session: false,
+					value: itemValue,
+				};
+				break;
 			}
-		});
-		if (findCookie) {
-			return {
-				domain: globalThis.location.hostname,
-				expirationDate: null,
-				hostOnly: true,
-				httpOnly: false,
-				name: cookieName,
-				path: "/",
-				sameSite: "unspecified",
-				secure: true,
-				session: false,
-				value: findCookie,
-			};
 		}
+		return findValue;
 	}
 	/**
 	 *  获取多组Cookie
@@ -94,12 +96,12 @@ class UtilsGMCookie {
 	 **/
 	list(
 		paramDetails: Partial<UtilsGMCookieListOptions>,
-		callback?: (data: UtilsGMCookieListResult[], error?: Error) => void
+		callback?: (data: UtilsGMCookieResult[], error?: Error) => void
 	) {
 		if (paramDetails == null) {
 			throw new Error("Utils.GMCookie.list 参数不能为空");
 		}
-		let resultData: UtilsGMCookieListResult[] = [];
+		let resultData: UtilsGMCookieResult[] = [];
 		try {
 			let details: Partial<UtilsGMCookieListOptions> = {
 				url: globalThis.location.href,
@@ -110,9 +112,11 @@ class UtilsGMCookie {
 			details = Utils.assign(details, paramDetails);
 			let cookies = document.cookie.split(";");
 			cookies.forEach((item) => {
-				item = item.trimStart();
-				let itemName = item.split("=")[0];
-				let itemValue = item.replace(new RegExp("^" + itemName + "="), "");
+				item = item.trim();
+				let itemSplit = item.split("=");
+				let itemName = itemSplit[0];
+				itemSplit.splice(0, 1);
+				let itemValue = decodeURIComponent(itemSplit.join(""));
 				let nameRegexp =
 					(details.name as RegExp) instanceof RegExp
 						? details.name
@@ -147,11 +151,11 @@ class UtilsGMCookie {
 	 **/
 	getList(
 		paramDetails: Partial<UtilsGMCookieListOptions>
-	): UtilsGMCookieListResult[] {
+	): UtilsGMCookieResult[] {
 		if (paramDetails == null) {
 			throw new Error("Utils.GMCookie.list 参数不能为空");
 		}
-		let resultData: UtilsGMCookieListResult[] = [];
+		let resultData: UtilsGMCookieResult[] = [];
 		let details: Partial<UtilsGMCookieListOptions> = {
 			url: globalThis.location.href,
 			domain: globalThis.location.hostname,
@@ -161,9 +165,11 @@ class UtilsGMCookie {
 		details = Utils.assign(details, paramDetails);
 		let cookies = document.cookie.split(";");
 		cookies.forEach((item) => {
-			item = item.trimStart();
-			let itemName = item.split("=")[0];
-			let itemValue = item.replace(new RegExp("^" + itemName + "="), "");
+			item = item.trim();
+			let itemSplit = item.split("=");
+			let itemName = itemSplit[0];
+			itemSplit.splice(0, 1);
+			let itemValue = decodeURIComponent(itemSplit.join(""));
 			let nameRegexp =
 				(details.name as RegExp) instanceof RegExp
 					? details.name