Merge pull request #781 from orbitjs/backport-780

Backport PR 780 to v0.16
orbitjs · Sep 14, 2020 · 839480d · 839480d
2 parents 7d669eb + 5cffe36
commit 839480d
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 1 deletion.
diff --git a/packages/@orbit/data/src/operation.ts b/packages/@orbit/data/src/operation.ts
@@ -2,7 +2,8 @@ import {
   Record,
   RecordIdentity,
   cloneRecordIdentity,
-  equalRecordIdentities
+  equalRecordIdentities,
+  mergeRecords
 } from './record';
 import { eq, deepGet, deepSet } from '@orbit/utils';
 
@@ -203,6 +204,15 @@ function mergeOperations(
           superceded.op = 'updateRecord';
           markOperationToDelete(superceding);
         }
+      } else if (
+        (superceded.op === 'addRecord' ||
+          superceded.op === 'updateRecord' ||
+          (superceded as any).op === 'replaceRecord') &&
+        (superceding.op === 'updateRecord' ||
+          (superceding as any).op === 'replaceRecord')
+      ) {
+        superceded.record = mergeRecords(superceded.record, superceding.record);
+        markOperationToDelete(superceding);
       } else if (
         (superceded.op === 'addRecord' ||
           superceded.op === 'updateRecord' ||

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