@livestore/common 0.3.0-dev.8 → 0.3.0

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

@@ -0,0 +1,16 @@
+import { Effect } from '@livestore/utils/effect';
+import type { SqliteDb } from '../adapter-types.js';
+import type { LiveStoreSchema } 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, eventNumsToRollback, }: {
+    dbState: SqliteDb;
+    dbEventlog: SqliteDb;
+    eventNumsToRollback: EventSequenceNumber.EventSequenceNumber[];
+}) => Effect.Effect<void, never, never>;
+//# sourceMappingURL=materialize-event.d.ts.map

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

@@ -0,0 +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,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

@@ -0,0 +1,109 @@
+import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
+import { Effect, ReadonlyArray, Schema } from '@livestore/utils/effect';
+import { getExecArgsFromEvent } from '../materializer-helper.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';
+import * as Eventlog from './eventlog.js';
+export const makeMaterializeEvent = ({ schema, dbState: db, dbEventlog, }) => Effect.gen(function* () {
+    const eventDefSchemaHashMap = new Map(
+    // TODO Running `Schema.hash` can be a bottleneck for larger schemas. There is an opportunity to run this
+    // at build time and lookup the pre-computed hash at runtime.
+    // Also see https://github.com/Effect-TS/effect/issues/2719
+    [...schema.eventsDefsMap.entries()].map(([k, v]) => [k, Schema.hash(v.schema)]));
+    return (eventEncoded, options) => Effect.gen(function* () {
+        const skipEventlog = options?.skipEventlog ?? false;
+        const eventName = eventEncoded.name;
+        const { eventDef, materializer } = getEventDef(schema, eventName);
+        const execArgsArr = getExecArgsFromEvent({
+            eventDef,
+            materializer,
+            db,
+            event: { decoded: undefined, encoded: eventEncoded },
+        });
+        // NOTE we might want to bring this back if we want to debug no-op events
+        // const makeExecuteOptions = (statementSql: string, bindValues: any) => ({
+        //   onRowsChanged: (rowsChanged: number) => {
+        //     if (rowsChanged === 0) {
+        //       console.warn(`Event "${eventDef.name}" did not affect any rows:`, statementSql, bindValues)
+        //     }
+        //   },
+        // })
+        // console.group('[@livestore/common:leader-thread:materializeEvent]', { eventName })
+        const session = db.session();
+        for (const { statementSql, bindValues } of execArgsArr) {
+            // console.debug(eventName, statementSql, bindValues)
+            // TODO use cached prepared statements instead of exec
+            yield* execSqlPrepared(db, statementSql, bindValues);
+        }
+        const changeset = session.changeset();
+        session.finish();
+        // TODO use prepared statements
+        yield* execSql(db, ...insertRow({
+            tableName: SystemTables.SESSION_CHANGESET_META_TABLE,
+            columns: SystemTables.sessionChangesetMetaTable.sqliteDef.columns,
+            values: {
+                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,
+            },
+        }));
+        // console.groupEnd()
+        // write to eventlog
+        if (skipEventlog === false) {
+            const eventName = eventEncoded.name;
+            const eventDefSchemaHash = eventDefSchemaHashMap.get(eventName) ?? shouldNeverHappen(`Unknown event definition: ${eventName}`);
+            yield* Eventlog.insertIntoEventlog(eventEncoded, dbEventlog, eventDefSchemaHash, eventEncoded.clientId, eventEncoded.sessionId);
+        }
+        else {
+            //   console.debug('[@livestore/common:leader-thread] skipping eventlog write', mutation, statementSql, bindValues)
+        }
+        return {
+            sessionChangeset: changeset
+                ? {
+                    _tag: 'sessionChangeset',
+                    data: changeset,
+                    debug: LS_DEV ? execArgsArr : null,
+                }
+                : { _tag: 'no-op' },
+        };
+    }).pipe(Effect.withSpan(`@livestore/common:leader-thread:materializeEvent`, {
+        attributes: {
+            eventName: eventEncoded.name,
+            eventNum: eventEncoded.seqNum,
+            'span.label': `${EventSequenceNumber.toString(eventEncoded.seqNum)} ${eventEncoded.name}`,
+        },
+    }));
+});
+export const rollback = ({ dbState, dbEventlog, eventNumsToRollback, }) => Effect.gen(function* () {
+    const rollbackEvents = dbState
+        .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];
+        if (changeset !== null) {
+            dbState.makeChangeset(changeset).invert().apply();
+        }
+    }
+    const eventNumPairChunks = ReadonlyArray.chunksOf(100)(eventNumsToRollback.map((seqNum) => `(${seqNum.global}, ${seqNum.client})`));
+    // Delete the changeset rows
+    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 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: eventNumsToRollback.length },
+}));
+//# sourceMappingURL=materialize-event.js.map

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

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

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

@@ -3,5 +3,5 @@ export * from './types.js';
 export * as ShutdownChannel from './shutdown-channel.js';
 export * from './leader-worker-devtools.js';
 export * from './make-leader-thread-layer.js';
-export * from './mutationlog.js';
+export * as Eventlog from './eventlog.js';
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

package/dist/leader-thread/mod.js

@@ -3,5 +3,5 @@ export * from './types.js';
 export * as ShutdownChannel from './shutdown-channel.js';
 export * from './leader-worker-devtools.js';
 export * from './make-leader-thread-layer.js';
-export * from './mutationlog.js';
+export * as Eventlog from './eventlog.js';
 //# sourceMappingURL=mod.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

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

@@ -1,7 +1,9 @@
 import type { HttpClient } from '@livestore/utils/effect';
 import { Effect } from '@livestore/utils/effect';
-import type { InvalidPullError, IsOfflineError, SqliteError } from '../index.js';
+import type { InvalidPullError, IsOfflineError, MigrationsReport, SqliteError } from '../index.js';
 import { UnexpectedError } from '../index.js';
 import { LeaderThreadCtx } from './types.js';
-export declare const recreateDb: Effect.Effect<void, UnexpectedError | SqliteError | IsOfflineError | InvalidPullError, LeaderThreadCtx | HttpClient.HttpClient>;
+export declare const recreateDb: Effect.Effect<{
+    migrationsReport: MigrationsReport;
+}, UnexpectedError | SqliteError | IsOfflineError | InvalidPullError, LeaderThreadCtx | HttpClient.HttpClient>;
 //# sourceMappingURL=recreate-db.d.ts.map

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,CAoGxC,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,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAClH,OAAO,EAAwC,eAAe,EAAE,MAAM,aAAa,CAAA;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC;IAAE,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,EACtC,eAAe,GAAG,WAAW,GAAG,cAAc,GAAG,gBAAgB,EACjE,eAAe,GAAG,UAAU,CAAC,UAAU,CA+FxC,CAAA"}

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

@@ -1,57 +1,52 @@
 import { casesHandled } from '@livestore/utils';
 import { Effect, Queue } from '@livestore/utils/effect';
-import { initializeSingletonTables, migrateDb, rehydrateFromMutationLog, UnexpectedError } from '../index.js';
+import { migrateDb, rematerializeFromEventlog, UnexpectedError } from '../index.js';
 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 migrationOptions = schema.migrationOptions;
+    const { dbState, dbEventlog, schema, bootStatusQueue, materializeEvent } = yield* LeaderThreadCtx;
+    const migrationOptions = schema.state.sqlite.migrations;
+    let migrationsReport;
     yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
         if (ex._tag === 'Failure')
-            db.destroy();
+            dbState.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
     // TODO bring back this optimization
-    // const tmpSyncDb = yield* makeSyncDb({ _tag: 'in-memory' })
-    const tmpSyncDb = db;
-    yield* configureConnection(tmpSyncDb, { fkEnabled: true });
+    // const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' })
+    const tmpDb = dbState;
+    yield* configureConnection(tmpDb, { foreignKeys: true });
     const initDb = (hooks) => Effect.gen(function* () {
-        yield* Effect.tryAll(() => hooks?.init?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
-        yield* migrateDb({
-            db: tmpSyncDb,
+        yield* Effect.tryAll(() => hooks?.init?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        const migrationsReport = yield* migrateDb({
+            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;
+        yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        return { migrationsReport, tmpDb };
     });
     switch (migrationOptions.strategy) {
-        case 'from-mutation-log': {
+        case 'auto': {
             const hooks = migrationOptions.hooks;
-            const tmpSyncDb = yield* initDb(hooks);
-            yield* rehydrateFromMutationLog({
-                db: tmpSyncDb,
-                logDb: dbLog,
+            const initResult = yield* initDb(hooks);
+            migrationsReport = initResult.migrationsReport;
+            yield* rematerializeFromEventlog({
+                // db: initResult.tmpDb,
+                dbEventlog,
                 schema,
-                migrationOptions,
+                materializeEvent,
                 onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
             });
-            yield* Effect.tryAll(() => hooks?.post?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
-            break;
-        }
-        case 'hard-reset': {
-            const hooks = migrationOptions.hooks;
-            const tmpInMemoryDb = yield* initDb(hooks);
-            // The database is migrated but empty now, so nothing else to do
-            yield* Effect.tryAll(() => hooks?.post?.(tmpInMemoryDb)).pipe(UnexpectedError.mapToUnexpectedError);
+            yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
             break;
         }
         case 'manual': {
-            const oldDbData = db.export();
+            const oldDbData = dbState.export();
+            migrationsReport = { migrations: [] };
             const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
-            tmpSyncDb.import(newDbData);
+            tmpDb.import(newDbData);
             // TODO validate schema
             break;
         }
@@ -61,15 +56,16 @@ export const recreateDb = Effect.gen(function* () {
     }
     // TODO bring back
     // Import the temporary in-memory database into the persistent database
-    // yield* Effect.sync(() => db.import(tmpSyncDb)).pipe(
+    // 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()
+    // const snapshotFromTmpDb = tmpDb.export()
     // TODO bring back
-    // tmpSyncDb.close()
+    // tmpDb.close()
+    return { migrationsReport };
 }).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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGvD,OAAO,EAAE,SAAS,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,UAAU,GAInB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAEjG,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAA;IACvD,IAAI,gBAAkC,CAAA;IAEtC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CACxB,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;QAC7C,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,EAAE,CAAA;IAC9C,CAAC,CAAC,CACH,CAAA;IAED,uFAAuF;IACvF,qEAAqE;IACrE,oCAAoC;IACpC,2DAA2D;IAC3D,MAAM,KAAK,GAAG,OAAO,CAAA;IACrB,KAAK,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IAExD,MAAM,MAAM,GAAG,CAAC,KAA0C,EAAE,EAAE,CAC5D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAA;QAE3F,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC;YACxC,EAAE,EAAE,KAAK;YACT,MAAM;YACN,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC9B,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;SAClF,CAAC,CAAA;QAEF,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAA;QAE1F,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IAEJ,QAAQ,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QAClC,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAA;YACpC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEvC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAA;YAE9C,KAAK,CAAC,CAAC,yBAAyB,CAAC;gBAC/B,wBAAwB;gBACxB,UAAU;gBACV,MAAM;gBACN,gBAAgB;gBAChB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC9B,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;aACpF,CAAC,CAAA;YAEF,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAA;YAEtG,MAAK;QACP,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;YAElC,gBAAgB,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;YAErC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACpF,eAAe,CAAC,oBAAoB,CACrC,CAAA;YAED,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAEvB,uBAAuB;YAEvB,MAAK;QACP,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,YAAY,CAAC,gBAAgB,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,uEAAuE;IACvE,mDAAmD;IACnD,0EAA0E;IAC1E,IAAI;IAEJ,0FAA0F;IAC1F,mGAAmG;IACnG,0CAA0C;IAC1C,2CAA2C;IAE3C,kBAAkB;IAClB,gBAAgB;IAEhB,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC7B,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM,EAAE,qFAAqF;AACpG,MAAM,CAAC,QAAQ,CAAC,4CAA4C,CAAC,EAC7D,MAAM,CAAC,sBAAsB,CAAC,4CAA4C,CAAC,CAC5E,CAAA"}

package/dist/leader-thread/shutdown-channel.d.ts

@@ -1,10 +1,7 @@
 import type { WebChannel } from '@livestore/utils/effect';
 import { Schema } from '@livestore/utils/effect';
-import { IntentionalShutdownCause } from '../index.js';
-declare const DedicatedWorkerDisconnectBroadcast_base: Schema.TaggedStruct<"DedicatedWorkerDisconnectBroadcast", {}>;
-export declare class DedicatedWorkerDisconnectBroadcast extends DedicatedWorkerDisconnectBroadcast_base {
-}
-declare const All_base: Schema.Union<[typeof IntentionalShutdownCause, typeof DedicatedWorkerDisconnectBroadcast]>;
+import { IntentionalShutdownCause, UnexpectedError } from '../index.js';
+declare const All_base: Schema.Union<[typeof IntentionalShutdownCause, typeof UnexpectedError]>;
 export declare class All extends All_base {
 }
 /**

package/dist/leader-thread/shutdown-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-channel.d.ts","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;;AAEtD,qBAAa,kCAAmC,SAAQ,uCAA6D;CAAG;;AAExH,qBAAa,GAAI,SAAQ,QAA0E;CAAG;AAEtG;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"shutdown-channel.d.ts","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;;AAEvE,qBAAa,GAAI,SAAQ,QAAuD;CAAG;AAEnF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAA"}

package/dist/leader-thread/shutdown-channel.js

@@ -1,7 +1,5 @@
 import { Schema } from '@livestore/utils/effect';
-import { IntentionalShutdownCause } from '../index.js';
-export class DedicatedWorkerDisconnectBroadcast extends Schema.TaggedStruct('DedicatedWorkerDisconnectBroadcast', {}) {
-}
-export class All extends Schema.Union(IntentionalShutdownCause, DedicatedWorkerDisconnectBroadcast) {
+import { IntentionalShutdownCause, UnexpectedError } from '../index.js';
+export class All extends Schema.Union(IntentionalShutdownCause, UnexpectedError) {
 }
 //# sourceMappingURL=shutdown-channel.js.map

package/dist/leader-thread/shutdown-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,MAAM,OAAO,kCAAmC,SAAQ,MAAM,CAAC,YAAY,CAAC,oCAAoC,EAAE,EAAE,CAAC;CAAG;AAExH,MAAM,OAAO,GAAI,SAAQ,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,kCAAkC,CAAC;CAAG"}
+{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEvE,MAAM,OAAO,GAAI,SAAQ,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,eAAe,CAAC;CAAG"}

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

@@ -1,65 +1,93 @@
-import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
+import type { Deferred, Effect, HttpClient, Option, Queue, Scope, Stream, Subscribable, SubscriptionRef } 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 { EventId, LiveStoreSchema, MutationEvent } from '../schema/mod.js';
+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 { 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';
-declare const OuterWorkerCtx_base: Context.TagClass<OuterWorkerCtx, "OuterWorkerCtx", {
-    innerFiber: Fiber.RuntimeFiber<any, any>;
-}>;
-export declare class OuterWorkerCtx extends OuterWorkerCtx_base {
-}
 export declare const InitialSyncOptionsSkip: Schema.TaggedStruct<"Skip", {}>;
 export type InitialSyncOptionsSkip = typeof InitialSyncOptionsSkip.Type;
 export declare const InitialSyncOptionsBlocking: Schema.TaggedStruct<"Blocking", {
-    timeout: typeof Schema.DurationFromMillis;
+    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
 }>;
 export type InitialSyncOptionsBlocking = typeof InitialSyncOptionsBlocking.Type;
 export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip", {}>, Schema.TaggedStruct<"Blocking", {
-    timeout: typeof Schema.DurationFromMillis;
+    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
 }>]>;
 export type InitialSyncOptions = typeof InitialSyncOptions.Type;
 export type InitialSyncInfo = Option.Option<{
-    cursor: EventId.EventId;
+    cursor: EventSequenceNumber.EventSequenceNumber;
     metadata: Option.Option<Schema.JsonValue>;
 }>;
-export type LeaderDatabase = SynchronousDatabase<{
+export type LeaderSqliteDb = SqliteDb<{
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
 }>;
 export type PersistenceInfoPair = {
-    db: PersistenceInfo;
-    mutationLog: PersistenceInfo;
+    state: PersistenceInfo;
+    eventlog: PersistenceInfo;
 };
 export type DevtoolsOptions = {
     enabled: false;
 } | {
     enabled: true;
-    makeContext: Effect.Effect<{
-        devtoolsWebChannel: WebChannel.WebChannel<Devtools.MessageToAppLeader, Devtools.MessageFromAppLeader>;
+    boot: Effect.Effect<{
+        node: MeshNode;
         persistenceInfo: PersistenceInfoPair;
-    }, UnexpectedError, Scope.Scope>;
+        mode: 'proxy' | 'direct';
+    }, UnexpectedError, Scope.Scope | HttpClient.HttpClient | LeaderThreadCtx>;
+};
+export type DevtoolsContext = {
+    enabled: true;
+    syncBackendLatch: Effect.Latch;
+    syncBackendLatchState: SubscriptionRef.SubscriptionRef<{
+        latchClosed: boolean;
+    }>;
+} | {
+    enabled: false;
 };
 declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThreadCtx", {
     schema: LiveStoreSchema;
     storeId: string;
     clientId: string;
-    makeSyncDb: MakeSynchronousDatabase;
-    db: LeaderDatabase;
-    dbLog: LeaderDatabase;
+    makeSqliteDb: MakeSqliteDb;
+    dbState: LeaderSqliteDb;
+    dbEventlog: LeaderSqliteDb;
     bootStatusQueue: Queue.Queue<BootStatus>;
     shutdownStateSubRef: SubscriptionRef.SubscriptionRef<ShutdownState>;
     shutdownChannel: ShutdownChannel;
-    mutationEventSchema: MutationEvent.ForMutationDefRecord<any>;
+    eventSchema: LiveStoreEvent.ForEventDefRecord<any>;
+    devtools: DevtoolsContext;
     syncBackend: SyncBackend | undefined;
     syncProcessor: LeaderSyncProcessor;
-    connectedClientSessionPullQueues: PullQueueSet;
-    /** e.g. used for `store.__dev` APIs */
-    extraIncomingMessagesQueue: Queue.Queue<Devtools.MessageToAppLeader>;
+    materializeEvent: MaterializeEvent;
+    initialState: {
+        leaderHead: EventSequenceNumber.EventSequenceNumber;
+        migrationsReport: MigrationsReport;
+    };
+    /**
+     * 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.Leader.MessageToApp>;
 }>;
 export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
 }
+export type MaterializeEvent = (eventEncoded: LiveStoreEvent.EncodedWithMeta, options?: {
+    /** Needed for rematerializeFromEventlog */
+    skipEventlog?: boolean;
+}) => Effect.Effect<{
+    sessionChangeset: {
+        _tag: 'sessionChangeset';
+        data: Uint8Array;
+        debug: any;
+    } | {
+        _tag: 'no-op';
+    };
+}, SqliteError | UnexpectedError>;
 export type InitialBlockingSyncContext = {
     blockingDeferred: Deferred.Deferred<void> | undefined;
     update: (_: {
@@ -67,23 +95,42 @@ export type InitialBlockingSyncContext = {
         processed: number;
     }) => Effect.Effect<void>;
 };
-export type PullQueueItem = {
-    payload: SyncState.PayloadUpstream;
-    remaining: number;
-};
 export interface LeaderSyncProcessor {
+    /** Used by client sessions to subscribe to upstream sync state changes */
+    pull: (args: {
+        cursor: LeaderPullCursor;
+    }) => Stream.Stream<{
+        payload: typeof SyncState.PayloadUpstream.Type;
+        mergeCounter: number;
+    }, UnexpectedError>;
+    /** The `pullQueue` API can be used instead of `pull` when more convenient */
+    pullQueue: (args: {
+        cursor: LeaderPullCursor;
+    }) => Effect.Effect<Queue.Queue<{
+        payload: typeof SyncState.PayloadUpstream.Type;
+        mergeCounter: number;
+    }>, UnexpectedError, Scope.Scope>;
+    /** Used by client sessions to push events to the leader thread */
     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>;
-    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.SyncState, UnexpectedError>;
-}
-export interface PullQueueSet {
-    makeQueue: (since: EventId.EventId) => Effect.Effect<Queue.Queue<PullQueueItem>, UnexpectedError, Scope.Scope | LeaderThreadCtx>;
-    offer: (item: PullQueueItem) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
+    batch: ReadonlyArray<LiveStoreEvent.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, LeaderAheadError>;
+    /** Currently only used by devtools which don't provide their own event numbers */
+    pushPartial: (args: {
+        event: LiveStoreEvent.PartialAnyEncoded;
+        clientId: string;
+        sessionId: string;
+    }) => Effect.Effect<void, UnexpectedError>;
+    boot: Effect.Effect<{
+        initialLeaderHead: EventSequenceNumber.EventSequenceNumber;
+    }, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
+    syncState: Subscribable.Subscribable<SyncState.SyncState>;
+    getMergeCounter: () => number;
 }
 export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1,9 +1,7 @@
 import { Context, Schema } from '@livestore/utils/effect';
-export class OuterWorkerCtx extends Context.Tag('OuterWorkerCtx')() {
-}
 export const InitialSyncOptionsSkip = Schema.TaggedStruct('Skip', {});
 export const InitialSyncOptionsBlocking = Schema.TaggedStruct('Blocking', {
-    timeout: Schema.DurationFromMillis,
+    timeout: Schema.Union(Schema.DurationFromMillis, Schema.Number),
 });
 export const InitialSyncOptions = Schema.Union(InitialSyncOptionsSkip, InitialSyncOptionsBlocking);
 export class LeaderThreadCtx extends Context.Tag('LeaderThreadCtx')() {

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;AA+BlG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAqBhE;CAAG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAqBzD,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,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC;CAChE,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AA4ClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EA6BhE;CAAG"}

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

@@ -0,0 +1,23 @@
+import type { Scope, SubscriptionRef } from '@livestore/utils/effect';
+import { Effect } from '@livestore/utils/effect';
+import * as Webmesh from '@livestore/webmesh';
+import type { AdapterArgs, ClientSession, ClientSessionLeaderThreadProxy, LockStatus, SqliteDb, UnexpectedError } from './adapter-types.js';
+import * as Devtools from './devtools/mod.js';
+declare global {
+    var __debugWebmeshNode: any;
+}
+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;
+    connectWebmeshNode: (args: {
+        webmeshNode: Webmesh.MeshNode;
+        sessionInfo: Devtools.SessionInfo.SessionInfo;
+    }) => Effect.Effect<void, UnexpectedError, Scope.Scope | R>;
+    webmeshMode: "direct" | "proxy";
+    registerBeforeUnload: (onBeforeUnload: () => void) => () => void;
+}) => Effect.Effect<ClientSession, never, Scope.Scope | R>;
+//# sourceMappingURL=make-client-session.d.ts.map

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

@@ -0,0 +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,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"}