@jhqn/utils-core 0.4.2 → 0.4.4

package/dist/index.js

@@ -349,38 +349,43 @@ const isError = (val) => getVariableType(val) === "error";
 * @param {any} val 检测的目标
 */
 const isDef = (val) => !isNull(val) && !isUndefined(val);
+const INVALID_JSON = Symbol("invalid_json");
+const JSON_LITERAL_PREFIXES = {
+	t: "true",
+	f: "false",
+	n: "null"
+};
+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;
+	if (firstChar in JSON_LITERAL_PREFIXES) {
+		const literal = JSON_LITERAL_PREFIXES[firstChar];
+		if (!normalized.startsWith(literal)) return INVALID_JSON;
+		const nextChar = normalized[literal.length];
+		if (isDef(nextChar) && !",]} 	\r\n".includes(nextChar)) return INVALID_JSON;
+	}
+	try {
+		return JSON.parse(normalized);
+	} catch (e) {
+		jWarn("Failed to parse invalid string", e);
+		return INVALID_JSON;
+	}
+};
 /**
 * 判断是否合法JSON字符串
 * @param str
 */
-const isJSONStr = (str) => {
-	if (isDef(str)) {
-		const normalized = str.trim();
-		if (normalized === "") return false;
-		const firstChar = normalized[0];
-		if (!"{[\"tfn-0123456789".includes(firstChar)) return false;
-		try {
-			JSON.parse(normalized);
-			return true;
-		} catch (e) {
-			jWarn("Failed to parse invalid string", e);
-			return false;
-		}
-	}
-	return false;
-};
+const isJSONStr = (str) => parseJSONLikeStr(str) !== INVALID_JSON;
 /**
 * 判断是否合法JSON数组字符串
 * @param str
 */
 const isArrStr = (str) => {
-	if (isDef(str)) try {
-		return 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

package/package.json

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