Fixed sindresorhus#6 (reuses object in deep assignment)

Kreozot · Nov 17, 2015 · 8a52558 · 8a52558
1 parent 8ef8a6a
commit 8a52558
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
 'use strict';
 var isObj = require('is-obj');
+var isPlainObj = require('is-plain-obj');
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 var propIsEnumerable = Object.prototype.propertyIsEnumerable;
 
@@ -24,7 +25,7 @@ function assignKey(to, from, key) {
 		}
 	}
 
-	if (!hasOwnProperty.call(to, key) || !isObj(val)) {
+	if ((!hasOwnProperty.call(to, key) && !isPlainObj(val)) || !isObj(val)) {
 		to[key] = val;
 	} else {
 		to[key] = assign(Object(to[key]), from[key]);

diff --git a/package.json b/package.json
@@ -37,7 +37,8 @@
     "properties"
   ],
   "dependencies": {
-    "is-obj": "^1.0.0"
+    "is-obj": "^1.0.0",
+    "is-plain-obj": "^1.1.0"
   },
   "devDependencies": {
     "ava": "*",