From bde2a0187e8890aa4d1e47b3cb21c6645401fd05 Mon Sep 17 00:00:00 2001
From: Andrew Worcester <andrew@amwmedia.com>
Date: Wed, 2 Dec 2015 11:18:04 -0500
Subject: [PATCH 1/2] implemented _links property to hold link and relationship
 links while not breaking the _relationships array interface

---
 src/jsonapi-datastore.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/jsonapi-datastore.js b/src/jsonapi-datastore.js
index e4e9696..c2d0409 100644
--- a/src/jsonapi-datastore.js
+++ b/src/jsonapi-datastore.js
@@ -165,6 +165,10 @@ class JsonApiDataStore {
       model[key] = rec.attributes[key];
     }
 
+    if (rec.links) {
+      model._links = rec.links;
+    }
+
     if (rec.relationships) {
       for (key in rec.relationships) {
         var rel = rec.relationships[key];
@@ -179,7 +183,8 @@ class JsonApiDataStore {
           }
         }
         if (rel.links) {
-          console.log("Warning: Links not implemented yet.");
+          model._links = model._links || {};
+          model._links[key] = rel.links;
         }
       }
     }

From 399bf69e18a982869df9c9e420cf246819c9c7aa Mon Sep 17 00:00:00 2001
From: Ben Morrall <bemo56@hotmail.com>
Date: Sat, 17 Jun 2017 14:08:09 +1000
Subject: [PATCH 2/2] Added relationships hash to links

---
 dist/jsonapi-datastore.js          |  8 ++-
 dist/jsonapi-datastore.min.js      |  2 +-
 dist/ng-jsonapi-datastore.js       |  8 ++-
 dist/ng-jsonapi-datastore.min.js   |  2 +-
 dist/node-jsonapi-datastore.js     |  8 ++-
 dist/node-jsonapi-datastore.min.js |  2 +-
 src/jsonapi-datastore.js           |  3 +-
 test/store.spec.js                 | 82 ++++++++++++++++++++++++++++++
 8 files changed, 108 insertions(+), 7 deletions(-)

diff --git a/dist/jsonapi-datastore.js b/dist/jsonapi-datastore.js
index 2ef8d3c..a4c98a7 100644
--- a/dist/jsonapi-datastore.js
+++ b/dist/jsonapi-datastore.js
@@ -201,6 +201,10 @@ var JsonApiDataStore = (function () {
         model[key] = rec.attributes[key];
       }
 
+      if (rec.links) {
+        model._links = rec.links;
+      }
+
       if (rec.relationships) {
         for (key in rec.relationships) {
           var rel = rec.relationships[key];
@@ -215,7 +219,9 @@ var JsonApiDataStore = (function () {
             }
           }
           if (rel.links) {
-            console.log("Warning: Links not implemented yet.");
+            model._links = model._links || {};
+            model._links._relationships = model._links._relationships || {};
+            model._links._relationships[key] = rel.links;
           }
         }
       }
diff --git a/dist/jsonapi-datastore.min.js b/dist/jsonapi-datastore.min.js
index c5ee19f..412dcfb 100644
--- a/dist/jsonapi-datastore.min.js
+++ b/dist/jsonapi-datastore.min.js
@@ -1 +1 @@
-"use strict";function _classCallCheck(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,i){for(var e=0;e<i.length;e++){var a=i[e];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(i,e,a){return e&&t(i.prototype,e),a&&t(i,a),i}}(),JsonApiDataStoreModel=function(){function t(i,e){_classCallCheck(this,t),this.id=e,this._type=i,this._attributes=[],this._relationships=[]}return _createClass(t,[{key:"serialize",value:function(t){var i=this,e={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(e.data.id=this.id),0!==t.attributes.length&&(e.data.attributes={}),0!==t.relationships.length&&(e.data.relationships={}),t.attributes.forEach(function(t){e.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function a(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?e.data.relationships[t]={data:i[t].map(a)}:e.data.relationships[t]={data:a(i[t])}:e.data.relationships[t]={data:null}}),e}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),t}(),JsonApiDataStore=function(){function t(){_classCallCheck(this,t),this.graph={}}return _createClass(t,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(e){return i.graph[t][e]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new JsonApiDataStoreModel(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!a.find(t.type,t.id)){var i=a.initModel(t.type,t.id);i._placeHolder=!0}return a.graph[t.type][t.id]}var e,a=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(e in t.attributes)-1===n._attributes.indexOf(e)&&n._attributes.push(e),n[e]=t.attributes[e];if(t.relationships)for(e in t.relationships){var r=t.relationships[e];void 0!==r.data&&(n._relationships.push(e),null===r.data?n[e]=null:r.data.constructor===Array?n[e]=r.data.map(i):n[e]=i(r.data)),r.links&&console.log("Warning: Links not implemented yet.")}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,e=this.syncRecord.bind(this);return i?(t.included&&t.included.map(e),{data:i.constructor===Array?i.map(e):e(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),t}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:JsonApiDataStore,JsonApiDataStoreModel:JsonApiDataStoreModel});
\ No newline at end of file
+"use strict";function _classCallCheck(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,i){for(var a=0;a<i.length;a++){var e=i[a];e.enumerable=e.enumerable||!1,e.configurable=!0,"value"in e&&(e.writable=!0),Object.defineProperty(t,e.key,e)}}return function(i,a,e){return a&&t(i.prototype,a),e&&t(i,e),i}}(),JsonApiDataStoreModel=function(){function t(i,a){_classCallCheck(this,t),this.id=a,this._type=i,this._attributes=[],this._relationships=[]}return _createClass(t,[{key:"serialize",value:function(t){var i=this,a={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(a.data.id=this.id),0!==t.attributes.length&&(a.data.attributes={}),0!==t.relationships.length&&(a.data.relationships={}),t.attributes.forEach(function(t){a.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function e(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?a.data.relationships[t]={data:i[t].map(e)}:a.data.relationships[t]={data:e(i[t])}:a.data.relationships[t]={data:null}}),a}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),t}(),JsonApiDataStore=function(){function t(){_classCallCheck(this,t),this.graph={}}return _createClass(t,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(a){return i.graph[t][a]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new JsonApiDataStoreModel(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!e.find(t.type,t.id)){var i=e.initModel(t.type,t.id);i._placeHolder=!0}return e.graph[t.type][t.id]}var a,e=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(a in t.attributes)n._attributes.indexOf(a)===-1&&n._attributes.push(a),n[a]=t.attributes[a];if(t.links&&(n._links=t.links),t.relationships)for(a in t.relationships){var s=t.relationships[a];void 0!==s.data&&(n._relationships.push(a),null===s.data?n[a]=null:s.data.constructor===Array?n[a]=s.data.map(i):n[a]=i(s.data)),s.links&&(n._links=n._links||{},n._links._relationships=n._links._relationships||{},n._links._relationships[a]=s.links)}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,a=this.syncRecord.bind(this);return i?(t.included&&t.included.map(a),{data:i.constructor===Array?i.map(a):a(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),t}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:JsonApiDataStore,JsonApiDataStoreModel:JsonApiDataStoreModel});
\ No newline at end of file
diff --git a/dist/ng-jsonapi-datastore.js b/dist/ng-jsonapi-datastore.js
index ad74c9e..bde8429 100644
--- a/dist/ng-jsonapi-datastore.js
+++ b/dist/ng-jsonapi-datastore.js
@@ -238,6 +238,10 @@
           model[key] = rec.attributes[key];
         }
 
+        if (rec.links) {
+          model._links = rec.links;
+        }
+
         if (rec.relationships) {
           for (key in rec.relationships) {
             var rel = rec.relationships[key];
@@ -252,7 +256,9 @@
               }
             }
             if (rel.links) {
-              console.log("Warning: Links not implemented yet.");
+              model._links = model._links || {};
+              model._links._relationships = model._links._relationships || {};
+              model._links._relationships[key] = rel.links;
             }
           }
         }
diff --git a/dist/ng-jsonapi-datastore.min.js b/dist/ng-jsonapi-datastore.min.js
index 42ca2e4..0cc93c0 100644
--- a/dist/ng-jsonapi-datastore.min.js
+++ b/dist/ng-jsonapi-datastore.min.js
@@ -1 +1 @@
-!function(){function t(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}angular.module("beauby.jsonApiDataStore",[]).factory("JsonApiDataStore",function(){return{store:new a,Model:e}});var i=function(){function t(t,i){for(var e=0;e<i.length;e++){var a=i[e];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(i,e,a){return e&&t(i.prototype,e),a&&t(i,a),i}}(),e=function(){function e(i,a){t(this,e),this.id=a,this._type=i,this._attributes=[],this._relationships=[]}return i(e,[{key:"serialize",value:function(t){var i=this,e={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(e.data.id=this.id),0!==t.attributes.length&&(e.data.attributes={}),0!==t.relationships.length&&(e.data.relationships={}),t.attributes.forEach(function(t){e.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function a(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?e.data.relationships[t]={data:i[t].map(a)}:e.data.relationships[t]={data:a(i[t])}:e.data.relationships[t]={data:null}}),e}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),e}(),a=function(){function a(){t(this,a),this.graph={}}return i(a,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(e){return i.graph[t][e]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new e(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!a.find(t.type,t.id)){var i=a.initModel(t.type,t.id);i._placeHolder=!0}return a.graph[t.type][t.id]}var e,a=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(e in t.attributes)-1===n._attributes.indexOf(e)&&n._attributes.push(e),n[e]=t.attributes[e];if(t.relationships)for(e in t.relationships){var r=t.relationships[e];void 0!==r.data&&(n._relationships.push(e),null===r.data?n[e]=null:r.data.constructor===Array?n[e]=r.data.map(i):n[e]=i(r.data)),r.links&&console.log("Warning: Links not implemented yet.")}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,e=this.syncRecord.bind(this);return i?(t.included&&t.included.map(e),{data:i.constructor===Array?i.map(e):e(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),a}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:a,JsonApiDataStoreModel:e})}();
\ No newline at end of file
+!function(){function t(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}angular.module("beauby.jsonApiDataStore",[]).factory("JsonApiDataStore",function(){return{store:new a,Model:e}});var i=function(){function t(t,i){for(var e=0;e<i.length;e++){var a=i[e];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(i,e,a){return e&&t(i.prototype,e),a&&t(i,a),i}}(),e=function(){function e(i,a){t(this,e),this.id=a,this._type=i,this._attributes=[],this._relationships=[]}return i(e,[{key:"serialize",value:function(t){var i=this,e={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(e.data.id=this.id),0!==t.attributes.length&&(e.data.attributes={}),0!==t.relationships.length&&(e.data.relationships={}),t.attributes.forEach(function(t){e.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function a(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?e.data.relationships[t]={data:i[t].map(a)}:e.data.relationships[t]={data:a(i[t])}:e.data.relationships[t]={data:null}}),e}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),e}(),a=function(){function a(){t(this,a),this.graph={}}return i(a,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(e){return i.graph[t][e]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new e(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!a.find(t.type,t.id)){var i=a.initModel(t.type,t.id);i._placeHolder=!0}return a.graph[t.type][t.id]}var e,a=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(e in t.attributes)n._attributes.indexOf(e)===-1&&n._attributes.push(e),n[e]=t.attributes[e];if(t.links&&(n._links=t.links),t.relationships)for(e in t.relationships){var r=t.relationships[e];void 0!==r.data&&(n._relationships.push(e),null===r.data?n[e]=null:r.data.constructor===Array?n[e]=r.data.map(i):n[e]=i(r.data)),r.links&&(n._links=n._links||{},n._links._relationships=n._links._relationships||{},n._links._relationships[e]=r.links)}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,e=this.syncRecord.bind(this);return i?(t.included&&t.included.map(e),{data:i.constructor===Array?i.map(e):e(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),a}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:a,JsonApiDataStoreModel:e})}();
\ No newline at end of file
diff --git a/dist/node-jsonapi-datastore.js b/dist/node-jsonapi-datastore.js
index 49b90d3..b1111d7 100644
--- a/dist/node-jsonapi-datastore.js
+++ b/dist/node-jsonapi-datastore.js
@@ -230,6 +230,10 @@
           model[key] = rec.attributes[key];
         }
 
+        if (rec.links) {
+          model._links = rec.links;
+        }
+
         if (rec.relationships) {
           for (key in rec.relationships) {
             var rel = rec.relationships[key];
@@ -244,7 +248,9 @@
               }
             }
             if (rel.links) {
-              console.log("Warning: Links not implemented yet.");
+              model._links = model._links || {};
+              model._links._relationships = model._links._relationships || {};
+              model._links._relationships[key] = rel.links;
             }
           }
         }
diff --git a/dist/node-jsonapi-datastore.min.js b/dist/node-jsonapi-datastore.min.js
index dc0ddd2..f31eba1 100644
--- a/dist/node-jsonapi-datastore.min.js
+++ b/dist/node-jsonapi-datastore.min.js
@@ -1 +1 @@
-!function(){"use strict";function t(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}var i=function(){function t(t,i){for(var e=0;e<i.length;e++){var a=i[e];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(i,e,a){return e&&t(i.prototype,e),a&&t(i,a),i}}(),e=function(){function e(i,a){t(this,e),this.id=a,this._type=i,this._attributes=[],this._relationships=[]}return i(e,[{key:"serialize",value:function(t){var i=this,e={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(e.data.id=this.id),0!==t.attributes.length&&(e.data.attributes={}),0!==t.relationships.length&&(e.data.relationships={}),t.attributes.forEach(function(t){e.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function a(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?e.data.relationships[t]={data:i[t].map(a)}:e.data.relationships[t]={data:a(i[t])}:e.data.relationships[t]={data:null}}),e}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),e}(),a=function(){function a(){t(this,a),this.graph={}}return i(a,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(e){return i.graph[t][e]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new e(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!a.find(t.type,t.id)){var i=a.initModel(t.type,t.id);i._placeHolder=!0}return a.graph[t.type][t.id]}var e,a=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(e in t.attributes)-1===n._attributes.indexOf(e)&&n._attributes.push(e),n[e]=t.attributes[e];if(t.relationships)for(e in t.relationships){var r=t.relationships[e];void 0!==r.data&&(n._relationships.push(e),null===r.data?n[e]=null:r.data.constructor===Array?n[e]=r.data.map(i):n[e]=i(r.data)),r.links&&console.log("Warning: Links not implemented yet.")}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,e=this.syncRecord.bind(this);return i?(t.included&&t.included.map(e),{data:i.constructor===Array?i.map(e):e(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),a}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:a,JsonApiDataStoreModel:e}),exports.JsonApiDataStore=a,exports.JsonApiDataStoreModel=e}();
\ No newline at end of file
+!function(){"use strict";function t(t,i){if(!(t instanceof i))throw new TypeError("Cannot call a class as a function")}var i=function(){function t(t,i){for(var e=0;e<i.length;e++){var a=i[e];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(i,e,a){return e&&t(i.prototype,e),a&&t(i,a),i}}(),e=function(){function e(i,a){t(this,e),this.id=a,this._type=i,this._attributes=[],this._relationships=[]}return i(e,[{key:"serialize",value:function(t){var i=this,e={data:{type:this._type}};return t=t||{},t.attributes=t.attributes||this._attributes,t.relationships=t.relationships||this._relationships,void 0!==this.id&&(e.data.id=this.id),0!==t.attributes.length&&(e.data.attributes={}),0!==t.relationships.length&&(e.data.relationships={}),t.attributes.forEach(function(t){e.data.attributes[t]=i[t]}),t.relationships.forEach(function(t){function a(t){return{type:t._type,id:t.id}}i[t]?i[t].constructor===Array?e.data.relationships[t]={data:i[t].map(a)}:e.data.relationships[t]={data:a(i[t])}:e.data.relationships[t]={data:null}}),e}},{key:"setAttribute",value:function(t,i){void 0===this[t]&&this._attributes.push(t),this[t]=i}},{key:"setRelationship",value:function(t,i){void 0===this[t]&&this._relationships.push(t),this[t]=i}}]),e}(),a=function(){function a(){t(this,a),this.graph={}}return i(a,[{key:"destroy",value:function(t){delete this.graph[t._type][t.id]}},{key:"find",value:function(t,i){return this.graph[t]&&this.graph[t][i]?this.graph[t][i]:null}},{key:"findAll",value:function(t){var i=this;return this.graph[t]?Object.keys(i.graph[t]).map(function(e){return i.graph[t][e]}):[]}},{key:"reset",value:function(){this.graph={}}},{key:"initModel",value:function(t,i){return this.graph[t]=this.graph[t]||{},this.graph[t][i]=this.graph[t][i]||new e(t,i),this.graph[t][i]}},{key:"syncRecord",value:function(t){function i(t){if(!a.find(t.type,t.id)){var i=a.initModel(t.type,t.id);i._placeHolder=!0}return a.graph[t.type][t.id]}var e,a=this,n=this.initModel(t.type,t.id);delete n._placeHolder;for(e in t.attributes)n._attributes.indexOf(e)===-1&&n._attributes.push(e),n[e]=t.attributes[e];if(t.links&&(n._links=t.links),t.relationships)for(e in t.relationships){var r=t.relationships[e];void 0!==r.data&&(n._relationships.push(e),null===r.data?n[e]=null:r.data.constructor===Array?n[e]=r.data.map(i):n[e]=i(r.data)),r.links&&(n._links=n._links||{},n._links._relationships=n._links._relationships||{},n._links._relationships[e]=r.links)}return n}},{key:"syncWithMeta",value:function(t){var i=t.data,e=this.syncRecord.bind(this);return i?(t.included&&t.included.map(e),{data:i.constructor===Array?i.map(e):e(i),meta:"meta"in t?t.meta:null}):[]}},{key:"sync",value:function(t){return this.syncWithMeta(t).data}}]),a}();"undefined"!=typeof module&&(module.exports={JsonApiDataStore:a,JsonApiDataStoreModel:e}),exports.JsonApiDataStore=a,exports.JsonApiDataStoreModel=e}();
\ No newline at end of file
diff --git a/src/jsonapi-datastore.js b/src/jsonapi-datastore.js
index c2d0409..2305579 100644
--- a/src/jsonapi-datastore.js
+++ b/src/jsonapi-datastore.js
@@ -184,7 +184,8 @@ class JsonApiDataStore {
         }
         if (rel.links) {
           model._links = model._links || {};
-          model._links[key] = rel.links;
+          model._links._relationships = model._links._relationships || {};
+          model._links._relationships[key] = rel.links;
         }
       }
     }
diff --git a/test/store.spec.js b/test/store.spec.js
index 1e48776..01c339a 100644
--- a/test/store.spec.js
+++ b/test/store.spec.js
@@ -212,6 +212,88 @@ describe('JsonApiDataStore', () => {
         expect(articles[1].related_article.id).to.eq(1337);
       });
     });
+
+    context('when given a payload with a link', () => {
+      var store = new JsonApiDataStore(),
+          payload = {
+            data: {
+              type: 'article',
+              id: 1337,
+              links: {
+                self: 'https://example.com/articles/1337'
+              }
+            }
+          };
+
+      it('should set the links', () => {
+        var article = store.sync(payload);
+        expect(article._links.self).to.eq('https://example.com/articles/1337');
+      });
+    });
+
+    context('when given a payload with relationships containing links', () => {
+      var store = new JsonApiDataStore(),
+          payload = {
+            data: {
+              type: 'article',
+              id: 1337,
+              relationships: {
+                author: {
+                  data: {
+                    type: 'user',
+                    id: 1
+                  },
+                  links: {
+                    self: 'http://example.com/articles/1337/relationships/user',
+                    related: 'http://example.com/articles/1337/user'
+                  },
+                }
+              }
+            }
+          };
+
+      it('should set the relationship links', () => {
+        var article = store.sync(payload);
+        expect(article._links._relationships.author.self).to.eq('http://example.com/articles/1337/relationships/user');
+        expect(article._links._relationships.author.related).to.eq('http://example.com/articles/1337/user');
+      });
+    });
+
+    context('when given a payload with links and relationships containing links', () => {
+      var store = new JsonApiDataStore(),
+          payload = {
+            data: {
+              type: 'article',
+              id: 1337,
+              links: {
+                self: 'https://example.com/articles/1337'
+              },
+              relationships: {
+                author: {
+                  data: {
+                    type: 'user',
+                    id: 1
+                  },
+                  links: {
+                    self: 'http://example.com/articles/1337/relationships/user',
+                    related: 'http://example.com/articles/1337/user'
+                  },
+                }
+              }
+            }
+          };
+
+      it('should set the links', () => {
+        var article = store.sync(payload);
+        expect(article._links.self).to.eq('https://example.com/articles/1337');
+      });
+
+      it('should set the relationship links', () => {
+        var article = store.sync(payload);
+        expect(article._links._relationships.author.self).to.eq('http://example.com/articles/1337/relationships/user');
+        expect(article._links._relationships.author.related).to.eq('http://example.com/articles/1337/user');
+      });
+    });
   });
 
   describe('.syncWithMeta()', () => {