Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assignDeep copy plain objects values instead of reference #151

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

assignDeep copy plain objects values instead of reference #151

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88b8e71
deepAssign copy values instead of reference
cherifGsoul Nov 27, 2018
603b86d
fix cyclic dependency
cherifGsoul Nov 27, 2018
7ec5792
use assignDeepMap Symbol from target if available
cherifGsoul Dec 6, 2018
bcb1bf8
copy plain object only
cherifGsoul Dec 11, 2018
090e342
remove target assignDeepMap Symbol invocation
cherifGsoul Dec 11, 2018
dcaebfb
Fix and make the test reflect the issue
cherifGsoul Dec 14, 2018
4cfe859
add failing tests for depending repos scenarios
cherifGsoul Dec 17, 2018
7392e55
fix a test
cherifGsoul Dec 17, 2018
9c8353b
make the tests pass
cherifGsoul Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions reflections/shape/shape-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,13 @@ QUnit.test("assignDeepList", function(){
], "assigned right");
});

QUnit.test("assignDeep copy #150", function() {
var obj = {};
var objMap = {prop: { foo: 'bar' }};
shapeReflections.assignDeep(obj, objMap);
QUnit.notEqual(obj.prop, objMap.prop, "copy without referencing");
});


/*QUnit.test("getAllEnumerableKeys", function(){

Expand Down
14 changes: 10 additions & 4 deletions reflections/shape/shape.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,18 +813,24 @@ shapeReflections = {
return target;
},
assignDeepMap: function(target, source) {

var hasOwnKey = fastHasOwnKey(target);
var getKeyValue = target[getKeyValueSymbol] || shiftedGetKeyValue;
var setKeyValue = target[setKeyValueSymbol] || shiftedSetKeyValue;

shapeReflections.eachKey(source, function(newVal, key){
if(!hasOwnKey(key)) {
// set no matter what
getSetReflections.setKeyValue(target, key, newVal);
// Plain objects needs to be serialized to make sure
// newVal is copied not referenced #150
if (typeReflections.isMapLike(newVal) && !typeReflections.isObservableLike(newVal)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't solve the original issue since it was using a DefineMap. Is that being handled somewhere else?

getSetReflections.setKeyValue(target, key, shapeReflections.serialize(newVal));
} else {
// set no matter what
getSetReflections.setKeyValue(target, key, newVal);
}
} else {
var curVal = getKeyValue.call(target, key);

// if either was primitive, no recursive update possible
if(newVal === curVal) {
// do nothing
Expand Down