@livestore/common 0.4.0 → 0.5.0-dev.0

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

@@ -1,10 +1,8 @@
-import { casesHandled } from '@livestore/utils';
 import { Effect, Queue } from '@livestore/utils/effect';
 import { migrateDb, rematerializeFromEventlog, UnknownError, } from "../index.js";
 import { configureConnection } from "./connection.js";
 export const recreateDb = ({ dbState, dbEventlog, schema, bootStatusQueue, materializeEvent, }) => Effect.gen(function* () {
-    const migrationOptions = schema.state.sqlite.migrations;
-    let migrationsReport = { migrations: [] };
+    const hooks = schema.state.sqlite.migrations.hooks;
     yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
         if (ex._tag === 'Failure')
             dbState.destroy();
@@ -15,43 +13,24 @@ export const recreateDb = ({ dbState, dbEventlog, schema, bootStatusQueue, mater
     // 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?.(tmpDb)).pipe(UnknownError.mapToUnknownError);
-        const migrationsReport = yield* migrateDb({
-            db: tmpDb,
-            schema,
-            onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
-        });
-        yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnknownError.mapToUnknownError);
-        return { migrationsReport, tmpDb };
+    // @effect-diagnostics-next-line anyUnknownInErrorContext:off -- user hook errors are immediately normalized to LiveStore UnknownError
+    yield* Effect.trySyncOrPromiseOrEffect(() => hooks?.init?.(tmpDb)).pipe(UnknownError.mapToUnknownError);
+    const migrationsReport = yield* migrateDb({
+        db: tmpDb,
+        schema,
+        onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
     });
-    switch (migrationOptions.strategy) {
-        case 'auto': {
-            const hooks = migrationOptions.hooks;
-            const initResult = yield* initDb(hooks);
-            migrationsReport = initResult.migrationsReport;
-            yield* rematerializeFromEventlog({
-                // db: initResult.tmpDb,
-                dbEventlog,
-                schema,
-                materializeEvent,
-                onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
-            });
-            yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnknownError.mapToUnknownError);
-            break;
-        }
-        case 'manual': {
-            const oldDbData = dbState.export();
-            migrationsReport = { migrations: [] };
-            const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnknownError.mapToUnknownError);
-            tmpDb.import(newDbData);
-            // TODO validate schema
-            break;
-        }
-        default: {
-            casesHandled(migrationOptions);
-        }
-    }
+    // @effect-diagnostics-next-line anyUnknownInErrorContext:off -- user hook errors are immediately normalized to LiveStore UnknownError
+    yield* Effect.trySyncOrPromiseOrEffect(() => hooks?.pre?.(tmpDb)).pipe(UnknownError.mapToUnknownError);
+    yield* rematerializeFromEventlog({
+        // db: tmpDb,
+        dbEventlog,
+        schema,
+        materializeEvent,
+        onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
+    });
+    // @effect-diagnostics-next-line anyUnknownInErrorContext:off -- user hook errors are immediately normalized to LiveStore UnknownError
+    yield* Effect.trySyncOrPromiseOrEffect(() => hooks?.post?.(tmpDb)).pipe(UnknownError.mapToUnknownError);
     // TODO bring back
     // Import the temporary in-memory database into the persistent database
     // yield* Effect.sync(() => db.import(tmpDb)).pipe(

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,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGvD,OAAO,EAGL,SAAS,EACT,yBAAyB,EAGzB,YAAY,GACb,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAGrD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,OAAO,EACP,UAAU,EACV,MAAM,EACN,eAAe,EACf,gBAAgB,GAOjB,EAAwG,EAAE,CACzG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAA;IAElD,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,sIAAsI;IACtI,KAAK,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAEvG,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC;QACxC,EAAE,EAAE,KAAK;QACT,MAAM;QACN,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;KACjH,CAAC,CAAA;IAEF,sIAAsI;IACtI,KAAK,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAEtG,KAAK,CAAC,CAAC,yBAAyB,CAAC;QAC/B,aAAa;QACb,UAAU;QACV,MAAM;QACN,gBAAgB;QAChB,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;KACpF,CAAC,CAAA;IAEF,sIAAsI;IACtI,KAAK,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAEvG,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,12 +1,8 @@
-import type { WebChannel } from '@livestore/utils/effect';
-import { Schema } from '@livestore/utils/effect';
+import { type WebChannel, Schema } from '@livestore/utils/effect';
 import { BackendIdMismatchError, IntentionalShutdownCause, MaterializeError, UnknownError } from '../index.ts';
-declare const All_base: Schema.Union<[typeof IntentionalShutdownCause, typeof UnknownError, typeof BackendIdMismatchError, typeof MaterializeError]>;
-export declare class All extends All_base {
-}
+export declare const All: Schema.Union<readonly [typeof IntentionalShutdownCause, typeof UnknownError, typeof BackendIdMismatchError, typeof MaterializeError]>;
 /**
  * Used internally by an adapter to shutdown gracefully.
  */
 export type ShutdownChannel = WebChannel.WebChannel<typeof All.Type, typeof All.Type>;
-export {};
 //# sourceMappingURL=shutdown-channel.d.ts.map

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,EACL,sBAAsB,EACtB,wBAAwB,EACxB,gBAAgB,EAChB,YAAY,EACb,MAAM,aAAa,CAAA;;AAEpB,qBAAa,GAAI,SAAQ,QAKxB;CAAG;AAEJ;;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,EAAE,KAAK,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE9G,eAAO,MAAM,GAAG,uIAAmG,CAAA;AAEnH;;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,5 +1,4 @@
 import { Schema } from '@livestore/utils/effect';
-import { BackendIdMismatchError, IntentionalShutdownCause, MaterializeError, UnknownError, } from "../index.js";
-export class All extends Schema.Union(IntentionalShutdownCause, UnknownError, BackendIdMismatchError, MaterializeError) {
-}
+import { BackendIdMismatchError, IntentionalShutdownCause, MaterializeError, UnknownError } from "../index.js";
+export const All = Schema.Union([IntentionalShutdownCause, UnknownError, BackendIdMismatchError, MaterializeError]);
 //# 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,EACL,sBAAsB,EACtB,wBAAwB,EACxB,gBAAgB,EAChB,YAAY,GACb,MAAM,aAAa,CAAA;AAEpB,MAAM,OAAO,GAAI,SAAQ,MAAM,CAAC,KAAK,CACnC,wBAAwB,EACxB,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,CACjB;CAAG"}
+{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE9G,MAAM,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,wBAAwB,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,CAAC,CAAC,CAAA"}

package/dist/leader-thread/stream-events.d.ts

@@ -1,5 +1,4 @@
-import type { Subscribable } from '@livestore/utils/effect';
-import { Stream } from '@livestore/utils/effect';
+import { type Subscribable, Stream } from '@livestore/utils/effect';
 import { type LiveStoreEvent } from '../schema/mod.ts';
 import type * as SyncState from '../sync/syncstate.ts';
 import type { LeaderSqliteDb, StreamEventsOptions } from './types.ts';
@@ -12,19 +11,17 @@ import type { LeaderSqliteDb, StreamEventsOptions } from './types.ts';
  * The batch size is set to 100 by default as this was meassured to provide the
  * best performance and 1000 as the upper limit.
  *
- * Adapters that call this helper:
+ * Adapters that call this helper include:
  * - `packages/@livestore/adapter-web/src/in-memory/in-memory-adapter.ts`
  * - `packages/@livestore/adapter-web/src/web-worker/leader-worker/make-leader-worker.ts`
- * - `packages/@livestore/adapter-node/src/client-session/adapter.ts`
- * - `packages/@livestore/adapter-node/src/make-leader-worker.ts`
  * - `packages/@livestore/adapter-cloudflare/src/make-adapter.ts`
+ * - external leader-thread adapters
  *
  * Each caller resolves dependencies inside the leader scope before invoking this helper,
  * so the stream stays environment-agnostic and does not leak `LeaderThreadCtx` into runtime
  * entry points such as `Store.eventsStream`.
  *
  * Test files:
- * Unit: `tests/package-common/src/leader-thread/stream-events.test.ts`
  * Integration: `packages/@livestore/livestore/src/store/store-eventstream.test.ts`
  * Performance: `tests/perf-eventlog/tests/suites/event-streaming.test.ts`
  *
@@ -45,7 +42,7 @@ import type { LeaderSqliteDb, StreamEventsOptions } from './types.ts';
  * Fetch plans into sink and decompose into windows
  * https://gist.github.com/slashv/a8f55f50121c080937f42e44b4039ac8
  *
- * Mailbox and Latch approach (suggestion by Tim Smart)
+ * Queue and Latch approach (suggestion by Tim Smart)
  * https://gist.github.com/slashv/d6b12395c85415bf0d3363372a1636c3
  */
 export declare const streamEventsWithSyncState: ({ dbEventlog, syncState, options, }: {

package/dist/leader-thread/stream-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-events.d.ts","sourceRoot":"","sources":["../../src/leader-thread/stream-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAgC,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAE9E,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC3E,OAAO,KAAK,KAAK,SAAS,MAAM,sBAAsB,CAAA;AAEtD,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,yBAAyB,GAAI,qCAIvC;IACD,UAAU,EAAE,cAAc,CAAA;IAC1B,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACzD,OAAO,EAAE,mBAAmB,CAAA;CAC7B,KAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAgJ9C,CAAA"}
+{"version":3,"file":"stream-events.d.ts","sourceRoot":"","sources":["../../src/leader-thread/stream-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAE1F,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC3E,OAAO,KAAK,KAAK,SAAS,MAAM,sBAAsB,CAAA;AAEtD,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,eAAO,MAAM,yBAAyB,GAAI,qCAIvC;IACD,UAAU,EAAE,cAAc,CAAA;IAC1B,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACzD,OAAO,EAAE,mBAAmB,CAAA;CAC7B,KAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAsJ9C,CAAA"}

package/dist/leader-thread/stream-events.js

@@ -1,4 +1,4 @@
-import { Chunk, Effect, Option, Queue, Stream } from '@livestore/utils/effect';
+import { Effect, Option, Queue, Stream } from '@livestore/utils/effect';
 import { EventSequenceNumber } from "../schema/mod.js";
 import * as Eventlog from "./eventlog.js";
 /**
@@ -10,19 +10,17 @@ import * as Eventlog from "./eventlog.js";
  * The batch size is set to 100 by default as this was meassured to provide the
  * best performance and 1000 as the upper limit.
  *
- * Adapters that call this helper:
+ * Adapters that call this helper include:
  * - `packages/@livestore/adapter-web/src/in-memory/in-memory-adapter.ts`
  * - `packages/@livestore/adapter-web/src/web-worker/leader-worker/make-leader-worker.ts`
- * - `packages/@livestore/adapter-node/src/client-session/adapter.ts`
- * - `packages/@livestore/adapter-node/src/make-leader-worker.ts`
  * - `packages/@livestore/adapter-cloudflare/src/make-adapter.ts`
+ * - external leader-thread adapters
  *
  * Each caller resolves dependencies inside the leader scope before invoking this helper,
  * so the stream stays environment-agnostic and does not leak `LeaderThreadCtx` into runtime
  * entry points such as `Store.eventsStream`.
  *
  * Test files:
- * Unit: `tests/package-common/src/leader-thread/stream-events.test.ts`
  * Integration: `packages/@livestore/livestore/src/store/store-eventstream.test.ts`
  * Performance: `tests/perf-eventlog/tests/suites/event-streaming.test.ts`
  *
@@ -43,13 +41,13 @@ import * as Eventlog from "./eventlog.js";
  * Fetch plans into sink and decompose into windows
  * https://gist.github.com/slashv/a8f55f50121c080937f42e44b4039ac8
  *
- * Mailbox and Latch approach (suggestion by Tim Smart)
+ * Queue and Latch approach (suggestion by Tim Smart)
  * https://gist.github.com/slashv/d6b12395c85415bf0d3363372a1636c3
  */
 export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) => {
     const initialCursor = options.since ?? EventSequenceNumber.Client.ROOT;
     const batchSize = options.batchSize ?? 100;
-    return Stream.unwrapScoped(Effect.gen(function* () {
+    return Stream.unwrap(Effect.gen(function* () {
         /**
          * Single-element Queue allows suspending the event stream until head
          * advances because Queue.take is a suspending effect. SubscriptionRef in
@@ -79,7 +77,7 @@ export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) =
             }
             return false;
         }), Stream.runForEach((head) => Queue.offer(headQueue, head)), Effect.forkScoped);
-        return Stream.paginateChunkEffect({ cursor: initialCursor, head: EventSequenceNumber.Client.ROOT }, ({ cursor, head }) => Effect.gen(function* () {
+        return Stream.paginate({ cursor: initialCursor, head: EventSequenceNumber.Client.ROOT }, ({ cursor, head }) => Effect.gen(function* () {
             /**
              * Early check guards agains:
              * since === until : Prevent empty query
@@ -87,7 +85,8 @@ export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) =
              */
             if (options.until !== undefined &&
                 EventSequenceNumber.Client.isGreaterThanOrEqual(cursor, options.until) === true) {
-                return [Chunk.empty(), Option.none()];
+                const done = [[], Option.none()];
+                return done;
             }
             /**
              * There are two scenarios where we take the next head from the headQueue:
@@ -130,10 +129,10 @@ export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) =
                 client: EventSequenceNumber.Client.DEFAULT,
             });
             /**
-             * Eventlog.getEventsFromEventlog returns a Chunk from each
-             * query which is what we emit at each itteration.
+             * Eventlog.getEventsFromEventlog returns a batch from each query
+             * which is what we emit at each itteration.
              */
-            const chunk = yield* Eventlog.getEventsFromEventlog({
+            const events = yield* Eventlog.getEventsFromEventlog({
                 dbEventlog,
                 options: {
                     ...options,
@@ -157,10 +156,8 @@ export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) =
                 'livestore.streamEvents.batchSize': batchSize,
                 'livestore.streamEvents.waitedForHead': waitForHead,
             };
-            return yield* Effect.succeed([
-                chunk,
-                nextState,
-            ]).pipe(Effect.withSpan('@livestore/common:streamEvents:segment', { attributes: spanAttributes }));
+            const result = [events, nextState];
+            return yield* Effect.succeed(result).pipe(Effect.withSpan('@livestore/common:streamEvents:segment', { attributes: spanAttributes }));
         }));
     }));
 };

package/dist/leader-thread/stream-events.js.map

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

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;
@@ -103,45 +101,45 @@ export declare const STREAM_EVENTS_BATCH_SIZE_DEFAULT = 100;
 export declare const STREAM_EVENTS_BATCH_SIZE_MAX = 1000;
 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;
     }>;
     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;
     }>;
-    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;
     }>;
     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;
     }>;
-    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 +173,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,11 +1,11 @@
-import { Context, Schema } from '@livestore/utils/effect';
+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;
@@ -15,7 +15,7 @@ export const StreamEventsOptionsFields = {
     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,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';