deepie-merge 1.3.2 → 1.3.4

package/README.md

@@ -23,12 +23,14 @@ deepMerge({a: [1], b: [1]}, {a: [2], b: [2]}, {arrayExtend: ["a"]});
 
 ## API
 
-### deepMerge(dst, src, options)
+### deepMerge(a, b, options)
 
-- `dst` *any*: Destination value
-- `src` *any*: Source value
+Deep-merge `b` into `a`.
+
+- `a` *any*: Destination value
+- `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: `10`
+  - `maxRecursions` *number*: Amount of nesting levels to recurse into. Default: `20`
 
 © [silverwind](https://github.com/silverwind), distributed under BSD licence

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-type ArrayExtend = boolean | string[];
+type ArrayExtend = boolean | Array<string>;
 type DeepieMergeOpts = {
     /** Either a boolean or a array of property keys to allow extension. Default: false */
     arrayExtend?: ArrayExtend;
@@ -7,7 +7,7 @@ type DeepieMergeOpts = {
 };
 type DeepMergeable = {
     [key: string]: any;
-} | any[];
+} | Array<any>;
 /** deep-merge b int a */
 export declare function deepMerge<T extends DeepMergeable>(a: T, b: any, { arrayExtend, maxRecursion }?: DeepieMergeOpts): T;
 export {};

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC;AAEtC,KAAK,eAAe,GAAG;IACrB,sFAAsF;IACtF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,KAAK,aAAa,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GAAG,GAAG,EAAE,CAAC;AAwBlD,yBAAyB;AACzB,wBAAgB,SAAS,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAC,WAAmB,EAAE,YAAiB,EAAC,GAAE,eAAwD,GAAG,CAAC,CA8BtK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAE3C,KAAK,eAAe,GAAG;IACrB,sFAAsF;IACtF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,KAAK,aAAa,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;AAwBvD,yBAAyB;AACzB,wBAAgB,SAAS,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAC,WAAmB,EAAE,YAAiB,EAAC,GAAE,eAAwD,GAAG,CAAC,CAgCtK"}

package/dist/index.js

@@ -15,7 +15,8 @@ function getType(obj) {
 function canExtendArray(key, arrayExtend) {
   return Array.isArray(arrayExtend) ? arrayExtend.includes(key) : arrayExtend;
 }
-function deepMerge(a, b, { arrayExtend = false, maxRecursion = 10 } = { arrayExtend: false, maxRecursion: 10 }) {
+function deepMerge(a, b, { arrayExtend = false, maxRecursion = 20 } = { arrayExtend: false, maxRecursion: 10 }) {
+  if (maxRecursion === 0) return a;
   if (Array.isArray(a)) {
     if (Array.isArray(b)) {
       return arrayExtend ? extendArrays(a, b) : b;
@@ -25,20 +26,20 @@ function deepMerge(a, b, { arrayExtend = false, maxRecursion = 10 } = { arrayExt
   } else if (Array.isArray(b)) {
     return b;
   }
-  if (!isObject(b)) return b;
-  if (maxRecursion === 0) return a;
-  for (const key of Object.keys(b)) {
-    const typeA = getType(a[key]);
-    const typeB = getType(b[key]);
-    if (typeA !== typeB) {
-      a[key] = b[key];
-    } else {
-      if (typeA === "array" && canExtendArray(key, arrayExtend)) {
-        a[key] = extendArrays(a[key], b[key]);
-      } else if (typeA === "object") {
-        a[key] = deepMerge(a[key], b[key], { arrayExtend, maxRecursion: maxRecursion - 1 });
-      } else {
+  if (isObject(a) && isObject(b)) {
+    for (const key of Object.keys(b)) {
+      const typeA = getType(a[key]);
+      const typeB = getType(b[key]);
+      if (typeA !== typeB) {
         a[key] = b[key];
+      } else {
+        if (typeA === "array" && canExtendArray(key, arrayExtend)) {
+          a[key] = extendArrays(a[key], b[key]);
+        } else if (typeA === "object") {
+          a[key] = deepMerge(a[key], b[key], { arrayExtend, maxRecursion: maxRecursion - 1 });
+        } else {
+          a[key] = b[key];
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepie-merge",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Yay, another deep merge",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/deepie-merge",
@@ -17,14 +17,14 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@types/node": "24.0.14",
+    "@types/node": "24.3.0",
     "eslint": "8.57.0",
-    "eslint-config-silverwind": "101.4.0",
-    "typescript": "5.8.3",
-    "typescript-config-silverwind": "9.0.8",
-    "updates": "16.4.4",
-    "versions": "13.1.0",
-    "vite": "7.0.5",
+    "eslint-config-silverwind": "102.0.3",
+    "typescript": "5.9.2",
+    "typescript-config-silverwind": "10.0.1",
+    "updates": "16.6.2",
+    "versions": "13.1.1",
+    "vite": "7.1.3",
     "vite-config-silverwind": "5.4.0",
     "vitest": "3.2.4",
     "vitest-config-silverwind": "10.2.0"