Fix #23 - Add option

Author: Tronix117

dist/js-data-jsonapi-light.js

@@ -1,6 +1,6 @@
 {
   "name": "js-data-jsonapi-light",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.7",
   "description": "JsonApi adapter serializer/dezerializer light.",
   "main": "./dist/js-data-jsonapi-light.js",
   "author": {

dist/js-data-jsonapi-light.js.map

@@ -40,26 +40,31 @@ export function jsonApiSerialize (mapper:any, data:any, opts:any){
 
   // @todo For the moment sending hasMany items is not supported and maybe
   // shouldn't be supported for security reasons (cf. JSON Api Spec)
-  for (let key in data) {
-    let relation:any = mapper.relationByFieldId[key];
-
-    // No relations means a simple attribute
-    if (!relation) {
-      attributes[key] = data[key];
-      continue;
-    }
+  if (opts.forceRelationshipsInAttributes !== true) {
+    for (let key in data) {
+      let relation:any = mapper.relationByFieldId[key];
+      
+      // No relations means a simple attribute
+      if (!relation) {
+        attributes[key] = data[key];
+        continue;
+      }
 
-    // Relation that can be in data are only belongsTo
-    relationships[relation.localField] = {
-      data: {
-        type: relation.relation,
-        id: data[key]
+      // Relation that can be in data are only belongsTo
+      relationships[relation.localField] = {
+        data: {
+          type: relation.relation,
+          id: data[key]
+        }
       }
     }
+  } else {
+    attributes = data;
   }
 
+
   // Only include relationships if needed
-  if (Object.keys(relationships).length) {
+  if (Object.keys(relationships).length !== 0) {
     output.data.relationships = relationships;
   }
 

package.json

@@ -61,6 +61,10 @@ describe('UPDATE', () => {
             }
           }
         }
+      },
+      TMP_AUTHOR:any = {
+        ID: "01ac757a-1cac-4a10-a6f1-ca4b7a91c4a8",
+        EMAIL: "else@example.com"
       };
 
     let reqGet:any = null;
@@ -142,7 +146,51 @@ describe('UPDATE', () => {
       })
     });
 
-    it('the request should send relation when a record is saved.', () => {
+    it('the request should send only changed relation in `relationships` when a record is saved.', () => {
+      return store.find('Article', ID).then((record) => {
+        // When id, record is not considered New
+        const otherAuthor = store.add('User', {
+          id: TMP_AUTHOR.ID,
+          email: TMP_AUTHOR.email
+        });
+        record.authorId = otherAuthor.id;
+        return record.save();
+      }).then((data) => {
+        expect(reqPatch.body.data).to.be.an('object');
+        expect(reqPatch.body.data.type).to.equal(MAPPER_NAME);
+        expect(reqPatch.body.data.id).to.equal(ID);
+        expect(reqPatch.body.data.attributes).to.be.undefined;
+        expect(reqPatch.body.data.relationships).to.be.an('object');
+        expect(reqPatch.body.data.relationships.author).to.be.an('object');
+        expect(reqPatch.body.data.relationships.author.data).to.deep.equal({
+          type: "User",
+          id: TMP_AUTHOR.ID
+        });
+      })
+    });
+
+    it('the request should send changed relation as attributes when a record is saved with option `forceRelationshipsInAttributes`.', () => {
+      return store.find('Article', ID).then((record) => {
+        // When record has id, it is not considered New
+        const otherAuthor = store.add('User', {
+          id: TMP_AUTHOR.ID,
+          email: TMP_AUTHOR.email
+        });
+        record.title = UPDATE_PARAMS.title;
+        record.author = otherAuthor;
+        return record.save({ forceRelationshipsInAttributes: true });
+      }).then((data) => {
+        expect(reqPatch.body.data).to.be.an('object');
+        expect(reqPatch.body.data.type).to.equal(MAPPER_NAME);
+        expect(reqPatch.body.data.id).to.equal(ID);
+        expect(reqPatch.body.data.attributes).to.deep.equal({
+          title: UPDATE_PARAMS.title,
+          authorId: TMP_AUTHOR.ID
+        })
+      })
+    });
+
+    it('the request should send all attributes and relationships when record is saved with option `replace`', () =>{
       return store.update('Article', ID, UPDATE_PARAMS, {
         forceReplace: true
       }).then((data) => {
@@ -162,10 +210,6 @@ describe('UPDATE', () => {
         expect(data.title).to.equal(UPDATE_PARAMS.title)
         expect(data.content).to.equal(FIND_RESPONSE.data.attributes.content)
       })
-    });
-
-    it('the request should send all attributes and relationships when record is saved with option `replace`', () =>{
-      return true;
     })
   })
 

src/serializer.ts

@@ -6,19 +6,19 @@ describe.skip('relations/nested', () => {
   describe('when data are fetched, relations should persist and be assigned if data is there', () => {
     const
       CATEGORY_LENGTH = 4,
-      ROOT_CATEGORY = {
+      ROOT_CATEGORY:any = {
         ID: '437add6a-a40f-4cf0-9c27-fd7bb4c9ef71',
         CHILDREN: [
           'dbb8d464-8229-4865-86c3-48ac90ae1029',
           'eecff649-5ad2-4e42-8d1a-f1e5d55926bd'
         ]
       },
-      CATEGORIES_ASCENDING_PATH = [
+      CATEGORIES_ASCENDING_PATH:[ string ] = [
         'c829339e-7b24-4fc8-b6ff-b605a2020fb3',
         'eecff649-5ad2-4e42-8d1a-f1e5d55926bd',
         '437add6a-a40f-4cf0-9c27-fd7bb4c9ef71'
       ],
-      CATEGORIES_NAME = {
+      CATEGORIES_NAME:any = {
         "437add6a-a40f-4cf0-9c27-fd7bb4c9ef71": "Level I - Root category",
         "dbb8d464-8229-4865-86c3-48ac90ae1029": "Cat I.A",
         "eecff649-5ad2-4e42-8d1a-f1e5d55926bd": "Cat I.B",