@pawover/kit 0.0.0-alpha.17 → 0.0.0-alpha.18

package/dist/index.d.ts

@@ -2,6 +2,12 @@ import { Class, NonEmptyObject, Replace, SetOptional, UnionToTuple, ValueOf } fr
 import { assign } from "radashi";
 
 //#region src/utils/array/arrayCast.d.ts
+
+/**
+ * 构造数组
+ * @param candidate 待构造项
+ * @param checkEmpty 是否检查 `undefined` 和 `null`
+ */
 declare function arrayCast<T>(candidate: T | T[], checkEmpty?: boolean): T[];
 //#endregion
 //#region src/utils/array/arrayCompete.d.ts
@@ -24,8 +30,15 @@ declare function arrayCompete<T>(initialList: readonly T[], match: (a: T, b: T)
  */
 declare function arrayCounting<T, K extends PropertyKey>(initialList: readonly T[], match: (row: T) => K): Record<string, number>;
 //#endregion
-//#region src/utils/array/arrayDiff.d.ts
-declare function arrayDiff<T>(initialList: readonly T[], diffList: readonly T[], match: (row: T) => PropertyKey): T[];
+//#region src/utils/array/arrayDifference.d.ts
+/**
+ * 求数组差集
+ *
+ * @param initialList 初始数组
+ * @param diffList 对比数组
+ * @param match 匹配函数
+ */
+declare function arrayDifference<T>(initialList: readonly T[], diffList: readonly T[], match?: (row: T) => unknown): T[];
 //#endregion
 //#region src/utils/array/arrayFirst.d.ts
 /**
@@ -46,6 +59,16 @@ declare function arrayFirst<T>(initialList: readonly T[], saveValue?: T): T | un
  */
 declare function arrayFork<T>(initialList: readonly T[], match: (item: T) => boolean): [T[], T[]];
 //#endregion
+//#region src/utils/array/arrayIntersection.d.ts
+/**
+ * 求数组交集
+ *
+ * @param initialList 初始数组
+ * @param diffList 对比数组
+ * @param match 匹配函数
+ */
+declare function arrayIntersection<T>(initialList: readonly T[], diffList: readonly T[], match?: (row: T) => unknown): T[];
+//#endregion
 //#region src/utils/array/arrayLast.d.ts
 /**
  * 获取数组最后一项
@@ -64,7 +87,7 @@ declare function arrayLast<T>(initialList: readonly T[], saveValue?: T): T | und
  * @param mergeList 待合并数组
  * @param match 匹配函数
  */
-declare function arrayMerge<T>(initialList: readonly T[], mergeList: readonly T[], match: (item: T) => unknown): T[];
+declare function arrayMerge<T>(initialList: readonly T[], mergeList: readonly T[], match?: (item: T) => unknown): T[];
 //#endregion
 //#region src/utils/array/arrayPick.d.ts
 /**
@@ -385,4 +408,4 @@ declare const prototypeStrings: {
 };
 declare function resolvePrototypeString(value: unknown): string;
 //#endregion
-export { arrayCast, arrayCompete, arrayCounting, arrayDiff, arrayFirst, arrayFork, arrayLast, arrayMerge, arrayPick, arrayReplace, arraySplit, cloneDeep, enumEntries, enumKeys, enumTypeCheck, enumValues, isArray, isAsyncFunction, isBigInt, isBoolean, isClass, isDate, isEqual, isError, isFile, isFunction, isGeneratorFunction, isInteger, isIterable, isMap, isNull, isNumber, isObject, isPromise, isPromiseLike, isRegExp, isSet, isString, isSymbol, isURLSearchParams, isUndefined, isWeakMap, isWeakSet, isWebSocket, isWindow, mapEntries, objectAssign, objectEntries, objectKeys, objectPick, objectSwitch, objectValues, prototypeStrings, resolvePrototypeString, rowsToTree, stringInitialCase, stringReplace, stringToJson, stringToValues, to, treeFilter, treeFind, treeForEach, treeMap, treeToRows };
+export { arrayCast, arrayCompete, arrayCounting, arrayDifference, arrayFirst, arrayFork, arrayIntersection, arrayLast, arrayMerge, arrayPick, arrayReplace, arraySplit, cloneDeep, enumEntries, enumKeys, enumTypeCheck, enumValues, isArray, isAsyncFunction, isBigInt, isBoolean, isClass, isDate, isEqual, isError, isFile, isFunction, isGeneratorFunction, isInteger, isIterable, isMap, isNull, isNumber, isObject, isPromise, isPromiseLike, isRegExp, isSet, isString, isSymbol, isURLSearchParams, isUndefined, isWeakMap, isWeakSet, isWebSocket, isWindow, mapEntries, objectAssign, objectEntries, objectKeys, objectPick, objectSwitch, objectValues, prototypeStrings, resolvePrototypeString, rowsToTree, stringInitialCase, stringReplace, stringToJson, stringToValues, to, treeFilter, treeFind, treeForEach, treeMap, treeToRows };

package/dist/index.js

@@ -227,6 +227,11 @@ function isWindow(value) {
 
 //#endregion
 //#region src/utils/array/arrayCast.ts
+/**
+* 构造数组
+* @param candidate 待构造项
+* @param checkEmpty 是否检查 `undefined` 和 `null`
+*/
 function arrayCast(candidate, checkEmpty = true) {
 	if (checkEmpty && (isUndefined(candidate) || isNull(candidate))) return [];
 	return isArray(candidate) ? [...candidate] : [candidate];
@@ -265,17 +270,27 @@ function arrayCounting(initialList, match) {
 }
 
 //#endregion
-//#region src/utils/array/arrayDiff.ts
-function arrayDiff(initialList, diffList, match) {
+//#region src/utils/array/arrayDifference.ts
+/**
+* 求数组差集
+*
+* @param initialList 初始数组
+* @param diffList 对比数组
+* @param match 匹配函数
+*/
+function arrayDifference(initialList, diffList, match) {
 	if (!isArray(initialList) && !isArray(diffList)) return [];
 	if (!isArray(initialList) || !initialList.length) return [...diffList];
 	if (!isArray(diffList) || !diffList.length) return [...initialList];
-	if (!isFunction(match)) return [];
-	const keys = diffList.reduce((prev, curr) => {
-		prev[match(curr)] = true;
-		return prev;
-	}, {});
-	return initialList.filter((a) => !keys[match(a)]);
+	if (!isFunction(match)) {
+		const arraySet = new Set(diffList);
+		return Array.from(new Set(initialList.filter((item) => !arraySet.has(item))));
+	}
+	const map = /* @__PURE__ */ new Map();
+	diffList.forEach((item) => {
+		map.set(match(item), true);
+	});
+	return initialList.filter((a) => !map.get(match(a)));
 }
 
 //#endregion
@@ -306,6 +321,30 @@ function arrayFork(initialList, match) {
 	return forked;
 }
 
+//#endregion
+//#region src/utils/array/arrayIntersection.ts
+/**
+* 求数组交集
+*
+* @param initialList 初始数组
+* @param diffList 对比数组
+* @param match 匹配函数
+*/
+function arrayIntersection(initialList, diffList, match) {
+	if (!isArray(initialList) && !isArray(diffList)) return [];
+	if (!isArray(initialList) || !initialList.length) return [...diffList];
+	if (!isArray(diffList) || !diffList.length) return [...initialList];
+	if (!isFunction(match)) {
+		const arraySet = new Set(diffList);
+		return Array.from(new Set(initialList.filter((item) => arraySet.has(item))));
+	}
+	const map = /* @__PURE__ */ new Map();
+	diffList.forEach((item) => {
+		map.set(match(item), true);
+	});
+	return initialList.filter((a) => map.get(match(a)));
+}
+
 //#endregion
 //#region src/utils/array/arrayLast.ts
 /**
@@ -332,7 +371,7 @@ function arrayLast(initialList, saveValue) {
 function arrayMerge(initialList, mergeList, match) {
 	if (!isArray(initialList)) return [];
 	if (!isArray(mergeList)) return [...initialList];
-	if (!isFunction(match)) return [...initialList];
+	if (!isFunction(match)) return Array.from(new Set([...initialList, ...mergeList]));
 	const keys = /* @__PURE__ */ new Map();
 	for (const item of mergeList) keys.set(match(item), item);
 	return initialList.map((prevItem) => {
@@ -1133,4 +1172,4 @@ function treeToRows(tree, options = {}) {
 }
 
 //#endregion
-export { arrayCast, arrayCompete, arrayCounting, arrayDiff, arrayFirst, arrayFork, arrayLast, arrayMerge, arrayPick, arrayReplace, arraySplit, cloneDeep, enumEntries, enumKeys, enumTypeCheck, enumValues, isArray, isAsyncFunction, isBigInt, isBoolean, isClass, isDate, isEqual, isError, isFile, isFunction, isGeneratorFunction, isInteger, isIterable, isMap, isNull, isNumber, isObject, isPromise, isPromiseLike, isRegExp, isSet, isString, isSymbol, isURLSearchParams, isUndefined, isWeakMap, isWeakSet, isWebSocket, isWindow, mapEntries, objectAssign, objectEntries, objectKeys, objectPick, objectSwitch, objectValues, prototypeStrings, resolvePrototypeString, rowsToTree, stringInitialCase, stringReplace, stringToJson, stringToValues, to, treeFilter, treeFind, treeForEach, treeMap, treeToRows };
+export { arrayCast, arrayCompete, arrayCounting, arrayDifference, arrayFirst, arrayFork, arrayIntersection, arrayLast, arrayMerge, arrayPick, arrayReplace, arraySplit, cloneDeep, enumEntries, enumKeys, enumTypeCheck, enumValues, isArray, isAsyncFunction, isBigInt, isBoolean, isClass, isDate, isEqual, isError, isFile, isFunction, isGeneratorFunction, isInteger, isIterable, isMap, isNull, isNumber, isObject, isPromise, isPromiseLike, isRegExp, isSet, isString, isSymbol, isURLSearchParams, isUndefined, isWeakMap, isWeakSet, isWebSocket, isWindow, mapEntries, objectAssign, objectEntries, objectKeys, objectPick, objectSwitch, objectValues, prototypeStrings, resolvePrototypeString, rowsToTree, stringInitialCase, stringReplace, stringToJson, stringToValues, to, treeFilter, treeFind, treeForEach, treeMap, treeToRows };

package/metadata.json

@@ -3,9 +3,10 @@
     "arrayCast",
     "arrayCompete",
     "arrayCounting",
-    "arrayDiff",
+    "arrayDifference",
     "arrayFirst",
     "arrayFork",
+    "arrayIntersection",
     "arrayLast",
     "arrayMerge",
     "arrayPick",

package/package.json

@@ -4,7 +4,7 @@
   "description": "pawover's kit",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.0-alpha.17",
+  "version": "0.0.0-alpha.18",
   "packageManager": "pnpm@10.20.0",
   "engines": {
     "node": ">=22.20.0"