From 2c8117714c2698228296539f6177eb2c0598c3bc Mon Sep 17 00:00:00 2001
From: cheton <cheton@gmail.com>
Date: Mon, 18 Nov 2024 22:18:15 +0800
Subject: [PATCH] feat: enhance the `merge` function to support both arrays and
 plain objects

---
 packages/utils/src/shared.js | 49 ++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/packages/utils/src/shared.js b/packages/utils/src/shared.js
index 10f98ae27b..96f820b7e3 100644
--- a/packages/utils/src/shared.js
+++ b/packages/utils/src/shared.js
@@ -16,17 +16,20 @@ const _joinWords = (words) => {
 };
 
 const _deepClone = (source) => {
-  if (!isPlainObject(source)) {
-    return source;
+  if (Array.isArray(source)) {
+    return source.map((item) => _deepClone(item));
   }
 
-  const output = {};
-
-  Object.keys(source).forEach((key) => {
-    output[key] = _deepClone(source[key]);
-  });
+  if (isPlainObject(source)) {
+    const output = {};
+    Object.keys(source).forEach((key) => {
+      output[key] = _deepClone(source[key]);
+    });
+    return output;
+  }
 
-  return output;
+  // For primitive values and other types, return as is
+  return source;
 };
 
 export const ariaAttr = (condition) => {
@@ -55,25 +58,33 @@ export const dataAttr = (condition) => {
 };
 
 export const merge = (target, source, options = { clone: true }) => {
-  const output = options.clone ? { ...target } : target;
+  // Merge arrays
+  if (Array.isArray(target) && Array.isArray(source)) {
+    const output = options.clone ? [...target] : target;
+    source.forEach((item, index) => {
+      if (isPlainObject(item) && isPlainObject(output[index])) {
+        output[index] = merge(output[index], item, options);
+      } else {
+        output[index] = options.clone ? _deepClone(item) : item;
+      }
+    });
+    return output;
+  }
 
+  // Merge plain objects
   if (isPlainObject(target) && isPlainObject(source)) {
+    const output = options.clone ? { ...target } : target;
     Object.keys(source).forEach((key) => {
-      if (
-        isPlainObject(source[key]) &&
-        Object.prototype.hasOwnProperty.call(target, key) &&
-        isPlainObject(target[key])
-      ) {
-        output[key] = merge(target[key], source[key], options);
-      } else if (options.clone) {
-        output[key] = isPlainObject(source[key]) ? _deepClone(source[key]) : source[key];
+      if (isPlainObject(source[key]) && isPlainObject(output[key]) && Object.prototype.hasOwnProperty.call(output, key)) {
+        output[key] = merge(output[key], source[key], options);
       } else {
-        output[key] = source[key];
+        output[key] = options.clone ? _deepClone(source[key]) : source[key];
       }
     });
+    return output;
   }
 
-  return output;
+  return options.clone ? _deepClone(source) : source;
 };
 
 export const noop = () => {};