Comparing version 0.5.0 to 0.5.1
@@ -12,13 +12,17 @@ 'use strict'; | ||
function deepMerge(dest, src) { | ||
for (const key of Object.keys(src)) { | ||
if (isObject(src[key])) { | ||
if (!dest[key]) { | ||
dest[key] = {}; | ||
} | ||
deepMerge(dest[key], src[key]); | ||
} else if (isArray(src[key]) && isArray(dest[key])) { | ||
dest[key] = dest[key].concat(src[key]); | ||
} else { | ||
dest[key] = src[key]; | ||
Object.keys(src).forEach((key) => deepMergeOneKey(dest, src, key)); | ||
} | ||
function deepMergeOneKey(dest, src, key) { | ||
if (isObject(src[key])) { | ||
if (!dest[key]) { | ||
dest[key] = {}; | ||
} | ||
deepMerge(dest[key], src[key]); | ||
} else if (isArray(src[key]) && isArray(dest[key])) { | ||
dest[key] = dest[key].concat(src[key]); | ||
} else if (isArray(src[key])) { | ||
dest[key] = [].concat(src[key]); | ||
} else { | ||
dest[key] = src[key]; | ||
} | ||
@@ -25,0 +29,0 @@ } |
{ | ||
"name": "httplease", | ||
"version": "0.5.0", | ||
"version": "0.5.1", | ||
"description": "HTTP client library with support for pluggable filters, including Zipkin, ASAP, etc", | ||
@@ -51,4 +51,4 @@ "main": "index.js", | ||
"proxyquire": "^1.7.4", | ||
"q": "^1.4.1" | ||
"q": "^1.5.0" | ||
} | ||
} |
34274
809