fix: merge function nested structure fix when using custom options

KiraLT · Jan 1, 2023 · c75f63d · c75f63d
1 parent 229608a
commit c75f63d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/object.spec.ts b/spec/object.spec.ts
@@ -115,6 +115,10 @@ describe('merge', () => {
     it('supports custom array merge function', () => {
         expect(merge([1, 2], [3, 4], { arrayPolicy: (a, b) => b.concat(a) })).toEqual([3, 4, 1, 2])
     })
+
+    it('skip nulls', () => {
+        expect(merge({ a: 1 }, { a: null }, { skipNulls: true })).toEqual({ a: 1 })
+    })
 })
 
 describe('clone', () => {

diff --git a/src/object.ts b/src/object.ts
@@ -126,15 +126,19 @@ export function merge<T>(
     options?: {
         /**
          * When `source` has `null` or `undefined` value, do not overwrite `target`
+         * 
+         * @default false
          */
-        skipNulls?: false
+        skipNulls?: boolean
         /**
          * Array merge policy, default is `overwrite`
          *
          * Available policies:
          * * `overwrite` - always replace `target` array with `source`
          * * `merge` - merge `target` and `source` array values
          * * `(target, source) => source` - custom array merge function
+         * 
+         * @default 'overwrite'
          */
         arrayPolicy?:
             | 'overwrite'
@@ -147,7 +151,7 @@ export function merge<T>(
     if (isPlainObject(target) && isPlainObject(source)) {
         return Object.entries(source).reduce(
             (prev, [key, value]) => {
-                prev[key] = merge(prev[key], value)
+                prev[key] = merge(prev[key], value, options)
                 return prev
             },
             { ...target }