@jhqn/utils-core 0.4.3 → 0.4.5

package/dist/index.js

@@ -5,7 +5,6 @@ import duration from "dayjs/plugin/duration.js";
 import localeData from "dayjs/plugin/localeData.js";
 import objectSupport from "dayjs/plugin/objectSupport.js";
 import relativeTime from "dayjs/plugin/relativeTime.js";
-
 //#region src/case.ts
 /**
 * snake2Kebab
@@ -150,7 +149,6 @@ const title2Pascal = (str) => str.replace(/ /g, "");
 * @example title2Camel('Hello World') // Hello World => helloWorld
 */
 const title2Camel = (str) => str.replace(/ /g, "").replace(/^[A-Z]/, (match) => match.toLowerCase());
-
 //#endregion
 //#region src/console/log-common.ts
 const sharedStyle = "color: white; padding: 1px 2px;";
@@ -185,7 +183,7 @@ const jGroup = console.group.bind(console, "%c[%s]", `${sharedStyle} background:
 /**
 * jade console.groupCollapsed
 */
-const jGroupC = console.groupCollapsed.bind(console, "%c[%s]", `${sharedStyle} background: slateblue;`);
+const jGroupC = console?.groupCollapsed?.bind(console, "%c[%s]", `${sharedStyle} background: slateblue;`);
 /**
 * jade console.groupEnd
 */
@@ -194,17 +192,16 @@ const jGroupE = console.groupEnd.bind(console);
 * jade console.time
 * @param str
 */
-const jTime = (str) => console.time(`[${str}]`);
+const jTime = (str) => console?.time(`[${str}]`);
 /**
 * jade console.timeEnd
 * @param str
 */
-const jTimeEnd = (str) => console.timeEnd(`[${str}]`);
+const jTimeEnd = (str) => console?.timeEnd(`[${str}]`);
 /**
 * jade console.clear
 */
-const jClear = console.clear.bind(console);
-
+const jClear = console?.clear?.bind(console);
 //#endregion
 //#region src/console/log-dedupe.ts
 let prevValue;
@@ -218,7 +215,6 @@ const jLogDedupe = (...args) => {
 	jLog(...args);
 	prevValue = args;
 };
-
 //#endregion
 //#region src/console/log-once.ts
 let logged = false;
@@ -231,7 +227,6 @@ const jLogOnce = (...args) => {
 	jLog(...args);
 	logged = true;
 };
-
 //#endregion
 //#region src/validate/core.ts
 /**
@@ -350,12 +345,23 @@ const isError = (val) => getVariableType(val) === "error";
 */
 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) {
@@ -396,7 +402,6 @@ const isValidKey = (key, object) => key in object;
 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;
 };
-
 //#endregion
 //#region src/validate/form.ts
 const cnPhoneRE = /^1[3-9]\d{9}$/;
@@ -497,7 +502,6 @@ const isValidFileType = (file, type) => {
 	if (typeArrStr.length > 1) return typeArrStr.some(validate);
 	return validate(type);
 };
-
 //#endregion
 //#region src/validate/request.ts
 /**
@@ -524,7 +528,6 @@ const isValidArrRes = (res, code) => isValidResCode(res, code) && isArray(res.da
 * @param code
 */
 const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && isArray(res.data.list || res.data.records);
-
 //#endregion
 //#region src/desensitize.ts
 /**
@@ -712,7 +715,6 @@ const hideBankCard = (bankCard) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/format/baseAttachUrl.ts
 /**
@@ -732,7 +734,6 @@ function setBaseAttachUrl(baseUrl) {
 function getBaseAttachUrl() {
 	return __BASE_ATTACH_URL__;
 }
-
 //#endregion
 //#region src/format/core.ts
 /**
@@ -806,7 +807,6 @@ function reviver(_key, value) {
 * @param {boolean} reverse 为true时过滤取反
 */
 const filterObj = (obj, keys, reverse = false) => Object.fromEntries(Object.entries(obj).filter(([key]) => reverse ? !keys.includes(key) : keys.includes(key)));
-
 //#endregion
 //#region src/format/currency.ts
 /**
@@ -834,7 +834,6 @@ const currencyFmt = (currency, maximumFractionDigits = 2) => {
 		maximumFractionDigits
 	}).format(num);
 };
-
 //#endregion
 //#region src/format/dayjs.ts
 dayjs.extend(localeData).locale("zh-cn", zhCN);
@@ -876,7 +875,6 @@ const dateDuration = (start, end) => {
 	].join("");
 	return dd.format(format);
 };
-
 //#endregion
 //#region src/format/resource.ts
 /**
@@ -929,7 +927,6 @@ const attachFmt = (data) => {
 	else if (prototype === "[object Object]") attachList = [data];
 	return attachList.map(recoverFile);
 };
-
 //#endregion
 //#region src/format/sort.ts
 /**
@@ -966,7 +963,6 @@ const naturalSort = (arr) => {
 const naturalSortBy = (arr, key) => {
 	return [...arr].sort((a, b) => naturalSort([a[key], b[key]])[0] === a[key] ? -1 : 1);
 };
-
 //#endregion
 //#region src/dom.ts
 /**
@@ -1045,7 +1041,6 @@ const getCodeOfDate = () => getCodeOfTime(dateFmt(/* @__PURE__ */ new Date(), "d
 * 获取当月的时间戳的异或值的绝对值, 当月内获取的值是唯一的
 */
 const getCodeOfMonth = () => getCodeOfTime(dateFmt(dayjs().endOf("month"), "date"));
-
 //#endregion
 //#region src/mock.ts
 const getMockData = (data, code = 200, message = "success") => {
@@ -1067,6 +1062,5 @@ const getMockDataList = (data, total, code = 200, message = "success", options =
 		message
 	};
 };
-
 //#endregion
-export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, cnIdCard15Re, cnIdCard18Re, cnPhoneRE, cnTelRE, cnTelRE2, cnUSCIRE, currencyFmt, dateDuration, dateFmt, dayjs, emailRE, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getMockData, getMockDataList, 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 };
+export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, cnIdCard15Re, cnIdCard18Re, cnPhoneRE, cnTelRE, cnTelRE2, cnUSCIRE, currencyFmt, dateDuration, dateFmt, dayjs, emailRE, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getMockData, getMockDataList, 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,6 +1,6 @@
 {
   "name": "@jhqn/utils-core",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "keywords": [
     "jade",
     "utils"
@@ -33,7 +33,7 @@
     }
   },
   "dependencies": {
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.20",
     "detect-browser-es": "0.1.1"
   },
   "scripts": {