@livestore/common 0.3.0-dev.46 → 0.3.0-dev.48

package/src/sync/ClientSessionSyncProcessor.ts

@@ -5,7 +5,7 @@ import { BucketQueue, Effect, FiberHandle, Queue, Schema, Stream, Subscribable }
 import * as otel from '@opentelemetry/api'
 
 import type { ClientSession, UnexpectedError } from '../adapter-types.js'
-import * as EventId from '../schema/EventId.js'
+import * as EventSequenceNumber from '../schema/EventSequenceNumber.js'
 import * as LiveStoreEvent from '../schema/LiveStoreEvent.js'
 import { getEventDef, type LiveStoreSchema, SystemTables } from '../schema/mod.js'
 import { sql } from '../util.js'
@@ -77,16 +77,16 @@ export const makeClientSessionSyncProcessor = ({
   const push: ClientSessionSyncProcessor['push'] = (batch, { otelContext }) => {
     // TODO validate batch
 
-    let baseEventId = syncStateRef.current.localHead
+    let baseEventSequenceNumber = syncStateRef.current.localHead
     const encodedEventDefs = batch.map(({ name, args }) => {
       const eventDef = getEventDef(schema, name)
-      const nextIdPair = EventId.nextPair(baseEventId, eventDef.eventDef.options.clientOnly)
-      baseEventId = nextIdPair.id
+      const nextNumPair = EventSequenceNumber.nextPair(baseEventSequenceNumber, eventDef.eventDef.options.clientOnly)
+      baseEventSequenceNumber = nextNumPair.seqNum
       return new LiveStoreEvent.EncodedWithMeta(
         Schema.encodeUnknownSync(eventSchema)({
           name,
           args,
-          ...nextIdPair,
+          ...nextNumPair,
           clientId: clientSession.clientId,
           sessionId: clientSession.sessionId,
         }),
@@ -179,7 +179,7 @@ export const makeClientSessionSyncProcessor = ({
     // NOTE We need to lazily call `.pull` as we want the cursor to be updated
     yield* Stream.suspend(() =>
       clientSession.leaderThread.events.pull({
-        cursor: { mergeCounter: getMergeCounter(), eventId: syncStateRef.current.localHead },
+        cursor: { mergeCounter: getMergeCounter(), eventNum: syncStateRef.current.localHead },
       }),
     ).pipe(
       Stream.tap(({ payload, mergeCounter: leaderMergeCounter }) =>
@@ -272,7 +272,7 @@ export const makeClientSessionSyncProcessor = ({
           refreshTables(writeTables)
         }).pipe(
           Effect.tapCauseLogPretty,
-          Effect.catchAllCause((cause) => Effect.sync(() => clientSession.shutdown(cause))),
+          Effect.catchAllCause((cause) => clientSession.shutdown(cause)),
         ),
       ),
       Stream.runDrain,

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

@@ -1,6 +1,6 @@
+import { EventSequenceNumber } from '../../schema/mod.js'
 import { replacesFacts } from './facts.js'
 import { graphologyDag } from './graphology_.js'
-import { eventIdToString } from './history-dag.js'
 import type { HistoryDag } from './history-dag-common.js'
 import { emptyHistoryDag } from './history-dag-common.js'
 
@@ -17,25 +17,25 @@ export const compactEvents = (inputDag: HistoryDag): { dag: HistoryDag; compacte
   const dag = inputDag.copy()
   const compactedEventCount = 0
 
-  const orderedEventIdStrs = graphologyDag.topologicalSort(dag).reverse()
+  const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag).reverse()
 
   // drop root
-  orderedEventIdStrs.pop()
+  orderedEventSequenceNumberStrs.pop()
 
-  for (const eventIdStr of orderedEventIdStrs) {
-    if (dag.hasNode(eventIdStr) === false) {
+  for (const eventNumStr of orderedEventSequenceNumberStrs) {
+    if (dag.hasNode(eventNumStr) === false) {
       continue
     }
 
-    const subDagsForEvent = Array.from(makeSubDagsForEvent(dag, eventIdStr))
+    const subDagsForEvent = Array.from(makeSubDagsForEvent(dag, eventNumStr))
     for (const subDag of subDagsForEvent) {
       let shouldRetry = true
       while (shouldRetry) {
-        const subDagsInHistory = findSubDagsInHistory(dag, subDag, eventIdStr)
+        const subDagsInHistory = findSubDagsInHistory(dag, subDag, eventNumStr)
 
         // console.debug(
         //   'subDagsInHistory',
-        //   eventIdStr,
+        //   eventNumStr,
         //   'target',
         //   subDag.nodes(),
         //   'found',
@@ -65,9 +65,9 @@ export const compactEvents = (inputDag: HistoryDag): { dag: HistoryDag; compacte
   return { dag, compactedEventCount }
 }
 
-function* makeSubDagsForEvent(inputDag: HistoryDag, eventIdStr: string): Generator<HistoryDag> {
-  /** Map from eventIdStr to array of eventIdStrs that are dependencies */
-  let nextIterationEls: Map<string, string[]> = new Map([[eventIdStr, []]])
+function* makeSubDagsForEvent(inputDag: HistoryDag, eventNumStr: string): Generator<HistoryDag> {
+  /** Map from eventNumStr to array of eventNumStrs that are dependencies */
+  let nextIterationEls: Map<string, string[]> = new Map([[eventNumStr, []]])
   let previousDag: HistoryDag | undefined
 
   while (nextIterationEls.size > 0) {
@@ -77,19 +77,22 @@ function* makeSubDagsForEvent(inputDag: HistoryDag, eventIdStr: string): Generat
     const currentIterationEls = new Map(nextIterationEls)
     nextIterationEls = new Map()
 
-    for (const [currentEventIdStr, edgeTargetIdStrs] of currentIterationEls) {
-      const node = inputDag.getNodeAttributes(currentEventIdStr)
-      if (subDag.hasNode(currentEventIdStr) === false) {
-        subDag.addNode(currentEventIdStr, { ...node })
+    for (const [currentEventSequenceNumberStr, edgeTargetIdStrs] of currentIterationEls) {
+      const node = inputDag.getNodeAttributes(currentEventSequenceNumberStr)
+      if (subDag.hasNode(currentEventSequenceNumberStr) === false) {
+        subDag.addNode(currentEventSequenceNumberStr, { ...node })
       }
       for (const edgeTargetIdStr of edgeTargetIdStrs) {
-        subDag.addEdge(currentEventIdStr, edgeTargetIdStr, { type: 'facts' })
+        subDag.addEdge(currentEventSequenceNumberStr, edgeTargetIdStr, { type: 'facts' })
       }
 
-      for (const depEdge of inputDag.outboundEdgeEntries(currentEventIdStr)) {
+      for (const depEdge of inputDag.outboundEdgeEntries(currentEventSequenceNumberStr)) {
         if (depEdge.attributes.type === 'facts') {
-          const depEventIdStr = depEdge.target
-          nextIterationEls.set(depEventIdStr, [...(nextIterationEls.get(depEventIdStr) ?? []), currentEventIdStr])
+          const depEventSequenceNumberStr = depEdge.target
+          nextIterationEls.set(depEventSequenceNumberStr, [
+            ...(nextIterationEls.get(depEventSequenceNumberStr) ?? []),
+            currentEventSequenceNumberStr,
+          ])
         }
       }
     }
@@ -102,23 +105,23 @@ function* makeSubDagsForEvent(inputDag: HistoryDag, eventIdStr: string): Generat
 }
 
 /**
- * Iterates over all events from root to `upToExclEventIdStr`
+ * Iterates over all events from root to `upToExclEventSequenceNumberStr`
  * and collects all valid sub dags that are replaced by `targetSubDag`.
  */
 const findSubDagsInHistory = (
   inputDag: HistoryDag,
   targetSubDag: HistoryDag,
-  upToExclEventIdStr: string,
+  upToExclEventSequenceNumberStr: string,
 ): { subDags: HistoryDag[]; allOutsideDependencies: string[][] } => {
   const subDags: HistoryDag[] = []
   const allOutsideDependencies: string[][] = []
 
-  for (const eventIdStr of graphologyDag.topologicalSort(inputDag)) {
-    if (eventIdStr === upToExclEventIdStr) {
+  for (const eventNumStr of graphologyDag.topologicalSort(inputDag)) {
+    if (eventNumStr === upToExclEventSequenceNumberStr) {
       break
     }
 
-    for (const subDag of makeSubDagsForEvent(inputDag, eventIdStr)) {
+    for (const subDag of makeSubDagsForEvent(inputDag, eventNumStr)) {
       // console.debug('findSubDagsInHistory', 'target', targetSubDag.nodes(), 'subDag', subDag.nodes())
       if (subDag.size < targetSubDag.size) {
         continue
@@ -152,9 +155,9 @@ const outsideDependenciesForDag = (subDag: HistoryDag, inputDag: HistoryDag) =>
   for (const nodeIdStr of subDag.nodes()) {
     for (const edgeEntry of inputDag.outboundEdgeEntries(nodeIdStr)) {
       if (edgeEntry.attributes.type === 'facts') {
-        const depEventIdStr = edgeEntry.target
-        if (subDag.hasNode(depEventIdStr) === false) {
-          outsideDependencies.push(depEventIdStr)
+        const depEventSequenceNumberStr = edgeEntry.target
+        if (subDag.hasNode(depEventSequenceNumberStr) === false) {
+          outsideDependencies.push(depEventSequenceNumberStr)
         }
       }
     }
@@ -201,19 +204,19 @@ const dagReplacesDag = (dagA: HistoryDag, dagB: HistoryDag): boolean => {
   return true
 }
 
-const removeEvent = (dag: HistoryDag, eventIdStr: string) => {
-  // console.debug('removing event', eventIdStr)
-  const event = dag.getNodeAttributes(eventIdStr)
-  const parentIdStr = eventIdToString(event.parentId)
-  const childEdges = dag.outboundEdgeEntries(eventIdStr)
+const removeEvent = (dag: HistoryDag, eventNumStr: string) => {
+  // console.debug('removing event', eventNumStr)
+  const event = dag.getNodeAttributes(eventNumStr)
+  const parentSeqNumStr = EventSequenceNumber.toString(event.parentSeqNum)
+  const childEdges = dag.outboundEdgeEntries(eventNumStr)
 
   for (const childEdge of childEdges) {
     if (childEdge.attributes.type === 'parent') {
       const childEvent = dag.getNodeAttributes(childEdge.target)
-      childEvent.parentId = { ...event.parentId }
-      dag.addEdge(parentIdStr, eventIdToString(childEvent.id), { type: 'parent' })
+      childEvent.parentSeqNum = { ...event.parentSeqNum }
+      dag.addEdge(parentSeqNumStr, EventSequenceNumber.toString(childEvent.seqNum), { type: 'parent' })
     }
   }
 
-  dag.dropNode(eventIdStr)
+  dag.dropNode(eventNumStr)
 }

package/src/sync/next/facts.ts

@@ -7,18 +7,18 @@ import type {
   EventDefFactsSnapshot,
   FactsCallback,
 } from '../../schema/EventDef.js'
-import type * as EventId from '../../schema/EventId.js'
+import type * as EventSequenceNumber from '../../schema/EventSequenceNumber.js'
 import { graphologyDag } from './graphology_.js'
 import { EMPTY_FACT_VALUE, type HistoryDag, type HistoryDagNode } from './history-dag-common.js'
 
 export const factsSnapshotForEvents = (
   events: HistoryDagNode[],
-  endEventId: EventId.EventId,
+  endEventSequenceNumber: EventSequenceNumber.EventSequenceNumber,
 ): EventDefFactsSnapshot => {
   const facts = new Map<string, any>()
 
   for (const event of events) {
-    if (compareEventIds(event.id, endEventId) > 0) {
+    if (compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
       return facts
     }
 
@@ -30,15 +30,15 @@ export const factsSnapshotForEvents = (
 
 export const factsSnapshotForDag = (
   dag: HistoryDag,
-  endEventId: EventId.EventId | undefined,
+  endEventSequenceNumber: EventSequenceNumber.EventSequenceNumber | undefined,
 ): EventDefFactsSnapshot => {
   const facts = new Map<string, any>()
 
-  const orderedEventIdStrs = graphologyDag.topologicalSort(dag)
+  const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag)
 
-  for (let i = 0; i < orderedEventIdStrs.length; i++) {
-    const event = dag.getNodeAttributes(orderedEventIdStrs[i]!)
-    if (endEventId !== undefined && compareEventIds(event.id, endEventId) > 0) {
+  for (let i = 0; i < orderedEventSequenceNumberStrs.length; i++) {
+    const event = dag.getNodeAttributes(orderedEventSequenceNumberStrs[i]!)
+    if (endEventSequenceNumber !== undefined && compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
       return facts
     }
 
@@ -226,7 +226,10 @@ export const getFactsGroupForEventArgs = ({
   return facts
 }
 
-export const compareEventIds = (a: EventId.EventId, b: EventId.EventId) => {
+export const compareEventSequenceNumbers = (
+  a: EventSequenceNumber.EventSequenceNumber,
+  b: EventSequenceNumber.EventSequenceNumber,
+) => {
   if (a.global !== b.global) {
     return a.global - b.global
   }

package/src/sync/next/history-dag-common.ts

@@ -1,5 +1,5 @@
 import type { EventDefFactsGroup } from '../../schema/EventDef.js'
-import * as EventId from '../../schema/EventId.js'
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js'
 import { graphology } from './graphology_.js'
 
 export const connectionTypeOptions = ['parent', 'facts'] as const
@@ -20,11 +20,14 @@ export const emptyHistoryDag = (): HistoryDag =>
   })
 
 // TODO consider making `ROOT_ID` parent to itself
-export const rootParentId = EventId.make({ global: EventId.ROOT.global - 1, client: EventId.clientDefault })
+export const rootParentNum = EventSequenceNumber.make({
+  global: EventSequenceNumber.ROOT.global - 1,
+  client: EventSequenceNumber.clientDefault,
+})
 
 export type HistoryDagNode = {
-  id: EventId.EventId
-  parentId: EventId.EventId
+  seqNum: EventSequenceNumber.EventSequenceNumber
+  parentSeqNum: EventSequenceNumber.EventSequenceNumber
   name: string
   args: any
   /** Facts are being used for conflict detection and history compaction */
@@ -35,8 +38,8 @@ export type HistoryDagNode = {
 }
 
 export const rootEventNode: HistoryDagNode = {
-  id: EventId.ROOT,
-  parentId: rootParentId,
+  seqNum: EventSequenceNumber.ROOT,
+  parentSeqNum: rootParentNum,
   // unused below
   name: '__Root__',
   args: {},

package/src/sync/next/history-dag.ts

@@ -1,9 +1,6 @@
-import type * as EventId from '../../schema/EventId.js'
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js'
 import { factsToString, validateFacts } from './facts.js'
-import { emptyHistoryDag, type HistoryDagNode, rootParentId } from './history-dag-common.js'
-
-export const eventIdToString = (eventId: EventId.EventId) =>
-  eventId.client === 0 ? eventId.global.toString() : `${eventId.global}.${eventId.client}`
+import { emptyHistoryDag, type HistoryDagNode, rootParentNum } from './history-dag-common.js'
 
 export const historyDagFromNodes = (dagNodes: HistoryDagNode[], options?: { skipFactsCheck: boolean }) => {
   if (options?.skipFactsCheck !== true) {
@@ -21,11 +18,13 @@ export const historyDagFromNodes = (dagNodes: HistoryDagNode[], options?: { skip
 
   const dag = emptyHistoryDag()
 
-  dagNodes.forEach((node) => dag.addNode(eventIdToString(node.id), node))
+  dagNodes.forEach((node) => dag.addNode(EventSequenceNumber.toString(node.seqNum), node))
 
   dagNodes.forEach((node) => {
-    if (eventIdToString(node.parentId) !== eventIdToString(rootParentId)) {
-      dag.addEdge(eventIdToString(node.parentId), eventIdToString(node.id), { type: 'parent' })
+    if (EventSequenceNumber.toString(node.parentSeqNum) !== EventSequenceNumber.toString(rootParentNum)) {
+      dag.addEdge(EventSequenceNumber.toString(node.parentSeqNum), EventSequenceNumber.toString(node.seqNum), {
+        type: 'parent',
+      })
     }
   })
 
@@ -34,28 +33,28 @@ export const historyDagFromNodes = (dagNodes: HistoryDagNode[], options?: { skip
     for (const factKey of factKeys) {
       // Find the first ancestor node with a matching fact key (via modifySet or modifyUnset) by traversing the graph backwards via the parent edges
       const depNode = (() => {
-        let currentIdStr = eventIdToString(node.id)
+        let currentSeqNumStr = EventSequenceNumber.toString(node.seqNum)
 
-        while (currentIdStr !== eventIdToString(rootParentId)) {
-          const parentEdge = dag.inEdges(currentIdStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent')
+        while (currentSeqNumStr !== EventSequenceNumber.toString(rootParentNum)) {
+          const parentEdge = dag.inEdges(currentSeqNumStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent')
           if (!parentEdge) return null
 
-          const parentIdStr = dag.source(parentEdge)
-          const parentNode = dag.getNodeAttributes(parentIdStr)
+          const parentSeqNumStr = dag.source(parentEdge)
+          const parentNode = dag.getNodeAttributes(parentSeqNumStr)
 
           if (parentNode.factsGroup.modifySet.has(factKey) || parentNode.factsGroup.modifyUnset.has(factKey)) {
             return parentNode
           }
 
-          currentIdStr = parentIdStr
+          currentSeqNumStr = parentSeqNumStr
         }
 
         return null
       })()
 
       if (depNode) {
-        const depNodeIdStr = eventIdToString(depNode.id)
-        const nodeIdStr = eventIdToString(node.id)
+        const depNodeIdStr = EventSequenceNumber.toString(depNode.seqNum)
+        const nodeIdStr = EventSequenceNumber.toString(node.seqNum)
         if (dag.edges(depNodeIdStr, nodeIdStr).filter((e) => dag.getEdgeAttributes(e).type === 'facts').length === 0) {
           dag.addEdge(depNodeIdStr, nodeIdStr, { type: 'facts' })
         }

package/src/sync/next/rebase-events.ts

@@ -1,5 +1,5 @@
 import type { EventDef, EventDefFactsSnapshot } from '../../schema/EventDef.js'
-import * as EventId from '../../schema/EventId.js'
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js'
 import type * as LiveStoreEvent from '../../schema/LiveStoreEvent.js'
 import {
   applyFactGroups,
@@ -88,13 +88,19 @@ export const rebaseEvents = ({
         initialSnapshot,
       }),
   })
-  const headGlobalId = newRemoteEvents.at(-1)!.id.global
+  const headGlobalId = newRemoteEvents.at(-1)!.seqNum.global
 
   return rebasedLocalEvents.map(
     (event, index) =>
       ({
-        id: EventId.make({ global: headGlobalId + index + 1, client: EventId.clientDefault }),
-        parentId: EventId.make({ global: headGlobalId + index, client: EventId.clientDefault }),
+        seqNum: EventSequenceNumber.make({
+          global: headGlobalId + index + 1,
+          client: EventSequenceNumber.clientDefault,
+        }),
+        parentSeqNum: EventSequenceNumber.make({
+          global: headGlobalId + index,
+          client: EventSequenceNumber.clientDefault,
+        }),
         name: event.name,
         args: event.args,
         clientId,

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

@@ -5,7 +5,7 @@ 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 './event-fixtures.js'
+import { printEvent, toEventNodes } from './event-fixtures.js'
 
 expect.addSnapshotSerializer(customSerializer)
 
@@ -15,7 +15,7 @@ const compact = (events: any[]) => {
 
   return Array.from(compacted.dag.nodeEntries())
     .map((_) => _.attributes)
-    .map(({ factsGroup, ...rest }) => ({ ...rest, facts: factsGroup }))
+    .map(printEvent)
     .slice(1)
 }
 
@@ -50,8 +50,8 @@ describe('compactEvents calculator', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 1, parentId: 0, name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
-        { id: 2, parentId: 1, name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", 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: "" }
       ]
     `)
   })
@@ -64,8 +64,8 @@ describe('compactEvents calculator', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 1, parentId: 0, name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero -multiplyByZero" }
-        { id: 2, parentId: 1, name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", 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" }
       ]
     `)
   })
@@ -79,7 +79,7 @@ describe('compactEvents calculator', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 3, parentId: 0, name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
+        { seqNum: "e3", parentSeqNum: "e0", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
       ]
     `)
   })
@@ -94,8 +94,8 @@ describe('compactEvents calculator', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 3, parentId: 0, name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
-        { id: 4, parentId: 3, name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", 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: "" }
       ]
     `)
   })
@@ -111,10 +111,10 @@ describe('compactEvents calculator', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 1, parentId: 0, name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
-        { id: 3, parentId: 1, name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
-        { id: 4, parentId: 3, name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero +multiplyByZero -multiplyByZero" }
-        { id: 5, parentId: 4, name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", 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

@@ -5,7 +5,7 @@ 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 { events as eventDefs, toEventNodes } from './event-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.client === 0
+          : (key === 'id' || key === 'parentSeqNum') && Object.keys(val).length === 2 && val.client === 0
             ? val.global
             : customStringify(val)
 
@@ -76,7 +76,7 @@ const compact = (events: any[]) => {
 
   return Array.from(compacted.dag.nodeEntries())
     .map((_) => _.attributes)
-    .map(({ factsGroup, ...rest }) => ({ ...rest, facts: factsGroup }))
+    .map(printEvent)
     .slice(1)
 }
 
@@ -90,8 +90,8 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -106,10 +106,10 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -126,9 +126,9 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -143,10 +143,10 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -162,11 +162,11 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -200,11 +200,11 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })
@@ -222,11 +222,11 @@ describe('compactEvents todo app', () => {
 
     expect(expected).toMatchInlineSnapshot(`
       [
-        { 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" }
+        { 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" }
       ]
     `)
   })