@jhqn/utils-core 0.0.1-beta.25 → 0.0.1-beta.26

package/dist/index.cjs

@@ -72,7 +72,11 @@ const jClear = console.clear.bind(console);
 const cnPhoneRE = /^1[3-9]\d{9}$/;
 const cnTelRE = /^0\d{9,11}$/;
 const isDef = (val) => val !== void 0 && val !== null;
-const isNumeric = (val) => typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
+const isNumeric = (val) => {
+  if (isDef(val))
+    return typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
+  return false;
+};
 const checkImg = (ext) => {
   return /\.(?:jpg|jpeg|png|gif)$/.test((ext || "").toLowerCase());
 };
@@ -80,19 +84,23 @@ const isEmpty = (val) => {
   return !isDef(val) || val === "" || Array.isArray(val) && val.length === 0 || Object.prototype.toString.call(val) === "[object Object]" && Object.keys(val).length === 0 || val instanceof Map && val.size === 0 || val instanceof Set && val.size === 0;
 };
 const isJSONStr = (str) => {
-  try {
-    JSON.parse(str);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  if (isDef(str))
+    try {
+      JSON.parse(str);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  return false;
 };
 const isArrStr = (str) => {
-  try {
-    return Array.isArray(JSON.parse(str));
-  } catch (e) {
-    return false;
-  }
+  if (isDef(str))
+    try {
+      return Array.isArray(JSON.parse(str));
+    } catch (e) {
+      return false;
+    }
+  return false;
 };
 const isValidKey = (key, object) => key in object;
 const isPhone = (val) => {
@@ -237,11 +245,11 @@ const hideEmail = (email) => {
     if (!name || !domain)
       return email;
     const len = name.length;
-    let newName = "";
+    let newName;
     if (len <= 3) {
       newName = `${name}***`;
     } else {
-      newName = `${name.substring(0, len - 3)}***`;
+      newName = hideTail(name, 3);
     }
     return `${newName}@${domain}`;
   }
@@ -386,8 +394,11 @@ const toThousands = (num) => {
 const currencyFmt = (currency, fraction = 0) => {
   if (!isDef(currency))
     return "";
+  const num = Number(currency);
+  if (Number.isNaN(num))
+    return "";
   return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits: fraction }).format(
-    currency
+    num
   );
 };
 

package/dist/index.d.cts

@@ -561,7 +561,7 @@ declare const toThousands: (num: number) => string | undefined;
  * @param currency
  * @param fraction
  */
-declare const currencyFmt: (currency: UnDef<number | bigint>, fraction?: number) => string;
+declare const currencyFmt: (currency: UnDef<Numeric | bigint>, fraction?: number) => string;
 
 type VantUploadFileStatus = '' | 'uploading' | 'done' | 'failed'
 type AntdUploadFileStatus = 'removed' | 'uploading' | 'done' | 'error'
@@ -662,7 +662,7 @@ declare const isDef: <T>(val: T) => val is NonNullable<T>;
  * 是否是数字或字符
  * @param val
  */
-declare const isNumeric: (val: Numeric) => val is string;
+declare const isNumeric: (val: UnDef<Numeric>) => val is string;
 /**
  * 是否是需要的图片格式
  * @param ext
@@ -677,12 +677,12 @@ declare const isEmpty: (val: UnDef<Numeric | boolean | Record<any, any> | Array<
  * 判断是否合法JSON字符串
  * @param str
  */
-declare const isJSONStr: (str: string) => boolean;
+declare const isJSONStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否合法JSON数组字符串
  * @param str
  */
-declare const isArrStr: (str: string) => boolean;
+declare const isArrStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否有效的key
  * @param {string | number | symbol} key 键名

package/dist/index.d.mts

@@ -561,7 +561,7 @@ declare const toThousands: (num: number) => string | undefined;
  * @param currency
  * @param fraction
  */
-declare const currencyFmt: (currency: UnDef<number | bigint>, fraction?: number) => string;
+declare const currencyFmt: (currency: UnDef<Numeric | bigint>, fraction?: number) => string;
 
 type VantUploadFileStatus = '' | 'uploading' | 'done' | 'failed'
 type AntdUploadFileStatus = 'removed' | 'uploading' | 'done' | 'error'
@@ -662,7 +662,7 @@ declare const isDef: <T>(val: T) => val is NonNullable<T>;
  * 是否是数字或字符
  * @param val
  */
-declare const isNumeric: (val: Numeric) => val is string;
+declare const isNumeric: (val: UnDef<Numeric>) => val is string;
 /**
  * 是否是需要的图片格式
  * @param ext
@@ -677,12 +677,12 @@ declare const isEmpty: (val: UnDef<Numeric | boolean | Record<any, any> | Array<
  * 判断是否合法JSON字符串
  * @param str
  */
-declare const isJSONStr: (str: string) => boolean;
+declare const isJSONStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否合法JSON数组字符串
  * @param str
  */
-declare const isArrStr: (str: string) => boolean;
+declare const isArrStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否有效的key
  * @param {string | number | symbol} key 键名

package/dist/index.d.ts

@@ -561,7 +561,7 @@ declare const toThousands: (num: number) => string | undefined;
  * @param currency
  * @param fraction
  */
-declare const currencyFmt: (currency: UnDef<number | bigint>, fraction?: number) => string;
+declare const currencyFmt: (currency: UnDef<Numeric | bigint>, fraction?: number) => string;
 
 type VantUploadFileStatus = '' | 'uploading' | 'done' | 'failed'
 type AntdUploadFileStatus = 'removed' | 'uploading' | 'done' | 'error'
@@ -662,7 +662,7 @@ declare const isDef: <T>(val: T) => val is NonNullable<T>;
  * 是否是数字或字符
  * @param val
  */
-declare const isNumeric: (val: Numeric) => val is string;
+declare const isNumeric: (val: UnDef<Numeric>) => val is string;
 /**
  * 是否是需要的图片格式
  * @param ext
@@ -677,12 +677,12 @@ declare const isEmpty: (val: UnDef<Numeric | boolean | Record<any, any> | Array<
  * 判断是否合法JSON字符串
  * @param str
  */
-declare const isJSONStr: (str: string) => boolean;
+declare const isJSONStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否合法JSON数组字符串
  * @param str
  */
-declare const isArrStr: (str: string) => boolean;
+declare const isArrStr: (str: UnDef<string>) => boolean;
 /**
  * 判断是否有效的key
  * @param {string | number | symbol} key 键名

package/dist/index.mjs

@@ -61,7 +61,11 @@ const jClear = console.clear.bind(console);
 const cnPhoneRE = /^1[3-9]\d{9}$/;
 const cnTelRE = /^0\d{9,11}$/;
 const isDef = (val) => val !== void 0 && val !== null;
-const isNumeric = (val) => typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
+const isNumeric = (val) => {
+  if (isDef(val))
+    return typeof val === "number" || /^\d+(?:\.\d+)?$/.test(val);
+  return false;
+};
 const checkImg = (ext) => {
   return /\.(?:jpg|jpeg|png|gif)$/.test((ext || "").toLowerCase());
 };
@@ -69,19 +73,23 @@ const isEmpty = (val) => {
   return !isDef(val) || val === "" || Array.isArray(val) && val.length === 0 || Object.prototype.toString.call(val) === "[object Object]" && Object.keys(val).length === 0 || val instanceof Map && val.size === 0 || val instanceof Set && val.size === 0;
 };
 const isJSONStr = (str) => {
-  try {
-    JSON.parse(str);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  if (isDef(str))
+    try {
+      JSON.parse(str);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  return false;
 };
 const isArrStr = (str) => {
-  try {
-    return Array.isArray(JSON.parse(str));
-  } catch (e) {
-    return false;
-  }
+  if (isDef(str))
+    try {
+      return Array.isArray(JSON.parse(str));
+    } catch (e) {
+      return false;
+    }
+  return false;
 };
 const isValidKey = (key, object) => key in object;
 const isPhone = (val) => {
@@ -226,11 +234,11 @@ const hideEmail = (email) => {
     if (!name || !domain)
       return email;
     const len = name.length;
-    let newName = "";
+    let newName;
     if (len <= 3) {
       newName = `${name}***`;
     } else {
-      newName = `${name.substring(0, len - 3)}***`;
+      newName = hideTail(name, 3);
     }
     return `${newName}@${domain}`;
   }
@@ -375,8 +383,11 @@ const toThousands = (num) => {
 const currencyFmt = (currency, fraction = 0) => {
   if (!isDef(currency))
     return "";
+  const num = Number(currency);
+  if (Number.isNaN(num))
+    return "";
   return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits: fraction }).format(
-    currency
+    num
   );
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jhqn/utils-core",
   "type": "module",
-  "version": "0.0.1-beta.25",
+  "version": "0.0.1-beta.26",
   "author": "jade-gjz <jiangang.zhang@jaderd.com>",
   "license": "MIT",
   "homepage": "https://github.com/jaderd-jh/utils/tree/main/packages/core#readme",