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

package/dist/leader-thread/eventlog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAc7D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,cAAc,GAAI,YAAY,QAAQ,0EAmB/C,CAAA;AAEJ,qCAAqC;AACrC,eAAO,MAAM,cAAc,GACzB,OAAO,OAAO,CAAC,OAAO,KACrB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,CA6ClF,CAAA;AAEJ,eAAO,MAAM,mBAAmB,GAAI,YAAY,QAAQ,KAAG,OAAO,CAAC,OAMlE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,YAAY,QAAQ,KAAG,OAAO,CAAC,aAE/C,CAAA;AAGrB,eAAO,MAAM,iBAAiB,GAAI,YAAY,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,SACG,CAAA;AAEhF,eAAO,MAAM,kBAAkB,GAC7B,cAAc,cAAc,CAAC,eAAe,EAC5C,YAAY,QAAQ,EACpB,oBAAoB,MAAM,EAC1B,UAAU,MAAM,EAChB,WAAW,MAAM,0EAsCf,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,OAAO,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,oFAkBnF,CAAA;AAEJ,eAAO,MAAM,wBAAwB,GAAI,YAAY,OAAO,CAAC,aAAa;;;;;;;;;;;;2BAoBuC,CAAA"}
+{"version":3,"file":"eventlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,mBAAmB,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAc7D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,cAAc,GAAI,YAAY,QAAQ,0EAmB/C,CAAA;AAEJ,qCAAqC;AACrC,eAAO,MAAM,cAAc,GACzB,OAAO,mBAAmB,CAAC,mBAAmB,KAC7C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,CA8ClF,CAAA;AAEJ,eAAO,MAAM,mBAAmB,GAAI,YAAY,QAAQ,KAAG,mBAAmB,CAAC,mBAS9E,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,YAAY,QAAQ,KAAG,mBAAmB,CAAC,yBAGjC,CAAA;AAG/C,eAAO,MAAM,iBAAiB,GAAI,YAAY,QAAQ,EAAE,MAAM,mBAAmB,CAAC,mBAAmB,SACrB,CAAA;AAEhF,eAAO,MAAM,kBAAkB,GAC7B,cAAc,cAAc,CAAC,eAAe,EAC5C,YAAY,QAAQ,EACpB,oBAAoB,MAAM,EAC1B,UAAU,MAAM,EAChB,WAAW,MAAM,0EAsCf,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,OAAO,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,oFAkBnF,CAAA;AAEJ,eAAO,MAAM,wBAAwB,GAAI,YAAY,mBAAmB,CAAC,yBAAyB;;;;;;;;;;;;2BAoBe,CAAA"}

package/dist/leader-thread/eventlog.js

@@ -1,6 +1,6 @@
 import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
 import { Effect, Option, Schema } from '@livestore/utils/effect';
-import * as EventId from '../schema/EventId.js';
+import * as EventSequenceNumber from '../schema/EventSequenceNumber.js';
 import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
 import { EVENTLOG_META_TABLE, eventlogMetaTable, eventlogSystemTables, sessionChangesetMetaTable, SYNC_STATUS_TABLE, } from '../schema/state/sqlite/system-tables.js';
 import { migrateTable } from '../schema-management/migrations.js';
@@ -19,26 +19,27 @@ export const initEventlogDb = (dbEventlog) => Effect.gen(function* () {
     }
     // Create sync status row if it doesn't exist
     yield* execSql(dbEventlog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
-          SELECT ${EventId.ROOT.global}
+          SELECT ${EventSequenceNumber.ROOT.global}
           WHERE NOT EXISTS (SELECT 1 FROM ${SYNC_STATUS_TABLE})`, {});
 });
 /** Exclusive of the "since event" */
 export const getEventsSince = (since) => Effect.gen(function* () {
     const { dbEventlog, dbState } = yield* LeaderThreadCtx;
-    const query = eventlogMetaTable.where('idGlobal', '>=', since.global).asSql();
+    const query = eventlogMetaTable.where('seqNumGlobal', '>=', since.global).asSql();
     const pendingEventsRaw = dbEventlog.select(query.query, prepareBindValues(query.bindValues, query.query));
     const pendingEvents = Schema.decodeUnknownSync(eventlogMetaTable.rowSchema.pipe(Schema.Array))(pendingEventsRaw);
-    const sessionChangesetRows = sessionChangesetMetaTable.where('idGlobal', '>=', since.global).asSql();
+    const sessionChangesetRows = sessionChangesetMetaTable.where('seqNumGlobal', '>=', since.global).asSql();
     const sessionChangesetRowsRaw = dbState.select(sessionChangesetRows.query, prepareBindValues(sessionChangesetRows.bindValues, sessionChangesetRows.query));
     const sessionChangesetRowsDecoded = Schema.decodeUnknownSync(sessionChangesetMetaTable.rowSchema.pipe(Schema.Array))(sessionChangesetRowsRaw);
     return pendingEvents
         .map((eventlogEvent) => {
-        const sessionChangeset = sessionChangesetRowsDecoded.find((readModelEvent) => readModelEvent.idGlobal === eventlogEvent.idGlobal && readModelEvent.idClient === eventlogEvent.idClient);
+        const sessionChangeset = sessionChangesetRowsDecoded.find((readModelEvent) => readModelEvent.seqNumGlobal === eventlogEvent.seqNumGlobal &&
+            readModelEvent.seqNumClient === eventlogEvent.seqNumClient);
         return LiveStoreEvent.EncodedWithMeta.make({
             name: eventlogEvent.name,
             args: eventlogEvent.argsJson,
-            id: { global: eventlogEvent.idGlobal, client: eventlogEvent.idClient },
-            parentId: { global: eventlogEvent.parentIdGlobal, client: eventlogEvent.parentIdClient },
+            seqNum: { global: eventlogEvent.seqNumGlobal, client: eventlogEvent.seqNumClient },
+            parentSeqNum: { global: eventlogEvent.parentSeqNumGlobal, client: eventlogEvent.parentSeqNumClient },
             clientId: eventlogEvent.clientId,
             sessionId: eventlogEvent.sessionId,
             meta: {
@@ -53,23 +54,22 @@ export const getEventsSince = (since) => Effect.gen(function* () {
             },
         });
     })
-        .filter((_) => EventId.compare(_.id, since) > 0)
-        .sort((a, b) => EventId.compare(a.id, b.id));
+        .filter((_) => EventSequenceNumber.compare(_.seqNum, since) > 0)
+        .sort((a, b) => EventSequenceNumber.compare(a.seqNum, b.seqNum));
 });
 export const getClientHeadFromDb = (dbEventlog) => {
-    const res = dbEventlog.select(sql `select idGlobal, idClient from ${EVENTLOG_META_TABLE} order by idGlobal DESC, idClient DESC limit 1`)[0];
-    return res ? { global: res.idGlobal, client: res.idClient } : EventId.ROOT;
+    const res = dbEventlog.select(sql `select seqNumGlobal, seqNumClient from ${EVENTLOG_META_TABLE} order by seqNumGlobal DESC, seqNumClient DESC limit 1`)[0];
+    return res ? { global: res.seqNumGlobal, client: res.seqNumClient } : EventSequenceNumber.ROOT;
 };
-export const getBackendHeadFromDb = (dbEventlog) => dbEventlog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ??
-    EventId.ROOT.global;
+export const getBackendHeadFromDb = (dbEventlog) => dbEventlog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ?? EventSequenceNumber.ROOT.global;
 // TODO use prepared statements
 export const updateBackendHead = (dbEventlog, head) => dbEventlog.execute(sql `UPDATE ${SYNC_STATUS_TABLE} SET head = ${head.global}`);
 export const insertIntoEventlog = (eventEncoded, dbEventlog, eventDefSchemaHash, clientId, sessionId) => Effect.gen(function* () {
     // Check history consistency during LS_DEV
-    if (LS_DEV && eventEncoded.parentId.global !== EventId.ROOT.global) {
-        const parentEventExists = dbEventlog.select(`SELECT COUNT(*) as count FROM ${EVENTLOG_META_TABLE} WHERE idGlobal = ? AND idClient = ?`, [eventEncoded.parentId.global, eventEncoded.parentId.client])[0].count === 1;
+    if (LS_DEV && eventEncoded.parentSeqNum.global !== EventSequenceNumber.ROOT.global) {
+        const parentEventExists = dbEventlog.select(`SELECT COUNT(*) as count FROM ${EVENTLOG_META_TABLE} WHERE seqNumGlobal = ? AND seqNumClient = ?`, [eventEncoded.parentSeqNum.global, eventEncoded.parentSeqNum.client])[0].count === 1;
         if (parentEventExists === false) {
-            shouldNeverHappen(`Parent mutation ${eventEncoded.parentId.global},${eventEncoded.parentId.client} does not exist`);
+            shouldNeverHappen(`Parent mutation ${eventEncoded.parentSeqNum.global},${eventEncoded.parentSeqNum.client} does not exist`);
         }
     }
     // TODO use prepared statements
@@ -77,10 +77,10 @@ export const insertIntoEventlog = (eventEncoded, dbEventlog, eventDefSchemaHash,
         tableName: EVENTLOG_META_TABLE,
         columns: eventlogMetaTable.sqliteDef.columns,
         values: {
-            idGlobal: eventEncoded.id.global,
-            idClient: eventEncoded.id.client,
-            parentIdGlobal: eventEncoded.parentId.global,
-            parentIdClient: eventEncoded.parentId.client,
+            seqNumGlobal: eventEncoded.seqNum.global,
+            seqNumClient: eventEncoded.seqNum.client,
+            parentSeqNumGlobal: eventEncoded.parentSeqNum.global,
+            parentSeqNumClient: eventEncoded.parentSeqNum.client,
             name: eventEncoded.name,
             argsJson: eventEncoded.args ?? {},
             clientId,
@@ -98,21 +98,21 @@ export const updateSyncMetadata = (items) => Effect.gen(function* () {
         yield* execSql(dbEventlog, ...updateRows({
             tableName: EVENTLOG_META_TABLE,
             columns: eventlogMetaTable.sqliteDef.columns,
-            where: { idGlobal: event.id.global, idClient: event.id.client },
+            where: { seqNumGlobal: event.seqNum.global, seqNumClient: event.seqNum.client },
             updateValues: { syncMetadataJson: event.meta.syncMetadata },
         }));
     }
 });
 export const getSyncBackendCursorInfo = (remoteHead) => Effect.gen(function* () {
     const { dbEventlog } = yield* LeaderThreadCtx;
-    if (remoteHead === EventId.ROOT.global)
+    if (remoteHead === EventSequenceNumber.ROOT.global)
         return Option.none();
     const EventlogQuerySchema = Schema.Struct({
         syncMetadataJson: Schema.parseJson(Schema.Option(Schema.JsonValue)),
     }).pipe(Schema.pluck('syncMetadataJson'), Schema.Array, Schema.head);
-    const syncMetadataOption = yield* Effect.sync(() => dbEventlog.select(sql `SELECT syncMetadataJson FROM ${EVENTLOG_META_TABLE} WHERE idGlobal = ${remoteHead} ORDER BY idClient ASC LIMIT 1`)).pipe(Effect.andThen(Schema.decode(EventlogQuerySchema)), Effect.map(Option.flatten), Effect.orDie);
+    const syncMetadataOption = yield* Effect.sync(() => dbEventlog.select(sql `SELECT syncMetadataJson FROM ${EVENTLOG_META_TABLE} WHERE seqNumGlobal = ${remoteHead} ORDER BY seqNumClient ASC LIMIT 1`)).pipe(Effect.andThen(Schema.decode(EventlogQuerySchema)), Effect.map(Option.flatten), Effect.orDie);
     return Option.some({
-        cursor: { global: remoteHead, client: EventId.clientDefault },
+        cursor: { global: remoteHead, client: EventSequenceNumber.clientDefault },
         metadata: syncMetadataOption,
     });
 }).pipe(Effect.withSpan('@livestore/common:eventlog:getSyncBackendCursorInfo', { attributes: { remoteHead } }));

package/dist/leader-thread/eventlog.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventlog.js","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eventlog.js","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/leader-worker-devtools.js

@@ -26,7 +26,7 @@ export const bootDevtools = (options) => Effect.gen(function* () {
             .pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'), Effect.interruptible, Effect.ignoreLogged);
         const syncState = yield* syncProcessor.syncState;
         const mergeCounter = syncProcessor.getMergeCounter();
-        yield* syncProcessor.pull({ cursor: { mergeCounter, eventId: syncState.localHead } }).pipe(Stream.tap(({ payload }) => sendMessage(Devtools.Leader.SyncPull.make({ payload, liveStoreVersion }))), Stream.runDrain, Effect.forkScoped);
+        yield* syncProcessor.pull({ cursor: { mergeCounter, eventNum: syncState.localHead } }).pipe(Stream.tap(({ payload }) => sendMessage(Devtools.Leader.SyncPull.make({ payload, liveStoreVersion }))), Stream.runDrain, Effect.forkScoped);
         yield* listenToDevtools({
             incomingMessages: channel.listen.pipe(Stream.flatten(), Stream.orDie),
             sendMessage,

package/dist/leader-thread/leader-worker-devtools.js.map

@@ -1 +1 @@
-{"version":3,"file":"leader-worker-devtools.js","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"leader-worker-devtools.js","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC3F,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAI5C,6CAA6C;AAC7C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAE,EAAE,CACvD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAM;IACR,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,0BAA0B,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAE/F,KAAK,CAAC,CAAC,gBAAgB,CAAC;QACtB,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC;QAC9D,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;KAC/B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAEpD,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;IAE3D,KAAK,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/B,MAAM,CAAC,MAAM,CACX,CAAC,GAAG,EAAE,EAAE,CACN,QAAQ,CAAC,aAAa,CAAC,oBAAoB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAC3G,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;YACtC,MAAM,EAAE,MAAM;YACd,WAAW;YACX,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE;YACtF,IAAI;SACL,CAAC,CAAA;QAEF,MAAM,WAAW,GAA0B,CAAC,OAAO,EAAE,EAAE,CACrD,OAAO;aACJ,IAAI,CAAC,OAAO,CAAC;aACb,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,yDAAyD,CAAC,EAC1E,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,YAAY,CACpB,CAAA;QAEL,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,CAAA;QAChD,MAAM,YAAY,GAAG,aAAa,CAAC,eAAe,EAAE,CAAA;QAEpD,KAAK,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CACzF,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EACtG,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,CAClB,CAAA;QAED,KAAK,CAAC,CAAC,gBAAgB,CAAC;YACtB,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC;YACrE,WAAW;YACX,eAAe;SAChB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,CACrD,EACD,MAAM,CAAC,QAAQ,CAChB,CAAA;AACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CAAC,CAAA;AAE3E,MAAM,gBAAgB,GAAG,CAAC,EACxB,gBAAgB,EAChB,WAAW,EACX,eAAe,GAKhB,EAAE,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EACJ,WAAW,EACX,YAAY,EACZ,OAAO,EACP,UAAU,EACV,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,QAAQ,EACR,QAAQ,GACT,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAG1B,MAAM,oBAAoB,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAkB,CAAA;IAGnE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAa,CAAA;IAE9C,KAAK,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAC1B,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAA;QAClC,MAAM,UAAU,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAA;QAE5D,0BAA0B;QAC1B,uGAAuG;QACvG,kBAAkB;QAClB,IAAI;QAEJ,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE,CAAC;YAClD,OAAM;QACR,CAAC;QAED,iFAAiF;QACjF,uFAAuF;QACvF,8CAA8C;QAC9C,gDAAgD;QAChD,IAAI,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,8DAA8D;YAC9D,OAAM;QACR,CAAC;QAED,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAEhC,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAChE,OAAM;YACR,CAAC;YACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;gBAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;gBAEjC,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAEjF,OAAM;YACR,CAAC;YACD,KAAK,qCAAqC,CAAC,CAAC,CAAC;gBAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAA;gBAE7B,IAAI,UAAuB,CAAA;gBAE3B,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAA;oBACxD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBAClB,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CACnC,qDAAqD,CACtD,CAAA;oBAED,UAAU,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;oBAEzD,KAAK,CAAC,KAAK,EAAE,CAAA;gBACf,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAA;oBAC9D,KAAK,CAAC,CAAC,WAAW,CAChB,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;wBAC1C,GAAG,UAAU;wBACb,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE;qBAC3C,CAAC,CACH,CAAA;oBAED,OAAM;gBACR,CAAC;gBAED,IAAI,CAAC;oBACH,IAAI,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBACrD,iBAAiB;wBACjB,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;wBAEhE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;wBAEvB,OAAO,CAAC,OAAO,EAAE,CAAA;oBACnB,CAAC;yBAAM,IACL,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,iBAAiB,CAAC;wBAC9C,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,4BAA4B,CAAC,EACzD,CAAC;wBACD,cAAc;wBACd,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;wBAEhE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;wBAEpB,UAAU,CAAC,OAAO,EAAE,CAAA;oBACtB,CAAC;yBAAM,CAAC;wBACN,KAAK,CAAC,CAAC,WAAW,CAChB,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;4BAC1C,GAAG,UAAU;4BACb,KAAK,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE;yBACxC,CAAC,CACH,CAAA;wBACD,OAAM;oBACR,CAAC;oBAED,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;oBACpF,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAA;oBAExG,OAAM;gBACR,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAA;oBAC9D,KAAK,CAAC,CAAC,WAAW,CAChB,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;wBAC1C,GAAG,UAAU;wBACb,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE;qBAC3C,CAAC,CACH,CAAA;oBACD,OAAM;gBACR,CAAC;YACH,CAAC;YACD,KAAK,iCAAiC,CAAC,CAAC,CAAC;gBACvC,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAA;gBAE7B,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;gBAEhE,OAAO,CAAC,OAAO,EAAE,CAAA;gBAEjB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;oBACxB,UAAU,CAAC,OAAO,EAAE,CAAA;gBACtB,CAAC;gBAED,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAEhF,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAA;gBAEvG,OAAM;YACR,CAAC;YACD,KAAK,gCAAgC,CAAC,CAAC,CAAC;gBACtC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;oBAClC,OAAO,CAAC,GAAG,CAAC,yFAAyF,CAAC,CAAA;oBACtG,OAAM;gBACR,CAAC;gBAED,MAAM,WAAW,GAAG,qFAAqF,CAAA;gBACzG,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAmB,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAE,CAAC,IAAI,CAAA;gBACpF,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAmB,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAE,CAAC,IAAI,CAAA;gBAE7F,KAAK,CAAC,CAAC,WAAW,CAChB,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC;oBACvC,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC,KAAK,EAAE;oBACvE,QAAQ,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;oBACnF,GAAG,UAAU;iBACd,CAAC,CACH,CAAA;gBAED,OAAM;YACR,CAAC;YACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;gBAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAA;gBAEpC,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAEjF,OAAM;YACR,CAAC;YACD,KAAK,2BAA2B,CAAC,CAAC,CAAC;gBACjC,KAAK,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC;oBAC/B,KAAK,EAAE,YAAY,CAAC,YAAY;oBAChC,QAAQ,EAAE,YAAY,QAAQ,EAAE;oBAChC,SAAS,EAAE,YAAY,QAAQ,EAAE;iBAClC,CAAC,CAAA;gBAEF,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAE1E,OAAM;YACR,CAAC;YACD,KAAK,iCAAiC,CAAC,CAAC,CAAC;gBACvC,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAA;gBAEvC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,wEAAwE;oBACxE,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAC1B,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxC,WAAW,CACT,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;wBAClC,YAAY;wBACZ,QAAQ;wBACR,cAAc;wBACd,GAAG,UAAU;wBACb,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;qBACtB,CAAC,CACH,CACF,EACD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,iBAAiB,EACxB,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,CACnD,CAAA;gBACH,CAAC;gBAED,OAAM;YACR,CAAC;YACD,KAAK,mCAAmC,CAAC,CAAC,CAAC;gBACzC,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAA;gBAClC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAA;gBAEpD,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;gBAEvD,OAAM;YACR,CAAC;YACD,KAAK,2BAA2B,CAAC,CAAC,CAAC;gBACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;oBACnD,OAAO,EAAE,WAAW,KAAK,SAAS;oBAClC,QAAQ,EAAE,WAAW,EAAE,QAAQ,IAAI,EAAE;iBACtC,CAAC,CAAA;gBAEF,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAEvF,OAAM;YACR,CAAC;YACD,KAAK,mCAAmC,CAAC,CAAC,CAAC;gBACzC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAA;oBAEvC,6EAA6E;oBAC7E,iDAAiD;oBACjD,oGAAoG;oBACpG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAEzB,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CACrB,WAAW,CAAC,WAAW,CAAC,OAAO,EAC/B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChG,CAAC,IAAI,CACJ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,CAC5C,WAAW,CACT,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC;wBACpC,aAAa,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE;wBACpE,cAAc;wBACd,GAAG,UAAU;wBACb,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;qBACtB,CAAC,CACH,CACF,EACD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,iBAAiB,EACxB,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,CACnD,CAAA;gBACH,CAAC;gBAED,OAAM;YACR,CAAC;YACD,KAAK,qCAAqC,CAAC,CAAC,CAAC;gBAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAA;gBAElC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;gBAEvD,OAAM;YACR,CAAC;YACD,KAAK,8BAA8B,CAAC,CAAC,CAAC;gBACpC,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAA;gBAEvC,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CACzC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACvB,WAAW,CACT,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC/B,KAAK,EAAE,SAAS,CAAC,SAAS;oBAC1B,QAAQ,EAAE,SAAS,CAAC,YAAY;oBAChC,cAAc;oBACd,GAAG,UAAU;oBACb,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;iBACtB,CAAC,CACH,CACF,EACD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,iBAAiB,EACxB,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,CACnD,CAAA;gBAED,OAAM;YACR,CAAC;YACD,KAAK,gCAAgC,CAAC,CAAC,CAAC;gBACtC,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAA;gBAEvC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAA;gBAE5D,OAAM;YACR,CAAC;YACD,KAAK,iCAAiC,CAAC,CAAC,CAAC;gBACvC,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,CAAA;gBAEnC,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK;oBAAE,OAAM;gBAEtC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;oBACxB,KAAK,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAA;gBACxC,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAA;gBACvC,CAAC;gBAED,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;gBAEvF,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;gBAEhF,OAAM;YACR,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,iCAAiC,EAAE,YAAY,CAAC,CAAA;YAC3E,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,qDAAqD,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CACnG,EACD,eAAe,CAAC,0BAA0B,EAC1C,MAAM,CAAC,QAAQ,CAChB,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/leader-thread/materialize-event.d.ts

@@ -1,16 +1,16 @@
 import { Effect } from '@livestore/utils/effect';
 import type { SqliteDb } from '../adapter-types.js';
 import type { LiveStoreSchema } from '../schema/mod.js';
-import { EventId } from '../schema/mod.js';
+import { EventSequenceNumber } from '../schema/mod.js';
 import type { MaterializeEvent } from './types.js';
 export declare const makeMaterializeEvent: ({ schema, dbState: db, dbEventlog, }: {
     schema: LiveStoreSchema;
     dbState: SqliteDb;
     dbEventlog: SqliteDb;
 }) => Effect.Effect<MaterializeEvent, never>;
-export declare const rollback: ({ dbState, dbEventlog, eventIdsToRollback, }: {
+export declare const rollback: ({ dbState, dbEventlog, eventNumsToRollback, }: {
     dbState: SqliteDb;
     dbEventlog: SqliteDb;
-    eventIdsToRollback: EventId.EventId[];
+    eventNumsToRollback: EventSequenceNumber.EventSequenceNumber[];
 }) => Effect.Effect<void, never, never>;
 //# sourceMappingURL=materialize-event.d.ts.map

package/dist/leader-thread/materialize-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-event.d.ts","sourceRoot":"","sources":["../../src/leader-thread/materialize-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAyB,MAAM,yBAAyB,CAAA;AAEvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,OAAO,EAA6B,MAAM,kBAAkB,CAAA;AAKrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,oBAAoB,GAAI,sCAIlC;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;CACrB,KAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAmGrC,CAAA;AAEJ,eAAO,MAAM,QAAQ,GAAI,8CAItB;IACD,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,kBAAkB,EAAE,OAAO,CAAC,OAAO,EAAE,CAAA;CACtC,sCAsCE,CAAA"}
+{"version":3,"file":"materialize-event.d.ts","sourceRoot":"","sources":["../../src/leader-thread/materialize-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAyB,MAAM,yBAAyB,CAAA;AAEvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAA6B,MAAM,kBAAkB,CAAA;AAKjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,oBAAoB,GAAI,sCAIlC;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;CACrB,KAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAmGrC,CAAA;AAEJ,eAAO,MAAM,QAAQ,GAAI,+CAItB;IACD,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,mBAAmB,EAAE,mBAAmB,CAAC,mBAAmB,EAAE,CAAA;CAC/D,sCA0CE,CAAA"}

package/dist/leader-thread/materialize-event.js

@@ -1,7 +1,7 @@
 import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
 import { Effect, ReadonlyArray, Schema } from '@livestore/utils/effect';
 import { getExecArgsFromEvent } from '../materializer-helper.js';
-import { EventId, getEventDef, SystemTables } from '../schema/mod.js';
+import { EventSequenceNumber, getEventDef, SystemTables } from '../schema/mod.js';
 import { insertRow } from '../sql-queries/index.js';
 import { sql } from '../util.js';
 import { execSql, execSqlPrepared } from './connection.js';
@@ -44,8 +44,8 @@ export const makeMaterializeEvent = ({ schema, dbState: db, dbEventlog, }) => Ef
             tableName: SystemTables.SESSION_CHANGESET_META_TABLE,
             columns: SystemTables.sessionChangesetMetaTable.sqliteDef.columns,
             values: {
-                idGlobal: eventEncoded.id.global,
-                idClient: eventEncoded.id.client,
+                seqNumGlobal: eventEncoded.seqNum.global,
+                seqNumClient: eventEncoded.seqNum.client,
                 // NOTE the changeset will be empty (i.e. null) for no-op events
                 changeset: changeset ?? null,
                 debug: LS_DEV ? execArgsArr : null,
@@ -73,16 +73,20 @@ export const makeMaterializeEvent = ({ schema, dbState: db, dbEventlog, }) => Ef
     }).pipe(Effect.withSpan(`@livestore/common:leader-thread:materializeEvent`, {
         attributes: {
             eventName: eventEncoded.name,
-            eventId: eventEncoded.id,
-            'span.label': `${EventId.toString(eventEncoded.id)} ${eventEncoded.name}`,
+            eventNum: eventEncoded.seqNum,
+            'span.label': `${EventSequenceNumber.toString(eventEncoded.seqNum)} ${eventEncoded.name}`,
         },
     }));
 });
-export const rollback = ({ dbState, dbEventlog, eventIdsToRollback, }) => Effect.gen(function* () {
+export const rollback = ({ dbState, dbEventlog, eventNumsToRollback, }) => Effect.gen(function* () {
     const rollbackEvents = dbState
-        .select(sql `SELECT * FROM ${SystemTables.SESSION_CHANGESET_META_TABLE} WHERE (idGlobal, idClient) IN (${eventIdsToRollback.map((id) => `(${id.global}, ${id.client})`).join(', ')})`)
-        .map((_) => ({ id: { global: _.idGlobal, client: _.idClient }, changeset: _.changeset, debug: _.debug }))
-        .toSorted((a, b) => EventId.compare(a.id, b.id));
+        .select(sql `SELECT * FROM ${SystemTables.SESSION_CHANGESET_META_TABLE} WHERE (seqNumGlobal, seqNumClient) IN (${eventNumsToRollback.map((id) => `(${id.global}, ${id.client})`).join(', ')})`)
+        .map((_) => ({
+        seqNum: { global: _.seqNumGlobal, client: _.seqNumClient },
+        changeset: _.changeset,
+        debug: _.debug,
+    }))
+        .toSorted((a, b) => EventSequenceNumber.compare(a.seqNum, b.seqNum));
     // Apply changesets in reverse order
     for (let i = rollbackEvents.length - 1; i >= 0; i--) {
         const { changeset } = rollbackEvents[i];
@@ -90,16 +94,16 @@ export const rollback = ({ dbState, dbEventlog, eventIdsToRollback, }) => Effect
             dbState.makeChangeset(changeset).invert().apply();
         }
     }
-    const eventIdPairChunks = ReadonlyArray.chunksOf(100)(eventIdsToRollback.map((id) => `(${id.global}, ${id.client})`));
+    const eventNumPairChunks = ReadonlyArray.chunksOf(100)(eventNumsToRollback.map((seqNum) => `(${seqNum.global}, ${seqNum.client})`));
     // Delete the changeset rows
-    for (const eventIdPairChunk of eventIdPairChunks) {
-        dbState.execute(sql `DELETE FROM ${SystemTables.SESSION_CHANGESET_META_TABLE} WHERE (idGlobal, idClient) IN (${eventIdPairChunk.join(', ')})`);
+    for (const eventNumPairChunk of eventNumPairChunks) {
+        dbState.execute(sql `DELETE FROM ${SystemTables.SESSION_CHANGESET_META_TABLE} WHERE (seqNumGlobal, seqNumClient) IN (${eventNumPairChunk.join(', ')})`);
     }
     // Delete the eventlog rows
-    for (const eventIdPairChunk of eventIdPairChunks) {
-        dbEventlog.execute(sql `DELETE FROM ${SystemTables.EVENTLOG_META_TABLE} WHERE (idGlobal, idClient) IN (${eventIdPairChunk.join(', ')})`);
+    for (const eventNumPairChunk of eventNumPairChunks) {
+        dbEventlog.execute(sql `DELETE FROM ${SystemTables.EVENTLOG_META_TABLE} WHERE (seqNumGlobal, seqNumClient) IN (${eventNumPairChunk.join(', ')})`);
     }
 }).pipe(Effect.withSpan('@livestore/common:LeaderSyncProcessor:rollback', {
-    attributes: { count: eventIdsToRollback.length },
+    attributes: { count: eventNumsToRollback.length },
 }));
 //# sourceMappingURL=materialize-event.js.map

package/dist/leader-thread/materialize-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-event.js","sourceRoot":"","sources":["../../src/leader-thread/materialize-event.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"materialize-event.js","sourceRoot":"","sources":["../../src/leader-thread/materialize-event.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/types.d.ts

@@ -3,7 +3,7 @@ import { Context, Schema } from '@livestore/utils/effect';
 import type { MeshNode } from '@livestore/webmesh';
 import type { LeaderPullCursor, SqliteError } from '../adapter-types.js';
 import type { BootStatus, Devtools, LeaderAheadError, MakeSqliteDb, MigrationsReport, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.js';
-import type { EventId, LiveStoreEvent, LiveStoreSchema } from '../schema/mod.js';
+import type { EventSequenceNumber, LiveStoreEvent, LiveStoreSchema } from '../schema/mod.js';
 import type * as SyncState from '../sync/syncstate.js';
 import type { ShutdownChannel } from './shutdown-channel.js';
 export type ShutdownState = 'running' | 'shutting-down';
@@ -18,7 +18,7 @@ export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip
 }>]>;
 export type InitialSyncOptions = typeof InitialSyncOptions.Type;
 export type InitialSyncInfo = Option.Option<{
-    cursor: EventId.EventId;
+    cursor: EventSequenceNumber.EventSequenceNumber;
     metadata: Option.Option<Schema.JsonValue>;
 }>;
 export type LeaderSqliteDb = SqliteDb<{
@@ -64,7 +64,7 @@ declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThr
     syncProcessor: LeaderSyncProcessor;
     materializeEvent: MaterializeEvent;
     initialState: {
-        leaderHead: EventId.EventId;
+        leaderHead: EventSequenceNumber.EventSequenceNumber;
         migrationsReport: MigrationsReport;
     };
     /**
@@ -127,7 +127,7 @@ export interface LeaderSyncProcessor {
         sessionId: string;
     }) => Effect.Effect<void, UnexpectedError>;
     boot: Effect.Effect<{
-        initialLeaderHead: EventId.EventId;
+        initialLeaderHead: EventSequenceNumber.EventSequenceNumber;
     }, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
     syncState: Subscribable.Subscribable<SyncState.SyncState>;
     getMergeCounter: () => number;

package/dist/leader-thread/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}

package/dist/make-client-session.d.ts

@@ -6,9 +6,10 @@ import * as Devtools from './devtools/mod.js';
 declare global {
     var __debugWebmeshNode: any;
 }
-export declare const makeClientSession: <R>({ storeId, clientId, sessionId, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, }: AdapterArgs & {
+export declare const makeClientSession: <R>({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, }: AdapterArgs & {
     clientId: string;
     sessionId: string;
+    isLeader: boolean;
     lockStatus: SubscriptionRef.SubscriptionRef<LockStatus>;
     leaderThread: ClientSessionLeaderThreadProxy;
     sqliteDb: SqliteDb;

package/dist/make-client-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,eAAe,EAChB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,yLAclC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAA;IAC5C,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC3D,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;CACjE,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAsFnD,CAAA"}
+{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,eAAe,EAChB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,oNAgBlC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAA;IAC5C,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC3D,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;CACjE,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAsFnD,CAAA"}

package/dist/make-client-session.js

@@ -2,7 +2,7 @@ import { Effect, Stream } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
 import * as Devtools from './devtools/mod.js';
 import { liveStoreVersion } from './version.js';
-export const makeClientSession = ({ storeId, clientId, sessionId, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, }) => Effect.gen(function* () {
+export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, }) => Effect.gen(function* () {
     const devtools = devtoolsEnabled
         ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
         : { enabled: false };
@@ -16,7 +16,7 @@ export const makeClientSession = ({ storeId, clientId, sessionId, devtoolsEnable
                 clientId,
                 sessionId,
                 schemaAlias,
-                isLeader: true, // TODO actually check if we are leader
+                isLeader,
             });
             yield* connectWebmeshNode({ webmeshNode, sessionInfo });
             const sessionInfoBroadcastChannel = yield* Devtools.makeSessionInfoBroadcastChannel(webmeshNode);
@@ -29,18 +29,16 @@ export const makeClientSession = ({ storeId, clientId, sessionId, devtoolsEnable
                 const clientSessionDevtoolsChannel = yield* webmeshNode.makeChannel({
                     target: source,
                     channelName,
-                    schema: {
-                        listen: Devtools.ClientSession.MessageToApp,
-                        send: Devtools.ClientSession.MessageFromApp,
-                    },
+                    schema: { listen: Devtools.ClientSession.MessageToApp, send: Devtools.ClientSession.MessageFromApp },
                     mode: webmeshMode,
                 });
-                const onBeforeUnload = () => {
-                    clientSessionDevtoolsChannel
-                        .send(Devtools.ClientSession.Disconnect.make({ clientId, liveStoreVersion, sessionId }))
-                        .pipe(Effect.runFork);
-                };
-                yield* Effect.acquireRelease(Effect.sync(() => registerBeforeUnload(onBeforeUnload)), (unsub) => Effect.sync(() => unsub()));
+                const sendDisconnect = clientSessionDevtoolsChannel
+                    .send(Devtools.ClientSession.Disconnect.make({ clientId, liveStoreVersion, sessionId }))
+                    .pipe(Effect.orDie);
+                // Disconnect on shutdown (e.g. when switching stores)
+                yield* Effect.addFinalizer(() => sendDisconnect);
+                // Disconnect on before unload
+                yield* Effect.acquireRelease(Effect.sync(() => registerBeforeUnload(() => sendDisconnect.pipe(Effect.runFork))), (unsub) => Effect.sync(() => unsub()));
                 yield* connectDevtoolsToStore(clientSessionDevtoolsChannel);
             }, Effect.tapCauseLogPretty, Effect.forkScoped)), Stream.runDrain);
         }).pipe(Effect.withSpan('@livestore/common:make-client-session:devtools'), Effect.tapCauseLogPretty, Effect.forkScoped);
@@ -53,6 +51,7 @@ export const makeClientSession = ({ storeId, clientId, sessionId, devtoolsEnable
         clientId,
         sessionId,
         shutdown,
+        debugInstanceId,
     };
 });
 //# sourceMappingURL=make-client-session.js.map

package/dist/make-client-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-client-session.js","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"make-client-session.js","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"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"}

package/dist/materializer-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materializer-helper.d.ts","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,sBAAsB,CAAA;AAChH,OAAO,KAAK,KAAK,cAAc,MAAM,4BAA4B,CAAA;AAKjE,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,oBAAoB,GAAI,wCAKlC;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,EAAE,EAAE,QAAQ,CAAA;IACZ,2GAA2G;IAC3G,KAAK,EACD;QACE,OAAO,EAAE,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAA;QACrE,OAAO,EAAE,SAAS,CAAA;KACnB,GACD;QACE,OAAO,EAAE,SAAS,CAAA;QAClB,OAAO,EAAE,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAA;KACtE,CAAA;CACN,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CA0CA,CAAA;AA8BD,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC5D,WAAW,MAAM,SAGlB,CAAA"}
+{"version":3,"file":"materializer-helper.d.ts","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,sBAAsB,CAAA;AAChH,OAAO,KAAK,KAAK,cAAc,MAAM,4BAA4B,CAAA;AAKjE,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,oBAAoB,GAAI,wCAKlC;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,EAAE,EAAE,QAAQ,CAAA;IACZ,2GAA2G;IAC3G,KAAK,EACD;QACE,OAAO,EAAE,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAA;QACrE,OAAO,EAAE,SAAS,CAAA;KACnB,GACD;QACE,OAAO,EAAE,SAAS,CAAA;QAClB,OAAO,EAAE,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAA;KACtE,CAAA;CACN,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CA6CA,CAAA;AA8BD,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC5D,WAAW,MAAM,SAGlB,CAAA"}

package/dist/materializer-helper.js

@@ -1,4 +1,4 @@
-import { isReadonlyArray } from '@livestore/utils';
+import { isNil, isReadonlyArray } from '@livestore/utils';
 import { Schema } from '@livestore/utils/effect';
 import { SessionIdSymbol } from './adapter-types.js';
 import { isQueryBuilder } from './schema/state/sqlite/query-builder/api.js';
@@ -6,7 +6,9 @@ import { getResultSchema } from './schema/state/sqlite/query-builder/impl.js';
 import { prepareBindValues } from './util.js';
 export const getExecArgsFromEvent = ({ eventDef, materializer, db, event, }) => {
     const eventArgsDecoded = event.decoded === undefined ? Schema.decodeUnknownSync(eventDef.schema)(event.encoded.args) : event.decoded.args;
-    const eventArgsEncoded = event.encoded?.args ?? Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args);
+    const eventArgsEncoded = isNil(event.decoded?.args)
+        ? undefined
+        : Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args);
     const query = (rawQueryOrQueryBuilder) => {
         if (isQueryBuilder(rawQueryOrQueryBuilder)) {
             const { query, bindValues } = rawQueryOrQueryBuilder.asSql();

package/dist/materializer-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"materializer-helper.js","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"materializer-helper.js","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"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"}

package/dist/rematerialize-from-eventlog.js

@@ -1,7 +1,7 @@
 import { memoizeByRef } from '@livestore/utils';
 import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
 import { UnexpectedError } from './adapter-types.js';
-import { EventId, getEventDef, LiveStoreEvent, SystemTables } from './schema/mod.js';
+import { EventSequenceNumber, getEventDef, LiveStoreEvent, SystemTables } from './schema/mod.js';
 import { sql } from './util.js';
 export const rematerializeFromEventlog = ({ dbEventlog, 
 // TODO re-use this db when bringing back the boot in-memory db implementation
@@ -25,8 +25,8 @@ This likely means the schema has changed in an incompatible way.
 `,
         })));
         const eventEncoded = LiveStoreEvent.EncodedWithMeta.make({
-            id: { global: row.idGlobal, client: row.idClient },
-            parentId: { global: row.parentIdGlobal, client: row.parentIdClient },
+            seqNum: { global: row.seqNumGlobal, client: row.seqNumClient },
+            parentSeqNum: { global: row.parentSeqNumGlobal, client: row.parentSeqNumClient },
             name: row.name,
             args,
             clientId: row.clientId,
@@ -37,8 +37,8 @@ This likely means the schema has changed in an incompatible way.
     const CHUNK_SIZE = 100;
     const stmt = dbEventlog.prepare(sql `\
 SELECT * FROM ${SystemTables.EVENTLOG_META_TABLE} 
-WHERE idGlobal > $idGlobal OR (idGlobal = $idGlobal AND idClient > $idClient)
-ORDER BY idGlobal ASC, idClient ASC
+WHERE seqNumGlobal > $seqNumGlobal OR (seqNumGlobal = $seqNumGlobal AND seqNumClient > $seqNumClient)
+ORDER BY seqNumGlobal ASC, seqNumClient ASC
 LIMIT ${CHUNK_SIZE}
 `);
     let processedEvents = 0;
@@ -47,11 +47,11 @@ LIMIT ${CHUNK_SIZE}
         if (Chunk.isChunk(item) && item.length === 0)
             return Option.none();
         const lastId = Chunk.isChunk(item)
-            ? Chunk.last(item).pipe(Option.map((_) => ({ global: _.idGlobal, client: _.idClient })), Option.getOrElse(() => EventId.ROOT))
-            : EventId.ROOT;
+            ? Chunk.last(item).pipe(Option.map((_) => ({ global: _.seqNumGlobal, client: _.seqNumClient })), Option.getOrElse(() => EventSequenceNumber.ROOT))
+            : EventSequenceNumber.ROOT;
         const nextItem = Chunk.fromIterable(stmt.select({
-            $idGlobal: lastId?.global,
-            $idClient: lastId?.client,
+            $seqNumGlobal: lastId?.global,
+            $seqNumClient: lastId?.client,
         }));
         const prevItem = Chunk.isChunk(item) ? item : Chunk.empty();
         return Option.some([prevItem, nextItem]);