diff options
author | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
commit | bbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch) | |
tree | c58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/es5-ext/object/assign-deep.js | |
parent | 003fb34971cf63466184351b4db5f7c67df4f444 (diff) |
update packages
Diffstat (limited to 'node_modules/es5-ext/object/assign-deep.js')
-rw-r--r-- | node_modules/es5-ext/object/assign-deep.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/node_modules/es5-ext/object/assign-deep.js b/node_modules/es5-ext/object/assign-deep.js index 8034a038e..4a8597a49 100644 --- a/node_modules/es5-ext/object/assign-deep.js +++ b/node_modules/es5-ext/object/assign-deep.js @@ -2,31 +2,32 @@ var includes = require("../array/#/contains") , uniq = require("../array/#/uniq") + , copyDeep = require("./copy-deep") , objForEach = require("./for-each") , isPlainObject = require("./is-plain-object") , ensureValue = require("./valid-value"); var isArray = Array.isArray, slice = Array.prototype.slice; -var deepAssign = function (source, target) { - if (isPlainObject(source)) { - if (!isPlainObject(target)) return target; - objForEach(target, function (value, key) { - source[key] = deepAssign(source[key], value); - }); - return source; +var deepAssign = function (target, source) { + if (target === source) return target; + if (isPlainObject(target) && isPlainObject(source)) { + objForEach(source, function (value, key) { target[key] = deepAssign(target[key], value); }); + return target; } - if (isArray(source)) { - if (!isArray(target)) return target; - target.forEach(function (item) { - if (!includes.call(source, item)) source.push(item); + if (isArray(target) && isArray(source)) { + source.forEach(function (item) { + if (includes.call(target, item)) return; + if (isArray(item) || isPlainObject(item)) item = copyDeep(item); + target.push(item); }); - return source; + return target; } - return target; + if (isPlainObject(source) || isArray(source)) return copyDeep(source); + return source; }; -module.exports = function (target /*, ...objects*/) { +module.exports = function (target/*, ...objects*/) { return uniq .call([ensureValue(target)].concat(slice.call(arguments, 1).map(ensureValue))) .reduce(deepAssign); |