Fix issue when obj1 property value is !Object (#7)

dispix · Jul 12, 2019 · 27eb242 · 27eb242
1 parent 069764b
commit 27eb242
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/src/deepDiff.js b/src/deepDiff.js
@@ -49,6 +49,12 @@ function deepDiff (obj1, obj2, keepNewKeys = false) {
         return
       }
 
+      if (!(obj1[key] instanceof Object)) {
+        diff[key] = obj2[key]
+
+        return
+      }
+
       diff[key] = deepDiff(obj1[key], obj2[key], keepNewKeys)
 
       //  Don't keep trace of a null key if it was generated by a recursive use of deepDiff.

diff --git a/test/deepDiff.test.js b/test/deepDiff.test.js
@@ -14,7 +14,13 @@ describe('deepDiff', () => {
     i: true,
     j: null,
     k: 'blue',
-    l: [[0, 1], [2, 3]]
+    l: [[0, 1], [2, 3]],
+    m: 'one',
+    n: {
+      a: 1,
+      b: {},
+      c: 'one'
+    }
   }
 
   const objTwo = {
@@ -31,7 +37,18 @@ describe('deepDiff', () => {
     i: false,
     j: null,
     k: null,
-    l: [[0, 1], [2, 4]]
+    l: [[0, 1], [2, 4]],
+    m: {
+      a: 1,
+      b: 2
+    },
+    n: {
+      a: 1,
+      b: {},
+      c: {
+        d: 'one'
+      }
+    }
   }
 
   const expected = {
@@ -42,7 +59,16 @@ describe('deepDiff', () => {
     h: [1, 'owt', 3, 'four'],
     i: false,
     k: null,
-    l: [[0, 1], [2, 4]]
+    l: [[0, 1], [2, 4]],
+    m: {
+      a: 1,
+      b: 2
+    },
+    n: {
+      c: {
+        d: 'one'
+      }
+    }
   }
 
   const expectedWithNewKeys = {
@@ -54,7 +80,16 @@ describe('deepDiff', () => {
     h: [1, 'owt', 3, 'four'],
     i: false,
     k: null,
-    l: [[0, 1], [2, 4]]
+    l: [[0, 1], [2, 4]],
+    m: {
+      a: 1,
+      b: 2
+    },
+    n: {
+      c: {
+        d: 'one'
+      }
+    }
   }
 
   it('should return the diff object between two objects', () => {