@jhqn/utils-core 0.0.3-beta.6 → 0.0.3-beta.8

package/dist/index.mjs

@@ -1,12 +1,12 @@
 export { detect } from 'detect-browser';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
-import localeData from 'dayjs/plugin/localeData';
-import duration from 'dayjs/plugin/duration';
-import relativeTime from 'dayjs/plugin/relativeTime';
+import zhCN from 'dayjs/locale/zh-cn';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import duration from 'dayjs/plugin/duration';
+import localeData from 'dayjs/plugin/localeData';
 import objectSupport from 'dayjs/plugin/objectSupport';
-import zhCN from 'dayjs/locale/zh-cn';
+import relativeTime from 'dayjs/plugin/relativeTime';
 
 const snake2Kebab = (str) => str.replace(/_([a-z])/g, (_, letter) => `-${letter.toLowerCase()}`);
 const snake2Pascal = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/^[a-z]/, (letter) => letter.toUpperCase());
@@ -109,6 +109,7 @@ const isJSONStr = (str) => {
       JSON.parse(str);
       return true;
     } catch (e) {
+      jError("isJSONStr", e);
       return false;
     }
   }
@@ -119,6 +120,7 @@ const isArrStr = (str) => {
     try {
       return Array.isArray(JSON.parse(str));
     } catch (e) {
+      jError("isArrStr", e);
       return false;
     }
   }
@@ -129,13 +131,14 @@ const isEmpty = (val) => {
   return !isDef(val) || val === "" || isArray(val) && val.length === 0 || isObject(val) && Object.keys(val).length === 0 || isMap(val) && val.size === 0 || isSet(val) && val.size === 0;
 };
 
-const isValidResCode = (res, code = 200) => res.code === code;
-const isValidRes = (res, code) => isValidResCode(res, code) && isDef(res.data);
-const isValidArrRes = (res, code) => isValidResCode(res, code) && Array.isArray(res.data);
-const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && Array.isArray(res.data.list || res.data.records);
-
 const cnPhoneRE = /^1[3-9]\d{9}$/;
 const cnTelRE = /^0\d{9,11}$/;
+const cnUSCIRE = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/;
+const isUSCI = (val) => {
+  if (!isDef(val))
+    return false;
+  return cnUSCIRE.test(val);
+};
 const isPhone = (val) => {
   if (!isDef(val))
     return false;
@@ -192,6 +195,11 @@ const isValidFileType = (file, type) => {
   return validate(type);
 };
 
+const isValidResCode = (res, code = 200) => res.code === code;
+const isValidRes = (res, code) => isValidResCode(res, code) && isDef(res.data);
+const isValidArrRes = (res, code) => isValidResCode(res, code) && Array.isArray(res.data);
+const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && Array.isArray(res.data.list || res.data.records);
+
 const hideMiddle = (str) => {
   if (!isDef(str))
     return "";
@@ -302,14 +310,34 @@ const hideBankCard = (bankCard) => {
   return "";
 };
 
+let __BASE_ATTACH_URL__;
+function setBaseAttachUrl(baseUrl) {
+  __BASE_ATTACH_URL__ = baseUrl;
+}
+function getBaseAttachUrl() {
+  return __BASE_ATTACH_URL__;
+}
+
 const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;
 const replacer = (_, value) => {
-  if (value instanceof Map) {
+  if (isMap(value)) {
     return {
       dataType: "Map",
       value: [...value]
     };
   }
+  if (isSet(value)) {
+    return {
+      dataType: "Set",
+      value: [...value]
+    };
+  }
+  if (isDate(value)) {
+    return {
+      dataType: "Date",
+      value: value.toISOString()
+    };
+  }
   return value;
 };
 const reviver = (_, value) => {
@@ -317,11 +345,33 @@ const reviver = (_, value) => {
     if (value.dataType === "Map") {
       return new Map(value.value);
     }
+    if (value.dataType === "Set") {
+      return new Set(value.value);
+    }
+    if (value.dataType === "Date") {
+      return new Date(value.value);
+    }
   }
   return value;
 };
 const filterObj = (obj, keys, reverse = false) => Object.fromEntries(Object.entries(obj).filter(([key]) => reverse ? !keys.includes(key) : keys.includes(key)));
 
+const toThousands = (num) => {
+  const arr = num.toString().split(".");
+  const integer = arr[0]?.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
+  if (arr.length > 1)
+    return `${integer}.${arr[1]}`;
+  return integer;
+};
+const currencyFmt = (currency, maximumFractionDigits = 2) => {
+  if (!isDef(currency))
+    return "";
+  const num = Number(currency);
+  if (Number.isNaN(num))
+    return "";
+  return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits }).format(num);
+};
+
 dayjs.extend(localeData).locale("zh-cn", zhCN);
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
@@ -355,34 +405,10 @@ const dateDuration = (start, end) => {
   return dd.format(format);
 };
 
-let __BASE_ATTACH_URL__;
-function setBaseAttachUrl(baseUrl) {
-  __BASE_ATTACH_URL__ = baseUrl;
-}
-function getBaseAttachUrl() {
-  return __BASE_ATTACH_URL__;
-}
-
-const toThousands = (num) => {
-  const arr = num.toString().split(".");
-  const integer = arr[0]?.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
-  if (arr.length > 1)
-    return `${integer}.${arr[1]}`;
-  return integer;
-};
-const currencyFmt = (currency, maximumFractionDigits = 2) => {
-  if (!isDef(currency))
-    return "";
-  const num = Number(currency);
-  if (Number.isNaN(num))
-    return "";
-  return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits }).format(num);
-};
-
 const resUrl = (url) => {
   if (!isDef(url))
     return void 0;
-  if (/^https?:\/\//.test(url) || /^blob:/.test(url) || /^data:/.test(url)) {
+  if (/^https?:\/\//.test(url) || url.startsWith("blob:") || url.startsWith("data:")) {
     return url;
   }
   const baseUrl = getBaseAttachUrl();
@@ -427,6 +453,23 @@ const attachFmt = (data) => {
   return attachList.map(recoverFile);
 };
 
+const isNumberArray = (arr) => arr.every((item) => typeof item === "number");
+const isStringArray = (arr) => arr.every((item) => typeof item === "string");
+const naturalSort = (arr) => {
+  if (isNumberArray(arr))
+    return [...arr].sort((a, b) => a - b);
+  if (isStringArray(arr)) {
+    return [...arr].sort((a, b) => a.localeCompare(b, "zh-CN")).sort((a, b) => a.length - b.length);
+  }
+  const newArr = [...arr].sort();
+  const validArr = newArr.filter((a) => isDef(a));
+  const invalidArr = newArr.filter((a) => !isDef(a));
+  return naturalSort(validArr).concat(invalidArr);
+};
+const naturalSortBy = (arr, key) => {
+  return [...arr].sort((a, b) => naturalSort([a[key], b[key]])[0] === a[key] ? -1 : 1);
+};
+
 const inBrowser = typeof window !== "undefined";
 const waitTime = (time = 100) => {
   return new Promise((resolve) => {
@@ -470,4 +513,4 @@ const getCodeOfHour = () => getCodeOfTime(`${dateFmt( new Date(), "YYYY-MM-DD HH
 const getCodeOfDate = () => getCodeOfTime(dateFmt(/* @__PURE__ */ new Date(), "date"));
 const getCodeOfMonth = () => getCodeOfTime(dateFmt(dayjs().endOf("month"), "date"));
 
-export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };
+export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUSCI, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, naturalSort, naturalSortBy, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jhqn/utils-core",
   "type": "module",
-  "version": "0.0.3-beta.6",
+  "version": "0.0.3-beta.8",
   "author": "jade-gjz <jiangang.zhang@jaderd.com>",
   "license": "MIT",
   "homepage": "https://github.com/jaderd-jh/utils/tree/main/packages/core#readme",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "dependencies": {
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.13",
     "detect-browser": "^5.3.0"
   },
   "scripts": {