deepie-merge 1.3.4 → 1.3.7

package/dist/index.d.ts

@@ -8,7 +8,6 @@ type DeepieMergeOpts = {
 type DeepMergeable = {
     [key: string]: any;
 } | Array<any>;
-/** deep-merge b int a */
+/** deep-merge b into a */
 export declare function deepMerge<T extends DeepMergeable>(a: T, b: any, { arrayExtend, maxRecursion }?: DeepieMergeOpts): T;
 export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,45 +1,37 @@
 function isObject(obj) {
   return Object.prototype.toString.call(obj) === "[object Object]";
 }
-function extendArrays(a, b) {
-  return uniq([...a, ...b]);
-}
-function uniq(arr) {
-  return Array.from(new Set(arr));
-}
 function getType(obj) {
   if (isObject(obj)) return "object";
   if (Array.isArray(obj)) return "array";
   return typeof obj;
 }
-function canExtendArray(key, arrayExtend) {
-  return Array.isArray(arrayExtend) ? arrayExtend.includes(key) : arrayExtend;
-}
 function deepMerge(a, b, { arrayExtend = false, maxRecursion = 20 } = { arrayExtend: false, maxRecursion: 10 }) {
+  return merge(a, b, arrayExtend, maxRecursion);
+}
+function merge(a, b, arrayExtend, maxRecursion) {
   if (maxRecursion === 0) return a;
   if (Array.isArray(a)) {
     if (Array.isArray(b)) {
-      return arrayExtend ? extendArrays(a, b) : b;
-    } else {
-      return b;
+      return arrayExtend ? Array.from(/* @__PURE__ */ new Set([...a, ...b])) : b;
     }
-  } else if (Array.isArray(b)) {
     return b;
   }
+  if (Array.isArray(b)) return b;
   if (isObject(a) && isObject(b)) {
-    for (const key of Object.keys(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]);
       const typeB = getType(b[key]);
       if (typeA !== typeB) {
         a[key] = b[key];
+      } else if (typeA === "array" && (Array.isArray(arrayExtend) ? arrayExtend.includes(key) : arrayExtend)) {
+        a[key] = Array.from(/* @__PURE__ */ new Set([...a[key], ...b[key]]));
+      } else if (typeA === "object") {
+        a[key] = merge(a[key], b[key], arrayExtend, maxRecursion - 1);
       } 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];
-        }
+        a[key] = b[key];
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepie-merge",
-  "version": "1.3.4",
+  "version": "1.3.7",
   "description": "Yay, another deep merge",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/deepie-merge",
@@ -17,16 +17,17 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@types/node": "24.3.0",
-    "eslint": "8.57.0",
-    "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"
+    "@types/node": "25.2.0",
+    "eslint": "9.39.2",
+    "eslint-config-silverwind": "120.1.2",
+    "jest-extended": "7.0.0",
+    "typescript": "5.9.3",
+    "typescript-config-silverwind": "14.0.0",
+    "updates": "17.1.0",
+    "versions": "14.1.0",
+    "vite": "7.3.1",
+    "vite-config-silverwind": "6.0.9",
+    "vitest": "4.0.18",
+    "vitest-config-silverwind": "10.6.1"
   }
-}
+}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"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"}