@jhqn/utils-core 0.4.1 → 0.4.3

package/dist/index.js

@@ -349,32 +349,32 @@ const isError = (val) => getVariableType(val) === "error";
 * @param {any} val 检测的目标
 */
 const isDef = (val) => !isNull(val) && !isUndefined(val);
-/**
-* 判断是否合法JSON字符串
-* @param str
-*/
-const isJSONStr = (str) => {
-	if (isDef(str)) try {
-		JSON.parse(str);
-		return true;
+const INVALID_JSON = Symbol("invalid_json");
+const parseJSONLikeStr = (str) => {
+	if (!isDef(str)) return INVALID_JSON;
+	const normalized = str.trim();
+	if (normalized === "") return INVALID_JSON;
+	const firstChar = normalized[0];
+	if (!"{[\"tfn-0123456789".includes(firstChar)) return INVALID_JSON;
+	try {
+		return JSON.parse(normalized);
 	} catch (e) {
 		jWarn("Failed to parse invalid string", e);
-		return false;
+		return INVALID_JSON;
 	}
-	return false;
 };
 /**
+* 判断是否合法JSON字符串
+* @param str
+*/
+const isJSONStr = (str) => parseJSONLikeStr(str) !== INVALID_JSON;
+/**
 * 判断是否合法JSON数组字符串
 * @param str
 */
 const isArrStr = (str) => {
-	if (isDef(str)) try {
-		return Array.isArray(JSON.parse(str));
-	} catch (e) {
-		jWarn("Failed to parse invalid string", e);
-		return false;
-	}
-	return false;
+	const parsed = parseJSONLikeStr(str);
+	return parsed !== INVALID_JSON && isArray(parsed);
 };
 /**
 * 判断是否有效的key
@@ -517,13 +517,13 @@ const isValidRes = (res, code) => isValidResCode(res, code) && isDef(res.data);
 * @param res
 * @param code
 */
-const isValidArrRes = (res, code) => isValidResCode(res, code) && Array.isArray(res.data);
+const isValidArrRes = (res, code) => isValidResCode(res, code) && isArray(res.data);
 /**
 * 校验接口分页返回内容
 * @param res
 * @param code
 */
-const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && Array.isArray(res.data.list || res.data.records);
+const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && isArray(res.data.list || res.data.records);
 
 //#endregion
 //#region src/desensitize.ts
@@ -914,7 +914,7 @@ const attachFmt = (data) => {
 	let attachList = [];
 	const prototype = Object.prototype.toString.call(data);
 	if (!data) attachList = [];
-	else if (Array.isArray(data)) attachList = data.filter(Boolean);
+	else if (isArray(data)) attachList = data.filter(Boolean);
 	else if (typeof data === "string") if (isArrStr(data)) attachList = (parseJSON(data) || []).filter(Boolean);
 	else {
 		const jsonData = parseJSON(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jhqn/utils-core",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "keywords": [
     "jade",
     "utils"