@jhqn/utils-core 0.0.3-beta.7 → 0.0.3

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());
@@ -44,8 +44,12 @@ const jDebug = (...args) => console.log.bind(
   `%c[${args.length === 1 ? "DEBUG" : "%s"}]`,
   `${sharedStyle} background: linear-gradient(LightSalmon, Tomato); border-radius: 2px; font-weight: bold; border-top: 2px solid Crimson; border-bottom: 2px solid Crimson;`
 )(...args);
-const jWarn = console.error.bind(console, "%c[WARN]", `${sharedStyle} background: tomato;`);
-const jError = console.error.bind(console, "%c[ERROR]", `${sharedStyle} background: crimson;`);
+const jWarn = (...args) => console.warn.bind(console, `%c[${args.length === 1 ? "WARN" : "%s"}]`, `${sharedStyle} background: tomato;`)(...args);
+const jError = (...args) => console.error.bind(
+  console,
+  `%c[${args.length === 1 ? "ERROR" : "%s"}]`,
+  `${sharedStyle} background: crimson;`
+)(...args);
 const jInfo = (...args) => console.info.bind(
   console,
   `%c[${args.length === 1 ? "INFO" : "%s"}]`,
@@ -60,18 +64,15 @@ const jClear = console.clear.bind(console);
 
 let prevValue;
 const jLogDedupe = (...args) => {
-  if (args.length === 0)
-    return;
-  if (args.length > 0 && prevValue && JSON.stringify(args) === JSON.stringify(prevValue))
-    return;
+  if (args.length === 0) return;
+  if (args.length > 0 && prevValue && JSON.stringify(args) === JSON.stringify(prevValue)) return;
   jLog(...args);
   prevValue = args;
 };
 
 let logged = false;
 const jLogOnce = (...args) => {
-  if (logged)
-    return;
+  if (logged) return;
   jLog(...args);
   logged = true;
 };
@@ -109,6 +110,7 @@ const isJSONStr = (str) => {
       JSON.parse(str);
       return true;
     } catch (e) {
+      jWarn("Failed to parse invalid string", e);
       return false;
     }
   }
@@ -119,6 +121,7 @@ const isArrStr = (str) => {
     try {
       return Array.isArray(JSON.parse(str));
     } catch (e) {
+      jWarn("Failed to parse invalid string", e);
       return false;
     }
   }
@@ -129,39 +132,36 @@ 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 cnTelRE = /^0\d{2,3}-?\d{7,8}$/;
+const cnTelRE2 = /^\(0\d{2,3}\)\d{7,8}$/;
+const cnUSCIRE = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/;
+const cnIdCard15Re = /^[1-9]\d{7}(?:0[1-9]|10|11|12)(?:[0-2][1-9]|10|20|30|31)\d{2}[\dX]$/i;
+const cnIdCard18Re = /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|1[0-2])(?:[0-2][1-9]|10|20|30|31)\d{3}[\dX]$/i;
+const emailRE = /^[a-z\d](?:\w|-)+@[a-z\d]+\.[a-z]{2,5}$/i;
+const isUSCI = (val) => {
+  if (!isDef(val)) return false;
+  return cnUSCIRE.test(val);
+};
 const isPhone = (val) => {
-  if (!isDef(val))
-    return false;
+  if (!isDef(val)) return false;
   return cnPhoneRE.test(val.toString());
 };
 const isTel = (val) => {
-  if (!isDef(val))
-    return false;
-  return cnTelRE.test(val.toString());
+  if (!isDef(val)) return false;
+  const valStr = val.toString().replaceAll(" ", "");
+  return cnTelRE.test(valStr) || cnTelRE2.test(valStr);
 };
 const isEmail = (val) => {
-  if (!isDef(val))
-    return false;
-  const reg = /^[a-z\d](?:\w|-)+@[a-z\d]+\.[a-z]{2,5}$/i;
-  return reg.test(val);
+  if (!isDef(val)) return false;
+  return emailRE.test(val);
 };
 const isIdCard = (val, compatible = true) => {
-  if (!isDef(val))
-    return false;
-  const card15 = /^[1-9]\d{7}(?:0[1-9]|10|11|12)(?:[0-2][1-9]|10|20|30|31)\d{2}[\dX]$/i;
-  const card18 = /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|1[0-2])(?:[0-2][1-9]|10|20|30|31)\d{3}[\dX]$/i;
-  return card18.test(val) || (compatible ? card15.test(val) : false);
+  if (!isDef(val)) return false;
+  return cnIdCard18Re.test(val) || (compatible ? cnIdCard15Re.test(val) : false);
 };
 const isNumeric = (val) => {
-  if (isDef(val))
-    return typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
+  if (isDef(val)) return typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
   return false;
 };
 const checkImg = (ext) => {
@@ -169,8 +169,7 @@ const checkImg = (ext) => {
 };
 const nonASCII = (text) => /[^\x20-\x7E]/.test(text);
 const isValidFileType = (file, type) => {
-  if (type === "*")
-    return true;
+  if (type === "*") return true;
   const fileType = file.type;
   const fileName = file.name;
   function validate(item) {
@@ -192,52 +191,49 @@ 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 "";
+  if (!isDef(str)) return "";
   const len = str.length;
-  if (len === 1)
-    return "*";
-  if (len === 2)
-    return "**";
+  if (len <= 2) return "*".repeat(len);
   return str[0] + "*".repeat(len - 2) + str[len - 1];
 };
 const hideThird = (str) => {
-  if (!isDef(str))
-    return "";
+  if (!isDef(str)) return "";
   const len = str.length;
+  if (len <= 2) return "*".repeat(len);
   const partLen = Math.round(len / 3);
-  if (len === 1)
-    return "*";
-  if (len === 2)
-    return "**";
   return str.slice(0, partLen) + "*".repeat(len - 2 * partLen) + str.slice(len - partLen);
 };
 const hideHead = (str, count) => {
-  if (!isDef(str))
-    return "";
+  if (!isDef(str)) return "";
   const len = str.length;
+  if (len <= 1) return "*".repeat(len);
   const cnt = count !== void 0 ? Math.max(Math.min(len, count), 0) : len - 1;
-  if (len === 1)
-    return "*";
   return "*".repeat(cnt) + str.substring(cnt);
 };
 const hideTail = (str, count) => {
-  if (!isDef(str))
-    return "";
+  if (!isDef(str)) return "";
   const len = str.length;
+  if (len <= 1) return "*".repeat(len);
   const cnt = count !== void 0 ? Math.max(Math.min(len, count), 0) : len - 1;
-  if (len === 1)
-    return "*";
   return str.substring(0, len - cnt) + "*".repeat(cnt);
 };
 const hidePhone = (phone) => {
   if (phone) {
-    if (isPhone(phone)) {
-      return phone.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
+    const phoneStr = phone.replaceAll(" ", "");
+    if (isPhone(phoneStr)) {
+      return phoneStr.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
+    }
+    if (cnTelRE.test(phoneStr)) {
+      return phoneStr.replace(/^(0\d{2,3})-?\d{3,4}(\d{4})$/, "$1****$2");
     }
-    if (isTel(phone)) {
-      return phone.replace(/^(\d{3,4})-?\d{3,4}(\d{4})$/, "$1****$2");
+    if (cnTelRE2.test(phoneStr)) {
+      return phoneStr.replace(/^\((0\d{2,3})\)\d{3,4}(\d{4})$/, "$1****$2");
     }
     return phone;
   }
@@ -252,20 +248,6 @@ const hideCardNo = (cardNo, strong = true) => {
   }
   return "";
 };
-const hideName = (name) => {
-  if (name) {
-    let res = "";
-    for (let i = 0; i < name.length; i += 1) {
-      if (i === 0) {
-        res += "*";
-      } else {
-        res += name[i];
-      }
-    }
-    return res;
-  }
-  return "";
-};
 const hideSurname = (name) => {
   return hideHead(name, 1);
 };
@@ -274,13 +256,11 @@ const hideFirstName = (name) => {
 };
 const hideEmail = (email) => {
   if (email) {
-    if (!email.includes("@"))
-      return email;
+    if (!email.includes("@")) return email;
     const arr = email.split("@");
     const name = arr[0];
     const domain = arr[1];
-    if (!name || !domain)
-      return email;
+    if (!name || !domain) return email;
     const len = name.length;
     let newName;
     if (len <= 3) {
@@ -295,33 +275,79 @@ const hideEmail = (email) => {
 const hideBankCard = (bankCard) => {
   if (bankCard) {
     const len = bankCard.length;
-    if (len <= 10)
-      return bankCard;
+    if (len <= 10) return bankCard;
     return bankCard.substring(0, 6) + "*".repeat(len - 10) + bankCard.substring(len - 4, len);
   }
   return "";
 };
 
-const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;
-const replacer = (_, value) => {
-  if (value instanceof Map) {
+let __BASE_ATTACH_URL__;
+function setBaseAttachUrl(baseUrl) {
+  __BASE_ATTACH_URL__ = baseUrl;
+}
+function getBaseAttachUrl() {
+  return __BASE_ATTACH_URL__;
+}
+
+function parseToJSON(str, reviverFn) {
+  return isJSONStr(str) ? JSON.parse(str, reviverFn) : null;
+}
+function parseJSON(str, reviverFn = reviver) {
+  return isJSONStr(str) ? JSON.parse(str, reviverFn) : null;
+}
+function stringifyJSON(value, replacerFn = replacer) {
+  return JSON.stringify(value, replacerFn);
+}
+function replacer(_key, value) {
+  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) => {
+}
+function reviver(_key, value) {
   if (typeof value === "object" && value !== null) {
     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);
@@ -330,19 +356,15 @@ dayjs.extend(objectSupport);
 const dateFmt = (date, format = "YYYY-MM-DD HH:mm:ss") => {
   const dd = dayjs(date);
   let fmt = format;
-  if (!isDef(date) || !dd.isValid())
-    return "";
-  if (format === "date")
-    fmt = "YYYY-MM-DD";
-  if (format === "datetime")
-    fmt = "YYYY-MM-DD HH:mm:ss";
+  if (!isDef(date) || !dd.isValid()) return "";
+  if (format === "date") fmt = "YYYY-MM-DD";
+  if (format === "datetime") fmt = "YYYY-MM-DD HH:mm:ss";
   return dd.format(fmt);
 };
 const dateDuration = (start, end) => {
   const startDay = dayjs(start);
   const endDay = dayjs(end);
-  if (!isDef(start) || !startDay.isValid() || !isDef(end) || !endDay.isValid())
-    return "";
+  if (!isDef(start) || !startDay.isValid() || !isDef(end) || !endDay.isValid()) return "";
   const dd = dayjs.duration(endDay.diff(startDay));
   const year = dd.years();
   const month = dd.months();
@@ -355,34 +377,9 @@ 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 (!isDef(url)) return void 0;
+  if (/^https?:\/\//.test(url) || url.startsWith("blob:") || url.startsWith("data:")) {
     return url;
   }
   const baseUrl = getBaseAttachUrl();
@@ -412,14 +409,12 @@ const attachFmt = (data) => {
     attachList = data.filter(Boolean);
   } else if (typeof data === "string") {
     if (isArrStr(data)) {
-      attachList = (parseToJSON(data) || []).filter(Boolean);
+      attachList = (parseJSON(data) || []).filter(Boolean);
     } else {
-      const jsonData = parseToJSON(data);
+      const jsonData = parseJSON(data);
       const prototypeJson = Object.prototype.toString.call(jsonData);
-      if (prototypeJson === "[object Object]")
-        attachList = [jsonData].filter(Boolean);
-      else
-        attachList = [{ id: data, name: "name", uri: data, group: "default" }];
+      if (prototypeJson === "[object Object]") attachList = [jsonData].filter(Boolean);
+      else attachList = [{ id: data, name: "name", uri: data, group: "default" }];
     }
   } else if (prototype === "[object Object]") {
     attachList = [data];
@@ -430,8 +425,7 @@ const attachFmt = (data) => {
 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 (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);
   }
@@ -483,8 +477,8 @@ const getHostEnv = () => {
 };
 const XOR_VAL = 1111;
 const getCodeOfTime = (time) => Math.abs(new Date(time).getTime() ^ XOR_VAL);
-const getCodeOfHour = () => getCodeOfTime(`${dateFmt( new Date(), "YYYY-MM-DD HH")}:00:00`);
+const getCodeOfHour = () => getCodeOfTime(`${dateFmt(/* @__PURE__ */ new Date(), "YYYY-MM-DD HH")}:00:00`);
 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, naturalSort, naturalSortBy, 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, cnIdCard15Re, cnIdCard18Re, cnPhoneRE, cnTelRE, cnTelRE2, cnUSCIRE, currencyFmt, dateDuration, dateFmt, emailRE, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, 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, parseJSON, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, stringifyJSON, 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.7",
+  "version": "0.0.3",
   "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": {