Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ts-jsonapi",
"version": "2.1.2",
"version": "2.1.3",
"description": "JSON API (De) Serializer in Typescript",
"main": "lib/index.js",
"module": "lib/index.js",
Expand Down
2 changes: 2 additions & 0 deletions src/deserializer-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export class DeserializerUtils {
.valueForRelationship;

return valueForRelationshipFct(relationshipData, included);
} else if (!included && relationshipData) {
return {id: relationshipData.id}
} else {
return included;
}
Expand Down
36 changes: 34 additions & 2 deletions test/deserializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,14 @@ describe('JSON API Deserializer', function () {
}
}});

expect(json[1]).to.have.key('id', 'first-name', 'last-name','address');
expect(json[1]).to.have.key('id', 'first-name', 'last-name', 'address');

expect(json[1].address).to.be.eql({
id: '54735697e16624ba1eee36bf',
'address-line1': '361 Shady Lane',
'zip-code': '23185',
country: 'USA'
country: 'USA',
lock: {id: "2"}
});

done();
Expand Down Expand Up @@ -545,6 +546,34 @@ describe('JSON API Deserializer', function () {

done(null, json);
});

it('return id by default if no included found', function (done) {
var dataSet = {
data: [{
type: 'users',
id: '54735750e16638ba1eee59cb',
attributes: {
'first-name': 'Yevhen',
'last-name': 'Baidiuk'
},
relationships: {
address: {
data: { type: 'address', id: '66635722e16620ba1eee36af' }
}
}
}]
};

var json = new JSONAPIDeserializer().deserialize(dataSet);

expect(json).to.be.an('array').with.length(1);
expect(json[0]).to.have.key('id', 'first-name', 'last-name', 'address');
expect(json[0].address).to.be.eql({
id: '66635722e16620ba1eee36af'
});

done(null, json);
});
});

describe('With empty relationship', function () {
Expand Down Expand Up @@ -778,6 +807,9 @@ describe('JSON API Deserializer', function () {
address_line1: '406 Madison Court',
zip_code: '49426',
id: '54735722e16620ba1eee36af',
country: {
id: "54735722e16609ba1eee36af"
}
}
}
});
Expand Down