@livestore/common 0.4.0-dev.1 → 0.4.0-dev.10

package/src/sync/ClientSessionSyncProcessor.ts

@@ -13,12 +13,13 @@ import {
   Stream,
   Subscribable,
 } from '@livestore/utils/effect'
-import * as otel from '@opentelemetry/api'
+import type * as otel from '@opentelemetry/api'
 
-import { type ClientSession, SyncError, type UnexpectedError } from '../adapter-types.ts'
+import { type ClientSession, UnexpectedError } from '../adapter-types.ts'
+import type { MaterializeError } from '../errors.ts'
 import * as EventSequenceNumber from '../schema/EventSequenceNumber.ts'
 import * as LiveStoreEvent from '../schema/LiveStoreEvent.ts'
-import { getEventDef, type LiveStoreSchema } from '../schema/mod.ts'
+import type { LiveStoreSchema } from '../schema/mod.ts'
 import * as SyncState from './syncstate.ts'
 
 /**
@@ -51,16 +52,19 @@ export const makeClientSessionSyncProcessor = ({
   clientSession: ClientSession
   runtime: Runtime.Runtime<Scope.Scope>
   materializeEvent: (
-    eventDecoded: LiveStoreEvent.AnyDecoded,
-    options: { otelContext: otel.Context; withChangeset: boolean; materializerHashLeader: Option.Option<number> },
-  ) => {
-    writeTables: Set<string>
-    sessionChangeset:
-      | { _tag: 'sessionChangeset'; data: Uint8Array<ArrayBuffer>; debug: any }
-      | { _tag: 'no-op' }
-      | { _tag: 'unset' }
-    materializerHash: Option.Option<number>
-  }
+    eventEncoded: LiveStoreEvent.EncodedWithMeta,
+    options: { withChangeset: boolean; materializerHashLeader: Option.Option<number> },
+  ) => Effect.Effect<
+    {
+      writeTables: Set<string>
+      sessionChangeset:
+        | { _tag: 'sessionChangeset'; data: Uint8Array<ArrayBuffer>; debug: any }
+        | { _tag: 'no-op' }
+        | { _tag: 'unset' }
+      materializerHash: Option.Option<number>
+    },
+    MaterializeError
+  >
   rollback: (changeset: Uint8Array<ArrayBuffer>) => void
   refreshTables: (tables: Set<string>) => void
   span: otel.Span
@@ -91,23 +95,26 @@ export const makeClientSessionSyncProcessor = ({
     }),
   }
 
-  /** Only used for debugging / observability, it's not relied upon for correctness of the sync processor. */
+  /** Only used for debugging / observability / testing, it's not relied upon for correctness of the sync processor. */
   const syncStateUpdateQueue = Queue.unbounded<SyncState.SyncState>().pipe(Effect.runSync)
   const isClientEvent = (eventEncoded: LiveStoreEvent.EncodedWithMeta) =>
-    getEventDef(schema, eventEncoded.name).eventDef.options.clientOnly
+    schema.eventsDefsMap.get(eventEncoded.name)?.options.clientOnly ?? false
 
   /** We're queuing push requests to reduce the number of messages sent to the leader by batching them */
   const leaderPushQueue = BucketQueue.make<LiveStoreEvent.EncodedWithMeta>().pipe(Effect.runSync)
 
-  const push: ClientSessionSyncProcessor['push'] = (batch, { otelContext }) => {
+  const push: ClientSessionSyncProcessor['push'] = Effect.fn('client-session-sync-processor:push')(function* (batch) {
     // TODO validate batch
 
     let baseEventSequenceNumber = syncStateRef.current.localHead
     const encodedEventDefs = batch.map(({ name, args }) => {
-      const eventDef = getEventDef(schema, name)
+      const eventDef = schema.eventsDefsMap.get(name)
+      if (eventDef === undefined) {
+        return shouldNeverHappen(`No event definition found for \`${name}\`.`)
+      }
       const nextNumPair = EventSequenceNumber.nextPair({
         seqNum: baseEventSequenceNumber,
-        isClient: eventDef.eventDef.options.clientOnly,
+        isClient: eventDef.options.clientOnly,
       })
       baseEventSequenceNumber = nextNumPair.seqNum
       return new LiveStoreEvent.EncodedWithMeta(
@@ -128,33 +135,35 @@ export const makeClientSessionSyncProcessor = ({
       isEqualEvent: LiveStoreEvent.isEqualEncoded,
     })
 
+    yield* Effect.annotateCurrentSpan({
+      batchSize: encodedEventDefs.length,
+      mergeResultTag: mergeResult._tag,
+      eventCounts: encodedEventDefs.reduce<Record<string, number>>((acc, event) => {
+        acc[event.name] = (acc[event.name] ?? 0) + 1
+        return acc
+      }, {}),
+      ...(TRACE_VERBOSE && { mergeResult: JSON.stringify(mergeResult) }),
+    })
+
     if (mergeResult._tag === 'unexpected-error') {
       return shouldNeverHappen('Unexpected error in client-session-sync-processor', mergeResult.message)
     }
 
-    span.addEvent('local-push', {
-      batchSize: encodedEventDefs.length,
-      mergeResult: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
-    })
-
     if (mergeResult._tag !== 'advance') {
       return shouldNeverHappen(`Expected advance, got ${mergeResult._tag}`)
     }
 
     syncStateRef.current = mergeResult.newSyncState
-    syncStateUpdateQueue.offer(mergeResult.newSyncState).pipe(Effect.runSync)
+    yield* syncStateUpdateQueue.offer(mergeResult.newSyncState)
 
     // Materialize events to state
     const writeTables = new Set<string>()
     for (const event of mergeResult.newEvents) {
-      // TODO avoid encoding and decoding here again
-      const decodedEventDef = Schema.decodeSync(eventSchema)(event)
       const {
         writeTables: newWriteTables,
         sessionChangeset,
         materializerHash,
-      } = materializeEvent(decodedEventDef, {
-        otelContext,
+      } = yield* materializeEvent(event, {
         withChangeset: true,
         materializerHashLeader: Option.none(),
       })
@@ -167,10 +176,10 @@ export const makeClientSessionSyncProcessor = ({
 
     // Trigger push to leader
     // console.debug('pushToLeader', encodedEventDefs.length, ...encodedEventDefs.map((_) => _.toJSON()))
-    BucketQueue.offerAll(leaderPushQueue, encodedEventDefs).pipe(Effect.runSync)
+    yield* BucketQueue.offerAll(leaderPushQueue, encodedEventDefs)
 
     return { writeTables }
-  }
+  })
 
   const debugInfo = {
     rebaseCount: 0,
@@ -178,8 +187,6 @@ export const makeClientSessionSyncProcessor = ({
     rejectCount: 0,
   }
 
-  const otelContext = otel.trace.setSpan(otel.context.active(), span)
-
   const boot: ClientSessionSyncProcessor['boot'] = Effect.gen(function* () {
     if (confirmUnsavedChanges && typeof window !== 'undefined' && typeof window.addEventListener === 'function') {
       const onBeforeUnload = (event: BeforeUnloadEvent) => {
@@ -229,13 +236,12 @@ export const makeClientSessionSyncProcessor = ({
           })
 
           if (mergeResult._tag === 'unexpected-error') {
-            return yield* new SyncError({ cause: mergeResult.message })
+            return yield* new UnexpectedError({ cause: mergeResult.message })
           } else if (mergeResult._tag === 'reject') {
             return shouldNeverHappen('Unexpected reject in client-session-sync-processor', mergeResult)
           }
 
           syncStateRef.current = mergeResult.newSyncState
-          yield* syncStateUpdateQueue.offer(mergeResult.newSyncState)
 
           if (mergeResult._tag === 'rebase') {
             span.addEvent('merge:pull:rebase', {
@@ -244,7 +250,6 @@ export const makeClientSessionSyncProcessor = ({
               newEventsCount: mergeResult.newEvents.length,
               rollbackCount: mergeResult.rollbackEvents.length,
               res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
-              rebaseGeneration: mergeResult.newSyncState.localHead.rebaseGeneration,
             })
 
             debugInfo.rebaseCount++
@@ -294,18 +299,19 @@ export const makeClientSessionSyncProcessor = ({
             debugInfo.advanceCount++
           }
 
-          if (mergeResult.newEvents.length === 0) return
+          if (mergeResult.newEvents.length === 0) {
+            // If there are no new events, we need to update the sync state as well
+            yield* syncStateUpdateQueue.offer(mergeResult.newSyncState)
+            return
+          }
 
           const writeTables = new Set<string>()
           for (const event of mergeResult.newEvents) {
-            // TODO apply changeset if available (will require tracking of write tables as well)
-            const decodedEventDef = Schema.decodeSync(eventSchema)(event)
             const {
               writeTables: newWriteTables,
               sessionChangeset,
               materializerHash,
-            } = materializeEvent(decodedEventDef, {
-              otelContext,
+            } = yield* materializeEvent(event, {
               withChangeset: true,
               materializerHashLeader: event.meta.materializerHashLeader,
             })
@@ -318,6 +324,9 @@ export const makeClientSessionSyncProcessor = ({
           }
 
           refreshTables(writeTables)
+
+          // We're only triggering the sync state update after all events have been materialized
+          yield* syncStateUpdateQueue.offer(mergeResult.newSyncState)
         }).pipe(
           Effect.tapCauseLogPretty,
           Effect.catchAllCause((cause) => clientSession.shutdown(Exit.failCause(cause))),
@@ -364,10 +373,7 @@ export const makeClientSessionSyncProcessor = ({
 export interface ClientSessionSyncProcessor {
   push: (
     batch: ReadonlyArray<LiveStoreEvent.PartialAnyDecoded>,
-    options: { otelContext: otel.Context },
-  ) => {
-    writeTables: Set<string>
-  }
+  ) => Effect.Effect<{ writeTables: Set<string> }, MaterializeError>
   boot: Effect.Effect<void, UnexpectedError, Scope.Scope>
   /**
    * Only used for debugging / observability.
@@ -388,11 +394,11 @@ const SIMULATION_ENABLED = true
 // Warning: High values for the simulation params can lead to very long test runs since those get multiplied with the number of events
 export const ClientSessionSyncProcessorSimulationParams = Schema.Struct({
   pull: Schema.Struct({
-    '1_before_leader_push_fiber_interrupt': Schema.Int.pipe(Schema.between(0, 25)),
-    '2_before_leader_push_queue_clear': Schema.Int.pipe(Schema.between(0, 25)),
-    '3_before_rebase_rollback': Schema.Int.pipe(Schema.between(0, 25)),
-    '4_before_leader_push_queue_offer': Schema.Int.pipe(Schema.between(0, 25)),
-    '5_before_leader_push_fiber_run': Schema.Int.pipe(Schema.between(0, 25)),
+    '1_before_leader_push_fiber_interrupt': Schema.Int.pipe(Schema.between(0, 15)),
+    '2_before_leader_push_queue_clear': Schema.Int.pipe(Schema.between(0, 15)),
+    '3_before_rebase_rollback': Schema.Int.pipe(Schema.between(0, 15)),
+    '4_before_leader_push_queue_offer': Schema.Int.pipe(Schema.between(0, 15)),
+    '5_before_leader_push_fiber_run': Schema.Int.pipe(Schema.between(0, 15)),
   }),
 })
 type ClientSessionSyncProcessorSimulationParams = typeof ClientSessionSyncProcessorSimulationParams.Type

package/src/sync/errors.ts

@@ -0,0 +1,38 @@
+import { Schema } from '@livestore/utils/effect'
+import { UnexpectedError } from '../errors.ts'
+import { EventSequenceNumber } from '../schema/mod.ts'
+
+export class IsOfflineError extends Schema.TaggedError<IsOfflineError>()('IsOfflineError', {
+  cause: Schema.Defect,
+}) {}
+
+/** Unique ID generated by the backend when its created. Used to check whether the backend identity has changed. */
+export const BackendId = Schema.String.annotations({ title: '@livestore/sync-cf:BackendId' })
+
+export class BackendIdMismatchError extends Schema.TaggedError<BackendIdMismatchError>()('BackendIdMismatchError', {
+  expected: BackendId,
+  received: BackendId,
+}) {}
+
+export class ServerAheadError extends Schema.TaggedError<ServerAheadError>()('ServerAheadError', {
+  minimumExpectedNum: EventSequenceNumber.GlobalEventSequenceNumber,
+  providedNum: EventSequenceNumber.GlobalEventSequenceNumber,
+}) {}
+
+export class InvalidPushError extends Schema.TaggedError<InvalidPushError>()('InvalidPushError', {
+  cause: Schema.Union(UnexpectedError, ServerAheadError, BackendIdMismatchError),
+}) {}
+
+export class InvalidPullError extends Schema.TaggedError<InvalidPullError>()('InvalidPullError', {
+  cause: Schema.Defect,
+}) {}
+
+export class LeaderAheadError extends Schema.TaggedError<LeaderAheadError>()('LeaderAheadError', {
+  minimumExpectedNum: EventSequenceNumber.EventSequenceNumber,
+  providedNum: EventSequenceNumber.EventSequenceNumber,
+  /** Generation number the client session should use for subsequent pushes */
+  // nextGeneration: Schema.Number,
+}) {}
+
+export const SyncError = Schema.Union(InvalidPushError, InvalidPullError)
+export type SyncError = typeof SyncError.Type

package/src/sync/index.ts

@@ -1,3 +1,6 @@
 export * from './ClientSessionSyncProcessor.ts'
+export * from './mock-sync-backend.ts'
 export * from './sync.ts'
+export { NetworkStatus } from './sync-backend.ts'
+export * from './transport-chunking.ts'
 export * from './validate-push-payload.ts'

package/src/sync/mock-sync-backend.ts

@@ -0,0 +1,184 @@
+import type { Schema, Scope } from '@livestore/utils/effect'
+import { Effect, Mailbox, Option, Queue, Stream, SubscriptionRef } from '@livestore/utils/effect'
+import { UnexpectedError } from '../errors.ts'
+import { EventSequenceNumber, type LiveStoreEvent } from '../schema/mod.ts'
+import { InvalidPushError } from './errors.ts'
+import * as SyncBackend from './sync-backend.ts'
+import { validatePushPayload } from './validate-push-payload.ts'
+
+export interface MockSyncBackend {
+  pushedEvents: Stream.Stream<LiveStoreEvent.AnyEncodedGlobal>
+  connect: Effect.Effect<void>
+  disconnect: Effect.Effect<void>
+  makeSyncBackend: Effect.Effect<SyncBackend.SyncBackend, UnexpectedError, Scope.Scope>
+  advance: (...batch: LiveStoreEvent.AnyEncodedGlobal[]) => Effect.Effect<void>
+  /** Fail the next N push calls with an InvalidPushError (or custom error) */
+  failNextPushes: (
+    count: number,
+    error?: (batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => Effect.Effect<never, InvalidPushError>,
+  ) => Effect.Effect<void>
+}
+
+export interface MockSyncBackendOptions {
+  /** Chunk size for non-live pulls; defaults to 100 */
+  nonLiveChunkSize?: number
+  /** Initial connected state; defaults to false */
+  startConnected?: boolean
+  // TODO add a "flaky" mode to simulate transient network / server failures for pull/push
+}
+
+export const makeMockSyncBackend = (
+  options?: MockSyncBackendOptions,
+): Effect.Effect<MockSyncBackend, UnexpectedError, Scope.Scope> =>
+  Effect.gen(function* () {
+    const syncEventSequenceNumberRef = { current: EventSequenceNumber.ROOT.global }
+    const syncPullQueue = yield* Queue.unbounded<LiveStoreEvent.AnyEncodedGlobal>()
+    const pushedEventsQueue = yield* Mailbox.make<LiveStoreEvent.AnyEncodedGlobal>()
+    const syncIsConnectedRef = yield* SubscriptionRef.make(options?.startConnected ?? false)
+    const allEventsRef: { current: LiveStoreEvent.AnyEncodedGlobal[] } = { current: [] }
+
+    const span = yield* Effect.currentSpan.pipe(Effect.orDie)
+
+    const semaphore = yield* Effect.makeSemaphore(1)
+
+    // TODO improve the API and implementation of simulating errors
+    const failCounterRef = yield* SubscriptionRef.make(0)
+    const failEffectRef = yield* SubscriptionRef.make<
+      ((batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => Effect.Effect<never, InvalidPushError>) | undefined
+    >(undefined)
+
+    const makeSyncBackend = Effect.gen(function* () {
+      const nonLiveChunkSize = Math.max(1, options?.nonLiveChunkSize ?? 100)
+
+      // TODO consider making offline state actively error pull/push.
+      // Currently, offline only reflects in `isConnected`, while operations still succeed,
+      // mirroring how some real providers behave during transient disconnects.
+      return SyncBackend.of<Schema.JsonValue>({
+        isConnected: syncIsConnectedRef,
+        connect: SubscriptionRef.set(syncIsConnectedRef, true),
+        ping: Effect.void,
+        pull: (cursor, options) =>
+          (options?.live
+            ? Stream.concat(
+                Stream.make(SyncBackend.pullResItemEmpty()),
+                Stream.fromQueue(syncPullQueue).pipe(
+                  Stream.chunks,
+                  Stream.map((chunk) => ({
+                    batch: [...chunk].map((eventEncoded) => ({ eventEncoded, metadata: Option.none() })),
+                    pageInfo: SyncBackend.pageInfoNoMore,
+                  })),
+                ),
+              )
+            : Stream.fromEffect(
+                Effect.sync(() => {
+                  const lastSeen = cursor.pipe(
+                    Option.match({
+                      onNone: () => EventSequenceNumber.ROOT.global,
+                      onSome: (_) => _.eventSequenceNumber,
+                    }),
+                  )
+                  // All events with seqNum greater than lastSeen
+                  const slice = allEventsRef.current.filter((e) => e.seqNum > lastSeen)
+                  // Split into configured chunk size
+                  const chunks: { events: LiveStoreEvent.AnyEncodedGlobal[]; remaining: number }[] = []
+                  for (let i = 0; i < slice.length; i += nonLiveChunkSize) {
+                    const end = Math.min(i + nonLiveChunkSize, slice.length)
+                    const remaining = Math.max(slice.length - end, 0)
+                    chunks.push({ events: slice.slice(i, end), remaining })
+                  }
+                  if (chunks.length === 0) {
+                    chunks.push({ events: [], remaining: 0 })
+                  }
+                  return chunks
+                }),
+              ).pipe(
+                Stream.flatMap((chunks) =>
+                  Stream.fromIterable(chunks).pipe(
+                    Stream.map(({ events, remaining }) => ({
+                      batch: events.map((eventEncoded) => ({ eventEncoded, metadata: Option.none() })),
+                      pageInfo: remaining > 0 ? SyncBackend.pageInfoMoreKnown(remaining) : SyncBackend.pageInfoNoMore,
+                    })),
+                  ),
+                ),
+              )
+          ).pipe(Stream.withSpan('MockSyncBackend:pull', { parent: span })),
+        push: (batch) =>
+          Effect.gen(function* () {
+            yield* validatePushPayload(batch, syncEventSequenceNumberRef.current)
+
+            const remaining = yield* SubscriptionRef.get(failCounterRef)
+            if (remaining > 0) {
+              const maybeFail = yield* SubscriptionRef.get(failEffectRef)
+              // decrement counter first
+              yield* SubscriptionRef.set(failCounterRef, remaining - 1)
+              if (maybeFail) {
+                return yield* maybeFail(batch)
+              }
+              return yield* new InvalidPushError({
+                cause: new UnexpectedError({ cause: new Error('MockSyncBackend: simulated push failure') }),
+              })
+            }
+
+            yield* Effect.sleep(10).pipe(Effect.withSpan('MockSyncBackend:push:sleep')) // Simulate network latency
+
+            yield* pushedEventsQueue.offerAll(batch)
+            yield* syncPullQueue.offerAll(batch)
+            allEventsRef.current = allEventsRef.current.concat(batch)
+
+            syncEventSequenceNumberRef.current = batch.at(-1)!.seqNum
+          }).pipe(
+            Effect.withSpan('MockSyncBackend:push', {
+              parent: span,
+              attributes: {
+                nums: batch.map((_) => _.seqNum),
+              },
+            }),
+            semaphore.withPermits(1),
+          ),
+        metadata: {
+          name: '@livestore/mock-sync',
+          description: 'Just a mock sync backend',
+        },
+        supports: {
+          pullPageInfoKnown: true,
+          pullLive: true,
+        },
+      })
+    })
+
+    const advance = (...batch: LiveStoreEvent.AnyEncodedGlobal[]) =>
+      Effect.gen(function* () {
+        syncEventSequenceNumberRef.current = batch.at(-1)!.seqNum
+        allEventsRef.current = allEventsRef.current.concat(batch)
+        yield* syncPullQueue.offerAll(batch)
+      }).pipe(
+        Effect.withSpan('MockSyncBackend:advance', {
+          parent: span,
+          attributes: { nums: batch.map((_) => _.seqNum) },
+        }),
+        semaphore.withPermits(1),
+      )
+
+    const connect = SubscriptionRef.set(syncIsConnectedRef, true)
+    const disconnect = SubscriptionRef.set(syncIsConnectedRef, false)
+
+    const failNextPushes = (
+      count: number,
+      error?: (batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => Effect.Effect<never, InvalidPushError>,
+    ) =>
+      Effect.gen(function* () {
+        yield* SubscriptionRef.set(failCounterRef, count)
+        yield* SubscriptionRef.set(failEffectRef, error)
+      })
+
+    return {
+      syncEventSequenceNumberRef,
+      syncPullQueue,
+      pushedEvents: Mailbox.toStream(pushedEventsQueue),
+      connect,
+      disconnect,
+      makeSyncBackend,
+      advance,
+      failNextPushes,
+    }
+  }).pipe(Effect.withSpanScoped('MockSyncBackend'))

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

@@ -1,6 +1,5 @@
 import { EventSequenceNumber } from '../../schema/mod.ts'
 import { replacesFacts } from './facts.ts'
-import { graphologyDag } from './graphology_.ts'
 import type { HistoryDag } from './history-dag-common.ts'
 import { emptyHistoryDag } from './history-dag-common.ts'
 
@@ -17,7 +16,7 @@ export const compactEvents = (inputDag: HistoryDag): { dag: HistoryDag; compacte
   const dag = inputDag.copy()
   const compactedEventCount = 0
 
-  const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag).reverse()
+  const orderedEventSequenceNumberStrs = dag.topologicalNodeIds().reverse()
 
   // drop root
   orderedEventSequenceNumberStrs.pop()
@@ -116,7 +115,7 @@ const findSubDagsInHistory = (
   const subDags: HistoryDag[] = []
   const allOutsideDependencies: string[][] = []
 
-  for (const eventNumStr of graphologyDag.topologicalSort(inputDag)) {
+  for (const eventNumStr of inputDag.topologicalNodeIds()) {
     if (eventNumStr === upToExclEventSequenceNumberStr) {
       break
     }
@@ -189,8 +188,8 @@ const dagReplacesDag = (dagA: HistoryDag, dagB: HistoryDag): boolean => {
   }
 
   // TODO write tests that covers deterministic order when DAGs have branches
-  const nodeEntriesA = graphologyDag.topologicalSort(dagA).map((nodeId) => dagA.getNodeAttributes(nodeId))
-  const nodeEntriesB = graphologyDag.topologicalSort(dagB).map((nodeId) => dagB.getNodeAttributes(nodeId))
+  const nodeEntriesA = dagA.topologicalNodeIds().map((nodeId) => dagA.getNodeAttributes(nodeId))
+  const nodeEntriesB = dagB.topologicalNodeIds().map((nodeId) => dagB.getNodeAttributes(nodeId))
 
   for (let i = 0; i < nodeEntriesA.length; i++) {
     const nodeA = nodeEntriesA[i]!

package/src/sync/next/facts.ts

@@ -1,5 +1,4 @@
 import { notYetImplemented } from '@livestore/utils'
-
 import type {
   EventDefFactInput,
   EventDefFacts,
@@ -8,7 +7,6 @@ import type {
   FactsCallback,
 } from '../../schema/EventDef.ts'
 import type * as EventSequenceNumber from '../../schema/EventSequenceNumber.ts'
-import { graphologyDag } from './graphology_.ts'
 import { EMPTY_FACT_VALUE, type HistoryDag, type HistoryDagNode } from './history-dag-common.ts'
 
 export const factsSnapshotForEvents = (
@@ -34,7 +32,7 @@ export const factsSnapshotForDag = (
 ): EventDefFactsSnapshot => {
   const facts = new Map<string, any>()
 
-  const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag)
+  const orderedEventSequenceNumberStrs = dag.topologicalNodeIds()
 
   for (let i = 0; i < orderedEventSequenceNumberStrs.length; i++) {
     const event = dag.getNodeAttributes(orderedEventSequenceNumberStrs[i]!)