@magic/deep 0.1.6 → 0.1.10

package/README.md

@@ -121,5 +121,18 @@ update dependencies
 ##### 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 - unreleased
+##### 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
+update dependencies
+
+##### 0.1.11 - unreleased
 ...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic/deep",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "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.15"
+    "@magic/types": "0.1.18"
   },
   "devDependencies": {
-    "@magic/format": "0.0.22",
-    "@magic/test": "0.1.66"
+    "@magic/format": "0.0.35",
+    "@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
   }