Ensure we only process true Arrays and Objects - This fixes keys with…

… Date values
rhalff · Aug 4, 2016 · a7e948f · a7e948f
1 parent e7fdaa6
commit a7e948f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -438,7 +438,7 @@ DotObject.prototype.dot = function (obj, tgt, path) {
   tgt = tgt || {}
   path = path || []
   Object.keys(obj).forEach(function (key) {
-    if (Object(obj[key]) === obj[key]) {
+    if (Object(obj[key]) === obj[key] && (Object.prototype.toString.call(obj[key]) === '[object Object]') || Object.prototype.toString.call(obj[key]) === '[object Array]') {
       return this.dot(obj[key], tgt, path.concat(key))
     } else {
       tgt[path.concat(key).join(this.seperator)] = obj[key]

diff --git a/src/dot-object.js b/src/dot-object.js
@@ -438,7 +438,7 @@ DotObject.prototype.dot = function (obj, tgt, path) {
   tgt = tgt || {}
   path = path || []
   Object.keys(obj).forEach(function (key) {
-    if (Object(obj[key]) === obj[key]) {
+    if (Object(obj[key]) === obj[key] && (Object.prototype.toString.call(obj[key]) === '[object Object]') || Object.prototype.toString.call(obj[key]) === '[object Array]') {
       return this.dot(obj[key], tgt, path.concat(key))
     } else {
       tgt[path.concat(key).join(this.seperator)] = obj[key]

diff --git a/test/dot.js b/test/dot.js
@@ -23,7 +23,10 @@ describe('dotted-key/value pairs:', function () {
       some: {
         array: ['A', 'B']
       },
-      ehrm: 123
+      ehrm: 123,
+      dates: {
+        first: new Date('Mon Oct 13 2014 00:00:00 GMT+0100 (BST)')
+      }
     }
 
     expected = {
@@ -32,7 +35,8 @@ describe('dotted-key/value pairs:', function () {
       'other.nested.stuff': 5,
       'some.array.0': 'A',
       'some.array.1': 'B',
-      ehrm: 123
+      ehrm: 123,
+      'dates.first': new Date('Mon Oct 13 2014 00:00:00 GMT+0100 (BST)')
     }
   })