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

[#39] null as forced default value #40

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

[#39] null as forced default value #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ae568
[#39] null as forced default value
nagarajanchinnasamy Sep 16, 2017
97bf3cd
Merge branch 'master' of https://github.com/wankdanker/node-object-ma…
nagarajanchinnasamy Sep 25, 2017
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
8 changes: 4 additions & 4 deletions src/object-mapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function _map(fromObject, toObject, propertyMap, propertyKeys) {
function _mapKey(fromObject, fromKey, toObject, toKey) {
var fromValue
, restToKeys
, _default = null
, _default // = null
, transform
;

Expand All @@ -87,14 +87,14 @@ function _mapKey(fromObject, fromKey, toObject, toKey) {
}

if (toKey instanceof Object && Object.getPrototypeOf(toKey) === Object.prototype) {
_default = toKey.default || null;
_default = toKey.default; // || null;
transform = toKey.transform;
toKey = toKey.key;
}

if (Array.isArray(toKey)) {
transform = toKey[1];
_default = toKey[2] || null;
_default = toKey[2]; // || null;
toKey = toKey[0];
}

Expand All @@ -103,7 +103,7 @@ function _mapKey(fromObject, fromKey, toObject, toKey) {
}

fromValue = getKeyValue(fromObject, fromKey);
if (typeof fromValue === 'undefined' || fromValue === null) {
if (typeof fromValue === 'undefined') { // || fromValue === null) {
fromValue = _default;
}

Expand Down
53 changes: 53 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,8 @@ test('original various tests', function (t) {
t.deepEqual(result, expected, 'override sku');

obj["inventory"] = null;
map["inventory.onHandQty"] = {key: ["Envelope.Request.Item.Inventory?", null, null]};
map["inventory.replenishQty"] = {key: ["Envelope.Request.Item.RelpenishQuantity?", null, null]};
expected.Envelope.Request.Item.Inventory = null;

result = merge(obj, {}, map);
Expand Down Expand Up @@ -1781,5 +1783,56 @@ test('Mapping source key properties with wrong escaped dot', function (t) {
t.end();
});

test('do not map when a property not present in source and default is not given in map', function (t) {
var expect = {
mapThis: 'defaultVal',
mapThisToo: [ {
property: 'defaultVal',
subArray: [ { property: null } ]
} ],
other: 'otherVal'
};

var map = {
"doNotMapThis": {
"key": "doNotMapThis",
"transform": function(val) {
return "_" + val;
}
},
"doNotMapThisToo[].property": {
"key": "doNotMapThisToo[].property",
"transform": function(val) {
return "_" + val;
}
},
"doNotMapThisToo[].subArray[].property": {
"key": "doNotMapThisToo[].subArray[].property",
"transform": function(val) {
return "_" + val;
}
},
"mapThis": {
"key": "mapThis",
"default": "defaultVal"
},
"mapThisToo[].property": {
"key": "mapThisToo[].property",
"default": "defaultVal"
},
"mapThisToo[].subArray[].property": {
"key": "mapThisToo[].subArray[].property?",
"default": null
},
"other": "other"
};

var obj = {
"other": "otherVal"
};

var result = om(obj, map);

t.deepEqual(result, expect);
t.end();
});