@gx-design-vue/pro-utils 0.2.0-alpha.2 → 0.2.0-alpha.4

package/dist/is/deepEqual.js

@@ -1,14 +1,16 @@
 //#region src/is/deepEqual.ts
 /**
-* React 深度比较
+* 深度比较两个值是否相等
+*
+* 支持数组、Map、Set、TypedArray、RegExp 及普通对象的递归比较。
 *
 * @param a - 第一个值
 * @param b - 第二个值
 * @param ignoreKeys - 忽略的键
-* @param debug - 是否调试
+* @param debug - 是否调试（打印首个不相等的键）
 * @returns 是否相等
 */
-function isDeepEqualReact(a, b, ignoreKeys, debug) {
+function isDeepEqual(a, b, ignoreKeys, debug) {
 	if (a === b) return true;
 	if (a && b && typeof a === "object" && typeof b === "object") {
 		if (a.constructor !== b.constructor) return false;
@@ -17,13 +19,13 @@ function isDeepEqualReact(a, b, ignoreKeys, debug) {
 		if (Array.isArray(a)) {
 			length = a.length;
 			if (length != b.length) return false;
-			for (i = length; i-- !== 0;) if (!isDeepEqualReact(a[i], b[i], ignoreKeys, debug)) return false;
+			for (i = length; i-- !== 0;) if (!isDeepEqual(a[i], b[i], ignoreKeys, debug)) return false;
 			return true;
 		}
 		if (a instanceof Map && b instanceof Map) {
 			if (a.size !== b.size) return false;
 			for (i of a.entries()) if (!b.has(i[0])) return false;
-			for (i of a.entries()) if (!isDeepEqualReact(i[1], b.get(i[0]), ignoreKeys, debug)) return false;
+			for (i of a.entries()) if (!isDeepEqual(i[1], b.get(i[0]), ignoreKeys, debug)) return false;
 			return true;
 		}
 		if (a instanceof Set && b instanceof Set) {
@@ -43,12 +45,12 @@ function isDeepEqualReact(a, b, ignoreKeys, debug) {
 		const keys = Object.keys(a);
 		length = keys.length;
 		if (length !== Object.keys(b).length) return false;
-		for (i = length; i-- !== 0;) if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
+		for (i = length; i-- !== 0;) if (!Object.hasOwn(b, keys[i])) return false;
 		for (i = length; i-- !== 0;) {
 			const key = keys[i];
 			if (ignoreKeys?.includes(key)) continue;
 			if (key === "_owner" && a.$$typeof) continue;
-			if (!isDeepEqualReact(a[key], b[key], ignoreKeys, debug)) {
+			if (!isDeepEqual(a[key], b[key], ignoreKeys, debug)) {
 				if (debug) console.log(key);
 				return false;
 			}
@@ -57,6 +59,9 @@ function isDeepEqualReact(a, b, ignoreKeys, debug) {
 	}
 	return a !== a && b !== b;
 }
-
+/**
+* @deprecated 请使用 isDeepEqual，该名称为历史遗留（早期移植自 React 实现）
+*/
+const isDeepEqualReact = isDeepEqual;
 //#endregion
-export { isDeepEqualReact };
+export { isDeepEqual, isDeepEqualReact };

package/dist/is/device.js

@@ -5,6 +5,7 @@
 * @returns 是否为移动端
 */
 function isMobile() {
+	if (typeof navigator === "undefined") return false;
 	const userAgent = navigator.userAgent || navigator.vendor;
 	if (/iPhone/.test(userAgent)) return true;
 	if (/Android/.test(userAgent) && /Mobile/.test(userAgent)) return true;
@@ -18,6 +19,7 @@ function isMobile() {
 * @returns 是否为平板
 */
 function isTablet() {
+	if (typeof navigator === "undefined" || typeof document === "undefined") return false;
 	const userAgent = navigator.userAgent || navigator.vendor;
 	if (/iPad/.test(userAgent)) return true;
 	if (/Macintosh/.test(userAgent) && "ontouchend" in document) return true;
@@ -30,8 +32,8 @@ function isTablet() {
 * @returns 是否为 Windows 系统
 */
 function isWindowsOs() {
+	if (typeof navigator === "undefined") return false;
 	return /windows|win32/i.test(navigator.userAgent);
 }
-
 //#endregion
-export { isMobile, isTablet, isWindowsOs };
+export { isMobile, isTablet, isWindowsOs };

package/dist/is/equal.js

@@ -29,6 +29,5 @@ function isEqual(obj1, obj2, shallow = false) {
 	}
 	return deepEqual(obj1, obj2);
 }
-
 //#endregion
-export { isEqual };
+export { isEqual };

package/dist/is/img.js

@@ -8,6 +8,5 @@
 function isImg(path) {
 	return /\w.(?:png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path);
 }
-
 //#endregion
-export { isImg };
+export { isImg };

package/dist/is/index.d.ts

@@ -1,6 +1,6 @@
-import { isBase64, isDataURLBase64 } from "./base64.js";
+import { isDataURLBase64, isMediaDataURI } from "./base64.js";
 import { isBrowser } from "./browser.js";
-import { isDeepEqualReact } from "./deepEqual.js";
+import { isDeepEqual, isDeepEqualReact } from "./deepEqual.js";
 import { isMobile, isTablet, isWindowsOs } from "./device.js";
 import { isEqual } from "./equal.js";
 import { isImg } from "./img.js";
@@ -13,4 +13,4 @@ import { isTypedArray } from "./typedArray.js";
 import { isUnsafeProperty } from "./unsafeProperty.js";
 import { isUrl } from "./url.js";
 import { convertValueBoolean, isValid } from "./valid.js";
-export { convertValueBoolean, is, isArray, isBase64, isBoolean, isBrowser, isDataURLBase64, isDeepEqualReact, isEqual, isFunction, isImg, isJSONStr, isMobile, isNil, isNotNil, isNumber, isObject, isObjectWithSymbols, isPlainObject, isPrimitive, isServer, isString, isTablet, isTypedArray, isUnsafeProperty, isUrl, isValid, isWindowsOs };
+export { convertValueBoolean, is, isArray, isBoolean, isBrowser, isDataURLBase64, isDeepEqual, isDeepEqualReact, isEqual, isFunction, isImg, isJSONStr, isMediaDataURI, isMobile, isNil, isNotNil, isNumber, isObject, isObjectWithSymbols, isPlainObject, isPrimitive, isServer, isString, isTablet, isTypedArray, isUnsafeProperty, isUrl, isValid, isWindowsOs };

package/dist/is/index.js

@@ -1,6 +1,6 @@
-import { isBase64, isDataURLBase64 } from "./base64.js";
+import { isDataURLBase64, isMediaDataURI } from "./base64.js";
 import { isBrowser } from "./browser.js";
-import { isDeepEqualReact } from "./deepEqual.js";
+import { isDeepEqual, isDeepEqualReact } from "./deepEqual.js";
 import { isMobile, isTablet, isWindowsOs } from "./device.js";
 import { isEqual } from "./equal.js";
 import { isImg } from "./img.js";
@@ -13,5 +13,4 @@ import { isTypedArray } from "./typedArray.js";
 import { isUnsafeProperty } from "./unsafeProperty.js";
 import { isUrl } from "./url.js";
 import { convertValueBoolean, isValid } from "./valid.js";
-
-export { convertValueBoolean, is, isArray, isBase64, isBoolean, isBrowser, isDataURLBase64, isDeepEqualReact, isEqual, isFunction, isImg, isJSONStr, isMobile, isNil, isNotNil, isNumber, isObject, isObjectWithSymbols, isPlainObject, isPrimitive, isServer, isString, isTablet, isTypedArray, isUnsafeProperty, isUrl, isValid, isWindowsOs };
+export { convertValueBoolean, is, isArray, isBoolean, isBrowser, isDataURLBase64, isDeepEqual, isDeepEqualReact, isEqual, isFunction, isImg, isJSONStr, isMediaDataURI, isMobile, isNil, isNotNil, isNumber, isObject, isObjectWithSymbols, isPlainObject, isPrimitive, isServer, isString, isTablet, isTypedArray, isUnsafeProperty, isUrl, isValid, isWindowsOs };

package/dist/is/nil.js

@@ -17,6 +17,5 @@ function isNil(val) {
 function isNotNil(val) {
 	return val !== null && val !== void 0;
 }
-
 //#endregion
-export { isNil, isNotNil };
+export { isNil, isNotNil };

package/dist/is/plainObject.js

@@ -1,6 +1,5 @@
 import { getSymbols } from "../function/object.js";
 import { isObject } from "./type.js";
-
 //#region src/is/plainObject.ts
 /**
 * 判断是否为纯对象（plain object）
@@ -12,7 +11,7 @@ function isPlainObject(value) {
 	if (!isObject(value)) return false;
 	const proto = Object.getPrototypeOf(value);
 	if (proto === null) return true;
-	const ctor = Object.prototype.hasOwnProperty.call(proto, "constructor") && proto.constructor;
+	const ctor = Object.hasOwn(proto, "constructor") && proto.constructor;
 	return typeof ctor === "function" && ctor instanceof ctor && Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object);
 }
 /**
@@ -25,6 +24,5 @@ function isObjectWithSymbols(value) {
 	if (!isObject(value)) return false;
 	return getSymbols(value).length > 0;
 }
-
 //#endregion
-export { isObjectWithSymbols, isPlainObject };
+export { isObjectWithSymbols, isPlainObject };

package/dist/is/primitive.js

@@ -8,6 +8,5 @@
 function isPrimitive(value) {
 	return value === null || typeof value !== "object" && typeof value !== "function";
 }
-
 //#endregion
-export { isPrimitive };
+export { isPrimitive };

package/dist/is/server.js

@@ -5,6 +5,5 @@
 * @returns 是否为服务端
 */
 const isServer = typeof window === "undefined";
-
 //#endregion
-export { isServer };
+export { isServer };

package/dist/is/type.js

@@ -79,6 +79,5 @@ function isJSONStr(str) {
 		return false;
 	}
 }
-
 //#endregion
-export { is, isArray, isBoolean, isFunction, isJSONStr, isNumber, isObject, isString };
+export { is, isArray, isBoolean, isFunction, isJSONStr, isNumber, isObject, isString };

package/dist/is/typedArray.js

@@ -28,6 +28,5 @@
 function isTypedArray(x) {
 	return ArrayBuffer.isView(x) && !(x instanceof DataView);
 }
-
 //#endregion
-export { isTypedArray };
+export { isTypedArray };

package/dist/is/unsafeProperty.js

@@ -13,6 +13,5 @@ function isUnsafeProperty(property) {
 		"prototype"
 	].includes(property);
 }
-
 //#endregion
-export { isUnsafeProperty };
+export { isUnsafeProperty };

package/dist/is/url.js

@@ -10,11 +10,9 @@ function isUrl(path) {
 	if (!path.startsWith("http")) return false;
 	try {
 		return !!new URL(path);
-	} catch (_) {
-		console.error("isUrl error", _);
+	} catch {
 		return false;
 	}
 }
-
 //#endregion
-export { isUrl };
+export { isUrl };

package/dist/is/valid.js

@@ -18,6 +18,5 @@ function convertValueBoolean(value) {
 	if (typeof value === "boolean") return value;
 	return !!value;
 }
-
 //#endregion
-export { convertValueBoolean, isValid };
+export { convertValueBoolean, isValid };

package/dist/merge/{useDeepMege.d.ts → deepCloneMerge.d.ts}

@@ -1,4 +1,4 @@
-//#region src/merge/useDeepMege.d.ts
+//#region src/merge/deepCloneMerge.d.ts
 /**
  * Merges the properties of the source object into a deep clone of the target object.
  * Unlike `merge`, This function does not modify the original target object.
@@ -10,6 +10,8 @@
  *
  * Note that this function does not mutate the target object.
  *
+ * 注意：函数名保留 `use` 前缀为历史命名，本函数是**纯函数**、非 Vue composable，无响应式副作用。
+ *
  * @param {T} target - The target object to be cloned and merged into. This object is not modified directly.
  * @param {S} source - The source object whose properties will be merged into the cloned target object.
  * @returns {T & S} A new object with properties from the source object merged into a deep clone of the target object.

package/dist/merge/{useDeepMege.js → deepCloneMerge.js}

@@ -1,8 +1,7 @@
 import { isPlainObject } from "../is/plainObject.js";
-import "../is/index.js";
+import { cloneDeep } from "../clone/cloneDeep.js";
 import { mergeWith } from "./mergeWith.js";
-
-//#region src/merge/useDeepMege.ts
+//#region src/merge/deepCloneMerge.ts
 /**
 * Merges the properties of the source object into a deep clone of the target object.
 * Unlike `merge`, This function does not modify the original target object.
@@ -14,6 +13,8 @@ import { mergeWith } from "./mergeWith.js";
 *
 * Note that this function does not mutate the target object.
 *
+* 注意：函数名保留 `use` 前缀为历史命名，本函数是**纯函数**、非 Vue composable，无响应式副作用。
+*
 * @param {T} target - The target object to be cloned and merged into. This object is not modified directly.
 * @param {S} source - The source object whose properties will be merged into the cloned target object.
 * @returns {T & S} A new object with properties from the source object merged into a deep clone of the target object.
@@ -46,11 +47,10 @@ import { mergeWith } from "./mergeWith.js";
 * // Output: { a: [1, 2, 3] }
 */
 function useDeepMerge(target, source) {
-	return mergeWith(target, source, function mergeRecursively(targetValue, sourceValue) {
+	return mergeWith(cloneDeep(target), source, function mergeRecursively(targetValue, sourceValue) {
 		if (isPlainObject(sourceValue)) if (isPlainObject(targetValue)) return mergeWith(targetValue, sourceValue, mergeRecursively);
 		else return mergeWith({}, sourceValue, mergeRecursively);
 	});
 }
-
 //#endregion
-export { useDeepMerge };
+export { useDeepMerge };

package/dist/merge/index.d.ts

@@ -1,4 +1,4 @@
-import { useDeepMerge } from "./useDeepMege.js";
+import { useDeepMerge } from "./deepCloneMerge.js";
 import { mergeWith } from "./mergeWith.js";
 
 //#region src/merge/index.d.ts

package/dist/merge/index.js

@@ -1,10 +1,7 @@
 import { isPlainObject } from "../is/plainObject.js";
-import "../is/index.js";
 import { cloneDeep } from "../clone/cloneDeep.js";
-import "../clone/index.js";
 import { mergeWith } from "./mergeWith.js";
-import { useDeepMerge } from "./useDeepMege.js";
-
+import { useDeepMerge } from "./deepCloneMerge.js";
 //#region src/merge/index.ts
 /**
 * 合并多个对象
@@ -17,7 +14,7 @@ function merge(...rest) {
 	const il = rest.length;
 	let key;
 	let i = 0;
-	for (; i < il; i += 1) for (key in rest[i]) if (Object.prototype.hasOwnProperty.call(rest[i], key)) if (typeof obj[key] === "object" && typeof rest[i][key] === "object" && obj[key] !== void 0 && obj[key] !== null && !Array.isArray(obj[key]) && !Array.isArray(rest[i][key])) obj[key] = {
+	for (; i < il; i += 1) for (key in rest[i]) if (Object.getOwnPropertyDescriptor(rest[i], key)) if (typeof obj[key] === "object" && typeof rest[i][key] === "object" && obj[key] !== void 0 && obj[key] !== null && !Array.isArray(obj[key]) && !Array.isArray(rest[i][key])) obj[key] = {
 		...obj[key],
 		...rest[i][key]
 	};
@@ -32,11 +29,30 @@ function merge(...rest) {
 * @returns 合并后的对象
 */
 function deepMerge(target, source) {
-	return mergeWith(cloneDeep(target), source, function mergeRecursively(targetValue, sourceValue) {
-		if (isPlainObject(sourceValue)) if (isPlainObject(targetValue)) return mergeWith(cloneDeep(targetValue), sourceValue, mergeRecursively);
-		else return mergeWith({}, sourceValue, mergeRecursively);
+	const sourceStack = /* @__PURE__ */ new WeakMap();
+	const clonedTarget = cloneDeep(target);
+	if (isPlainObject(source)) sourceStack.set(source, clonedTarget);
+	const mergedTarget = mergeWith(clonedTarget, source, function mergeRecursively(targetValue, sourceValue) {
+		if (isPlainObject(sourceValue)) {
+			const cached = sourceStack.get(sourceValue);
+			if (cached) return cached;
+			if (isPlainObject(targetValue)) {
+				const nextTarget = cloneDeep(targetValue);
+				sourceStack.set(sourceValue, nextTarget);
+				const merged = mergeWith(nextTarget, sourceValue, mergeRecursively);
+				sourceStack.delete(sourceValue);
+				return merged;
+			} else {
+				const nextTarget = {};
+				sourceStack.set(sourceValue, nextTarget);
+				const merged = mergeWith(nextTarget, sourceValue, mergeRecursively);
+				sourceStack.delete(sourceValue);
+				return merged;
+			}
+		}
 	});
+	if (isPlainObject(source)) sourceStack.delete(source);
+	return mergedTarget;
 }
-
 //#endregion
-export { deepMerge, merge, mergeWith, useDeepMerge };
+export { deepMerge, merge, mergeWith, useDeepMerge };

package/dist/merge/mergeWith.js

@@ -1,7 +1,5 @@
 import { isPlainObject } from "../is/plainObject.js";
 import { isUnsafeProperty } from "../is/unsafeProperty.js";
-import "../is/index.js";
-
 //#region src/merge/mergeWith.ts
 /**
 * 合并对象（带自定义处理）
@@ -26,6 +24,5 @@ function mergeWith(target, source, merge) {
 	}
 	return target;
 }
-
 //#endregion
-export { mergeWith };
+export { mergeWith };

package/dist/number/chinese.js

@@ -1,6 +1,4 @@
 import { isNumber } from "../is/type.js";
-import "../is/index.js";
-
 //#region src/number/chinese.ts
 /**
 * 数字转中文
@@ -41,6 +39,5 @@ function toChinesNum(num) {
 	if (noWan.toString().length < 4) noWan = `0${noWan}`;
 	return overWan ? `${getWan(overWan)}万${getWan(noWan)}` : getWan(num);
 }
-
 //#endregion
-export { toChinesNum };
+export { toChinesNum };

package/dist/number/format.js

@@ -1,7 +1,6 @@
 import { isNumber } from "../is/type.js";
-import "../is/index.js";
-
 //#region src/number/format.ts
+const formatNumberRegexCache = /* @__PURE__ */ new Map();
 /**
 * 格式化数字，保留指定小数位
 *
@@ -10,8 +9,11 @@ import "../is/index.js";
 * @returns 格式化后的字符串
 */
 function formatNumber(fixedNum, value) {
-	const regexPattern = `^\\d+(?:\\.\\d{0,${fixedNum}})?`;
-	const match = new RegExp(regexPattern);
+	let match = formatNumberRegexCache.get(fixedNum);
+	if (!match) {
+		match = new RegExp(`^\\d+(?:\\.\\d{0,${fixedNum}})?`);
+		formatNumberRegexCache.set(fixedNum, match);
+	}
 	const result = value.toString().match(match);
 	if (result) {
 		const formattedValue = result[0];
@@ -67,6 +69,5 @@ function toConvertNumberShow(number, options) {
 		unit: countStr
 	};
 }
-
 //#endregion
-export { formatNumber, toConvertNumberShow };
+export { formatNumber, toConvertNumberShow };

package/dist/number/index.js

@@ -1,4 +1,3 @@
 import { toChinesNum } from "./chinese.js";
 import { formatNumber, toConvertNumberShow } from "./format.js";
-
-export { formatNumber, toChinesNum, toConvertNumberShow };
+export { formatNumber, toChinesNum, toConvertNumberShow };

package/dist/object/classNames.js

@@ -1,6 +1,4 @@
 import { isArray, isObject, isString } from "../is/type.js";
-import "../is/index.js";
-
 //#region src/object/classNames.ts
 /**
 * 类名合并工具
@@ -24,7 +22,5 @@ function classNames(...args) {
 	}
 	return classes.filter((el) => el).join(" ");
 }
-var classNames_default = classNames;
-
 //#endregion
-export { classNames_default as default };
+export { classNames as default };

package/dist/object/index.js

@@ -1,6 +1,5 @@
-import classNames_default from "./classNames.js";
+import classNames from "./classNames.js";
 import { omitBoolean } from "./omitBoolean.js";
 import { omitUndefined } from "./omitUndefined.js";
 import { omitUndefinedAndEmptyArr } from "./omitUndefinedAndEmptyArr.js";
-
-export { classNames_default as classNames, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr };
+export { classNames, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr };

package/dist/object/omitBoolean.js

@@ -8,6 +8,5 @@
 function omitBoolean(obj) {
 	if (obj && obj !== true) return obj;
 }
-
 //#endregion
-export { omitBoolean };
+export { omitBoolean };

package/dist/object/omitUndefined.js

@@ -13,6 +13,5 @@ function omitUndefined(obj) {
 	if (Object.keys(newObj).length < 1) return;
 	return newObj;
 }
-
 //#endregion
-export { omitUndefined };
+export { omitUndefined };

package/dist/object/omitUndefinedAndEmptyArr.js

@@ -14,6 +14,5 @@ function omitUndefinedAndEmptyArr(obj) {
 	});
 	return newObj;
 }
-
 //#endregion
-export { omitUndefinedAndEmptyArr };
+export { omitUndefinedAndEmptyArr };