@livestore/common 0.4.0 → 0.5.0-dev.1

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

@@ -1,27 +1,25 @@
-import type { Deferred, Effect, HttpClient, Option, Queue, Scope, Stream, Subscribable, SubscriptionRef } from '@livestore/utils/effect';
-import { Context, Schema } from '@livestore/utils/effect';
+import { type Deferred, type Effect, type HttpClient, type Latch, type Option, type Queue, type Scope, type Subscribable, type SubscriptionRef, Context, Schema } from '@livestore/utils/effect';
 import type { MeshNode } from '@livestore/webmesh';
 import type { MigrationsReport } from '../defs.ts';
 import type { MaterializeError } from '../errors.ts';
-import type { BootStatus, Devtools, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnknownError, UnknownEventError } from '../index.ts';
-import type { RejectedPushError } from './RejectedPushError.ts';
+import type { BootStatus, Devtools, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnknownError } from '../index.ts';
 import { EventSequenceNumber, type LiveStoreEvent, type LiveStoreSchema } from '../schema/mod.ts';
-import type * as SyncState from '../sync/syncstate.ts';
+import type * as LeaderSyncProcessor from './LeaderSyncProcessor.ts';
 import type { ShutdownChannel } from './shutdown-channel.ts';
 export type ShutdownState = 'running' | 'shutting-down';
 export declare const InitialSyncOptionsSkip: Schema.TaggedStruct<"Skip", {}>;
 export type InitialSyncOptionsSkip = typeof InitialSyncOptionsSkip.Type;
 export declare const InitialSyncOptionsBlocking: Schema.TaggedStruct<"Blocking", {
-    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
+    readonly timeout: Schema.Union<readonly [Schema.DurationFromMillis, Schema.Finite]>;
 }>;
 export type InitialSyncOptionsBlocking = typeof InitialSyncOptionsBlocking.Type;
-export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip", {}>, Schema.TaggedStruct<"Blocking", {
-    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
+export declare const InitialSyncOptions: Schema.Union<readonly [Schema.TaggedStruct<"Skip", {}>, Schema.TaggedStruct<"Blocking", {
+    readonly timeout: Schema.Union<readonly [Schema.DurationFromMillis, Schema.Finite]>;
 }>]>;
 export type InitialSyncOptions = typeof InitialSyncOptions.Type;
 export type InitialSyncInfo = Option.Option<{
     eventSequenceNumber: EventSequenceNumber.Global.Type;
-    metadata: Option.Option<Schema.JsonValue>;
+    metadata: Option.Option<Schema.Json>;
 }>;
 export type LeaderSqliteDb = SqliteDb<{
     dbPointer: number;
@@ -43,14 +41,14 @@ export type DevtoolsOptions = {
 };
 export type DevtoolsContext = {
     enabled: true;
-    syncBackendLatch: Effect.Latch;
+    syncBackendLatch: Latch.Latch;
     syncBackendLatchState: SubscriptionRef.SubscriptionRef<{
         latchClosed: boolean;
     }>;
 } | {
     enabled: false;
 };
-declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThreadCtx", {
+declare const LeaderThreadCtx_base: Context.ServiceClass<LeaderThreadCtx, "LeaderThreadCtx", {
     schema: LiveStoreSchema;
     storeId: string;
     clientId: string;
@@ -63,7 +61,7 @@ declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThr
     eventSchema: LiveStoreEvent.ForEventDef.ForRecord<any>;
     devtools: DevtoolsContext;
     syncBackend: SyncBackend.SyncBackend | undefined;
-    syncProcessor: LeaderSyncProcessor;
+    syncProcessor: LeaderSyncProcessor.Service;
     materializeEvent: MaterializeEvent;
     initialState: {
         leaderHead: EventSequenceNumber.Client.Composite;
@@ -101,47 +99,49 @@ export type InitialBlockingSyncContext = {
 };
 export declare const STREAM_EVENTS_BATCH_SIZE_DEFAULT = 100;
 export declare const STREAM_EVENTS_BATCH_SIZE_MAX = 1000;
+export declare const STATE_REBUILD_BATCH_SIZE_DEFAULT = 100;
+export declare const StateRebuildBatchSizeSchema: Schema.Int;
 export declare const StreamEventsOptionsFields: {
     readonly since: Schema.optional<Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
     }> & {
-        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+        make(seqNum: EventSequenceNumber.Client.CompositeInput): EventSequenceNumber.Client.Composite;
     }>;
     readonly until: Schema.optional<Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
     }> & {
-        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+        make(seqNum: EventSequenceNumber.Client.CompositeInput): EventSequenceNumber.Client.Composite;
     }>;
-    readonly filter: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly clientIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly sessionIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly batchSize: Schema.optional<Schema.filter<typeof Schema.Int>>;
-    readonly includeClientOnly: Schema.optional<typeof Schema.Boolean>;
+    readonly filter: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly clientIds: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly sessionIds: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly batchSize: Schema.optional<Schema.Int>;
+    readonly includeClientOnly: Schema.optional<Schema.Boolean>;
 };
 export declare const StreamEventsOptionsSchema: Schema.Struct<{
     readonly since: Schema.optional<Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
     }> & {
-        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+        make(seqNum: EventSequenceNumber.Client.CompositeInput): EventSequenceNumber.Client.Composite;
     }>;
     readonly until: Schema.optional<Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
     }> & {
-        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+        make(seqNum: EventSequenceNumber.Client.CompositeInput): EventSequenceNumber.Client.Composite;
     }>;
-    readonly filter: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly clientIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly sessionIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    readonly batchSize: Schema.optional<Schema.filter<typeof Schema.Int>>;
-    readonly includeClientOnly: Schema.optional<typeof Schema.Boolean>;
+    readonly filter: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly clientIds: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly sessionIds: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly batchSize: Schema.optional<Schema.Int>;
+    readonly includeClientOnly: Schema.optional<Schema.Boolean>;
 }>;
 export interface StreamEventsOptions {
     /**
@@ -175,40 +175,5 @@ export interface StreamEventsOptions {
      */
     includeClientOnly?: boolean;
 }
-export interface LeaderSyncProcessor {
-    /** Used by client sessions to subscribe to upstream sync state changes */
-    pull: (args: {
-        cursor: EventSequenceNumber.Client.Composite;
-    }) => Stream.Stream<{
-        payload: typeof SyncState.PayloadUpstream.Type;
-    }>;
-    /** The `pullQueue` API can be used instead of `pull` when more convenient */
-    pullQueue: (args: {
-        cursor: EventSequenceNumber.Client.Composite;
-    }) => Effect.Effect<Queue.Queue<{
-        payload: typeof SyncState.PayloadUpstream.Type;
-    }>, never, 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<LiveStoreEvent.Client.EncodedWithMeta>, options?: {
-        /**
-         * If true, the effect will only finish when the local push has been processed (i.e. succeeded or was rejected).
-         * `true` doesn't mean the events have been pushed to the sync backend.
-         * @default false
-         */
-        waitForProcessing?: boolean;
-    }) => Effect.Effect<void, RejectedPushError>;
-    /** Currently only used by devtools which don't provide their own event numbers */
-    pushPartial: (args: {
-        event: LiveStoreEvent.Input.Encoded;
-        clientId: string;
-        sessionId: string;
-    }) => Effect.Effect<void, UnknownEventError>;
-    boot: Effect.Effect<{
-        initialLeaderHead: EventSequenceNumber.Client.Composite;
-    }, never, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
-    syncState: Subscribable.Subscribable<SyncState.SyncState>;
-}
 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,21 +1,25 @@
-import { Context, Schema } from '@livestore/utils/effect';
-import { EventSequenceNumber } from "../schema/mod.js";
+import { Context, Schema, } from '@livestore/utils/effect';
+import { EventSequenceNumber } from '../schema/mod.js';
 export const InitialSyncOptionsSkip = Schema.TaggedStruct('Skip', {});
 export const InitialSyncOptionsBlocking = Schema.TaggedStruct('Blocking', {
-    timeout: Schema.Union(Schema.DurationFromMillis, Schema.Number),
+    timeout: Schema.Union([Schema.DurationFromMillis, Schema.Finite]),
 });
-export const InitialSyncOptions = Schema.Union(InitialSyncOptionsSkip, InitialSyncOptionsBlocking);
-export class LeaderThreadCtx extends Context.Tag('LeaderThreadCtx')() {
+export const InitialSyncOptions = Schema.Union([InitialSyncOptionsSkip, InitialSyncOptionsBlocking]);
+export class LeaderThreadCtx extends Context.Service()('LeaderThreadCtx') {
 }
 export const STREAM_EVENTS_BATCH_SIZE_DEFAULT = 100;
 export const STREAM_EVENTS_BATCH_SIZE_MAX = 1_000;
+export const STATE_REBUILD_BATCH_SIZE_DEFAULT = 100;
+export const StateRebuildBatchSizeSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)).annotate({
+    title: 'stateRebuildBatchSize',
+});
 export const StreamEventsOptionsFields = {
     since: Schema.optional(EventSequenceNumber.Client.Composite),
     until: Schema.optional(EventSequenceNumber.Client.Composite),
     filter: Schema.optional(Schema.Array(Schema.String)),
     clientIds: Schema.optional(Schema.Array(Schema.String)),
     sessionIds: Schema.optional(Schema.Array(Schema.String)),
-    batchSize: Schema.optional(Schema.Int.pipe(Schema.between(1, STREAM_EVENTS_BATCH_SIZE_MAX))),
+    batchSize: Schema.optional(Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: STREAM_EVENTS_BATCH_SIZE_MAX }))),
     includeClientOnly: Schema.optional(Schema.Boolean),
 };
 export const StreamEventsOptionsSchema = Schema.Struct(StreamEventsOptionsFields);

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;AAgBzD,OAAO,EAAE,mBAAmB,EAA6C,MAAM,kBAAkB,CAAA;AAMjG,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,EA8BhE;CAAG;AAqBN,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAA;AACnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAA;AAEjD,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC,CAAC;IAC5F,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;CAC1C,CAAA;AAEV,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAWL,OAAO,EACP,MAAM,GACP,MAAM,yBAAyB,CAAA;AAchC,OAAO,EAAE,mBAAmB,EAA6C,MAAM,kBAAkB,CAAA;AAOjG,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,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAClE,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAC,CAAA;AA4CpG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,OAAO,EA8BjD,CAAC,iBAAiB,CAAC;CAAG;AAqBzB,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAA;AACnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAA;AAEjD,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAA;AACnD,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrG,KAAK,EAAE,uBAAuB;CAC/B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC,CAAC;IACrH,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;CAC1C,CAAA;AAEV,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAA"}

package/dist/logging.d.ts

@@ -1,40 +1,15 @@
-import { Effect, type Layer, LogLevel } from '@livestore/utils/effect';
+import type { Layer, LogLevel } from '@livestore/utils/effect';
 /**
- * Optional Effect logger configuration that LiveStore entry points accept.
+ * Optional Effect logger configuration accepted by LiveStore entry points.
  *
- * When provided, `logger` replaces the default pretty logger for the runtime.
- * Use `logLevel` to control verbosity. Set to `LogLevel.None` to disable logging
+ * When provided, `logger` replaces the default logger for the runtime.
+ * Use `logLevel` to control verbosity. Set to `"None"` to disable logging
  * entirely while keeping the same logger implementation.
  */
-export type WithLoggerOptions = {
+export type LoggerOptions = {
     /** Optional Effect logger layer to control logging output. */
     logger?: Layer.Layer<never> | undefined;
     /** Optional minimum log level for the runtime. */
     logLevel?: LogLevel.LogLevel | undefined;
 };
-/**
- * Common defaults for resolving a logger configuration.
- * - `threadName` is used by the default pretty logger when `logger` is not provided.
- * - `mode` selects pretty logger mode (e.g. 'browser' for web workers).
- * - `defaultLogLevel` is used when `logLevel` is not provided.
- */
-export type LoggerDefaults = {
-    threadName?: string;
-    mode?: 'tty' | 'browser';
-    defaultLogLevel?: LogLevel.LogLevel;
-    /** Optional default logger layer to use when `config.logger` is not provided. */
-    defaultLogger?: Layer.Layer<never>;
-};
-/**
- * Resolve the logger layer to provide to the Effect runtime.
- */
-export declare const resolveLoggerLayer: (config?: WithLoggerOptions, defaults?: LoggerDefaults) => Layer.Layer<never>;
-/**
- * Resolve the minimum log level, falling back to `defaults.defaultLogLevel` then `LogLevel.Debug`.
- */
-export declare const resolveLogLevel: (config?: WithLoggerOptions, defaults?: LoggerDefaults) => LogLevel.LogLevel;
-/**
- * Wrap an effect by applying the resolved minimum log level and providing the resolved logger layer.
- */
-export declare const withLoggerConfig: <TEnv, TError, TOut>(config?: WithLoggerOptions, defaults?: LoggerDefaults) => ((effect: Effect.Effect<TOut, TError, TEnv>) => Effect.Effect<TOut, TError, TEnv>);
 //# sourceMappingURL=logging.d.ts.map

package/dist/logging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAU,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACvC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAA;CACzC,CAAA;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;IACxB,eAAe,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACnC,iFAAiF;IACjF,aAAa,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;CACnC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,EAAE,WAAW,cAAc,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAM3G,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,SAAS,iBAAiB,EAAE,WAAW,cAAc,KAAG,QAAQ,CAAC,QAIhG,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,IAAI,EAAE,MAAM,EAAE,IAAI,EACjD,SAAS,iBAAiB,EAC1B,WAAW,cAAc,KACxB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAInF,CAAA"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACvC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAA;CACzC,CAAA"}

package/dist/logging.js

@@ -1,33 +1,2 @@
-import { isDevEnv } from '@livestore/utils';
-import { Effect, Logger, LogLevel } from '@livestore/utils/effect';
-/**
- * Resolve the logger layer to provide to the Effect runtime.
- */
-export const resolveLoggerLayer = (config, defaults) => {
-    if (config?.logger !== undefined)
-        return config.logger;
-    if (defaults?.defaultLogger !== undefined)
-        return defaults.defaultLogger;
-    const threadName = defaults?.threadName ?? 'livestore';
-    const mode = defaults?.mode;
-    return Logger.prettyWithThread(threadName, mode !== undefined ? { mode } : {});
-};
-/**
- * Resolve the minimum log level, falling back to `defaults.defaultLogLevel` then `LogLevel.Debug`.
- */
-export const resolveLogLevel = (config, defaults) => {
-    if (config?.logLevel !== undefined)
-        return config.logLevel;
-    if (defaults?.defaultLogLevel !== undefined)
-        return defaults.defaultLogLevel;
-    return isDevEnv() === true ? LogLevel.Debug : LogLevel.Info;
-};
-/**
- * Wrap an effect by applying the resolved minimum log level and providing the resolved logger layer.
- */
-export const withLoggerConfig = (config, defaults) => {
-    const level = resolveLogLevel(config, defaults);
-    const layer = resolveLoggerLayer(config, defaults);
-    return (effect) => effect.pipe(Logger.withMinimumLogLevel(level), Effect.provide(layer));
-};
+export {};
 //# sourceMappingURL=logging.js.map

package/dist/logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AA8B9E;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAA0B,EAAE,QAAyB,EAAsB,EAAE;IAC9G,IAAI,MAAM,EAAE,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,MAAM,CAAA;IACtD,IAAI,QAAQ,EAAE,aAAa,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,aAAa,CAAA;IACxE,MAAM,UAAU,GAAG,QAAQ,EAAE,UAAU,IAAI,WAAW,CAAA;IACtD,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAA;IAC3B,OAAO,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAChF,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAA0B,EAAE,QAAyB,EAAqB,EAAE;IAC1G,IAAI,MAAM,EAAE,QAAQ,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1D,IAAI,QAAQ,EAAE,eAAe,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,eAAe,CAAA;IAC5E,OAAO,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;AAC7D,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAA0B,EAC1B,QAAyB,EAC2D,EAAE;IACtF,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAClD,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;AAC1F,CAAC,CAAA"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":""}

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

@@ -1,5 +1,4 @@
-import type { Scope, SubscriptionRef } from '@livestore/utils/effect';
-import { Effect } from '@livestore/utils/effect';
+import { type Scope, type SubscriptionRef, Effect } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
 import type { AdapterArgs, ClientSession, ClientSessionLeaderThreadProxy, LockStatus, SqliteDb, UnknownError } from './adapter-types.ts';
 import * as Devtools from './devtools/mod.ts';
@@ -17,7 +16,7 @@ export declare const makeClientSession: <R>({ storeId, clientId, sessionId, isLe
         webmeshNode: Webmesh.MeshNode;
         sessionInfo: Devtools.SessionInfo.SessionInfo;
     }) => Effect.Effect<void, UnknownError, Scope.Scope | R>;
-    webmeshMode: "direct" | "proxy";
+    webmeshMode: 'direct' | 'proxy';
     registerBeforeUnload: (onBeforeUnload: () => void) => () => void;
     /** Browser origin of the client session; used for origin-scoped DevTools mesh channels */
     origin: string | undefined;

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,YAAY,EACb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,4NAiBlC,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,CAAC,8BAA8B,CAAA;IAC3E,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,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChE,0FAA0F;IAC1F,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAyFY,CAAA"}
+{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,eAAe,EAAE,MAAM,EAAiB,MAAM,yBAAyB,CAAA;AACjG,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,8NAiBhC,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,CAAC,8BAA8B,CAAA;IAC3E,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,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChE,0FAA0F;IAC1F,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CA0FY,CAAA"}

package/dist/make-client-session.js

@@ -1,10 +1,10 @@
-import { Effect, Stream } from '@livestore/utils/effect';
+import { Effect, Latch, Stream } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
-import * as Devtools from "./devtools/mod.js";
-import { liveStoreVersion } from "./version.js";
+import * as Devtools from './devtools/mod.js';
+import { liveStoreVersion } from './version.js';
 export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, origin, }) => Effect.gen(function* () {
     const devtools = devtoolsEnabled === true
-        ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
+        ? { enabled: true, pullLatch: yield* Latch.make(true), pushLatch: yield* Latch.make(true) }
         : { enabled: false };
     if (devtoolsEnabled === true) {
         yield* Effect.gen(function* () {
@@ -43,7 +43,7 @@ export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devt
                 // 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);
+            }, Effect.tapCauseLogPretty, Effect.forkScoped())), Stream.runDrain);
         }).pipe(Effect.withSpan('@livestore/common:make-client-session:devtools'), Effect.tapCauseLogPretty, Effect.forkScoped);
     }
     return {

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

@@ -30,5 +30,4 @@ export declare const hashMaterializerResults: (materializerResults: ReadonlyArra
     bindValues: PreparedBindValues;
     writeTables: ReadonlySet<string> | undefined;
 }>) => number;
-export declare const replaceSessionIdSymbol: (bindValues: Record<string, unknown> | ReadonlyArray<unknown>, sessionId: string) => void;
 //# sourceMappingURL=materializer-helper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"materializer-helper.d.ts","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,0BAA0B,CAAA;AACpH,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAKzD,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,iCAAiC,GAAI,6CAK/C;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,QAAQ,CAAA;IACjB,2GAA2G;IAC3G,KAAK,EACD;QAAE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,GAC9D;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAA;KAAE,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,CAmDA,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC9B,qBAAqB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,MACnE,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAwB3D,CAAA;AAEH,eAAO,MAAM,uBAAuB,GAClC,qBAAqB,aAAa,CAAC;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAAC,WACiD,CAAA;AA8BrD,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":"AACA,OAAO,EAAQ,MAAM,EAAoC,MAAM,yBAAyB,CAAA;AAExF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,0BAA0B,CAAA;AACpH,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAKzD,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,iCAAiC,gDAK3C;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,QAAQ,CAAA;IACjB,2GAA2G;IAC3G,KAAK,EACD;QAAE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,GAC9D;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAA;KAAE,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,CAoDA,CAAA;AAED,eAAO,MAAM,oBAAoB,wBACT;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,aAC5D,cAAc,CAAC,MAAM,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAwB3D,CAAA;AAEH,eAAO,MAAM,uBAAuB,wBACb,aAAa,CAAC;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAAC,WACiD,CAAA"}

package/dist/materializer-helper.js

@@ -1,9 +1,8 @@
-import { isDevEnv, isNil, isReadonlyArray } from '@livestore/utils';
-import { Hash, Option, Schema } from '@livestore/utils/effect';
-import { SessionIdSymbol } from "./adapter-types.js";
-import { isQueryBuilder } from "./schema/state/sqlite/query-builder/api.js";
-import { getResultSchema } from "./schema/state/sqlite/query-builder/impl.js";
-import { prepareBindValues } from "./util.js";
+import { isDevEnv } from '@livestore/utils';
+import { Hash, Option, Predicate, ReadonlyArray, Schema } from '@livestore/utils/effect';
+import { isQueryBuilder } from './schema/state/sqlite/query-builder/api.js';
+import { getResultSchema } from './schema/state/sqlite/query-builder/impl.js';
+import { prepareBindValues } from './util.js';
 export const getExecStatementsFromMaterializer = ({ eventDef, materializer, dbState, event, }) => {
     const eventDecoded = event.decoded === undefined
         ? {
@@ -11,9 +10,9 @@ export const getExecStatementsFromMaterializer = ({ eventDef, materializer, dbSt
             args: Schema.decodeUnknownSync(eventDef.schema)(event.encoded.args),
         }
         : event.decoded;
-    const eventArgsEncoded = isNil(event.decoded?.args) === true
-        ? undefined
-        : Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args);
+    const eventArgsEncoded = Predicate.isNotUndefined(event.decoded) === true && Predicate.isNotNullish(event.decoded.args) === true
+        ? Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args)
+        : undefined;
     const query = (rawQueryOrQueryBuilder) => {
         if (isQueryBuilder(rawQueryOrQueryBuilder) === true) {
             const { query, bindValues } = rawQueryOrQueryBuilder.asSql();
@@ -66,7 +65,7 @@ export const makeMaterializerHash = ({ schema, dbState }) => (event) => {
 };
 export const hashMaterializerResults = (materializerResults) => Hash.string(JSON.stringify(materializerResults));
 const fromMaterializerResult = (materializerResult) => {
-    if (isReadonlyArray(materializerResult) === true) {
+    if (ReadonlyArray.isArray(materializerResult) === true) {
         return materializerResult.flatMap(fromMaterializerResult);
     }
     if (isQueryBuilder(materializerResult) === true) {
@@ -86,31 +85,4 @@ const fromMaterializerResult = (materializerResult) => {
         ];
     }
 };
-// NOTE we should explore whether there is a more elegant solution
-// e.g. by leveraging the schema to replace the sessionIdSymbol
-export const replaceSessionIdSymbol = (bindValues, sessionId) => {
-    deepReplaceValue(bindValues, SessionIdSymbol, sessionId);
-};
-const deepReplaceValue = (input, searchValue, replaceValue) => {
-    if (Array.isArray(input) === true) {
-        for (const i in input) {
-            if (input[i] === searchValue) {
-                input[i] = replaceValue;
-            }
-            else {
-                deepReplaceValue(input[i], searchValue, replaceValue);
-            }
-        }
-    }
-    else if (typeof input === 'object' && input !== null) {
-        for (const key in input) {
-            if (input[key] === searchValue) {
-                input[key] = replaceValue;
-            }
-            else {
-                deepReplaceValue(input[key], searchValue, replaceValue);
-            }
-        }
-    }
-};
 //# sourceMappingURL=materializer-helper.js.map

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/otel.d.ts

@@ -1,10 +1,9 @@
 import * as otel from '@opentelemetry/api';
+import type { Tracer } from '@livestore/utils/effect';
 import { Effect, Layer, OtelTracer } from '@livestore/utils/effect';
 export declare const OtelLiveDummy: Layer.Layer<OtelTracer.OtelTracer>;
 export declare const provideOtel: ({ otelTracer, parentSpanContext }: {
     otelTracer?: otel.Tracer;
     parentSpanContext?: otel.Context;
-}) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, OtelTracer.OtelTracer>>;
-export declare const getDurationMsFromSpan: (span: otel.Span) => number;
-export declare const getStartTimeHighResFromSpan: (span: otel.Span) => DOMHighResTimeStamp;
+}) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, OtelTracer.OtelTracer | Tracer.Tracer>>;
 //# sourceMappingURL=otel.d.ts.map

package/dist/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAQ3D,CAAA;AAEF,eAAO,MAAM,WAAW,GACrB,mCAAmC;IAAE,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CAAE,MACjG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,CAa/F,CAAA;AAEH,eAAO,MAAM,qBAAqB,GAAI,MAAM,IAAI,CAAC,IAAI,KAAG,MAGvD,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,MAAM,IAAI,CAAC,IAAI,KAAG,mBACF,CAAA"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAM3D,CAAA;AAEF,eAAO,MAAM,WAAW,sCACc;IAAE,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CAAE,MACjG,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAa/G,CAAA"}

package/dist/otel.js

@@ -3,19 +3,14 @@ import { makeNoopTracer } from '@livestore/utils';
 import { Effect, identity, Layer, OtelTracer } from '@livestore/utils/effect';
 export const OtelLiveDummy = Layer.suspend(() => {
     const OtelTracerLive = Layer.succeed(OtelTracer.OtelTracer, makeNoopTracer());
-    const TracingLive = Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(OtelTracerLive));
+    const TracingLive = OtelTracer.layerWithoutOtelTracer.pipe(Layer.provideMerge(OtelTracerLive));
     return TracingLive;
 });
 export const provideOtel = ({ otelTracer, parentSpanContext }) => (effect) => {
     const OtelTracerLive = Layer.succeed(OtelTracer.OtelTracer, otelTracer ?? makeNoopTracer());
-    const TracingLive = Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(OtelTracerLive));
+    const TracingLive = OtelTracer.layerWithoutOtelTracer.pipe(Layer.provideMerge(OtelTracerLive));
     return effect.pipe(parentSpanContext !== undefined
         ? Effect.withParentSpan(OtelTracer.makeExternalSpan(otel.trace.getSpanContext(parentSpanContext)))
         : identity, Effect.provide(TracingLive));
 };
-export const getDurationMsFromSpan = (span) => {
-    const durationHr = span._duration;
-    return durationHr[0] * 1000 + durationHr[1] / 1_000_000;
-};
-export const getStartTimeHighResFromSpan = (span) => span._performanceStartTime;
 //# sourceMappingURL=otel.js.map

package/dist/otel.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACnC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAkE,EAAE,EAAE,CACtG,CAAU,MAA8B,EAA0D,EAAE;IAClG,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,IAAI,cAAc,EAAE,CAAC,CAAA;IAE3F,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACU,CAAA;IAE9C,OAAO,MAAM,CAAC,IAAI,CAChB,iBAAiB,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAE,CAAC,CAAC;QACnG,CAAC,CAAC,QAAQ,EACZ,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;AACH,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAe,EAAU,EAAE;IAC/D,MAAM,UAAU,GAAsC,IAAY,CAAC,SAAS,CAAA;IAC5E,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,IAAe,EAAuB,EAAE,CACjF,IAAY,CAAC,qBAA4C,CAAA"}
+{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAA;IAE9F,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAkE,EAAE,EAAE,CACtG,CAAU,MAA8B,EAA0E,EAAE;IAClH,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,IAAI,cAAc,EAAE,CAAC,CAAA;IAE3F,MAAM,WAAW,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CACxD,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAC0B,CAAA;IAE9D,OAAO,MAAM,CAAC,IAAI,CAChB,iBAAiB,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAE,CAAC,CAAC;QACnG,CAAC,CAAC,QAAQ,EACZ,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;AACH,CAAC,CAAA"}

package/dist/rematerialize-from-eventlog.d.ts

@@ -4,11 +4,13 @@ import type { MaterializeEvent } from './leader-thread/mod.ts';
 import type { LiveStoreSchema } from './schema/mod.ts';
 export declare const rematerializeFromEventlog: (args_0: {
     dbEventlog: SqliteDb;
+    dbState: SqliteDb;
     schema: LiveStoreSchema;
     onProgress: (_: {
         done: number;
         total: number;
     }) => Effect.Effect<void>;
     materializeEvent: MaterializeEvent;
-}) => Effect.Effect<void, UnknownError | import("./errors.ts").MaterializeError, never>;
+    batchSize?: number;
+}) => Effect.Effect<undefined, import("./errors.ts").MaterializeError | import("./errors.ts").SqliteError | UnknownError, never>;
 //# sourceMappingURL=rematerialize-from-eventlog.d.ts.map

package/dist/rematerialize-from-eventlog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rematerialize-from-eventlog.d.ts","sourceRoot":"","sources":["../src/rematerialize-from-eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAQhE,eAAO,MAAM,yBAAyB;gBAQxB,QAAQ;YAEZ,eAAe;gBACX,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;sBACrD,gBAAgB;uFA6G4C,CAAA"}
+{"version":3,"file":"rematerialize-from-eventlog.d.ts","sourceRoot":"","sources":["../src/rematerialize-from-eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAwD,MAAM,yBAAyB,CAAA;AAEtG,OAAO,EAAE,KAAK,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAShE,eAAO,MAAM,yBAAyB;gBASxB,QAAQ;aACX,QAAQ;YACT,eAAe;gBACX,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;sBACrD,gBAAgB;gBACtB,MAAM;gIA2H4D,CAAA"}