@magic/deep 0.1.5 → 0.1.9

package/README.md

@@ -118,5 +118,18 @@ update dependencies
 * bump required node version to 14.15.4
 * update dependencies
 
-##### 0.1.6 - unreleased
+##### 0.1.6
+* merge now checks if o2.hasOwnProperty is a function before using it to check if we should overwrite keys of o1 or not.
+
+##### 0.1.7 
+update @magic/types to avoid circular dependency
+
+##### 0.1.8
+* update dependencies
+* use @magic/types for all type comparisons
+
+##### 0.1.9
+update dependencies
+
+##### 0.1.10 - unreleased
 ...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic/deep",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "author": "Wizards & Witches",
   "description": "manipulate nested objects and arrays",
   "homepage": "https://github.com/magic/deep",
@@ -30,11 +30,11 @@
     "src"
   ],
   "dependencies": {
-    "@magic/types": "0.1.14"
+    "@magic/types": "0.1.17"
   },
   "devDependencies": {
-    "@magic/format": "0.0.20",
-    "@magic/test": "0.1.59"
+    "@magic/format": "0.0.34",
+    "@magic/test": "0.2.0"
   },
   "contributors": [
     {

package/src/flatten.mjs

@@ -1,4 +1,6 @@
-export const shallow = flat => (Array.isArray(flat) ? flatten(...flat) : flat)
+import is from '@magic/types'
+
+export const shallow = flat => (is.array(flat) ? flatten(...flat) : flat)
 
 export const concat = (flat, deep) => flat.concat(shallow(deep))
 

package/src/merge.mjs

@@ -1,9 +1,9 @@
 import is from '@magic/types'
 
 export const merge = (o1, o2) => {
-  if (typeof o1 === 'undefined') {
+  if (is.undefined(o1)) {
     return o2
-  } else if (typeof o2 === 'undefined') {
+  } else if (is.undefined(o2)) {
     return o1
   }
 
@@ -16,8 +16,9 @@ export const merge = (o1, o2) => {
   if (is.mergeable(o1) && is.mergeable(o2)) {
     const keys = Object.keys({ ...o1, ...o2 })
     const final = {}
+
     keys.forEach(key => {
-      if (!o2.hasOwnProperty(key)) {
+      if (!is.function(o2.hasOwnProperty) || !o2.hasOwnProperty(key)) {
         final[key] = o1[key]
       } else {
         final[key] = merge(o1[key], o2[key])