fix(shared): fix merge empty object is not work (#2841)

* fix(shared): fix merge empty object is not work * fix(shared): fix ci
alibaba · Feb 21, 2022 · 28a5853 · 28a5853
1 parent c38e728
commit 28a5853
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/shared/src/__tests__/index.spec.ts b/packages/shared/src/__tests__/index.spec.ts
@@ -698,6 +698,19 @@ describe('merge', () => {
     })
   })
 
+  test('empty', () => {
+    expect(
+      merge(
+        {
+          aa: undefined,
+        },
+        {
+          aa: {},
+        }
+      )
+    ).toEqual({ aa: {} })
+  })
+
   test('clone', () => {
     const target = {
       aa: {

diff --git a/packages/shared/src/merge.ts b/packages/shared/src/merge.ts
@@ -1,4 +1,4 @@
-import { isValid } from './isEmpty'
+import { isValid, isEmpty } from './isEmpty'
 import { isFn, isPlainObj } from './checkers'
 
 function defaultIsMergeableObject(value: any) {
@@ -99,10 +99,9 @@ function mergeObject(target: any, source: any, options: Options) {
     if (propertyIsUnsafe(target, key)) {
       return
     }
-    if (!target[key]) {
+    if (isEmpty(target[key])) {
       destination[key] = source[key]
-    }
-    if (
+    } else if (
       propertyIsOnObject(target, key) &&
       options.isMergeableObject(source[key])
     ) {