@livestore/common 0.3.0-dev.28 → 0.3.0-dev.29

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

@@ -1,11 +1,11 @@
-import type { MutationEventFacts } from '@livestore/common/schema'
+import type { EventDefFacts } from '@livestore/common/schema'
 import { describe, expect, it } from 'vitest'
 
 import { compactEvents } from '../compact-events.js'
 import { historyDagFromNodes } from '../history-dag.js'
 import type { HistoryDagNode } from '../history-dag-common.js'
 import { EMPTY_FACT_VALUE } from '../history-dag-common.js'
-import { mutations, toEventNodes } from './mutation-fixtures.js'
+import { events as eventDefs, toEventNodes } from './event-fixtures.js'
 
 const customStringify = (value: any): string => {
   if (value === null) {
@@ -58,7 +58,7 @@ const factsToString = (facts: HistoryDagNode['factsGroup']) =>
     .flat()
     .join(' ')
 
-const factsSetToString = (facts: MutationEventFacts, prefix: string) =>
+const factsSetToString = (facts: EventDefFacts, prefix: string) =>
   Array.from(facts.entries()).map(([key, value]) => prefix + key + (value === EMPTY_FACT_VALUE ? '' : `=${value}`))
 
 export const customSerializer = {
@@ -71,7 +71,7 @@ export const customSerializer = {
 expect.addSnapshotSerializer(customSerializer)
 
 const compact = (events: any[]) => {
-  const dag = historyDagFromNodes(toEventNodes(events, mutations, 'client-id', 'session-id'))
+  const dag = historyDagFromNodes(toEventNodes(events, eventDefs, 'client-id', 'session-id'))
   const compacted = compactEvents(dag)
 
   return Array.from(compacted.dag.nodeEntries())
@@ -83,90 +83,90 @@ const compact = (events: any[]) => {
 describe('compactEvents todo app', () => {
   it('todoCompleted', () => {
     const expected = compact([
-      mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.todoCompleted({ id: 'A' }), // 1
-      mutations.todoCompleted({ id: 'A' }), // 2
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.todoCompleted({ id: 'A' }), // 1
+      eventDefs.todoCompleted({ id: 'A' }), // 2
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 3, parentId: 1, name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
 
   it('toggleTodo', () => {
     const expected = compact([
-      mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.toggleTodo({ id: 'A' }), // 1
-      mutations.toggleTodo({ id: 'A' }), // 2
-      mutations.toggleTodo({ id: 'A' }), // 3
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.toggleTodo({ id: 'A' }), // 1
+      eventDefs.toggleTodo({ id: 'A' }), // 2
+      eventDefs.toggleTodo({ id: 'A' }), // 3
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 1, name: "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: 3, parentId: 2, name: "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: 4, parentId: 3, name: "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('todoCompleted / toggleTodo', () => {
     const expected = compact([
-      mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.toggleTodo({ id: 'A' }), // 1
-      mutations.toggleTodo({ id: 'A' }), // 2
-      mutations.todoCompleted({ id: 'A' }), // 3
-      mutations.todoCompleted({ id: 'A' }), // 4
-      mutations.toggleTodo({ id: 'A' }), // 5
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.toggleTodo({ id: 'A' }), // 1
+      eventDefs.toggleTodo({ id: 'A' }), // 2
+      eventDefs.todoCompleted({ id: 'A' }), // 3
+      eventDefs.todoCompleted({ id: 'A' }), // 4
+      eventDefs.toggleTodo({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 5, parentId: 1, name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 6, parentId: 5, name: "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" }
       ]
     `)
   })
 
   it('readonly setTextTodo', () => {
     const expected = compact([
-      mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.setReadonlyTodo({ id: 'A', readonly: false }), // 1
-      mutations.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 2
-      mutations.setReadonlyTodo({ id: 'A', readonly: true }), // 3
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.setReadonlyTodo({ id: 'A', readonly: false }), // 1
+      eventDefs.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 2
+      eventDefs.setReadonlyTodo({ id: 'A', readonly: true }), // 3
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 1, name: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { id: 3, parentId: 2, name: "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, name: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
     `)
   })
 
   it('readonly setTextTodo 2', () => {
     const expected = compact([
-      mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.setReadonlyTodo({ id: 'A', readonly: false }), // 1
-      mutations.todoCompleted({ id: 'A' }), // 2
-      mutations.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 3
-      mutations.setReadonlyTodo({ id: 'A', readonly: true }), // 4
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.setReadonlyTodo({ id: 'A', readonly: false }), // 1
+      eventDefs.todoCompleted({ id: 'A' }), // 2
+      eventDefs.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 3
+      eventDefs.setReadonlyTodo({ id: 'A', readonly: true }), // 4
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 1, name: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { id: 3, parentId: 2, name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 4, parentId: 3, name: "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: 5, parentId: 4, name: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
     `)
   })
@@ -174,15 +174,15 @@ describe('compactEvents todo app', () => {
   it('readonly setTextTodo - should fail', () => {
     const expected = () =>
       compact([
-        mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-        mutations.setReadonlyTodo({ id: 'A', readonly: false }), // 1
-        mutations.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 2
-        mutations.setReadonlyTodo({ id: 'A', readonly: true }), // 3
-        mutations.setTextTodo({ id: 'A', text: 'buy oat milk' }), // 4
+        eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+        eventDefs.setReadonlyTodo({ id: 'A', readonly: false }), // 1
+        eventDefs.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 2
+        eventDefs.setReadonlyTodo({ id: 'A', readonly: true }), // 3
+        eventDefs.setTextTodo({ id: 'A', text: 'buy oat milk' }), // 4
       ])
 
     expect(expected).toThrowErrorMatchingInlineSnapshot(`
-      [Error: Mutation setTextTodo requires facts that have not been set yet.
+      [Error: Event setTextTodo requires facts that have not been set yet.
       Requires: todo-exists-A, todo-is-writeable-A=true
       Facts Snapshot: todo-exists-A, todo-is-writeable-A=false, todo-completed-A=false, todo-text-updated-A]
     `)
@@ -190,43 +190,43 @@ describe('compactEvents todo app', () => {
 
   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.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 3
-      mutations.toggleTodo({ id: 'A' }), // 4
-      mutations.todoCompleted({ id: 'A' }), // 5
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.createTodo({ id: 'B', text: 'buy bread' }), // 1
+      eventDefs.createTodo({ id: 'C', text: 'buy cheese' }), // 2
+      eventDefs.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 3
+      eventDefs.toggleTodo({ id: 'A' }), // 4
+      eventDefs.todoCompleted({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 1, name: "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: 3, parentId: 2, name: "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: 3, name: "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, name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
 
   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.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 4
-      mutations.toggleTodo({ id: 'A' }), // 5
-      mutations.todoCompleted({ id: 'A' }), // 6
+      eventDefs.createTodo({ id: 'A', text: 'buy milk' }), // 0
+      eventDefs.createTodo({ id: 'B', text: 'buy bread' }), // 1
+      eventDefs.createTodo({ id: 'C', text: 'buy cheese' }), // 2
+      eventDefs.toggleTodo({ id: 'A' }), // 3
+      eventDefs.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 4
+      eventDefs.toggleTodo({ id: 'A' }), // 5
+      eventDefs.todoCompleted({ id: 'A' }), // 6
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { id: 1, parentId: 0, name: "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: 1, name: "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: 3, parentId: 2, name: "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: 5, parentId: 3, name: "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: 7, parentId: 5, name: "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/event-fixtures.ts

@@ -0,0 +1,219 @@
+import { Schema } from '@livestore/utils/effect'
+
+import type { EventDef } from '../../../schema/EventDef.js'
+import { defineEvent, defineFacts } from '../../../schema/EventDef.js'
+import * as EventId from '../../../schema/EventId.js'
+import { factsSnapshotForDag, getFactsGroupForEventArgs } from '../facts.js'
+import { historyDagFromNodes } from '../history-dag.js'
+import type { HistoryDagNode } from '../history-dag-common.js'
+import { rootEventNode } from '../history-dag-common.js'
+
+/** Used for conflict detection and event history compaction */
+export const facts = defineFacts({
+  todoExists: (id: string) => `todo-exists-${id}`,
+  todoIsWriteable: (id: string, writeable: boolean) => [`todo-is-writeable-${id}`, writeable],
+  todoCompleted: (id: string, completed: boolean) => [`todo-completed-${id}`, completed],
+  todoTextUpdated: (id: string) => `todo-text-updated-${id}`,
+  inputValue: (id: string) => `input-value-${id}`,
+})
+
+export const events = {
+  createTodo: defineEvent({
+    name: 'createTodo',
+    schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+    // 'INSERT INTO todos (id, text) VALUES ($id, $text)',
+    // {
+    facts: ({ id }) => ({
+      modify: {
+        set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoCompleted(id, false)],
+      },
+    }),
+  }),
+  upsertTodo: defineEvent({
+    name: 'upsertTodo',
+    schema: Schema.Struct({ id: Schema.String, text: Schema.optional(Schema.String) }),
+    // 'INSERT INTO todos (id, text) VALUES ($id, $text) ON CONFLICT (id) DO UPDATE SET text = $text',
+    // {
+    facts: ({ id }, currentFacts) =>
+      // TODO enable an API along the lines of `map.has(key, value)`
+      currentFacts.has(facts.todoExists(id)) && currentFacts.get(facts.todoIsWriteable(id, true)[0]) === false
+        ? { require: [facts.todoExists(id), facts.todoIsWriteable(id, true)] }
+        : { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
+  }),
+  todoCompleted: defineEvent({
+    name: 'todoCompleted',
+    schema: Schema.Struct({ id: Schema.String }),
+    // consider `RETURNING` to validate before applying facts
+    // 'UPDATE todos SET completed = true WHERE id = $id',
+    // {
+    // prewrite assertions from DB
+    // enables more concurrency
+    // turning database inside out
+    // similar to upsert semantics
+    facts: ({ id }) => ({
+      require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+      modify: { set: [facts.todoCompleted(id, true)] },
+    }),
+  }),
+  todoUncompleted: defineEvent({
+    name: 'todoUncompleted',
+    schema: Schema.Struct({ id: Schema.String }),
+    // 'UPDATE todos SET completed = false WHERE id = $id',
+    // {
+    facts: ({ id }) => ({
+      require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+      modify: { set: [facts.todoCompleted(id, false)] },
+    }),
+  }),
+  todoCompleteds: defineEvent({
+    name: 'todoCompleteds',
+    schema: Schema.Struct({ ids: Schema.Array(Schema.String) }),
+    // 'UPDATE todos SET completed = true WHERE id IN ($ids:csv)',
+    // {
+    facts: ({ ids }) => ({
+      require: ids.flatMap((id) => [facts.todoExists(id), facts.todoIsWriteable(id, true)]),
+      modify: { set: ids.map((id) => facts.todoCompleted(id, true)) },
+    }),
+  }),
+  toggleTodo: defineEvent({
+    name: 'toggleTodo',
+    schema: Schema.Struct({ id: Schema.String }),
+    // 'UPDATE todos SET completed = NOT completed WHERE id = $id',
+    // {
+    facts: ({ id }, currentFacts) => {
+      const currentIsCompleted = currentFacts.get(facts.todoCompleted(id, true)[0]) === true
+      return {
+        require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+        modify: {
+          // remove: [facts.todoCompleted(id, currentIsCompleted)],
+          set: [facts.todoCompleted(id, !currentIsCompleted)],
+        },
+      }
+    },
+  }),
+  setReadonlyTodo: defineEvent({
+    name: 'setReadonlyTodo',
+    schema: Schema.Struct({ id: Schema.String, readonly: Schema.Boolean }),
+    // 'UPDATE todos SET readonly = $readonly WHERE id = $id',
+    // {
+    facts: ({ id, readonly }) => ({
+      require: [facts.todoExists(id)],
+      modify: { set: [facts.todoIsWriteable(id, !readonly)] },
+    }),
+  }),
+  setTextTodo: defineEvent({
+    name: 'setTextTodo',
+    schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+    // 'UPDATE todos SET text = $text WHERE id = $id',
+    // {
+    facts: ({ id }) => ({
+      require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+      modify: { set: [facts.todoTextUpdated(id)] },
+    }),
+  }),
+  setInputValue: defineEvent({
+    name: 'setInputValue',
+    schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+    // 'UPDATE todos SET text = $text WHERE id = $id',
+    // {
+    clientOnly: true,
+    facts: ({ id }) => ({ modify: { set: [facts.inputValue(id)] } }),
+  }),
+}
+
+export type PartialEvent = { name: string; args: any }
+
+export const toEventNodes = (
+  partialEvents: PartialEvent[],
+  eventDefs: Record<string, EventDef.Any>,
+  clientId: string,
+  sessionId: string | undefined,
+): HistoryDagNode[] => {
+  const nodesAcc: HistoryDagNode[] = [rootEventNode]
+
+  let currentEventId: EventId.EventId = EventId.ROOT
+
+  const eventNodes = partialEvents.map((partialEvent) => {
+    const eventDef = eventDefs[partialEvent.name]!
+    const eventId = EventId.nextPair(currentEventId, eventDef.options.clientOnly).id
+    currentEventId = eventId
+
+    const factsSnapshot = factsSnapshotForDag(historyDagFromNodes(nodesAcc, { skipFactsCheck: true }), undefined)
+    // console.log('factsSnapshot', eventId, factsSnapshot)
+    // const depRead: EventDefFactsSnapshot = new Map<string, any>()
+    // const factsSnapshotProxy = new Proxy(factsSnapshot, {
+    //   get: (target, prop) => {
+    //     if (prop === 'has') {
+    //       return (key: string) => {
+    //         depRead.set(key, EMPTY_FACT_VALUE)
+    //         return target.has(key)
+    //       }
+    //     } else if (prop === 'get') {
+    //       return (key: string) => {
+    //         depRead.set(key, EMPTY_FACT_VALUE)
+    //         return target.get(key)
+    //       }
+    //     }
+
+    //     notYetImplemented(`toEventNodes: ${prop.toString()} is not yet implemented`)
+    //   },
+    // })
+
+    // const factsRes = eventDef.options.facts?.(partialEvent.args, factsSnapshotProxy)
+    // console.log('factsRes', factsRes?.modify, factsRes?.require)
+    // const iterableToMap = (iterable: Iterable<EventDefFactInput>) => {
+    //   const map = new Map()
+    //   for (const item of iterable) {
+    //     if (typeof item === 'string') {
+    //       map.set(item, EMPTY_FACT_VALUE)
+    //     } else {
+    //       map.set(item[0], item[1])
+    //     }
+    //   }
+    //   return map
+    // }
+    // const facts = {
+    //   modifyAdd: factsRes?.modify.add ? iterableToMap(factsRes.modify.add) : new Map(),
+    //   modifyRemove: factsRes?.modify.remove ? iterableToMap(factsRes.modify.remove) : new Map(),
+    //   depRequire: factsRes?.require ? iterableToMap(factsRes.require) : new Map(),
+    //   depRead,
+    // } satisfies EventDefFactsGroup
+
+    // applyFactGroup(facts, factsSnapshot)
+
+    const facts = getFactsGroupForEventArgs({
+      factsCallback: eventDef.options.facts,
+      args: partialEvent.args,
+      currentFacts: factsSnapshot,
+    })
+
+    const node = {
+      id: eventId,
+      parentId: getParentId(eventId),
+      name: partialEvent.name,
+      args: partialEvent.args,
+      factsGroup: facts,
+      clientId,
+      sessionId,
+    } satisfies HistoryDagNode
+    nodesAcc.push(node)
+    return node
+  })
+
+  eventNodes.unshift(rootEventNode as never)
+
+  // console.log('eventNodes', eventNodes)
+
+  return eventNodes
+}
+
+const getParentId = (eventId: EventId.EventId): EventId.EventId => {
+  const globalParentId = eventId.global
+  const clientParentId = eventId.client - 1
+
+  if (clientParentId < 0) {
+    return EventId.make({ global: globalParentId - 1, client: EventId.clientDefault })
+  }
+
+  return EventId.make({ global: globalParentId, client: clientParentId })
+}

package/src/sync/next/test/mod.ts

@@ -1 +1 @@
-export * from './mutation-fixtures.js'
+export * from './event-fixtures.js'

package/src/sync/sync.ts

@@ -4,7 +4,7 @@ import { Schema } from '@livestore/utils/effect'
 import type { UnexpectedError } from '../adapter-types.js'
 import type { InitialSyncOptions } from '../leader-thread/types.js'
 import * as EventId from '../schema/EventId.js'
-import type * as MutationEvent from '../schema/MutationEvent.js'
+import type * as LiveStoreEvent from '../schema/LiveStoreEvent.js'
 
 /**
  * Those arguments can be used to implement multi-tenancy etc and are passed in from the store.
@@ -48,7 +48,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
   ) => Stream.Stream<
     {
       batch: ReadonlyArray<{
-        mutationEventEncoded: MutationEvent.AnyEncodedGlobal
+        eventEncoded: LiveStoreEvent.AnyEncodedGlobal
         metadata: Option.Option<TSyncMetadata>
       }>
       remaining: number
@@ -63,7 +63,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
      * - Number of events: 1-100
      * - event ids must be in ascending order
      * */
-    batch: ReadonlyArray<MutationEvent.AnyEncodedGlobal>,
+    batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>,
   ) => Effect.Effect<void, IsOfflineError | InvalidPushError, HttpClient.HttpClient>
   isConnected: SubscriptionRef.SubscriptionRef<boolean>
   /**

package/src/sync/syncstate.test.ts

@@ -2,10 +2,10 @@
 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(
     id: EventId.EventId | typeof EventId.EventId.Encoded,
     parentId: EventId.EventId,
@@ -15,7 +15,7 @@ class TestEvent extends MutationEvent.EncodedWithMeta {
     super({
       id: EventId.make(id),
       parentId: EventId.make(parentId),
-      mutation: 'a',
+      name: 'a',
       args: payload,
       clientId: 'static-local-id',
       sessionId: 'static-session-id',
@@ -39,9 +39,9 @@ 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 isClientEvent = (event: MutationEvent.EncodedWithMeta) => (event as TestEvent).isLocal
+const isClientEvent = (event: LiveStoreEvent.EncodedWithMeta) => (event as TestEvent).isLocal
 
 describe('syncstate', () => {
   describe('merge', () => {
@@ -460,14 +460,14 @@ 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).toStrictEqual(expected[i]!.id)
     expect(event.parentId).toStrictEqual(expected[i]!.parentId)
-    expect(event.mutation).toStrictEqual(expected[i]!.mutation)
+    expect(event.name).toStrictEqual(expected[i]!.name)
     expect(event.args).toStrictEqual(expected[i]!.args)
   })
 }