@xfe-repo/web-utils 1.0.5 → 1.0.7

package/dist/storage.d.mts

@@ -0,0 +1,9 @@
+import cookie from 'js-cookie';
+import queryString, { ParseOptions, ParsedQuery } from 'query-string';
+
+declare const cookies: cookie.CookiesStatic<string>;
+declare function parseUrlQuery(options?: ParseOptions): queryString.ParsedQuery<string>;
+declare function getUrlQuery(key: string): string | (string | null)[] | null | undefined;
+declare function setUrlQuery(queryJson: ParsedQuery<string | boolean | number>): void;
+
+export { cookies, getUrlQuery, parseUrlQuery, setUrlQuery };

package/dist/storage.d.ts

@@ -0,0 +1,9 @@
+import cookie from 'js-cookie';
+import queryString, { ParseOptions, ParsedQuery } from 'query-string';
+
+declare const cookies: cookie.CookiesStatic<string>;
+declare function parseUrlQuery(options?: ParseOptions): queryString.ParsedQuery<string>;
+declare function getUrlQuery(key: string): string | (string | null)[] | null | undefined;
+declare function setUrlQuery(queryJson: ParsedQuery<string | boolean | number>): void;
+
+export { cookies, getUrlQuery, parseUrlQuery, setUrlQuery };

package/dist/{token.js → storage.js}

@@ -27,18 +27,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/token.ts
-var token_exports = {};
-__export(token_exports, {
+// src/storage.ts
+var storage_exports = {};
+__export(storage_exports, {
   cookies: () => cookies,
-  getFingerPrint: () => getFingerPrint,
   getUrlQuery: () => getUrlQuery,
   parseUrlQuery: () => parseUrlQuery,
-  setUrlQuery: () => setUrlQuery,
-  uuid: () => uuid
+  setUrlQuery: () => setUrlQuery
 });
-module.exports = __toCommonJS(token_exports);
+module.exports = __toCommonJS(storage_exports);
 var import_js_cookie = __toESM(require("js-cookie"));
+var import_query_string = __toESM(require("query-string"));
 var cookies = import_js_cookie.default.withConverter({
   read(value) {
     return value;
@@ -47,68 +46,27 @@ var cookies = import_js_cookie.default.withConverter({
     return encodeURIComponent(`${value}`);
   }
 });
-function uuid() {
-  let s = [];
-  let hexDigits = "0123456789abcdef";
-  for (let i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 16), 1);
-  }
-  s[14] = "4";
-  s[19] = hexDigits.substr(s[19] & 3 | 8, 1);
-  s[8] = s[13] = s[18] = s[23] = "-";
-  return s.join("");
-}
-function getFingerPrint() {
-  let fp = import_js_cookie.default.get("fp");
-  if (!fp) {
-    fp = uuid();
-    import_js_cookie.default.set("fp", fp, {
-      expires: 3650
-    });
-  }
-  return fp;
-}
-function parseUrlQuery() {
+function parseUrlQuery(options) {
   let { search, hash } = window.location;
-  const queryJson = {};
   if (!search && hash.indexOf("?") !== -1) {
     search = `?${hash.split("?")[1]}`;
   }
-  let query = search.match(/([?&])[^&]+/gi);
-  if (query) {
-    query.forEach((str) => {
-      let arr;
-      str = str.substring(1);
-      str = str.replace(/=/, "==");
-      arr = str.split("==");
-      queryJson[arr[0] || ""] = arr[1] ? decodeURIComponent(arr[1]) : "";
-    });
-  }
-  return queryJson;
+  return import_query_string.default.parse(search, options);
 }
 function getUrlQuery(key) {
-  const queryJson = parseUrlQuery();
+  const queryJson = parseUrlQuery({ parseBooleans: true, parseNumbers: true });
   return queryJson[key];
 }
-function setUrlQuery(key, value, isDelete) {
-  const queryJson = parseUrlQuery();
+function setUrlQuery(queryJson) {
   let { hash, origin, pathname } = window.location;
-  if (isDelete) {
-    delete queryJson[key];
-  } else {
-    queryJson[key] = String(value);
-  }
-  let newSearch = Object.entries(queryJson).map(([key2, value2]) => `${key2}=${value2}`).join("&");
-  if (newSearch)
-    newSearch = `?${newSearch}`;
-  window.history.replaceState({}, "", origin + pathname + newSearch + hash.split("?")[0]);
+  const search = import_query_string.default.stringify(queryJson, { skipNull: true, skipEmptyString: true });
+  const url = `${origin}${pathname}${search ? `?${search}` : ""}${hash.split("?")[0]}`;
+  window.history.replaceState({}, "", url);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cookies,
-  getFingerPrint,
   getUrlQuery,
   parseUrlQuery,
-  setUrlQuery,
-  uuid
+  setUrlQuery
 });

package/dist/storage.mjs

@@ -0,0 +1,36 @@
+import "./chunk-6BSPRPK2.mjs";
+
+// src/storage.ts
+import cookie from "js-cookie";
+import queryString from "query-string";
+var cookies = cookie.withConverter({
+  read(value) {
+    return value;
+  },
+  write(value) {
+    return encodeURIComponent(`${value}`);
+  }
+});
+function parseUrlQuery(options) {
+  let { search, hash } = window.location;
+  if (!search && hash.indexOf("?") !== -1) {
+    search = `?${hash.split("?")[1]}`;
+  }
+  return queryString.parse(search, options);
+}
+function getUrlQuery(key) {
+  const queryJson = parseUrlQuery({ parseBooleans: true, parseNumbers: true });
+  return queryJson[key];
+}
+function setUrlQuery(queryJson) {
+  let { hash, origin, pathname } = window.location;
+  const search = queryString.stringify(queryJson, { skipNull: true, skipEmptyString: true });
+  const url = `${origin}${pathname}${search ? `?${search}` : ""}${hash.split("?")[0]}`;
+  window.history.replaceState({}, "", url);
+}
+export {
+  cookies,
+  getUrlQuery,
+  parseUrlQuery,
+  setUrlQuery
+};

package/dist/tools.d.mts

@@ -11,6 +11,7 @@ declare const throttle: (delay: number, callback: any) => {
 };
 declare const widthThrottle: (delay: number) => (target: any, _name: string, descriptor: PropertyDescriptor) => void;
 declare const debounce: <T extends (...args: any) => any>(delay: number, callback: T) => T;
+declare function uuid(): string;
 declare const imgRelative2Absolute: (imgUrl?: string) => string;
 declare const resizeAliYun: (imgUrl?: string, width?: number | null, quality?: number) => string;
 type FieldsWithoutArray<FS extends Record<string, any>> = {
@@ -40,4 +41,4 @@ declare const combobox2Options: <CB extends Record<string, (ComboBox<number> | C
     optionsMap: OptionsMapType<keyof CB>;
 };
 
-export { type ComboBox, type OptionsMapType, type OptionsRecordType, type OptionsType, combobox2Options, debounce, delayHandle, fieldsArrayToString, fieldsReset, formatterPrice, formatterTax, getBase64, getObjectURL, imgRelative2Absolute, mockSkeletons, resizeAliYun, throttle, widthThrottle };
+export { type ComboBox, type OptionsMapType, type OptionsRecordType, type OptionsType, combobox2Options, debounce, delayHandle, fieldsArrayToString, fieldsReset, formatterPrice, formatterTax, getBase64, getObjectURL, imgRelative2Absolute, mockSkeletons, resizeAliYun, throttle, uuid, widthThrottle };

package/dist/tools.d.ts

@@ -11,6 +11,7 @@ declare const throttle: (delay: number, callback: any) => {
 };
 declare const widthThrottle: (delay: number) => (target: any, _name: string, descriptor: PropertyDescriptor) => void;
 declare const debounce: <T extends (...args: any) => any>(delay: number, callback: T) => T;
+declare function uuid(): string;
 declare const imgRelative2Absolute: (imgUrl?: string) => string;
 declare const resizeAliYun: (imgUrl?: string, width?: number | null, quality?: number) => string;
 type FieldsWithoutArray<FS extends Record<string, any>> = {
@@ -40,4 +41,4 @@ declare const combobox2Options: <CB extends Record<string, (ComboBox<number> | C
     optionsMap: OptionsMapType<keyof CB>;
 };
 
-export { type ComboBox, type OptionsMapType, type OptionsRecordType, type OptionsType, combobox2Options, debounce, delayHandle, fieldsArrayToString, fieldsReset, formatterPrice, formatterTax, getBase64, getObjectURL, imgRelative2Absolute, mockSkeletons, resizeAliYun, throttle, widthThrottle };
+export { type ComboBox, type OptionsMapType, type OptionsRecordType, type OptionsType, combobox2Options, debounce, delayHandle, fieldsArrayToString, fieldsReset, formatterPrice, formatterTax, getBase64, getObjectURL, imgRelative2Absolute, mockSkeletons, resizeAliYun, throttle, uuid, widthThrottle };

package/dist/tools.js

@@ -47,6 +47,7 @@ __export(tools_exports, {
   mockSkeletons: () => mockSkeletons,
   resizeAliYun: () => resizeAliYun,
   throttle: () => throttle,
+  uuid: () => uuid,
   widthThrottle: () => widthThrottle
 });
 module.exports = __toCommonJS(tools_exports);
@@ -164,6 +165,17 @@ var debounce = (delay, callback) => {
   }
   return wrapper;
 };
+function uuid() {
+  let s = [];
+  let hexDigits = "0123456789abcdef";
+  for (let i = 0; i < 36; i++) {
+    s[i] = hexDigits.substr(Math.floor(Math.random() * 16), 1);
+  }
+  s[14] = "4";
+  s[19] = hexDigits.substr(s[19] & 3 | 8, 1);
+  s[8] = s[13] = s[18] = s[23] = "-";
+  return s.join("");
+}
 var imgRelative2Absolute = (imgUrl = "") => {
   if (!imgUrl)
     return imgUrl;
@@ -245,5 +257,6 @@ var combobox2Options = (comboBox) => {
   mockSkeletons,
   resizeAliYun,
   throttle,
+  uuid,
   widthThrottle
 });

package/dist/tools.mjs

@@ -108,6 +108,17 @@ var debounce = (delay, callback) => {
   }
   return wrapper;
 };
+function uuid() {
+  let s = [];
+  let hexDigits = "0123456789abcdef";
+  for (let i = 0; i < 36; i++) {
+    s[i] = hexDigits.substr(Math.floor(Math.random() * 16), 1);
+  }
+  s[14] = "4";
+  s[19] = hexDigits.substr(s[19] & 3 | 8, 1);
+  s[8] = s[13] = s[18] = s[23] = "-";
+  return s.join("");
+}
 var imgRelative2Absolute = (imgUrl = "") => {
   if (!imgUrl)
     return imgUrl;
@@ -188,5 +199,6 @@ export {
   mockSkeletons,
   resizeAliYun,
   throttle,
+  uuid,
   widthThrottle
 };

package/package.json

@@ -1,25 +1,29 @@
 {
   "name": "@xfe-repo/web-utils",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "sideEffects": false,
   "exports": {
     "./*": {
       "import": {
         "types": "./dist/*.d.mts",
-        "require": "./dist/*.mjs"
+        "default": "./dist/*.mjs"
       },
       "require": {
         "types": "./dist/*.d.ts",
         "default": "./dist/*.js"
       },
-      "default": "./dist/*.js"
+      "default": {
+        "types": "./dist/*.d.ts",
+        "default": "./dist/*.js"
+      }
     }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "js-cookie": "^3.0.5"
+    "js-cookie": "^3.0.5",
+    "query-string": "^7.1.3"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.5",

package/dist/chunk-WDFZ2WQK.mjs

@@ -1,24 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
-export {
-  __async
-};

package/dist/token.d.mts

@@ -1,10 +0,0 @@
-import cookie from 'js-cookie';
-
-declare const cookies: cookie.CookiesStatic<string>;
-declare function uuid(): string;
-declare function getFingerPrint(): string;
-declare function parseUrlQuery(): Record<string, string>;
-declare function getUrlQuery(key: string): string | undefined;
-declare function setUrlQuery(key: string, value: string | number, isDelete?: boolean): void;
-
-export { cookies, getFingerPrint, getUrlQuery, parseUrlQuery, setUrlQuery, uuid };

package/dist/token.d.ts

@@ -1,10 +0,0 @@
-import cookie from 'js-cookie';
-
-declare const cookies: cookie.CookiesStatic<string>;
-declare function uuid(): string;
-declare function getFingerPrint(): string;
-declare function parseUrlQuery(): Record<string, string>;
-declare function getUrlQuery(key: string): string | undefined;
-declare function setUrlQuery(key: string, value: string | number, isDelete?: boolean): void;
-
-export { cookies, getFingerPrint, getUrlQuery, parseUrlQuery, setUrlQuery, uuid };

package/dist/token.mjs

@@ -1,76 +0,0 @@
-import "./chunk-6BSPRPK2.mjs";
-
-// src/token.ts
-import cookie from "js-cookie";
-var cookies = cookie.withConverter({
-  read(value) {
-    return value;
-  },
-  write(value) {
-    return encodeURIComponent(`${value}`);
-  }
-});
-function uuid() {
-  let s = [];
-  let hexDigits = "0123456789abcdef";
-  for (let i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 16), 1);
-  }
-  s[14] = "4";
-  s[19] = hexDigits.substr(s[19] & 3 | 8, 1);
-  s[8] = s[13] = s[18] = s[23] = "-";
-  return s.join("");
-}
-function getFingerPrint() {
-  let fp = cookie.get("fp");
-  if (!fp) {
-    fp = uuid();
-    cookie.set("fp", fp, {
-      expires: 3650
-    });
-  }
-  return fp;
-}
-function parseUrlQuery() {
-  let { search, hash } = window.location;
-  const queryJson = {};
-  if (!search && hash.indexOf("?") !== -1) {
-    search = `?${hash.split("?")[1]}`;
-  }
-  let query = search.match(/([?&])[^&]+/gi);
-  if (query) {
-    query.forEach((str) => {
-      let arr;
-      str = str.substring(1);
-      str = str.replace(/=/, "==");
-      arr = str.split("==");
-      queryJson[arr[0] || ""] = arr[1] ? decodeURIComponent(arr[1]) : "";
-    });
-  }
-  return queryJson;
-}
-function getUrlQuery(key) {
-  const queryJson = parseUrlQuery();
-  return queryJson[key];
-}
-function setUrlQuery(key, value, isDelete) {
-  const queryJson = parseUrlQuery();
-  let { hash, origin, pathname } = window.location;
-  if (isDelete) {
-    delete queryJson[key];
-  } else {
-    queryJson[key] = String(value);
-  }
-  let newSearch = Object.entries(queryJson).map(([key2, value2]) => `${key2}=${value2}`).join("&");
-  if (newSearch)
-    newSearch = `?${newSearch}`;
-  window.history.replaceState({}, "", origin + pathname + newSearch + hash.split("?")[0]);
-}
-export {
-  cookies,
-  getFingerPrint,
-  getUrlQuery,
-  parseUrlQuery,
-  setUrlQuery,
-  uuid
-};