Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-11 03:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure _.merge deep clones array/typed-array/plain-object sources. [closes #1987]

Browse Source
This commit is contained in:
John-David Dalton
2016-02-11 22:56:33 -08:00
parent bd2428dde5
commit 53b3f81abe
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lodash.js
View File

@@ -3081,7 +3081,7 @@
} }
else { else {
isCommon = false; isCommon = false;
newValue = baseClone(srcValue); newValue = baseClone(srcValue, true);
} }
} }
else if (isPlainObject(srcValue) || isArguments(srcValue)) { else if (isPlainObject(srcValue) || isArguments(srcValue)) {
@@ -3090,10 +3090,10 @@
} }
else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) { else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
isCommon = false; isCommon = false;
newValue = baseClone(srcValue); newValue = baseClone(srcValue, true);
} }
else { else {
newValue = srcIndex ? baseClone(objValue) : objValue; newValue = objValue;
} }
} }
else { else {

22
test/test.js
View File

@@ -13937,15 +13937,27 @@
assert.deepEqual(actual.a, [[3, 4, 3]]); assert.deepEqual(actual.a, [[3, 4, 3]]);
}); });
QUnit.test('should shallow clone array/typed-array/plain-object sources', function(assert) { QUnit.test('should deep clone array/typed-array/plain-object sources', function(assert) {
assert.expect(1); assert.expect(1);
var values = [[], new (Uint8Array || Object), {}], var typedArray = Uint8Array
? new Uint8Array(new ArrayBuffer(2))
: { 'buffer': [0, 0] };
var props = ['0', 'a', 'buffer'],
values = [[{ 'a': 1 }], { 'a': [1] }, typedArray],
expected = lodashStable.map(values, alwaysTrue); expected = lodashStable.map(values, alwaysTrue);
var actual = lodashStable.map(values, function(value) { var actual = lodashStable.map(values, function(value, index) {
var object = _.merge({}, { 'value': value }); var key = props[index],
return object.value !== value && lodashStable.isEqual(object.value, value); object = _.merge({}, { 'value': value }),
newValue = object.value;
return (
newValue !== value &&
newValue[key] !== value[key] &&
lodashStable.isEqual(newValue, value)
);
}); });
assert.deepEqual(actual, expected); assert.deepEqual(actual, expected);