@livestore/common 0.3.0-dev.5 → 0.3.0-dev.51

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

@@ -1,21 +1,21 @@
-import { defineMutation } from '@livestore/common/schema'
+import { defineEvent } from '@livestore/common/schema'
 import { Schema } from '@livestore/utils/effect'
 import { describe, expect, it } from 'vitest'
 
 import { compactEvents } from '../compact-events.js'
 import { historyDagFromNodes } from '../history-dag.js'
 import { customSerializer } from './compact-events.test.js'
-import { toEventNodes } from './mutation-fixtures.js'
+import { printEvent, toEventNodes } from './event-fixtures.js'
 
 expect.addSnapshotSerializer(customSerializer)
 
 const compact = (events: any[]) => {
-  const dag = historyDagFromNodes(toEventNodes(events, mutations))
+  const dag = historyDagFromNodes(toEventNodes(events, eventDefs, 'client-id', 'session-id'))
   const compacted = compactEvents(dag)
 
   return Array.from(compacted.dag.nodeEntries())
     .map((_) => _.attributes)
-    .map(({ factsGroup, ...rest }) => ({ ...rest, facts: factsGroup }))
+    .map(printEvent)
     .slice(1)
 }
 
@@ -23,98 +23,98 @@ const facts = {
   multiplyByZero: `multiplyByZero`,
 }
 
-const mutations = {
-  add: defineMutation('add', Schema.Struct({ value: Schema.Number }), 'UPDATE values SET value = value + $value', {}),
-  multiply: defineMutation(
-    'multiply',
-    Schema.Struct({ value: Schema.Number }),
-    'UPDATE values SET value = value * $value',
-    {
-      facts: ({ value }, currentFacts) => ({
-        modify: {
-          set: value === 0 || currentFacts.has(facts.multiplyByZero) ? [facts.multiplyByZero] : [],
-          unset: value === 0 ? [] : [facts.multiplyByZero],
-        },
-      }),
-    },
-  ),
+const eventDefs = {
+  add: defineEvent({
+    name: 'add',
+    schema: Schema.Struct({ value: Schema.Number }),
+  }),
+  multiply: defineEvent({
+    name: 'multiply',
+    schema: Schema.Struct({ value: Schema.Number }),
+    facts: ({ value }, currentFacts) => ({
+      modify: {
+        set: value === 0 || currentFacts.has(facts.multiplyByZero) ? [facts.multiplyByZero] : [],
+        unset: value === 0 ? [] : [facts.multiplyByZero],
+      },
+    }),
+  }),
   // TODO divide by zero
 }
 
 describe('compactEvents calculator', () => {
   it('1 + 1', () => {
     const expected = compact([
-      mutations.add({ value: 1 }), // 0
-      mutations.add({ value: 1 }), // 1
+      eventDefs.add({ value: 1 }), // 0
+      eventDefs.add({ value: 1 }), // 1
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "add", args: { value: 1 }, facts: "" }
-        { id: 1, parentId: 0, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `)
   })
 
   it('2 * 2', () => {
     const expected = compact([
-      mutations.multiply({ value: 2 }), // 0
-      mutations.multiply({ value: 2 }), // 1
+      eventDefs.multiply({ value: 2 }), // 0
+      eventDefs.multiply({ value: 2 }), // 1
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero -multiplyByZero" }
-        { id: 1, parentId: 0, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero -multiplyByZero" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero -multiplyByZero" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero -multiplyByZero" }
       ]
     `)
   })
 
   it('2 * 2 * 0', () => {
     const expected = compact([
-      mutations.multiply({ value: 2 }), // 0
-      mutations.multiply({ value: 2 }), // 1
-      mutations.multiply({ value: 0 }), // 2
+      eventDefs.multiply({ value: 2 }), // 0
+      eventDefs.multiply({ value: 2 }), // 1
+      eventDefs.multiply({ value: 0 }), // 2
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 2, parentId: -1, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
+        { seqNum: "e3", parentSeqNum: "e0", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
       ]
     `)
   })
 
   it('2 * 2 * 0 + 1', () => {
     const expected = compact([
-      mutations.multiply({ value: 2 }), // 0
-      mutations.multiply({ value: 2 }), // 1
-      mutations.multiply({ value: 0 }), // 2
-      mutations.add({ value: 1 }), // 3
+      eventDefs.multiply({ value: 2 }), // 0
+      eventDefs.multiply({ value: 2 }), // 1
+      eventDefs.multiply({ value: 0 }), // 2
+      eventDefs.add({ value: 1 }), // 3
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 2, parentId: -1, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
-        { id: 3, parentId: 2, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e3", parentSeqNum: "e0", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
+        { seqNum: "e4", parentSeqNum: "e3", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `)
   })
 
   it('1 + 2 * 0 * 2 + 1', () => {
     const expected = compact([
-      mutations.add({ value: 1 }), // 0
-      mutations.multiply({ value: 2 }), // 1
-      mutations.multiply({ value: 0 }), // 2
-      mutations.multiply({ value: 2 }), // 3
-      mutations.add({ value: 1 }), // 4
+      eventDefs.add({ value: 1 }), // 0
+      eventDefs.multiply({ value: 2 }), // 1
+      eventDefs.multiply({ value: 0 }), // 2
+      eventDefs.multiply({ value: 2 }), // 3
+      eventDefs.add({ value: 1 }), // 4
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "add", args: { value: 1 }, facts: "" }
-        { id: 2, parentId: 0, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
-        { id: 3, parentId: 2, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero +multiplyByZero -multiplyByZero" }
-        { id: 4, parentId: 3, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
+        { seqNum: "e3", parentSeqNum: "e1", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
+        { seqNum: "e4", parentSeqNum: "e3", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero +multiplyByZero -multiplyByZero" }
+        { seqNum: "e5", parentSeqNum: "e4", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `)
   })

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, printEvent, toEventNodes } from './event-fixtures.js'
 
 const customStringify = (value: any): string => {
   if (value === null) {
@@ -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 === 'parentSeqNum') && Object.keys(val).length === 2 && val.client === 0
             ? val.global
             : customStringify(val)
 
@@ -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,102 +71,102 @@ export const customSerializer = {
 expect.addSnapshotSerializer(customSerializer)
 
 const compact = (events: any[]) => {
-  const dag = historyDagFromNodes(toEventNodes(events, mutations))
+  const dag = historyDagFromNodes(toEventNodes(events, eventDefs, 'client-id', 'session-id'))
   const compacted = compactEvents(dag)
 
   return Array.from(compacted.dag.nodeEntries())
     .map((_) => _.attributes)
-    .map(({ factsGroup, ...rest }) => ({ ...rest, facts: factsGroup }))
+    .map(printEvent)
     .slice(1)
 }
 
 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
+      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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e3", parentSeqNum: "e1", 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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e2", parentSeqNum: "e1", 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" }
+        { seqNum: "e3", parentSeqNum: "e2", 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" }
+        { seqNum: "e4", parentSeqNum: "e3", 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('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.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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e5", parentSeqNum: "e1", name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { seqNum: "e6", parentSeqNum: "e5", 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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { seqNum: "e3", parentSeqNum: "e2", 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" }
+        { seqNum: "e4", parentSeqNum: "e3", 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.completeTodo({ 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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
+        { seqNum: "e3", parentSeqNum: "e2", name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { seqNum: "e4", parentSeqNum: "e3", 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" }
+        { seqNum: "e5", parentSeqNum: "e4", name: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
     `)
   })
@@ -174,59 +174,59 @@ 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]
     `)
   })
 
-  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.toggleTodo({ id: 'A' }), // 4
-      mutations.completeTodo({ 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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e2", parentSeqNum: "e1", 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" }
+        { seqNum: "e3", parentSeqNum: "e2", 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" }
+        { seqNum: "e4", parentSeqNum: "e3", 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" }
+        { seqNum: "e6", parentSeqNum: "e4", 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('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.toggleTodo({ id: 'A' }), // 5
-      mutations.completeTodo({ 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" }, 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" }
+        { seqNum: "e1", parentSeqNum: "e0", 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" }
+        { seqNum: "e2", parentSeqNum: "e1", 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" }
+        { seqNum: "e3", parentSeqNum: "e2", 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" }
+        { seqNum: "e5", parentSeqNum: "e3", 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" }
+        { seqNum: "e7", parentSeqNum: "e5", name: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })