@livestore/common 0.3.0-dev.12 → 0.3.0-dev.14

package/src/sync/next/test/compact-events.test.ts

@@ -37,7 +37,7 @@ const customStringify = (value: any): string => {
       const valStr =
         key === 'facts'
           ? `"${factsToString(val)}"`
-          : (key === 'id' || key === 'parentId') && Object.keys(val).length === 2 && val.local === 0
+          : (key === 'id' || key === 'parentId') && Object.keys(val).length === 2 && val.client === 0
             ? val.global
             : customStringify(val)
 
@@ -71,7 +71,7 @@ export const customSerializer = {
 expect.addSnapshotSerializer(customSerializer)
 
 const compact = (events: any[]) => {
-  const dag = historyDagFromNodes(toEventNodes(events, mutations))
+  const dag = historyDagFromNodes(toEventNodes(events, mutations, 'client-id', 'session-id'))
   const compacted = compactEvents(dag)
 
   return Array.from(compacted.dag.nodeEntries())
@@ -81,17 +81,17 @@ const compact = (events: any[]) => {
 }
 
 describe('compactEvents todo app', () => {
-  it('completeTodo', () => {
+  it('todoCompleted', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.completeTodo({ id: 'A' }), // 1
-      mutations.completeTodo({ id: 'A' }), // 2
+      mutations.todoCompleted({ id: 'A' }), // 1
+      mutations.todoCompleted({ id: 'A' }), // 2
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 2, parentId: 0, mutation: "completeTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 2, parentId: 0, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
@@ -106,29 +106,29 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 1, parentId: 0, mutation: "toggleTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=true" }
-        { id: 2, parentId: 1, mutation: "toggleTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=false" }
-        { id: 3, parentId: 2, mutation: "toggleTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=true" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 1, parentId: 0, mutation: "toggleTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=true" }
+        { id: 2, parentId: 1, mutation: "toggleTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=false" }
+        { id: 3, parentId: 2, mutation: "toggleTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=true" }
       ]
     `)
   })
 
-  it('completeTodo / toggleTodo', () => {
+  it('todoCompleted / toggleTodo', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.toggleTodo({ id: 'A' }), // 1
       mutations.toggleTodo({ id: 'A' }), // 2
-      mutations.completeTodo({ id: 'A' }), // 3
-      mutations.completeTodo({ id: 'A' }), // 4
+      mutations.todoCompleted({ id: 'A' }), // 3
+      mutations.todoCompleted({ id: 'A' }), // 4
       mutations.toggleTodo({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 4, parentId: 0, mutation: "completeTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
-        { id: 5, parentId: 4, mutation: "toggleTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=false" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 4, parentId: 0, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 5, parentId: 4, mutation: "toggleTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=false" }
       ]
     `)
   })
@@ -143,10 +143,10 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 1, parentId: 0, mutation: "setReadonlyTodo", args: { id: "A", readonly: false }, facts: "↖todo-exists-A +todo-is-writeable-A=true" }
-        { id: 2, parentId: 1, mutation: "setTextTodo", args: { id: "A", text: "buy soy milk" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-text-updated-A" }
-        { id: 3, parentId: 2, mutation: "setReadonlyTodo", args: { id: "A", readonly: true }, facts: "↖todo-exists-A +todo-is-writeable-A=false" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 1, parentId: 0, mutation: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { id: 2, parentId: 1, mutation: "setTextTodo", args: { id: "A", text: "buy soy milk" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-text-updated-A" }
+        { id: 3, parentId: 2, mutation: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
     `)
   })
@@ -155,18 +155,18 @@ describe('compactEvents todo app', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.setReadonlyTodo({ id: 'A', readonly: false }), // 1
-      mutations.completeTodo({ id: 'A' }), // 2
+      mutations.todoCompleted({ id: 'A' }), // 2
       mutations.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 3
       mutations.setReadonlyTodo({ id: 'A', readonly: true }), // 4
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 1, parentId: 0, mutation: "setReadonlyTodo", args: { id: "A", readonly: false }, facts: "↖todo-exists-A +todo-is-writeable-A=true" }
-        { id: 2, parentId: 1, mutation: "completeTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
-        { id: 3, parentId: 2, mutation: "setTextTodo", args: { id: "A", text: "buy soy milk" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-text-updated-A" }
-        { id: 4, parentId: 3, mutation: "setReadonlyTodo", args: { id: "A", readonly: true }, facts: "↖todo-exists-A +todo-is-writeable-A=false" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 1, parentId: 0, mutation: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { id: 2, parentId: 1, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 3, parentId: 2, mutation: "setTextTodo", args: { id: "A", text: "buy soy milk" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-text-updated-A" }
+        { id: 4, parentId: 3, mutation: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
     `)
   })
@@ -188,45 +188,45 @@ describe('compactEvents todo app', () => {
     `)
   })
 
-  it('completeTodos', () => {
+  it('todoCompleteds', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.createTodo({ id: 'B', text: 'buy bread' }), // 1
       mutations.createTodo({ id: 'C', text: 'buy cheese' }), // 2
-      mutations.completeTodos({ ids: ['A', 'B', 'C'] }), // 3
+      mutations.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 3
       mutations.toggleTodo({ id: 'A' }), // 4
-      mutations.completeTodo({ id: 'A' }), // 5
+      mutations.todoCompleted({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
-        { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
-        { id: 3, parentId: 2, mutation: "completeTodos", args: { ids: ["A", "B", "C"] }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
-        { id: 5, parentId: 3, mutation: "completeTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
+        { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
+        { id: 3, parentId: 2, mutation: "todoCompleteds", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
+        { id: 5, parentId: 3, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
 
-  it('completeTodos 2', () => {
+  it('todoCompleteds 2', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.createTodo({ id: 'B', text: 'buy bread' }), // 1
       mutations.createTodo({ id: 'C', text: 'buy cheese' }), // 2
       mutations.toggleTodo({ id: 'A' }), // 3
-      mutations.completeTodos({ ids: ['A', 'B', 'C'] }), // 4
+      mutations.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 4
       mutations.toggleTodo({ id: 'A' }), // 5
-      mutations.completeTodo({ id: 'A' }), // 6
+      mutations.todoCompleted({ id: 'A' }), // 6
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
-        { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
-        { id: 4, parentId: 2, mutation: "completeTodos", args: { ids: ["A", "B", "C"] }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
-        { id: 6, parentId: 4, mutation: "completeTodo", args: { id: "A" }, facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
+        { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
+        { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
+        { id: 4, parentId: 2, mutation: "todoCompleteds", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
+        { id: 6, parentId: 4, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })

package/src/sync/next/test/mutation-fixtures.ts

@@ -42,8 +42,8 @@ export const mutations = {
           : { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
     },
   ),
-  completeTodo: defineMutation(
-    'completeTodo',
+  todoCompleted: defineMutation(
+    'todoCompleted',
     Schema.Struct({ id: Schema.String }),
     // consider `RETURNING` to validate before applying facts
     'UPDATE todos SET completed = true WHERE id = $id',
@@ -58,8 +58,8 @@ export const mutations = {
       }),
     },
   ),
-  uncompleteTodo: defineMutation(
-    'uncompleteTodo',
+  todoUncompleted: defineMutation(
+    'todoUncompleted',
     Schema.Struct({ id: Schema.String }),
     'UPDATE todos SET completed = false WHERE id = $id',
     {
@@ -69,8 +69,8 @@ export const mutations = {
       }),
     },
   ),
-  completeTodos: defineMutation(
-    'completeTodos',
+  todoCompleteds: defineMutation(
+    'todoCompleteds',
     Schema.Struct({ ids: Schema.Array(Schema.String) }),
     'UPDATE todos SET completed = true WHERE id IN ($ids:csv)',
     {
@@ -124,7 +124,7 @@ export const mutations = {
     Schema.Struct({ id: Schema.String, text: Schema.String }),
     'UPDATE todos SET text = $text WHERE id = $id',
     {
-      localOnly: true,
+      clientOnly: true,
       facts: ({ id }) => ({ modify: { set: [facts.inputValue(id)] } }),
     },
   ),
@@ -135,6 +135,8 @@ export type PartialEvent = { mutation: string; args: any }
 export const toEventNodes = (
   partialEvents: PartialEvent[],
   mutationDefs: Record<string, MutationDef.Any>,
+  clientId: string,
+  sessionId: string | undefined,
 ): HistoryDagNode[] => {
   const nodesAcc: HistoryDagNode[] = [rootEventNode]
 
@@ -142,7 +144,7 @@ export const toEventNodes = (
 
   const eventNodes = partialEvents.map((partialEvent) => {
     const mutationDef = mutationDefs[partialEvent.mutation]!
-    const eventId = EventId.nextPair(currentEventId, mutationDef.options.localOnly).id
+    const eventId = EventId.nextPair(currentEventId, mutationDef.options.clientOnly).id
     currentEventId = eventId
 
     const factsSnapshot = factsSnapshotForDag(historyDagFromNodes(nodesAcc, { skipFactsCheck: true }), undefined)
@@ -200,6 +202,8 @@ export const toEventNodes = (
       mutation: partialEvent.mutation,
       args: partialEvent.args,
       factsGroup: facts,
+      clientId,
+      sessionId,
     } satisfies HistoryDagNode
     nodesAcc.push(node)
     return node
@@ -214,11 +218,11 @@ export const toEventNodes = (
 
 const getParentId = (eventId: EventId.EventId): EventId.EventId => {
   const globalParentId = eventId.global
-  const localParentId = eventId.local - 1
+  const clientParentId = eventId.client - 1
 
-  if (localParentId < 0) {
-    return EventId.make({ global: globalParentId - 1, local: EventId.localDefault })
+  if (clientParentId < 0) {
+    return EventId.make({ global: globalParentId - 1, client: EventId.clientDefault })
   }
 
-  return EventId.make({ global: globalParentId, local: localParentId })
+  return EventId.make({ global: globalParentId, client: clientParentId })
 }

package/src/sync/syncstate.test.ts

@@ -18,6 +18,8 @@ class TestEvent extends MutationEvent.EncodedWithMeta {
       mutation: 'a',
       args: payload,
       meta: {},
+      clientId: 'static-local-id',
+      sessionId: undefined,
     })
   }
 
@@ -26,17 +28,17 @@ 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 e_r_1 = new TestEvent({ global: -1, client: 1 }, EventId.ROOT, 'a', true)
+const e_0_0 = new TestEvent({ global: 0, client: 0 }, EventId.ROOT, 'a', false)
+const e_0_1 = new TestEvent({ global: 0, client: 1 }, e_0_0.id, 'a', true)
+const e_0_2 = new TestEvent({ global: 0, client: 2 }, e_0_1.id, 'a', true)
+const e_0_3 = new TestEvent({ global: 0, client: 3 }, e_0_2.id, 'a', true)
+const e_1_0 = new TestEvent({ global: 1, client: 0 }, e_0_0.id, 'a', false)
+const e_1_1 = new TestEvent({ global: 1, client: 1 }, e_1_0.id, 'a', true)
 
 const isEqualEvent = MutationEvent.isEqualEncoded
 
@@ -176,7 +178,7 @@ describe('syncstate', () => {
     )
 
     describe('upstream-advance: advance', () => {
-      it('should throw error if newEvents are not sorted in ascending order by eventId (local)', () => {
+      it('should throw error if newEvents are not sorted in ascending order by eventId (client)', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_0_0],
           rollbackTail: [],
@@ -267,7 +269,7 @@ describe('syncstate', () => {
         expect(result.newEvents).toStrictEqual([e_0_2, e_0_3, e_1_0, e_1_1])
       })
 
-      it('should ignore local events (incoming is subset of pending)', () => {
+      it('should ignore client events (incoming is subset of pending)', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_r_1, e_0_0],
           rollbackTail: [],
@@ -287,7 +289,7 @@ describe('syncstate', () => {
         expect(result.newEvents).toStrictEqual([])
       })
 
-      it('should ignore local events (incoming is subset of pending case 2)', () => {
+      it('should ignore client events (incoming is subset of pending case 2)', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_r_1, e_0_0, e_1_0],
           rollbackTail: [],
@@ -307,7 +309,7 @@ describe('syncstate', () => {
         expect(result.newEvents).toStrictEqual([])
       })
 
-      it('should ignore local events (incoming goes beyond pending)', () => {
+      it('should ignore client events (incoming goes beyond pending)', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_r_1, e_0_0, e_0_1],
           rollbackTail: [],
@@ -330,7 +332,7 @@ describe('syncstate', () => {
     })
 
     describe('upstream-advance: rebase', () => {
-      it('should rebase single local event to end', () => {
+      it('should rebase single client event to end', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_0_0],
           rollbackTail: [],
@@ -351,7 +353,7 @@ describe('syncstate', () => {
       })
 
       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 e_0_0_b = new TestEvent({ global: 0, client: 0 }, EventId.ROOT, '0_0_b', true)
         const syncState = new SyncState.SyncState({
           pending: [e_0_0_b],
           rollbackTail: [],
@@ -372,7 +374,7 @@ describe('syncstate', () => {
       })
 
       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 e_1_0_b = new TestEvent({ global: 1, client: 0 }, e_0_0.id, '1_0_b', false)
         const syncState = new SyncState.SyncState({
           pending: [e_1_0_b],
           rollbackTail: [e_0_0, e_0_1],
@@ -391,7 +393,7 @@ describe('syncstate', () => {
         expect(result.newSyncState.localHead).toMatchObject(e_1_0_e_2_0.id)
       })
 
-      it('should rebase single local event to end (more incoming events)', () => {
+      it('should rebase single client event to end (more incoming events)', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_0_0],
           rollbackTail: [],
@@ -435,7 +437,7 @@ describe('syncstate', () => {
         expect(result.newSyncState.localHead).toMatchObject(e_0_1_e_1_1.id)
       })
 
-      it('should rebase all local events when incoming chain starts differently', () => {
+      it('should rebase all client events when incoming chain starts differently', () => {
         const syncState = new SyncState.SyncState({
           pending: [e_0_0, e_0_1],
           rollbackTail: [],

package/src/sync/syncstate.ts

@@ -49,8 +49,8 @@ export class SyncState extends Schema.Class<SyncState>('SyncState')({
     return {
       pending: this.pending.map((e) => e.toJSON()),
       rollbackTail: this.rollbackTail.map((e) => e.toJSON()),
-      upstreamHead: `(${this.upstreamHead.global},${this.upstreamHead.local})`,
-      localHead: `(${this.localHead.global},${this.localHead.local})`,
+      upstreamHead: `(${this.upstreamHead.global},${this.upstreamHead.client})`,
+      localHead: `(${this.localHead.global},${this.localHead.client})`,
     }
   }
 }
@@ -137,7 +137,7 @@ export const updateSyncState = ({
       )
       if (rollbackIndex === -1) {
         return shouldNeverHappen(
-          `Rollback event not found in rollback tail. Rollback until: [${payload.rollbackUntil.global},${payload.rollbackUntil.local}]. Rollback tail: [${syncState.rollbackTail.map((e) => e.toString()).join(', ')}]`,
+          `Rollback event not found in rollback tail. Rollback until: [${payload.rollbackUntil.global},${payload.rollbackUntil.client}]. Rollback tail: [${syncState.rollbackTail.map((e) => e.toString()).join(', ')}]`,
         )
       }
 
@@ -200,8 +200,8 @@ export const updateSyncState = ({
       })
 
       if (divergentPendingIndex === -1) {
-        const pendingEventIds = new Set(syncState.pending.map((e) => `${e.id.global},${e.id.local}`))
-        const newEvents = payload.newEvents.filter((e) => !pendingEventIds.has(`${e.id.global},${e.id.local}`))
+        const pendingEventIds = new Set(syncState.pending.map((e) => `${e.id.global},${e.id.client}`))
+        const newEvents = payload.newEvents.filter((e) => !pendingEventIds.has(`${e.id.global},${e.id.client}`))
 
         // In the case where the incoming events are a subset of the pending events,
         // we need to split the pending events into two groups:
@@ -227,7 +227,7 @@ export const updateSyncState = ({
 
         const seenEventIds = new Set<string>()
         const pendingAndNewEvents = [...pendingMatching, ...payload.newEvents].filter((event) => {
-          const eventIdStr = `${event.id.global},${event.id.local}`
+          const eventIdStr = `${event.id.global},${event.id.client}`
           if (seenEventIds.has(eventIdStr)) {
             return false
           }

package/src/version.ts

@@ -2,7 +2,7 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.3.0-dev.12' as const
+export const liveStoreVersion = '0.3.0-dev.14' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.

package/tsconfig.json

@@ -7,5 +7,5 @@
     "tsBuildInfoFile": "./dist/.tsbuildinfo"
   },
   "include": ["./src"],
-  "references": [{ "path": "../db-schema" }, { "path": "../utils" }]
+  "references": [{ "path": "../utils" }]
 }