fix(decorated-merger.ts): undefined values in new object should not o…

…verride old object
neckaros · Nov 24, 2018 · a8c3e71 · a8c3e71
1 parent 3e6f497
commit a8c3e71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/decorated-merger.ts b/src/decorated-merger.ts
@@ -70,12 +70,11 @@ export const merger = <T extends any, Y extends any>(
   }
   const allProperties = getAllPropertiesToMerge(merge, options)
   for (const property of allProperties) {
-    const typeNew = typeof merge
-    if (typeNew === 'undefined' || typeNew === 'function') {
-      continue
-    }
     const oldValue = into[property.name]
     const newValue = merge[property.name]
+    if (newValue === undefined) {
+      continue
+    }
     if (oldValue === undefined) {
       into[property.name] = newValue
       continue

diff --git a/test/merge.test.ts b/test/merge.test.ts
@@ -90,6 +90,15 @@ describe('Merging', () => {
     expect(newMovie.to).toBeDefined()
   })
 
+  it('Undefinded in new object should not override', () => {
+    let movieA = { title: 'test', genre: ['Drama'] }
+    const movieB = { title: undefined, genre: undefined }
+    const newMovie = merger(movieB, movieA)
+
+    expect(newMovie.title).toEqual('test')
+    expect(newMovie.genre[0]).toEqual('Drama')
+  })
+
   it('Two simple class with exsiting array should merge', () => {
     const car = getTestCar()
     const carNew = getTestCar()