Bump to v4.16.4.

This commit is contained in:
John-David Dalton
2016-10-05 19:32:45 -07:00
parent d9fd2bdf9c
commit 6778141728
17 changed files with 103 additions and 69 deletions

View File

@@ -1,11 +1,9 @@
import Stack from './_Stack.js';
import arrayEach from './_arrayEach.js';
import assignMergeValue from './_assignMergeValue.js';
import baseKeysIn from './_baseKeysIn.js';
import baseFor from './_baseFor.js';
import baseMergeDeep from './_baseMergeDeep.js';
import isArray from './isArray.js';
import isObject from './isObject.js';
import isTypedArray from './isTypedArray.js';
import keysIn from './keysIn.js';
/**
* The base implementation of `_.merge` without support for multiple sources.
@@ -22,14 +20,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) {
if (object === source) {
return;
}
if (!(isArray(source) || isTypedArray(source))) {
var props = baseKeysIn(source);
}
arrayEach(props || source, function(srcValue, key) {
if (props) {
key = srcValue;
srcValue = source[key];
}
baseFor(source, function(srcValue, key) {
if (isObject(srcValue)) {
stack || (stack = new Stack);
baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
@@ -44,7 +35,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) {
}
assignMergeValue(object, key, newValue);
}
});
}, keysIn);
}
export default baseMerge;