@livestore/common 0.3.0-dev.3 → 0.3.0-dev.31

package/src/sync/syncstate.test.ts

@@ -2,22 +2,23 @@
 import { describe, expect, it } from 'vitest'
 
 import * as EventId from '../schema/EventId.js'
-import * as MutationEvent from '../schema/MutationEvent.js'
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js'
 import * as SyncState from './syncstate.js'
 
-class TestEvent extends MutationEvent.EncodedWithMeta {
+class TestEvent extends LiveStoreEvent.EncodedWithMeta {
   constructor(
-    public readonly id: EventId.EventId,
-    public readonly parentId: EventId.EventId,
+    id: EventId.EventId | typeof EventId.EventId.Encoded,
+    parentId: EventId.EventId,
     public readonly payload: string,
     public readonly isLocal: boolean,
   ) {
     super({
-      id,
-      parentId,
-      mutation: 'a',
+      id: EventId.make(id),
+      parentId: EventId.make(parentId),
+      name: 'a',
       args: payload,
-      meta: {},
+      clientId: 'static-local-id',
+      sessionId: 'static-session-id',
     })
   }
 
@@ -26,411 +27,431 @@ class TestEvent extends MutationEvent.EncodedWithMeta {
   }
 
   // Only used for Vitest printing
-  // toJSON = () => `(${this.id.global},${this.id.local},${this.payload})`
+  // toJSON = () => `(${this.id.global},${this.id.client},${this.payload})`
   // toString = () => this.toJSON()
 }
 
-const e_r_1 = new TestEvent({ global: -1, local: 1 }, EventId.ROOT, 'a', true)
-const e_0_0 = new TestEvent({ global: 0, local: 0 }, EventId.ROOT, 'a', false)
-const e_0_1 = new TestEvent({ global: 0, local: 1 }, e_0_0.id, 'a', true)
-const e_0_2 = new TestEvent({ global: 0, local: 2 }, e_0_1.id, 'a', true)
-const e_0_3 = new TestEvent({ global: 0, local: 3 }, e_0_2.id, 'a', true)
-const e_1_0 = new TestEvent({ global: 1, local: 0 }, e_0_0.id, 'a', false)
-const e_1_1 = new TestEvent({ global: 1, local: 1 }, e_1_0.id, 'a', true)
+const e0_1 = new TestEvent({ global: 0, client: 1 }, EventId.ROOT, 'a', true)
+const e1_0 = new TestEvent({ global: 1, client: 0 }, EventId.ROOT, 'a', false)
+const e1_1 = new TestEvent({ global: 1, client: 1 }, e1_0.id, 'a', true)
+const e1_2 = new TestEvent({ global: 1, client: 2 }, e1_1.id, 'a', true)
+const e1_3 = new TestEvent({ global: 1, client: 3 }, e1_2.id, 'a', true)
+const e2_0 = new TestEvent({ global: 2, client: 0 }, e1_0.id, 'a', false)
+const e2_1 = new TestEvent({ global: 2, client: 1 }, e2_0.id, 'a', true)
 
-const isEqualEvent = MutationEvent.isEqualEncoded
+const isEqualEvent = LiveStoreEvent.isEqualEncoded
 
-const isLocalEvent = (event: MutationEvent.EncodedWithMeta) => (event as TestEvent).isLocal
+const isClientEvent = (event: LiveStoreEvent.EncodedWithMeta) => (event as TestEvent).isLocal
 
 describe('syncstate', () => {
-  describe('updateSyncState', () => {
-    const run = ({
+  describe('merge', () => {
+    const merge = ({
       syncState,
       payload,
-      ignoreLocalEvents = false,
+      ignoreClientEvents = false,
     }: {
       syncState: SyncState.SyncState
       payload: typeof SyncState.Payload.Type
-      ignoreLocalEvents?: boolean
-    }) => SyncState.updateSyncState({ syncState, payload, isLocalEvent, isEqualEvent, ignoreLocalEvents })
-
-    describe.each([{ trimRollbackUntil: false }, { trimRollbackUntil: true }])(
-      'upstream-rebase (trimRollbackUntil: $trimRollbackUntil)',
-      ({ trimRollbackUntil }) => {
-        it('should rollback until start', () => {
-          const syncState = {
-            pending: [e_1_0],
-            rollbackTail: [e_0_0, e_0_1],
-            upstreamHead: EventId.ROOT,
-            localHead: e_1_0.id,
-          }
-          const e_0_0_e_1_0 = e_0_0.rebase_(e_1_0.id)
-          const e_0_1_e_1_1 = e_0_1.rebase_(e_0_0_e_1_0.id)
-          const result = run({
-            syncState,
-            payload: {
-              _tag: 'upstream-rebase',
-              rollbackUntil: e_0_0.id,
-              newEvents: [e_0_0_e_1_0, e_0_1_e_1_1],
-              trimRollbackUntil: trimRollbackUntil ? e_0_1_e_1_1.id : undefined,
-            },
-          })
-          const e_1_0_e_2_0 = e_1_0.rebase_(e_0_0_e_1_0.id)
-          expectRebase(result)
-          expectEventArraysEqual(result.newSyncState.pending, [e_1_0_e_2_0])
-          if (trimRollbackUntil) {
-            expectEventArraysEqual(result.newSyncState.rollbackTail, [])
-          } else {
-            expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0_e_1_0, e_0_1_e_1_1])
-          }
-          expect(result.newSyncState.upstreamHead).toBe(e_0_1_e_1_1.id)
-          expect(result.newSyncState.localHead).toMatchObject(e_1_0_e_2_0.id)
-          expectEventArraysEqual(result.newEvents, [e_0_0_e_1_0, e_0_1_e_1_1])
-          expectEventArraysEqual(result.eventsToRollback, [e_0_0, e_0_1, e_1_0])
-        })
-
-        it('should rollback only to specified point', () => {
-          const syncState = {
-            pending: [e_1_0],
-            rollbackTail: [e_0_0, e_0_1],
-            upstreamHead: EventId.ROOT,
-            localHead: e_1_0.id,
-          }
-          const e_0_1_e_1_0 = e_0_1.rebase_(e_0_0.id)
-          const result = run({
-            syncState,
-            payload: {
-              _tag: 'upstream-rebase',
-              rollbackUntil: e_0_1.id,
-              newEvents: [e_0_1_e_1_0],
-              trimRollbackUntil: trimRollbackUntil ? e_0_0.id : undefined,
-            },
-          })
-          const e_1_0_e_2_0 = e_1_0.rebase_(e_0_1_e_1_0.id)
-          expectRebase(result)
-          expectEventArraysEqual(result.newSyncState.pending, [e_1_0_e_2_0])
-          if (trimRollbackUntil) {
-            expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_1_e_1_0])
-          } else {
-            expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0, e_0_1_e_1_0])
-          }
-          expect(result.newSyncState.upstreamHead).toBe(e_0_1_e_1_0.id)
-          expect(result.newSyncState.localHead).toMatchObject(e_1_0_e_2_0.id)
-          expectEventArraysEqual(result.newEvents, [e_0_1_e_1_0])
-          expectEventArraysEqual(result.eventsToRollback, [e_0_1, e_1_0])
-        })
-
-        it('should work for empty pending', () => {
-          const syncState = { pending: [], rollbackTail: [e_0_0], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-          const result = run({
-            syncState,
-            payload: { _tag: 'upstream-rebase', rollbackUntil: e_0_0.id, newEvents: [e_1_0] },
-          })
-          expectRebase(result)
-          expectEventArraysEqual(result.newSyncState.pending, [])
-          expectEventArraysEqual(result.newSyncState.rollbackTail, [e_1_0])
-          expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-          expect(result.newSyncState.localHead).toMatchObject(e_1_0.id)
-          expect(result.newEvents).toEqual([e_1_0])
-        })
-
-        it('should fail for empty rollback tail', () => {
-          const syncState = { pending: [], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-          expect(() =>
-            run({
-              syncState,
-              payload: { _tag: 'upstream-rebase', rollbackUntil: e_0_0.id, newEvents: [e_1_0] },
-            }),
-          ).toThrow()
+      ignoreClientEvents?: boolean
+    }) => SyncState.merge({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents })
+
+    describe('upstream-rebase', () => {
+      it('should rollback until start', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e2_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e2_0.id,
+        })
+        const e1_0_e2_0 = e1_0.rebase_(e2_0.id)
+        const e1_1_e2_1 = e1_1.rebase_(e1_0_e2_0.id)
+        const result = merge({
+          syncState,
+          payload: SyncState.PayloadUpstreamRebase.make({
+            rollbackEvents: [e1_0, e1_1],
+            newEvents: [e1_0_e2_0, e1_1_e2_1],
+          }),
         })
+        const e2_0_e3_0 = e2_0.rebase_(e1_0_e2_0.id)
+        expectRebase(result)
+        expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_1_e2_1.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0_e3_0.id)
+        expectEventArraysEqual(result.newEvents, [e1_0_e2_0, e1_1_e2_1, e2_0_e3_0])
+        expectEventArraysEqual(result.rollbackEvents, [e1_0, e1_1, e2_0])
+      })
 
-        it('should work for empty incoming', () => {
-          const syncState = { pending: [], rollbackTail: [e_0_0], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-          const result = run({
-            syncState,
-            payload: { _tag: 'upstream-rebase', rollbackUntil: e_0_0.id, newEvents: [] },
-          })
-          expectRebase(result)
-          expectEventArraysEqual(result.newSyncState.pending, [])
-          expectEventArraysEqual(result.newSyncState.rollbackTail, [])
-          expect(result.newSyncState.upstreamHead).toBe(EventId.ROOT)
-          expect(result.newSyncState.localHead).toMatchObject(EventId.ROOT)
-          expect(result.newEvents).toEqual([])
+      it('should rollback only to specified point', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e2_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e2_0.id,
+        })
+        const e1_1_e2_0 = e1_1.rebase_(e1_0.id)
+        const result = merge({
+          syncState,
+          payload: SyncState.PayloadUpstreamRebase.make({
+            newEvents: [e1_1_e2_0],
+            rollbackEvents: [e1_1],
+          }),
         })
-      },
-    )
+        const e2_0_e3_0 = e2_0.rebase_(e1_1_e2_0.id)
+        expectRebase(result)
+        expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_1_e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0_e3_0.id)
+        expectEventArraysEqual(result.newEvents, [e1_1_e2_0, e2_0_e3_0])
+        expectEventArraysEqual(result.rollbackEvents, [e1_1, e2_0])
+      })
+
+      it('should work for empty pending', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({
+          syncState,
+          payload: SyncState.PayloadUpstreamRebase.make({ rollbackEvents: [e1_0], newEvents: [e2_0] }),
+        })
+        expectRebase(result)
+        expectEventArraysEqual(result.newSyncState.pending, [])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0.id)
+        expect(result.newEvents).toStrictEqual([e2_0])
+      })
+    })
 
     describe('upstream-advance: advance', () => {
-      it('should throw error if newEvents are not sorted in ascending order by eventId (local)', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        expect(() => run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_1, e_0_0] } })).toThrow()
+      it('should throw error if newEvents are not sorted in ascending order by eventId (client)', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_1, e1_0] } })
+        expect(result).toMatchObject({ _tag: 'unexpected-error' })
       })
 
       it('should throw error if newEvents are not sorted in ascending order by eventId (global)', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        expect(() => run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_1_0, e_0_0] } })).toThrow()
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e2_0, e1_0] } })
+        expect(result).toMatchObject({ _tag: 'unexpected-error' })
+      })
+
+      it('should throw error if incoming event is < expected upstream head', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [],
+          upstreamHead: e2_0.id,
+          localHead: e2_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } })
+        expect(result).toMatchObject({ _tag: 'unexpected-error' })
+      })
+
+      it('should throw error if incoming event is = expected upstream head', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [],
+          upstreamHead: e2_0.id,
+          localHead: e2_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e2_0] } })
+        expect(result).toMatchObject({ _tag: 'unexpected-error' })
       })
 
-      it('should acknowledge pending event when receiving matching event', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_0] } })
+      it('should confirm pending event when receiving matching event', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } })
 
         expectAdvance(result)
         expectEventArraysEqual(result.newSyncState.pending, [])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_0.id)
-        expect(result.newEvents).toEqual([])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_0.id)
+        expectEventArraysEqual(result.newEvents, [])
+        expectEventArraysEqual(result.confirmedEvents, [e1_0])
       })
 
-      it('should acknowledge partial pending event when receiving matching event', () => {
-        const syncState = {
-          pending: [e_0_0, e_1_0],
-          rollbackTail: [],
+      it('should confirm partial pending event when receiving matching event', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0, e2_0],
           upstreamHead: EventId.ROOT,
-          localHead: e_1_0.id,
-        }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_0] } })
+          localHead: e2_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } })
 
         expectAdvance(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_1_0])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_1_0.id)
-        expect(result.newEvents).toEqual([])
+        expectEventArraysEqual(result.newSyncState.pending, [e2_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0.id)
+        expectEventArraysEqual(result.newEvents, [])
+        expectEventArraysEqual(result.confirmedEvents, [e1_0])
       })
 
-      it('should acknowledge pending event and add new event', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_0, e_0_1] } })
+      it('should confirm pending event and add new event', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0, e1_1] } })
 
         expectAdvance(result)
         expectEventArraysEqual(result.newSyncState.pending, [])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0, e_0_1])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_1.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_1.id)
-        expect(result.newEvents).toEqual([e_0_1])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_1.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_1.id)
+        expect(result.newEvents).toStrictEqual([e1_1])
+        expectEventArraysEqual(result.confirmedEvents, [e1_0])
       })
 
-      it('should acknowledge pending event and add multiple new events', () => {
-        const syncState = { pending: [e_0_1], rollbackTail: [], upstreamHead: e_0_0.id, localHead: e_0_1.id }
-        const result = run({
+      it('should confirm pending event and add multiple new events', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_1],
+          upstreamHead: e1_0.id,
+          localHead: e1_1.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_1, e_0_2, e_0_3, e_1_0, e_1_1] },
+          payload: { _tag: 'upstream-advance', newEvents: [e1_1, e1_2, e1_3, e2_0, e2_1] },
         })
 
         expectAdvance(result)
         expectEventArraysEqual(result.newSyncState.pending, [])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_1, e_0_2, e_0_3, e_1_0, e_1_1])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_1.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_1_1.id)
-        expect(result.newEvents).toEqual([e_0_2, e_0_3, e_1_0, e_1_1])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_1.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_1.id)
+        expect(result.newEvents).toStrictEqual([e1_2, e1_3, e2_0, e2_1])
+        expectEventArraysEqual(result.confirmedEvents, [e1_1])
+      })
+
+      it('should confirm pending global event while keep pending client events', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0, e1_1],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_1.id,
+        })
+        const result = merge({
+          syncState,
+          payload: { _tag: 'upstream-advance', newEvents: [e1_0] },
+        })
+
+        expectAdvance(result)
+        expectEventArraysEqual(result.newSyncState.pending, [e1_1])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_1.id)
+        expectEventArraysEqual(result.newEvents, [])
+        expectEventArraysEqual(result.confirmedEvents, [e1_0])
       })
 
-      it('should ignore local events (incoming is subset of pending)', () => {
-        const syncState = {
-          pending: [e_r_1, e_0_0],
-          rollbackTail: [],
+      it('should ignore client events (incoming is subset of pending)', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e0_1, e1_0],
           upstreamHead: EventId.ROOT,
-          localHead: e_0_0.id,
-        }
-        const result = run({
+          localHead: e1_0.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_0] },
-          ignoreLocalEvents: true,
+          payload: { _tag: 'upstream-advance', newEvents: [e1_0] },
+          ignoreClientEvents: true,
         })
         expectAdvance(result)
         expectEventArraysEqual(result.newSyncState.pending, [])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_r_1, e_0_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_0.id)
-        expect(result.newEvents).toEqual([])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_0.id)
+        expectEventArraysEqual(result.newEvents, [])
+        expectEventArraysEqual(result.confirmedEvents, [e0_1, e1_0])
       })
 
-      it('should ignore local events (incoming is subset of pending case 2)', () => {
-        const syncState = {
-          pending: [e_r_1, e_0_0, e_1_0],
-          rollbackTail: [],
+      it('should ignore client events (incoming is subset of pending case 2)', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e0_1, e1_0, e2_0],
           upstreamHead: EventId.ROOT,
-          localHead: e_0_0.id,
-        }
-        const result = run({
+          localHead: e1_0.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_0] },
-          ignoreLocalEvents: true,
+          payload: { _tag: 'upstream-advance', newEvents: [e1_0] },
+          ignoreClientEvents: true,
         })
         expectAdvance(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_1_0])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_r_1, e_0_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_1_0.id)
-        expect(result.newEvents).toEqual([])
+        expectEventArraysEqual(result.newSyncState.pending, [e2_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0.id)
+        expectEventArraysEqual(result.newEvents, [])
+        expectEventArraysEqual(result.confirmedEvents, [e0_1, e1_0])
       })
 
-      it('should ignore local events (incoming goes beyond pending)', () => {
-        const syncState = {
-          pending: [e_r_1, e_0_0, e_0_1],
-          rollbackTail: [],
+      it('should ignore client events (incoming goes beyond pending)', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e0_1, e1_0, e1_1],
           upstreamHead: EventId.ROOT,
-          localHead: e_0_1.id,
-        }
-        const result = run({
+          localHead: e1_1.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_0, e_1_0] },
-          ignoreLocalEvents: true,
+          payload: { _tag: 'upstream-advance', newEvents: [e1_0, e2_0] },
+          ignoreClientEvents: true,
         })
 
         expectAdvance(result)
         expectEventArraysEqual(result.newSyncState.pending, [])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_r_1, e_0_0, e_0_1, e_1_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_1_0.id)
-        expect(result.newEvents).toEqual([e_1_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0.id)
+        expect(result.newEvents).toStrictEqual([e2_0])
+        expectEventArraysEqual(result.confirmedEvents, [e0_1, e1_0, e1_1])
       })
-    })
 
-    describe('upstream-advance: rebase', () => {
-      it('should rebase single local event to end', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_1] } })
-
-        const e_0_0_e_0_2 = e_0_0.rebase_(e_0_1.id)
-
-        expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_0_0_e_0_2])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_1])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_1.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_0_e_0_2.id)
-        expectEventArraysEqual(result.eventsToRollback, [e_0_0])
-        expectEventArraysEqual(result.newEvents, [e_0_1, e_0_0_e_0_2])
+      it('should fail if incoming event is ≤ local head', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [],
+          upstreamHead: e2_0.id,
+          localHead: e2_0.id,
+        })
+        const result = merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } })
+        expect(result).toMatchObject({ _tag: 'unexpected-error' })
       })
+    })
 
-      it('should rebase different event with same id (no rollback tail)', () => {
-        const e_0_0_b = new TestEvent({ global: 0, local: 0 }, EventId.ROOT, '0_0_b', true)
-        const syncState = { pending: [e_0_0_b], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0_b.id }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_0_0] } })
+    describe('upstream-advance: rebase', () => {
+      it('should rebase single client event to end', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({ syncState, payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1] }) })
 
-        const e_0_0_e_1_0 = e_0_0_b.rebase_(e_0_0.id)
+        const e1_0_e1_2 = e1_0.rebase_(e1_1.id)
 
         expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_0_0_e_1_0])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0])
-        expectEventArraysEqual(result.newEvents, [e_0_0, e_0_0_e_1_0])
-        expectEventArraysEqual(result.eventsToRollback, [e_0_0_b])
-        expect(result.newSyncState.upstreamHead).toBe(e_0_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_0_e_1_0.id)
+        expectEventArraysEqual(result.newSyncState.pending, [e1_0_e1_2])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e1_1.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_0_e1_2.id)
+        expectEventArraysEqual(result.rollbackEvents, [e1_0])
+        expectEventArraysEqual(result.newEvents, [e1_1, e1_0_e1_2])
       })
 
       it('should rebase different event with same id', () => {
-        const e_1_0_b = new TestEvent({ global: 1, local: 0 }, e_0_0.id, '1_0_b', false)
-        const syncState = {
-          pending: [e_1_0_b],
-          rollbackTail: [e_0_0, e_0_1],
+        const e2_0_b = new TestEvent({ global: 1, client: 0 }, e1_0.id, '1_0_b', false)
+        const syncState = new SyncState.SyncState({
+          pending: [e2_0_b],
           upstreamHead: EventId.ROOT,
-          localHead: e_1_0_b.id,
-        }
-        const result = run({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e_1_0] } })
-        const e_1_0_e_2_0 = e_1_0_b.rebase_(e_1_0.id)
+          localHead: e2_0_b.id,
+        })
+        const result = merge({ syncState, payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e2_0] }) })
+        const e2_0_e3_0 = e2_0_b.rebase_(e2_0.id)
 
         expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_1_0_e_2_0])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0, e_0_1, e_1_0])
-        expectEventArraysEqual(result.newEvents, [e_1_0, e_1_0_e_2_0])
-        expectEventArraysEqual(result.eventsToRollback, [e_0_0, e_0_1, e_1_0_b])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_1_0_e_2_0.id)
+        expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0])
+        expectEventArraysEqual(result.newEvents, [e2_0, e2_0_e3_0])
+        expectEventArraysEqual(result.rollbackEvents, [e2_0_b])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e2_0_e3_0.id)
       })
 
-      it('should rebase single local event to end (more incoming events)', () => {
-        const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-        const result = run({
+      it('should rebase single client event to end (more incoming events)', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0],
+          upstreamHead: EventId.ROOT,
+          localHead: e1_0.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_1, e_0_2, e_0_3, e_1_0] },
+          payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1, e1_2, e1_3, e2_0] }),
         })
 
-        const e_0_0_e_2_0 = e_0_0.rebase_(e_1_0.id)
+        const e1_0_e3_0 = e1_0.rebase_(e2_0.id)
 
         expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_0_0_e_2_0])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_1, e_0_2, e_0_3, e_1_0])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_0_e_2_0.id)
+        expectEventArraysEqual(result.newSyncState.pending, [e1_0_e3_0])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_0_e3_0.id)
       })
 
       it('should only rebase divergent events when first event matches', () => {
-        const syncState = {
-          pending: [e_0_0, e_0_1],
-          rollbackTail: [],
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0, e1_1],
           upstreamHead: EventId.ROOT,
-          localHead: e_0_0.id,
-        }
-        const result = run({
+          localHead: e1_0.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_0, e_0_2, e_0_3, e_1_0] },
+          payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_0, e1_2, e1_3, e2_0] }),
         })
 
-        const e_0_1_e_1_1 = e_0_1.rebase_(e_1_0.id)
+        const e1_1_e2_1 = e1_1.rebase_(e2_0.id)
 
         expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_0_1_e_1_1])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_0, e_0_2, e_0_3, e_1_0])
-        expectEventArraysEqual(result.eventsToRollback, [e_0_1])
-        expectEventArraysEqual(result.newEvents, [e_0_2, e_0_3, e_1_0, e_0_1_e_1_1])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_1_e_1_1.id)
+        expectEventArraysEqual(result.newSyncState.pending, [e1_1_e2_1])
+        expectEventArraysEqual(result.rollbackEvents, [e1_1])
+        expectEventArraysEqual(result.newEvents, [e1_2, e1_3, e2_0, e1_1_e2_1])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_1_e2_1.id)
       })
 
-      it('should rebase all local events when incoming chain starts differently', () => {
-        const syncState = {
-          pending: [e_0_0, e_0_1],
-          rollbackTail: [],
+      it('should rebase all client events when incoming chain starts differently', () => {
+        const syncState = new SyncState.SyncState({
+          pending: [e1_0, e1_1],
           upstreamHead: EventId.ROOT,
-          localHead: e_0_1.id,
-        }
-        const result = run({
+          localHead: e1_1.id,
+        })
+        const result = merge({
           syncState,
-          payload: { _tag: 'upstream-advance', newEvents: [e_0_1, e_0_2, e_0_3, e_1_0] },
+          payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1, e1_2, e1_3, e2_0] }),
         })
 
-        const e_0_0_e_1_1 = e_0_0.rebase_(e_1_0.id)
-        const e_0_1_e_1_2 = e_0_1.rebase_(e_0_0_e_1_1.id)
+        const e1_0_e2_1 = e1_0.rebase_(e2_0.id)
+        const e1_1_e2_2 = e1_1.rebase_(e1_0_e2_1.id)
 
         expectRebase(result)
-        expectEventArraysEqual(result.newSyncState.pending, [e_0_0_e_1_1, e_0_1_e_1_2])
-        expectEventArraysEqual(result.newSyncState.rollbackTail, [e_0_1, e_0_2, e_0_3, e_1_0])
-        expectEventArraysEqual(result.newEvents, [e_0_1, e_0_2, e_0_3, e_1_0, e_0_0_e_1_1, e_0_1_e_1_2])
-        expectEventArraysEqual(result.eventsToRollback, [e_0_0, e_0_1])
-        expect(result.newSyncState.upstreamHead).toBe(e_1_0.id)
-        expect(result.newSyncState.localHead).toMatchObject(e_0_1_e_1_2.id)
+        expectEventArraysEqual(result.newSyncState.pending, [e1_0_e2_1, e1_1_e2_2])
+        expectEventArraysEqual(result.newEvents, [e1_1, e1_2, e1_3, e2_0, e1_0_e2_1, e1_1_e2_2])
+        expectEventArraysEqual(result.rollbackEvents, [e1_0, e1_1])
+        expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.id)
+        expect(result.newSyncState.localHead).toMatchObject(e1_1_e2_2.id)
       })
 
       describe('local-push', () => {
         describe('advance', () => {
           it('should advance with new events', () => {
-            const syncState = { pending: [e_0_0], rollbackTail: [], upstreamHead: EventId.ROOT, localHead: e_0_0.id }
-            const result = run({ syncState, payload: { _tag: 'local-push', newEvents: [e_0_1, e_0_2, e_0_3] } })
+            const syncState = new SyncState.SyncState({
+              pending: [e1_0],
+              upstreamHead: EventId.ROOT,
+              localHead: e1_0.id,
+            })
+            const result = merge({
+              syncState,
+              payload: SyncState.PayloadLocalPush.make({ newEvents: [e1_1, e1_2, e1_3] }),
+            })
 
             expectAdvance(result)
-            expectEventArraysEqual(result.newSyncState.pending, [e_0_0, e_0_1, e_0_2, e_0_3])
-            expectEventArraysEqual(result.newSyncState.rollbackTail, [])
-            expect(result.newSyncState.upstreamHead).toBe(EventId.ROOT)
-            expect(result.newSyncState.localHead).toMatchObject(e_0_3.id)
-            expectEventArraysEqual(result.newEvents, [e_0_1, e_0_2, e_0_3])
+            expectEventArraysEqual(result.newSyncState.pending, [e1_0, e1_1, e1_2, e1_3])
+            expect(result.newSyncState.upstreamHead).toMatchObject(EventId.ROOT)
+            expect(result.newSyncState.localHead).toMatchObject(e1_3.id)
+            expectEventArraysEqual(result.newEvents, [e1_1, e1_2, e1_3])
+            expectEventArraysEqual(result.confirmedEvents, [])
           })
         })
 
         describe('reject', () => {
           it('should reject when new events are greater than pending events', () => {
-            const syncState = {
-              pending: [e_0_0, e_0_1],
-              rollbackTail: [],
+            const syncState = new SyncState.SyncState({
+              pending: [e1_0, e1_1],
               upstreamHead: EventId.ROOT,
-              localHead: e_0_1.id,
-            }
-            const result = run({ syncState, payload: { _tag: 'local-push', newEvents: [e_0_1, e_0_2] } })
+              localHead: e1_1.id,
+            })
+            const result = merge({
+              syncState,
+              payload: SyncState.PayloadLocalPush.make({ newEvents: [e1_1, e1_2] }),
+            })
 
             expectReject(result)
-            expect(result.expectedMinimumId).toMatchObject(e_0_2.id)
+            expect(result.expectedMinimumId).toMatchObject(e1_2.id)
           })
         })
       })
@@ -439,26 +460,32 @@ describe('syncstate', () => {
 })
 
 const expectEventArraysEqual = (
-  actual: ReadonlyArray<MutationEvent.EncodedWithMeta>,
-  expected: ReadonlyArray<MutationEvent.EncodedWithMeta>,
+  actual: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>,
+  expected: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>,
 ) => {
   expect(actual.length).toBe(expected.length)
   actual.forEach((event, i) => {
-    expect(event.id).toEqual(expected[i]!.id)
-    expect(event.parentId).toEqual(expected[i]!.parentId)
-    expect(event.mutation).toEqual(expected[i]!.mutation)
-    expect(event.args).toEqual(expected[i]!.args)
+    expect(event.id).toStrictEqual(expected[i]!.id)
+    expect(event.parentId).toStrictEqual(expected[i]!.parentId)
+    expect(event.name).toStrictEqual(expected[i]!.name)
+    expect(event.args).toStrictEqual(expected[i]!.args)
   })
 }
 
-function expectAdvance(result: SyncState.UpdateResult): asserts result is SyncState.UpdateResultAdvance {
+function expectAdvance(
+  result: typeof SyncState.MergeResult.Type,
+): asserts result is typeof SyncState.MergeResultAdvance.Type {
   expect(result._tag).toBe('advance')
 }
 
-function expectRebase(result: SyncState.UpdateResult): asserts result is SyncState.UpdateResultRebase {
-  expect(result._tag).toBe('rebase')
+function expectRebase(
+  result: typeof SyncState.MergeResult.Type,
+): asserts result is typeof SyncState.MergeResultRebase.Type {
+  expect(result._tag, `Expected rebase, got ${result}`).toBe('rebase')
 }
 
-function expectReject(result: SyncState.UpdateResult): asserts result is SyncState.UpdateResultReject {
+function expectReject(
+  result: typeof SyncState.MergeResult.Type,
+): asserts result is typeof SyncState.MergeResultReject.Type {
   expect(result._tag).toBe('reject')
 }