deepie-merge 3.0.2 → 3.1.0

package/README.md

@@ -4,8 +4,9 @@
 > Yay, another deep merge
 
 ## Usage
-```console
-npm i deepie-merge
+
+```sh
+pnpm add deepie-merge
 ```
 
 ```js
@@ -31,6 +32,7 @@ Deep-merge `b` into `a`.
 - `b` *any*: Source value
 - `options` *object*:
   - `arrayExtend` *boolean* or *string[]*: Whether to extend arrays instead of replacing them. When passed a string array, it will only extend the object keys provided in that array.
-  - `maxRecursions` *number*: Amount of nesting levels to recurse into. Default: `20`
+  - `maxRecursion` *number*: Amount of nesting levels to recurse into. Default: `20`
+  - `clone` *boolean* or *function*: Return a new value instead of mutating `a`. A function is used to clone `a`, otherwise `structuredClone`. Default: `false`
 
 © [silverwind](https://github.com/silverwind), distributed under BSD licence

package/dist/index.d.ts

@@ -1,23 +1,18 @@
 //#region index.d.ts
 type ArrayExtend = boolean | Array<string>;
 type DeepieMergeOpts<T = any> = {
-  /** Either a boolean or a array of property keys to allow extension. Default: false */arrayExtend?: ArrayExtend; /** Maximum recursions to perform. Default: 10. */
-  maxRecursion?: number; /** Return a new value instead of mutating the first argument. Default: false */
+  /** Either a boolean or an array of property keys to allow extension. Default: false */
+  arrayExtend?: ArrayExtend;
+  /** Maximum recursions to perform. Default: 20. */
+  maxRecursion?: number;
+  /** Return a new value instead of mutating the first argument. Default: false */
   clone?: boolean | ((value: NoInfer<T>) => NoInfer<T>);
 };
 type DeepMergeable = {
   [key: string]: any;
 } | Array<any>;
-/** Same top-level shape as `T` (array vs object) with the same keys, but with
- *  values widened to `unknown`. Catches array/object mismatches and top-level
- *  excess keys on fresh literals, while accepting wider override types
- *  (e.g. `Partial<UserConfig>` against a `satisfies`-narrowed literal). */
-type DeepMergeSource<T> = T extends ReadonlyArray<any> ? ReadonlyArray<unknown> : T extends object ? { [K in keyof T]?: unknown } : never;
+/** Top-level shape and keys of `T` with `unknown` values: rejects excess keys, accepts wider overrides */
+type DeepMergeSource<T> = T extends ReadonlyArray<any> ? ReadonlyArray<unknown> : T extends object ? { [K in keyof T]?: unknown; } : never;
 /** deep-merge b into a */
-declare function deepMerge<T extends DeepMergeable>(a: T, b: NoInfer<T> | DeepMergeSource<NoInfer<T>> | null | undefined, {
-  arrayExtend,
-  maxRecursion,
-  clone
-}?: DeepieMergeOpts<T>): T;
-//#endregion
-export { deepMerge };
+export declare function deepMerge<T extends DeepMergeable>(a: T, b: NoInfer<T> | DeepMergeSource<NoInfer<T>> | null | undefined, { arrayExtend, maxRecursion, clone }?: DeepieMergeOpts<T>): T;
+//#endregion

package/dist/index.js

@@ -8,28 +8,28 @@ function getType(obj) {
 	return typeof obj;
 }
 /** deep-merge b into a */
-function deepMerge(a, b, { arrayExtend = false, maxRecursion = 20, clone = false } = {
-	arrayExtend: false,
-	maxRecursion: 10
-}) {
+function deepMerge(a, b, { arrayExtend = false, maxRecursion = 20, clone = false } = {}) {
 	return merge(clone ? typeof clone === "function" ? clone(a) : structuredClone(a) : a, b, arrayExtend, maxRecursion);
 }
+function union(target, source) {
+	const set = new Set(target);
+	for (const value of source) set.add(value);
+	return Array.from(set);
+}
 function merge(a, b, arrayExtend, maxRecursion) {
 	if (maxRecursion === 0) return a;
-	if (Array.isArray(a)) {
-		if (Array.isArray(b)) return arrayExtend ? Array.from(new Set([...a, ...b])) : b;
-		return b;
-	}
+	if (Array.isArray(a)) return arrayExtend && Array.isArray(b) ? union(a, b) : b;
 	if (Array.isArray(b)) return b;
 	if (isObject(a) && isObject(b)) {
 		const keys = Object.keys(b);
 		for (let i = 0, len = keys.length; i < len; i++) {
 			const key = keys[i];
-			const typeA = getType(a[key]);
-			if (typeA !== getType(b[key])) a[key] = b[key];
-			else if (typeA === "array" && (Array.isArray(arrayExtend) ? arrayExtend.includes(key) : arrayExtend)) a[key] = Array.from(new Set([...a[key], ...b[key]]));
-			else if (typeA === "object") a[key] = merge(a[key], b[key], arrayExtend, maxRecursion - 1);
-			else a[key] = b[key];
+			const valueA = a[key];
+			if (key === "__proto__" || (key === "constructor" || key === "prototype") && isObject(valueA) && !Object.hasOwn(a, key)) continue;
+			const valueB = b[key];
+			if (isObject(valueA) && isObject(valueB)) a[key] = merge(valueA, valueB, arrayExtend, maxRecursion - 1);
+			else if (Array.isArray(valueA) && Array.isArray(valueB) && (Array.isArray(arrayExtend) ? arrayExtend.includes(key) : arrayExtend)) a[key] = union(valueA, valueB);
+			else a[key] = valueB === null && getType(valueA) === "object" ? valueA : valueB;
 		}
 	}
 	return a;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "deepie-merge",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Yay, another deep merge",
   "author": "silverwind <me@silverwind.io>",
-  "repository": "silverwind/deepie-merge",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/silverwind/deepie-merge.git"
+  },
   "license": "BSD-2-Clause",
   "type": "module",
   "sideEffects": false,
@@ -17,19 +20,18 @@
     "node": ">=22"
   },
   "devDependencies": {
-    "@types/node": "25.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20260507.1",
-    "eslint": "10.3.0",
-    "eslint-config-silverwind": "133.0.1",
-    "jest-extended": "7.0.0",
-    "tsdown": "0.22.0",
-    "tsdown-config-silverwind": "3.0.0",
+    "@types/node": "26.6.3",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "eslint": "10.11.0",
+    "eslint-config-silverwind": "151.0.1",
+    "tsdown": "0.23.0",
+    "tsdown-config-silverwind": "4.1.2",
     "typescript": "6.0.3",
-    "typescript-config-silverwind": "18.0.0",
-    "updates": "17.16.9",
-    "updates-config-silverwind": "3.0.1",
-    "versions": "15.0.3",
-    "vitest": "4.1.5",
-    "vitest-config-silverwind": "11.3.3"
+    "typescript-config-silverwind": "21.0.1",
+    "updates": "19.0.2",
+    "updates-config-silverwind": "4.0.7",
+    "versions": "15.5.1",
+    "vitest": "5.0.2",
+    "vitest-config-silverwind": "12.0.5"
   }
 }