Merge pull request #713 from orbitjs/backport-fixes

Backport fixes to v0.16
orbitjs · Dec 10, 2019 · 160c5fd · 160c5fd
2 parents 18b5d0b + 863e9c8
commit 160c5fd
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 3 deletions.
diff --git a/packages/@orbit/data/src/operation.ts b/packages/@orbit/data/src/operation.ts
@@ -320,12 +320,12 @@ function updateRecordReplaceAttribute(
 function updateRecordReplaceHasOne(
   record: Record,
   relationship: string,
-  relatedRecord: RecordIdentity
+  relatedRecord: RecordIdentity | null
 ) {
   deepSet(
     record,
     ['relationships', relationship, 'data'],
-    cloneRecordIdentity(relatedRecord)
+    relatedRecord ? cloneRecordIdentity(relatedRecord) : null
   );
 }
 

diff --git a/packages/@orbit/data/test/operation-test.ts b/packages/@orbit/data/test/operation-test.ts
@@ -197,6 +197,42 @@ module('Operation', function() {
       );
     });
 
+    test('can coalesce replaceAttribute + replaceRelatedRecord with null', function(assert) {
+      assert.deepEqual(
+        coalesceRecordOperations([
+          {
+            op: 'replaceRelatedRecord',
+            record: { type: 'contact', id: '1234' },
+            relationship: 'address',
+            relatedRecord: null
+          },
+          {
+            op: 'replaceAttribute',
+            record: { type: 'contact', id: '1234' },
+            attribute: 'name',
+            value: 'James'
+          }
+        ]),
+        [
+          {
+            op: 'updateRecord',
+            record: {
+              type: 'contact',
+              id: '1234',
+              attributes: {
+                name: 'James'
+              },
+              relationships: {
+                address: {
+                  data: null
+                }
+              }
+            }
+          }
+        ]
+      );
+    });
+
     test('can coalesce addRecord + addToRelatedRecords for the same record', function(assert) {
       assert.deepEqual(
         coalesceRecordOperations([

diff --git a/packages/@orbit/jsonapi/src/jsonapi-serializer.ts b/packages/@orbit/jsonapi/src/jsonapi-serializer.ts
@@ -371,7 +371,10 @@ export class JSONAPISerializer
     }
     const serializer = this._serializers[attrOptions.type];
     if (serializer) {
-      value = serializer.serialize(value, attrOptions.serializationOptions);
+      value =
+        value === null
+          ? null
+          : serializer.serialize(value, attrOptions.serializationOptions);
     }
     deepSet(
       resource,

diff --git a/packages/@orbit/jsonapi/test/jsonapi-serializer-test.ts b/packages/@orbit/jsonapi/test/jsonapi-serializer-test.ts
@@ -154,6 +154,38 @@ module('JSONAPISerializer', function(hooks) {
       );
     });
 
+    test('#serialize will pass null values without throwing', function(assert) {
+      assert.deepEqual(
+        serializer.serialize({
+          data: {
+            type: 'person',
+            id: '123',
+            attributes: {
+              name: null,
+              birthday: null,
+              birthtime: null,
+              height: null, // meters
+              isAdult: null
+            }
+          }
+        }),
+        {
+          data: {
+            type: 'persons',
+            id: '123',
+            attributes: {
+              name: null,
+              birthday: null,
+              birthtime: null,
+              height: null, // cm (with 2 digits)
+              'is-adult': null
+            }
+          }
+        },
+        'serialized document matches'
+      );
+    });
+
     test('#deserialize will use available serializers for attribute values', function(assert) {
       let result = serializer.deserialize({
         data: {