@livestore/common 0.3.0-dev.1 → 0.3.0-dev.11

package/dist/leader-thread/make-leader-thread-layer.js

@@ -4,32 +4,51 @@ import { EventId, MutationEvent, mutationLogMetaTable, SYNC_STATUS_TABLE, syncSt
 import { migrateTable } from '../schema-management/migrations.js';
 import { sql } from '../util.js';
 import { execSql } from './connection.js';
-import { makeLeaderSyncProcessor } from './leader-sync-processor.js';
 import { bootDevtools } from './leader-worker-devtools.js';
+import { makeLeaderSyncProcessor } from './LeaderSyncProcessor.js';
 import { makePullQueueSet } from './pull-queue-set.js';
 import { recreateDb } from './recreate-db.js';
 import { LeaderThreadCtx } from './types.js';
-export const makeLeaderThreadLayer = ({ schema, storeId, originId, makeSyncDb, makeSyncBackend, db, dbLog, devtoolsOptions, initialSyncOptions = { _tag: 'Skip' }, }) => Effect.gen(function* () {
+export const makeLeaderThreadLayer = ({ schema, storeId, clientId, makeSqliteDb, syncOptions, dbReadModel, dbMutationLog, devtoolsOptions, shutdownChannel, }) => Effect.gen(function* () {
     const bootStatusQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
     // TODO do more validation here than just checking the count of tables
     // Either happens on initial boot or if schema changes
-    const dbMissing = db.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
-    const syncBackend = makeSyncBackend === undefined ? undefined : yield* makeSyncBackend;
-    const initialBlockingSyncContext = yield* makeInitialBlockingSyncContext({ initialSyncOptions, bootStatusQueue });
-    const syncProcessor = yield* makeLeaderSyncProcessor({ schema, dbMissing, dbLog, initialBlockingSyncContext });
+    const dbMissing = dbReadModel.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
+    const syncBackend = syncOptions === undefined ? undefined : yield* syncOptions.makeBackend({ storeId, clientId });
+    const initialBlockingSyncContext = yield* makeInitialBlockingSyncContext({
+        initialSyncOptions: syncOptions?.initialSyncOptions ?? { _tag: 'Skip' },
+        bootStatusQueue,
+    });
+    const syncProcessor = yield* makeLeaderSyncProcessor({
+        schema,
+        dbMissing,
+        dbMutationLog,
+        initialBlockingSyncContext,
+    });
+    const extraIncomingMessagesQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
+    const devtoolsContext = devtoolsOptions.enabled
+        ? {
+            enabled: true,
+            syncBackendPullLatch: yield* Effect.makeLatch(true),
+            syncBackendPushLatch: yield* Effect.makeLatch(true),
+        }
+        : { enabled: false };
     const ctx = {
         schema,
         bootStatusQueue,
         storeId,
-        originId,
-        db,
-        dbLog,
-        makeSyncDb,
+        clientId,
+        dbReadModel,
+        dbMutationLog,
+        makeSqliteDb,
         mutationEventSchema: MutationEvent.makeMutationEventSchema(schema),
         shutdownStateSubRef: yield* SubscriptionRef.make('running'),
+        shutdownChannel,
         syncBackend,
         syncProcessor,
         connectedClientSessionPullQueues: yield* makePullQueueSet,
+        extraIncomingMessagesQueue,
+        devtools: devtoolsContext,
     };
     // @ts-expect-error For debugging purposes
     globalThis.__leaderThreadCtx = ctx;
@@ -72,21 +91,21 @@ const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }
  * It also starts various background processes (e.g. syncing)
  */
 const bootLeaderThread = ({ dbMissing, initialBlockingSyncContext, devtoolsOptions, }) => Effect.gen(function* () {
-    const { dbLog, bootStatusQueue, syncProcessor } = yield* LeaderThreadCtx;
+    const { dbMutationLog, bootStatusQueue, syncProcessor } = yield* LeaderThreadCtx;
     yield* migrateTable({
-        db: dbLog,
+        db: dbMutationLog,
         behaviour: 'create-if-not-exists',
         tableAst: mutationLogMetaTable.sqliteDef.ast,
         skipMetaTable: true,
     });
     yield* migrateTable({
-        db: dbLog,
+        db: dbMutationLog,
         behaviour: 'create-if-not-exists',
         tableAst: syncStatusTable.sqliteDef.ast,
         skipMetaTable: true,
     });
     // Create sync status row if it doesn't exist
-    yield* execSql(dbLog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
+    yield* execSql(dbMutationLog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
           SELECT ${EventId.ROOT.global}
           WHERE NOT EXISTS (SELECT 1 FROM ${SYNC_STATUS_TABLE})`, {});
     const dbReady = yield* Deferred.make();

package/dist/leader-thread/make-leader-thread-layer.js.map

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

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

@@ -1,23 +1,10 @@
 import { Effect } from '@livestore/utils/effect';
-import type { SynchronousDatabase } from '../adapter-types.js';
+import type { SqliteDb } from '../adapter-types.js';
 import * as EventId from '../schema/EventId.js';
+import type * as MutationEvent from '../schema/MutationEvent.js';
 import { LeaderThreadCtx } from './types.js';
-export declare const getMutationEventsSince: (since: EventId.EventId) => Effect.Effect<{
-    mutation: string;
-    args: any;
-    id: {
-        global: number;
-        local: number;
-    };
-    parentId: {
-        global: number;
-        local: number;
-    };
-}[], never, LeaderThreadCtx>;
-export declare const getLocalHeadFromDb: (dbLog: SynchronousDatabase) => {
-    global: number;
-    local: number;
-};
-export declare const getBackendHeadFromDb: (dbLog: SynchronousDatabase) => number;
-export declare const updateBackendHead: (dbLog: SynchronousDatabase, head: EventId.EventId) => void;
+export declare const getMutationEventsSince: (since: EventId.EventId) => Effect.Effect<ReadonlyArray<MutationEvent.AnyEncoded>, never, LeaderThreadCtx>;
+export declare const getLocalHeadFromDb: (dbMutationLog: SqliteDb) => EventId.EventId;
+export declare const getBackendHeadFromDb: (dbMutationLog: SqliteDb) => EventId.GlobalEventId;
+export declare const updateBackendHead: (dbMutationLog: SqliteDb, head: EventId.EventId) => void;
 //# sourceMappingURL=mutationlog.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mutationlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAExD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAG/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,sBAAsB,UAAW,OAAO,CAAC,OAAO;;;;;;;;;;;4BAkBzD,CAAA;AAEJ,eAAO,MAAM,kBAAkB,UAAW,mBAAmB;;;CAM5D,CAAA;AAED,eAAO,MAAM,oBAAoB,UAAW,mBAAmB,WAC6C,CAAA;AAG5G,eAAO,MAAM,iBAAiB,UAAW,mBAAmB,QAAQ,OAAO,CAAC,OAAO,SACR,CAAA"}
+{"version":3,"file":"mutationlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,sBAAsB,UAC1B,OAAO,CAAC,OAAO,KACrB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,CAkB5E,CAAA;AAEJ,eAAO,MAAM,kBAAkB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,OAMpE,CAAA;AAED,eAAO,MAAM,oBAAoB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,aAElD,CAAA;AAGrB,eAAO,MAAM,iBAAiB,kBAAmB,QAAQ,QAAQ,OAAO,CAAC,OAAO,SACG,CAAA"}

package/dist/leader-thread/mutationlog.js

@@ -4,9 +4,9 @@ import { MUTATION_LOG_META_TABLE, mutationLogMetaTable, SYNC_STATUS_TABLE } from
 import { prepareBindValues, sql } from '../util.js';
 import { LeaderThreadCtx } from './types.js';
 export const getMutationEventsSince = (since) => Effect.gen(function* () {
-    const { dbLog } = yield* LeaderThreadCtx;
+    const { dbMutationLog } = yield* LeaderThreadCtx;
     const query = mutationLogMetaTable.query.where('idGlobal', '>=', since.global).asSql();
-    const pendingMutationEventsRaw = dbLog.select(query.query, prepareBindValues(query.bindValues, query.query));
+    const pendingMutationEventsRaw = dbMutationLog.select(query.query, prepareBindValues(query.bindValues, query.query));
     const pendingMutationEvents = Schema.decodeUnknownSync(mutationLogMetaTable.schema.pipe(Schema.Array))(pendingMutationEventsRaw);
     return pendingMutationEvents
         .map((_) => ({
@@ -17,11 +17,12 @@ export const getMutationEventsSince = (since) => Effect.gen(function* () {
     }))
         .filter((_) => EventId.compare(_.id, since) > 0);
 });
-export const getLocalHeadFromDb = (dbLog) => {
-    const res = dbLog.select(sql `select idGlobal, idLocal from ${MUTATION_LOG_META_TABLE} order by idGlobal DESC, idLocal DESC limit 1`)[0];
+export const getLocalHeadFromDb = (dbMutationLog) => {
+    const res = dbMutationLog.select(sql `select idGlobal, idLocal from ${MUTATION_LOG_META_TABLE} order by idGlobal DESC, idLocal DESC limit 1`)[0];
     return res ? { global: res.idGlobal, local: res.idLocal } : EventId.ROOT;
 };
-export const getBackendHeadFromDb = (dbLog) => dbLog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ?? EventId.ROOT.global;
+export const getBackendHeadFromDb = (dbMutationLog) => dbMutationLog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ??
+    EventId.ROOT.global;
 // TODO use prepared statements
-export const updateBackendHead = (dbLog, head) => dbLog.execute(sql `UPDATE ${SYNC_STATUS_TABLE} SET head = ${head.global}`);
+export const updateBackendHead = (dbMutationLog, head) => dbMutationLog.execute(sql `UPDATE ${SYNC_STATUS_TABLE} SET head = ${head.global}`);
 //# sourceMappingURL=mutationlog.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mutationlog.js","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC7G,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAsB,EAAE,EAAE,CAC/D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAExC,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACtF,MAAM,wBAAwB,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5G,MAAM,qBAAqB,GAAG,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CACpG,wBAAwB,CACzB,CAAA;IAED,OAAO,qBAAqB;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;QAC5C,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE;KAC/D,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;AACpD,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAA0B,EAAE,EAAE;IAC/D,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CACtB,GAAG,CAAA,iCAAiC,uBAAuB,+CAA+C,CAC3G,CAAC,CAAC,CAAC,CAAA;IAEJ,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;AAC1E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAA0B,EAAE,EAAE,CACjE,KAAK,CAAC,MAAM,CAAmB,GAAG,CAAA,oBAAoB,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;AAE5G,+BAA+B;AAC/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAA0B,EAAE,IAAqB,EAAE,EAAE,CACrF,KAAK,CAAC,OAAO,CAAC,GAAG,CAAA,UAAU,iBAAiB,eAAe,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA"}
+{"version":3,"file":"mutationlog.js","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC7G,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAsB,EAC0D,EAAE,CAClF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAEhD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACtF,MAAM,wBAAwB,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACpH,MAAM,qBAAqB,GAAG,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CACpG,wBAAwB,CACzB,CAAA;IAED,OAAO,qBAAqB;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;QAC5C,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE;KAC/D,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;AACpD,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,aAAuB,EAAmB,EAAE;IAC7E,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAC9B,GAAG,CAAA,iCAAiC,uBAAuB,+CAA+C,CAC3G,CAAC,CAAC,CAAC,CAAA;IAEJ,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;AAC1E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAuB,EAAyB,EAAE,CACrF,aAAa,CAAC,MAAM,CAAkC,GAAG,CAAA,oBAAoB,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI;IAC1G,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;AAErB,+BAA+B;AAC/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAuB,EAAE,IAAqB,EAAE,EAAE,CAClF,aAAa,CAAC,OAAO,CAAC,GAAG,CAAA,UAAU,iBAAiB,eAAe,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA"}

package/dist/leader-thread/pull-queue-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-queue-set.d.ts","sourceRoot":"","sources":["../../src/leader-thread/pull-queue-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAIvD,OAAO,EAAE,KAAK,aAAa,EAAqB,MAAM,YAAY,CAAA;AAElE,eAAO,MAAM,gBAAgB;kEAoDizE,OAAQ,MAAM,CAAC,MAAM,KAAK;oCAAkG,OAAQ,MAAM;uCADt9E,CAAA"}
+{"version":3,"file":"pull-queue-set.d.ts","sourceRoot":"","sources":["../../src/leader-thread/pull-queue-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAIvD,OAAO,EAAE,KAAK,aAAa,EAAqB,MAAM,YAAY,CAAA;AAElE,eAAO,MAAM,gBAAgB;kEAoD+uF,OAAQ,MAAM,CAAC,MAAM,KAAK;oCAAkG,OAAQ,MAAM;uCADp5F,CAAA"}

package/dist/leader-thread/recreate-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recreate-db.d.ts","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAS,MAAM,yBAAyB,CAAA;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAkB,WAAW,EAAE,MAAM,aAAa,CAAA;AAChG,OAAO,EAAkE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7G,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,IAAI,EACJ,eAAe,GAAG,WAAW,GAAG,cAAc,GAAG,gBAAgB,EACjE,eAAe,GAAG,UAAU,CAAC,UAAU,CAgGxC,CAAA"}
+{"version":3,"file":"recreate-db.d.ts","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAS,MAAM,yBAAyB,CAAA;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAkB,WAAW,EAAE,MAAM,aAAa,CAAA;AAChG,OAAO,EAAkE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7G,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,IAAI,EACJ,eAAe,GAAG,WAAW,GAAG,cAAc,GAAG,gBAAgB,EACjE,eAAe,GAAG,UAAU,CAAC,UAAU,CAoGxC,CAAA"}

package/dist/leader-thread/recreate-db.js

@@ -4,39 +4,41 @@ import { initializeSingletonTables, migrateDb, rehydrateFromMutationLog, Unexpec
 import { configureConnection } from './connection.js';
 import { LeaderThreadCtx } from './types.js';
 export const recreateDb = Effect.gen(function* () {
-    const { db, dbLog, makeSyncDb, schema, bootStatusQueue } = yield* LeaderThreadCtx;
+    const { dbReadModel, dbMutationLog, schema, bootStatusQueue } = yield* LeaderThreadCtx;
     const migrationOptions = schema.migrationOptions;
     yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
         if (ex._tag === 'Failure')
-            db.destroy();
+            dbReadModel.destroy();
     }));
     // NOTE to speed up the operations below, we're creating a temporary in-memory database
     // and later we'll overwrite the persisted database with the new data
-    const tmpSyncDb = yield* makeSyncDb({ _tag: 'in-memory' });
-    yield* configureConnection(tmpSyncDb, { fkEnabled: true });
+    // TODO bring back this optimization
+    // const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' })
+    const tmpDb = dbReadModel;
+    yield* configureConnection(tmpDb, { fkEnabled: true });
     const initDb = (hooks) => Effect.gen(function* () {
-        yield* Effect.tryAll(() => hooks?.init?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        yield* Effect.tryAll(() => hooks?.init?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
         yield* migrateDb({
-            db: tmpSyncDb,
+            db: tmpDb,
             schema,
             onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
         });
-        initializeSingletonTables(schema, tmpSyncDb);
-        yield* Effect.tryAll(() => hooks?.pre?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
-        return tmpSyncDb;
+        initializeSingletonTables(schema, tmpDb);
+        yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        return tmpDb;
     });
     switch (migrationOptions.strategy) {
         case 'from-mutation-log': {
             const hooks = migrationOptions.hooks;
-            const tmpSyncDb = yield* initDb(hooks);
+            const tmpDb = yield* initDb(hooks);
             yield* rehydrateFromMutationLog({
-                db: tmpSyncDb,
-                logDb: dbLog,
+                db: tmpDb,
+                logDb: dbMutationLog,
                 schema,
                 migrationOptions,
                 onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
             });
-            yield* Effect.tryAll(() => hooks?.post?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
+            yield* Effect.tryAll(() => hooks?.post?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
             break;
         }
         case 'hard-reset': {
@@ -47,9 +49,9 @@ export const recreateDb = Effect.gen(function* () {
             break;
         }
         case 'manual': {
-            const oldDbData = db.export();
+            const oldDbData = dbReadModel.export();
             const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
-            tmpSyncDb.import(newDbData);
+            tmpDb.import(newDbData);
             // TODO validate schema
             break;
         }
@@ -57,13 +59,17 @@ export const recreateDb = Effect.gen(function* () {
             casesHandled(migrationOptions);
         }
     }
+    // TODO bring back
     // Import the temporary in-memory database into the persistent database
-    yield* Effect.sync(() => db.import(tmpSyncDb)).pipe(Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'));
+    // yield* Effect.sync(() => db.import(tmpDb)).pipe(
+    //   Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'),
+    // )
     // TODO maybe bring back re-using this initial snapshot to avoid calling `.export()` again
     // We've disabled this for now as it made the code too complex, as we often run syncing right after
     // so the snapshot is no longer up to date
-    // const snapshotFromTmpDb = tmpSyncDb.export()
-    tmpSyncDb.close();
+    // const snapshotFromTmpDb = tmpDb.export()
+    // TODO bring back
+    // tmpDb.close()
 }).pipe(Effect.scoped, // NOTE we're closing the scope here so finalizers are called when the effect is done
 Effect.withSpan('@livestore/common:leader-thread:recreateDb'), Effect.withPerformanceMeasure('@livestore/common:leader-thread:recreateDb'));
 //# sourceMappingURL=recreate-db.js.map

package/dist/leader-thread/recreate-db.js.map

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

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

@@ -1,8 +1,8 @@
-import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
+import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope, Subscribable, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
 import { Context, Schema } from '@livestore/utils/effect';
-import type { BootStatus, Devtools, InvalidPushError, MakeSynchronousDatabase, PersistenceInfo, SyncBackend, SynchronousDatabase, UnexpectedError } from '../index.js';
+import type { BootStatus, Devtools, InvalidPushError, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.js';
 import type { EventId, LiveStoreSchema, MutationEvent } from '../schema/mod.js';
-import type { PayloadUpstream, SyncState } from '../sync/syncstate.js';
+import type * as SyncState from '../sync/syncstate.js';
 import type { ShutdownChannel } from './shutdown-channel.js';
 export type ShutdownState = 'running' | 'shutting-down';
 declare const OuterWorkerCtx_base: Context.TagClass<OuterWorkerCtx, "OuterWorkerCtx", {
@@ -24,37 +24,51 @@ export type InitialSyncInfo = Option.Option<{
     cursor: EventId.EventId;
     metadata: Option.Option<Schema.JsonValue>;
 }>;
-export type LeaderDatabase = SynchronousDatabase<{
+export type LeaderSqliteDb = SqliteDb<{
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
 }>;
 export type PersistenceInfoPair = {
-    db: PersistenceInfo;
+    readModel: PersistenceInfo;
     mutationLog: PersistenceInfo;
 };
 export type DevtoolsOptions = {
     enabled: false;
 } | {
     enabled: true;
-    makeContext: Effect.Effect<{
+    makeBootContext: Effect.Effect<{
         devtoolsWebChannel: WebChannel.WebChannel<Devtools.MessageToAppLeader, Devtools.MessageFromAppLeader>;
-        shutdownChannel: ShutdownChannel;
         persistenceInfo: PersistenceInfoPair;
     }, UnexpectedError, Scope.Scope>;
 };
+export type DevtoolsContext = {
+    enabled: true;
+    syncBackendPullLatch: Effect.Latch;
+    syncBackendPushLatch: Effect.Latch;
+} | {
+    enabled: false;
+};
 declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThreadCtx", {
     schema: LiveStoreSchema;
     storeId: string;
-    originId: string;
-    makeSyncDb: MakeSynchronousDatabase;
-    db: LeaderDatabase;
-    dbLog: LeaderDatabase;
+    clientId: string;
+    makeSqliteDb: MakeSqliteDb;
+    dbReadModel: LeaderSqliteDb;
+    dbMutationLog: LeaderSqliteDb;
     bootStatusQueue: Queue.Queue<BootStatus>;
     shutdownStateSubRef: SubscriptionRef.SubscriptionRef<ShutdownState>;
+    shutdownChannel: ShutdownChannel;
     mutationEventSchema: MutationEvent.ForMutationDefRecord<any>;
+    devtools: DevtoolsContext;
     syncBackend: SyncBackend | undefined;
-    syncProcessor: SyncProcessor;
+    syncProcessor: LeaderSyncProcessor;
     connectedClientSessionPullQueues: PullQueueSet;
+    /**
+     * e.g. used for `store._dev` APIs
+     *
+     * This is currently separated from `.devtools` as it also needs to work when devtools are disabled
+     */
+    extraIncomingMessagesQueue: Queue.Queue<Devtools.MessageToAppLeader>;
 }>;
 export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
 }
@@ -66,18 +80,24 @@ export type InitialBlockingSyncContext = {
     }) => Effect.Effect<void>;
 };
 export type PullQueueItem = {
-    payload: PayloadUpstream;
+    payload: SyncState.PayloadUpstream;
     remaining: number;
 };
-export interface SyncProcessor {
+export interface LeaderSyncProcessor {
     push: (
     /** `batch` needs to follow the same rules as `batch` in `SyncBackend.push` */
-    batch: ReadonlyArray<MutationEvent.EncodedWithMeta>) => Effect.Effect<void, UnexpectedError | InvalidPushError, HttpClient.HttpClient | LeaderThreadCtx>;
+    batch: ReadonlyArray<MutationEvent.EncodedWithMeta>, options?: {
+        /**
+         * If true, the effect will only finish when the local push has been processed (i.e. succeeded or was rejected).
+         * @default false
+         */
+        waitForProcessing?: boolean;
+    }) => Effect.Effect<void, InvalidPushError>;
     pushPartial: (mutationEvent: MutationEvent.PartialAnyEncoded) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
     boot: (args: {
         dbReady: Deferred.Deferred<void>;
     }) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
-    syncState: Effect.Effect<SyncState, UnexpectedError>;
+    syncState: Subscribable.Subscribable<SyncState.SyncState>;
 }
 export interface PullQueueSet {
     makeQueue: (since: EventId.EventId) => Effect.Effect<Queue.Queue<PullQueueItem>, UnexpectedError, Scope.Scope | LeaderThreadCtx>;

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/leader-thread/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAkBzD,MAAM,OAAO,cAAe,SAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAK9D;CAAG;AAEN,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAGrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE;IACxE,OAAO,EAAE,MAAM,CAAC,kBAAkB;CACnC,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AAgClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAkBhE;CAAG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAkBzD,MAAM,OAAO,cAAe,SAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAK9D;CAAG;AAEN,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAGrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE;IACxE,OAAO,EAAE,MAAM,CAAC,kBAAkB;CACnC,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AAyClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAyBhE;CAAG"}

package/dist/mutation.d.ts

@@ -1,9 +1,16 @@
 import type * as MutationEvent from './schema/MutationEvent.js';
 import type { MutationDef } from './schema/mutations.js';
 import type { PreparedBindValues } from './util.js';
-export declare const getExecArgsFromMutation: ({ mutationDef, mutationEventDecoded, }: {
+export declare const getExecArgsFromMutation: ({ mutationDef, mutationEvent, }: {
     mutationDef: MutationDef.Any;
-    mutationEventDecoded: MutationEvent.Any | MutationEvent.PartialAny;
+    /** Both encoded and decoded mutation events are supported to reduce the number of times we need to decode/encode */
+    mutationEvent: {
+        decoded: MutationEvent.AnyDecoded | MutationEvent.PartialAnyDecoded;
+        encoded: undefined;
+    } | {
+        decoded: undefined;
+        encoded: MutationEvent.AnyEncoded | MutationEvent.PartialAnyEncoded;
+    };
 }) => ReadonlyArray<{
     statementSql: string;
     bindValues: PreparedBindValues;

package/dist/mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGnD,eAAO,MAAM,uBAAuB,2CAGjC;IACD,WAAW,EAAE,WAAW,CAAC,GAAG,CAAA;IAC5B,oBAAoB,EAAE,aAAa,CAAC,GAAG,GAAG,aAAa,CAAC,UAAU,CAAA;CACnE,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAiCA,CAAA;AAID,eAAO,MAAM,sBAAsB,eACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,aACjD,MAAM,SAGlB,CAAA"}
+{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGnD,eAAO,MAAM,uBAAuB,oCAGjC;IACD,WAAW,EAAE,WAAW,CAAC,GAAG,CAAA;IAC5B,oHAAoH;IACpH,aAAa,EACT;QACE,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAA;QACnE,OAAO,EAAE,SAAS,CAAA;KACnB,GACD;QACE,OAAO,EAAE,SAAS,CAAA;QAClB,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAA;KACpE,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,CAkCA,CAAA;AAID,eAAO,MAAM,sBAAsB,eACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,aACjD,MAAM,SAGlB,CAAA"}

package/dist/mutation.js

@@ -1,11 +1,12 @@
 import { Schema } from '@livestore/utils/effect';
 import { SessionIdSymbol } from './adapter-types.js';
 import { prepareBindValues } from './util.js';
-export const getExecArgsFromMutation = ({ mutationDef, mutationEventDecoded, }) => {
+export const getExecArgsFromMutation = ({ mutationDef, mutationEvent, }) => {
     let statementRes;
     switch (typeof mutationDef.sql) {
         case 'function': {
-            const res = mutationDef.sql(mutationEventDecoded.args);
+            const mutationArgsDecoded = mutationEvent.decoded?.args ?? Schema.decodeUnknownSync(mutationDef.schema)(mutationEvent.encoded.args);
+            const res = mutationDef.sql(mutationArgsDecoded);
             statementRes = Array.isArray(res) ? res : [res];
             break;
         }
@@ -20,9 +21,8 @@ export const getExecArgsFromMutation = ({ mutationDef, mutationEventDecoded, })
     }
     return statementRes.map((statementRes) => {
         const statementSql = typeof statementRes === 'string' ? statementRes : statementRes.sql;
-        const bindValues = typeof statementRes === 'string'
-            ? Schema.encodeUnknownSync(mutationDef.schema)(mutationEventDecoded.args)
-            : statementRes.bindValues;
+        const mutationArgsEncoded = mutationEvent.encoded?.args ?? Schema.encodeUnknownSync(mutationDef.schema)(mutationEvent.decoded.args);
+        const bindValues = typeof statementRes === 'string' ? mutationArgsEncoded : statementRes.bindValues;
         const writeTables = typeof statementRes === 'string' ? undefined : statementRes.writeTables;
         return { statementSql, bindValues: prepareBindValues(bindValues ?? {}, statementSql), writeTables };
     });

package/dist/mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutation.js","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACtC,WAAW,EACX,oBAAoB,GAIrB,EAIE,EAAE;IACH,IAAI,YAEH,CAAA;IAED,QAAQ,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC;QAC/B,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;YACtD,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YAC/C,MAAK;QACP,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,YAAY,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAChC,MAAK;QACP,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,YAAY,GAAG,WAAW,CAAC,GAAG,CAAA;YAC9B,MAAK;QACP,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAA;QAEvF,MAAM,UAAU,GACd,OAAO,YAAY,KAAK,QAAQ;YAC9B,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC;YACzE,CAAC,CAAC,YAAY,CAAC,UAAU,CAAA;QAE7B,MAAM,WAAW,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAA;QAE3F,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,CAAC,UAAU,IAAI,EAAE,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IACrG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,kEAAkE;AAClE,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,UAA4D,EAC5D,SAAiB,EACjB,EAAE;IACF,gBAAgB,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;AAC1D,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAO,KAAU,EAAE,WAAc,EAAE,YAAe,EAAQ,EAAE;IACnF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC7B,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAA;YACzB,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;YACvD,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACvD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC/B,KAAK,CAAC,GAAG,CAAC,GAAG,YAAY,CAAA;YAC3B,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;YACzD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"mutation.js","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"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"}

package/dist/query-builder/impl.d.ts

@@ -7,6 +7,6 @@ export declare const invalidQueryBuilder: (msg?: string) => never;
 export declare const getResultSchema: (qb: QueryBuilder<any, any, any>) => Schema.Array$<Schema.Schema<any, any, never>> | Schema.SchemaClass<any, readonly any[], never> | Schema.SchemaClass<number, readonly {
     readonly count: number;
 }[], never> | Schema.SchemaClass<any, readonly {
-    readonly value: any;
+    value: any;
 }[], never>;
 //# sourceMappingURL=impl.d.ts.map

package/dist/rehydrate-from-mutationlog.d.ts

@@ -1,14 +1,14 @@
 import { Effect } from '@livestore/utils/effect';
-import { type MigrationOptionsFromMutationLog, type SynchronousDatabase, UnexpectedError } from './adapter-types.js';
+import { type MigrationOptionsFromMutationLog, type SqliteDb, UnexpectedError } from './adapter-types.js';
 import type { LiveStoreSchema } from './schema/mod.js';
-export declare const rehydrateFromMutationLog: ({ logDb, db, schema, migrationOptions, onProgress, }: {
-    logDb: SynchronousDatabase;
-    db: SynchronousDatabase;
+export declare const rehydrateFromMutationLog: ({ logDb, schema, migrationOptions, onProgress, }: {
+    logDb: SqliteDb;
+    db: SqliteDb;
     schema: LiveStoreSchema;
     migrationOptions: MigrationOptionsFromMutationLog;
     onProgress: (_: {
         done: number;
         total: number;
     }) => Effect.Effect<void>;
-}) => Effect.Effect<void, UnexpectedError, never>;
+}) => Effect.Effect<void, UnexpectedError | import("./adapter-types.js").SqliteError, import("effect/Scope").Scope | import("./leader-thread/types.js").LeaderThreadCtx>;
 //# sourceMappingURL=rehydrate-from-mutationlog.d.ts.map

package/dist/rehydrate-from-mutationlog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rehydrate-from-mutationlog.d.ts","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,mBAAmB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpH,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,iBAAiB,CAAA;AAKtG,eAAO,MAAM,wBAAwB,yDAMlC;IACD,KAAK,EAAE,mBAAmB,CAAA;IAC1B,EAAE,EAAE,mBAAmB,CAAA;IACvB,MAAM,EAAE,eAAe,CAAA;IACvB,gBAAgB,EAAE,+BAA+B,CAAA;IACjD,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACxE,gDAwGE,CAAA"}
+{"version":3,"file":"rehydrate-from-mutationlog.d.ts","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,QAAQ,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzG,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,iBAAiB,CAAA;AAKtG,eAAO,MAAM,wBAAwB,qDAOlC;IACD,KAAK,EAAE,QAAQ,CAAA;IACf,EAAE,EAAE,QAAQ,CAAA;IACZ,MAAM,EAAE,eAAe,CAAA;IACvB,gBAAgB,EAAE,+BAA+B,CAAA;IACjD,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACxE,uKA+FE,CAAA"}

package/dist/rehydrate-from-mutationlog.js

@@ -1,12 +1,16 @@
-import { isDevEnv, memoizeByRef, shouldNeverHappen } from '@livestore/utils';
+import { memoizeByRef, shouldNeverHappen } from '@livestore/utils';
 import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
 import { UnexpectedError } from './adapter-types.js';
-import { getExecArgsFromMutation } from './mutation.js';
+import { makeApplyMutation } from './leader-thread/apply-mutation.js';
 import { EventId, MUTATION_LOG_META_TABLE } from './schema/mod.js';
 import { sql } from './util.js';
-export const rehydrateFromMutationLog = ({ logDb, db, schema, migrationOptions, onProgress, }) => Effect.gen(function* () {
+export const rehydrateFromMutationLog = ({ logDb, 
+// TODO re-use this db when bringing back the boot in-memory db implementation
+// db,
+schema, migrationOptions, onProgress, }) => Effect.gen(function* () {
     const mutationsCount = logDb.select(`SELECT COUNT(*) AS count FROM ${MUTATION_LOG_META_TABLE}`)[0].count;
     const hashMutation = memoizeByRef((mutation) => Schema.hash(mutation.schema));
+    const applyMutation = yield* makeApplyMutation;
     const processMutation = (row) => Effect.gen(function* () {
         const mutationDef = schema.mutations.get(row.mutation) ?? shouldNeverHappen(`Unknown mutation ${row.mutation}`);
         if (migrationOptions.excludeMutations?.has(row.mutation) === true)
@@ -14,7 +18,9 @@ export const rehydrateFromMutationLog = ({ logDb, db, schema, migrationOptions,
         if (hashMutation(mutationDef) !== row.schemaHash) {
             yield* Effect.logWarning(`Schema hash mismatch for mutation ${row.mutation}. Trying to apply mutation anyway.`);
         }
-        const argsDecoded = yield* Schema.decodeUnknown(Schema.parseJson(mutationDef.schema))(row.argsJson).pipe(Effect.mapError((cause) => UnexpectedError.make({
+        const args = JSON.parse(row.argsJson);
+        // Checking whether the schema has changed in an incompatible way
+        yield* Schema.decodeUnknown(mutationDef.schema)(args).pipe(Effect.mapError((cause) => UnexpectedError.make({
             cause,
             note: `\
 There was an error during rehydrating from the mutation log while decoding
@@ -22,25 +28,13 @@ the persisted mutation event args for mutation "${row.mutation}".
 This likely means the schema has changed in an incompatible way.
 `,
         })));
-        const mutationEventDecoded = {
+        const mutationEventEncoded = {
             id: { global: row.idGlobal, local: row.idLocal },
             parentId: { global: row.parentIdGlobal, local: row.parentIdLocal },
             mutation: row.mutation,
-            args: argsDecoded,
+            args,
         };
-        const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded });
-        const makeExecuteOptions = (statementSql, bindValues) => ({
-            onRowsChanged: (rowsChanged) => {
-                if (rowsChanged === 0 && migrationOptions.logging?.excludeAffectedRows?.(statementSql) !== true) {
-                    console.warn(`Mutation "${mutationDef.name}" did not affect any rows:`, statementSql, bindValues);
-                }
-            },
-        });
-        for (const { statementSql, bindValues } of execArgsArr) {
-            // TODO cache prepared statements for mutations
-            db.execute(statementSql, bindValues, isDevEnv() ? makeExecuteOptions(statementSql, bindValues) : undefined);
-            // console.log(`Re-executed mutation ${mutationSql}`, bindValues)
-        }
+        yield* applyMutation(mutationEventEncoded, { skipMutationLog: true });
     }).pipe(Effect.withSpan(`@livestore/common:rehydrateFromMutationLog:processMutation`));
     const CHUNK_SIZE = 100;
     const stmt = logDb.prepare(sql `\