fix(deepMerge): override plain value

antfu · Jul 2, 2023 · 34cbabf · 34cbabf
1 parent c7bbe2d
commit 34cbabf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/object.test.ts b/src/object.test.ts
@@ -51,6 +51,11 @@ describe('deepMerge', () => {
  const obj2 = { a: ['C'], b: ['D'] }
  expect(deepMerge({}, obj1, obj2)).toEqual({ a: ['C'], b: ['D'] })
  })
+ it('should overide plain value', () => {
+ const obj1 = { a: { x: 1 } }
+ const obj2 = { a: { x: { f: 2 } } } as any
+ expect(deepMerge({}, obj1, obj2)).toEqual({ a: { x: { f: 2 } } })
+ })
 
  it('prototype pollution 1', () => {
  const obj = {} as any

diff --git a/src/object.ts b/src/object.ts
@@ -96,7 +96,14 @@ export function deepMerge<T extends object = object, S extends object = T>(targe
  target[key] = {}
 
  // @ts-expect-error
- deepMerge(target[key], source[key])
+ if (isMergableObject(target[key])) {
+ // @ts-expect-error
+ deepMerge(target[key], source[key])
+ }
+ else {
+ // @ts-expect-error
+ target[key] = source[key]
+ }
  }
  else {
  // @ts-expect-error