@livestore/livestore 0.4.0 → 0.5.0-dev.0

package/dist/store/StoreRegistry.d.ts

@@ -1,9 +1,9 @@
 import { UnknownError } from '@livestore/common';
 import type { LiveStoreSchema } from '@livestore/common/schema';
-import { Effect, type OtelTracer, Runtime, type Schema, type Scope } from '@livestore/utils/effect';
+import { type Context, Effect, type OtelTracer, type Schema, Scope } from '@livestore/utils/effect';
 import { type CreateStoreOptions } from './create-store.ts';
-import type { Store } from './store.ts';
 import type { OtelOptions } from './store-types.ts';
+import type { Store } from './store.ts';
 /**
  * Default time to keep unused stores in cache.
  *
@@ -26,7 +26,7 @@ export declare const DEFAULT_UNUSED_CACHE_TIME: number;
  * @see {@link storeOptions} for defining reusable store configurations
  * @see {@link StoreRegistry} for managing store lifecycles
  */
-export interface RegistryStoreOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue> extends CreateStoreOptions<TSchema, TContext, TSyncPayloadSchema> {
+export interface RegistryStoreOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json> extends CreateStoreOptions<TSchema, TContext, TSyncPayloadSchema> {
     /**
      * OpenTelemetry configuration for tracing store operations.
      *
@@ -71,10 +71,10 @@ type StoreRegistryConfig = {
      */
     defaultOptions?: Partial<Pick<RegistryStoreOptions, 'batchUpdates' | 'disableDevtools' | 'confirmUnsavedChanges' | 'debug' | 'otelOptions' | 'unusedCacheTime'>>;
     /**
-     * Custom Effect runtime for all registry operations (loading, caching, etc.).
-     * When the runtime's scope closes, all managed stores are automatically shut down.
+     * Custom Effect context for all registry operations (loading, caching, etc.).
+     * When the context's scope closes, all managed stores are automatically shut down.
      */
-    runtime?: Runtime.Runtime<Scope.Scope | OtelTracer.OtelTracer>;
+    context?: Context.Context<Scope.Scope | OtelTracer.OtelTracer>;
 };
 /**
  * Store Registry coordinating store loading, caching, and retention
@@ -111,7 +111,7 @@ export declare class StoreRegistry {
      *   if no other scopes retain it
      * - Concurrent calls with the same storeId share the same store instance
      */
-    getOrLoad: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Effect.Effect<Store<TSchema, TContext>, UnknownError, Scope.Scope>;
+    getOrLoad: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Effect.Effect<Store<TSchema, TContext>, UnknownError, Scope.Scope>;
     /**
      * Get or load a store, returning it directly if already loaded or a promise if loading.
      *
@@ -128,7 +128,7 @@ export declare class StoreRegistry {
      * - Applies default options from registry config, with call-site options taking precedence
      * - Concurrent calls with the same storeId share the same store instance
      */
-    getOrLoadPromise: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Store<TSchema, TContext> | Promise<Store<TSchema, TContext>>;
+    getOrLoadPromise: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Store<TSchema, TContext> | Promise<Store<TSchema, TContext>>;
     /**
      * Retains the store in cache.
      *
@@ -142,7 +142,7 @@ export declare class StoreRegistry {
      * - If the store isn't cached yet, it will be loaded and then retained
      * - The store will remain in cache until all retains are released and after `unusedCacheTime` expires
      */
-    retain: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => (() => void);
+    retain: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => (() => void);
     /**
      * Loads a store (without suspending) to warm up the cache.
      *
@@ -156,7 +156,7 @@ export declare class StoreRegistry {
      * - If the entry remains unused after preload resolves/rejects, it is scheduled for disposal.
      * - Does not affect the retention of the store in cache.
      */
-    preload: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Promise<void>;
+    preload: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => Promise<void>;
     /**
      * Disposes the registry and all its managed stores, immediately releasing resources
      * (database connections, WebSocket connections, web workers, etc.).
@@ -168,7 +168,7 @@ export declare class StoreRegistry {
      * @returns A promise that resolves when disposal is complete
      *
      * @remarks
-     * - No-op if a custom `runtime` was provided to the constructor (caller owns cleanup)
+     * - No-op if a custom `context` was provided to the constructor (caller owns cleanup)
      * - Idempotent: safe to call multiple times
      * - After disposal, the registry should not be used
      */
@@ -210,6 +210,6 @@ export declare class StoreRegistry {
  * });
  * ```
  */
-export declare const storeOptions: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>;
+export declare const storeOptions: <TSchema extends LiveStoreSchema, TContext = {}, TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json>(options: RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>) => RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>;
 export {};
 //# sourceMappingURL=StoreRegistry.d.ts.map

package/dist/store/StoreRegistry.d.ts.map

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

package/dist/store/StoreRegistry.js

@@ -1,6 +1,6 @@
-import { LogConfig, OtelLiveDummy, provideOtel, UnknownError } from '@livestore/common';
-import { omitUndefineds } from '@livestore/utils';
-import { Cause, Effect, Equal, Exit, Fiber, Hash, Layer, ManagedRuntime, RcMap, Runtime, } from '@livestore/utils/effect';
+import { OtelLiveDummy, provideOtel, UnknownError } from '@livestore/common';
+import { isDevEnv, omitUndefineds } from '@livestore/utils';
+import { Cause, Effect, Equal, Exit, Fiber, Hash, Layer, ManagedRuntime, Result, RcMap, References, Scope, } from '@livestore/utils/effect';
 import { createStore } from "./create-store.js";
 /**
  * Default time to keep unused stores in cache.
@@ -51,13 +51,13 @@ export class StoreRegistry {
      */
     #rcMap;
     /**
-     * Effect runtime providing Scope and OtelTracer for all registry operations.
-     * When the runtime's scope closes, all managed stores are automatically shut down.
+     * Effect context providing Scope and OtelTracer for all registry operations.
+     * When the context's scope closes, all managed stores are automatically shut down.
      */
-    #runtime;
+    #context;
     /**
      * Disposal callback for the runtime created by the registry.
-     * Undefined when caller provided their own runtime (caller owns cleanup in that case).
+     * Undefined when caller provided their own services (caller owns cleanup in that case).
      */
     #disposeOwnedRuntime;
     /**
@@ -79,25 +79,25 @@ export class StoreRegistry {
      * ```
      */
     constructor(config = {}) {
-        if (config.runtime !== undefined) {
-            this.#runtime = config.runtime;
+        if (config.context !== undefined) {
+            this.#context = config.context;
         }
         else {
-            const ownedRuntime = ManagedRuntime.make(Layer.mergeAll(Layer.scope, OtelLiveDummy));
-            this.#runtime = ownedRuntime.runtimeEffect.pipe(Effect.runSync);
+            const ownedRuntime = ManagedRuntime.make(Layer.mergeAll(Layer.effect(Scope.Scope, Effect.scope), OtelLiveDummy));
+            this.#context = ownedRuntime.contextEffect.pipe(Effect.runSync);
             this.#disposeOwnedRuntime = () => ownedRuntime.dispose();
         }
         this.#rcMap = RcMap.make({
             lookup: ({ options }) => {
                 // Merge registry defaults with call-site options (call-site takes precedence)
                 const mergedOptions = { ...config.defaultOptions, ...options };
-                return createStore(mergedOptions).pipe(Effect.catchAllDefect((cause) => UnknownError.make({ cause })), Effect.withSpan(`StoreRegistry.lookup:${mergedOptions.storeId}`), LogConfig.withLoggerConfig(mergedOptions, { threadName: 'window' }), provideOtel(omitUndefineds({
+                return createStore(mergedOptions).pipe(Effect.catchDefect((cause) => UnknownError.make({ cause })), Effect.withSpan(`StoreRegistry.lookup:${mergedOptions.storeId}`), Effect.provide(Layer.mergeAll(mergedOptions.logger ?? Layer.empty, Layer.succeed(References.MinimumLogLevel, mergedOptions.logLevel ?? (isDevEnv() === true ? 'Debug' : 'Info')))), provideOtel(omitUndefineds({
                     parentSpanContext: mergedOptions.otelOptions?.rootSpanContext,
                     otelTracer: mergedOptions.otelOptions?.tracer,
                 })));
             },
             idleTimeToLive: ({ options }) => options.unusedCacheTime ?? config.defaultOptions?.unusedCacheTime ?? DEFAULT_UNUSED_CACHE_TIME,
-        }).pipe(Runtime.runSync(this.#runtime));
+        }).pipe(Effect.runSyncWith(this.#context));
     }
     /**
      * Gets a cached store or loads a new one, with the store lifetime scoped to the caller.
@@ -113,7 +113,7 @@ export class StoreRegistry {
      *   if no other scopes retain it
      * - Concurrent calls with the same storeId share the same store instance
      */
-    getOrLoad = (options) => Effect.gen(this, function* () {
+    getOrLoad = (options) => Effect.gen({ self: this }, function* () {
         // Cast options to satisfy StoreCacheKey's wider type (type safety enforced at API boundary)
         const key = new StoreCacheKey(options);
         const store = yield* RcMap.get(this.#rcMap, key);
@@ -136,16 +136,16 @@ export class StoreRegistry {
      * - Concurrent calls with the same storeId share the same store instance
      */
     getOrLoadPromise = (options) => {
-        const exit = this.getOrLoad(options).pipe(Effect.scoped, Runtime.runSyncExit(this.#runtime));
+        const exit = this.getOrLoad(options).pipe(Effect.scoped, Effect.runSyncExitWith(this.#context));
         if (Exit.isSuccess(exit) === true)
             return exit.value;
         // Check if the failure is due to async work
-        const defect = Cause.dieOption(exit.cause);
-        if (defect._tag !== 'Some') {
+        const defect = Cause.findDefect(exit.cause);
+        if (Result.isFailure(defect) === true) {
             // Handle synchronous failure
             throw Cause.squash(exit.cause);
         }
-        if (Runtime.isAsyncFiberException(defect.value) === false) {
+        if (Cause.isAsyncFiberError(defect.success) === false) {
             // Handle synchronous failure
             throw Cause.squash(exit.cause);
         }
@@ -155,9 +155,9 @@ export class StoreRegistry {
         if (cached !== undefined)
             return cached;
         // Create and cache the promise
-        const fiber = defect.value.fiber;
+        const fiber = defect.success.fiber;
         const promise = Fiber.join(fiber)
-            .pipe(Runtime.runPromise(this.#runtime))
+            .pipe(Effect.runPromiseWith(this.#context))
             .finally(() => this.#loadingPromises.delete(storeId));
         this.#loadingPromises.set(storeId, promise);
         return promise;
@@ -176,15 +176,15 @@ export class StoreRegistry {
      * - The store will remain in cache until all retains are released and after `unusedCacheTime` expires
      */
     retain = (options) => {
-        const release = Effect.gen(this, function* () {
+        const release = Effect.gen({ self: this }, function* () {
             // Cast options to satisfy StoreCacheKey's wider type (type safety enforced at API boundary)
             const key = new StoreCacheKey(options);
             yield* RcMap.get(this.#rcMap, key);
             // Effect.never suspends indefinitely, keeping the RcMap reference alive.
             // When `release()` is called, the fiber is interrupted, closing the scope
             // and releasing the RcMap entry (which may trigger disposal after idleTimeToLive).
-            yield* Effect.never;
-        }).pipe(Effect.scoped, Runtime.runCallback(this.#runtime));
+            return yield* Effect.never;
+        }).pipe(Effect.scoped, Effect.runCallbackWith(this.#context));
         return () => release();
     };
     /**
@@ -219,7 +219,7 @@ export class StoreRegistry {
      * @returns A promise that resolves when disposal is complete
      *
      * @remarks
-     * - No-op if a custom `runtime` was provided to the constructor (caller owns cleanup)
+     * - No-op if a custom `context` was provided to the constructor (caller owns cleanup)
      * - Idempotent: safe to call multiple times
      * - After disposal, the registry should not be used
      */

package/dist/store/StoreRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"StoreRegistry.js","sourceRoot":"","sources":["../../src/store/StoreRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EACL,KAAK,EACL,MAAM,EACN,KAAK,EACL,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,cAAc,EAEd,KAAK,EACL,OAAO,GAGR,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAA;AAIxE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAA;AA4E1G;;;;;;;;;;GAUG;AACH,MAAM,aAAa;IACR,OAAO,CAAqC;IAErD,YAAY,OAA4C;QACtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED;;;;OAIG;IACH,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAiB;QAC9B,OAAO,IAAI,YAAY,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;IACvF,CAAC;IAED,CAAC,IAAI,CAAC,MAAM,CAAC;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,OAAO,aAAa;IACxB;;;OAGG;IACM,MAAM,CAA2D;IAE1E;;;OAGG;IACM,QAAQ,CAAsD;IAEvE;;;OAGG;IACM,oBAAoB,CAAmC;IAEhE;;;OAGG;IACM,gBAAgB,GAA0C,IAAI,GAAG,EAAE,CAAA;IAE5E;;;;;;;;;;;;OAYG;IACH,YAAY,SAA8B,EAAE;QAC1C,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAA;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAA;YACpF,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC/D,IAAI,CAAC,oBAAoB,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,CAAA;QAC1D,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;YACvB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAiB,EAAE,EAAE;gBACrC,8EAA8E;gBAC9E,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,OAAO,EAAE,CAAA;gBAC9D,OAAO,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,CACpC,MAAM,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAC9D,MAAM,CAAC,QAAQ,CAAC,wBAAwB,aAAa,CAAC,OAAO,EAAE,CAAC,EAChE,SAAS,CAAC,gBAAgB,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EACnE,WAAW,CACT,cAAc,CAAC;oBACb,iBAAiB,EAAE,aAAa,CAAC,WAAW,EAAE,eAAe;oBAC7D,UAAU,EAAE,aAAa,CAAC,WAAW,EAAE,MAAM;iBAC9C,CAAC,CACH,CACF,CAAA;YACH,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,OAAO,EAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,EAAE,eAAe,IAAI,yBAAyB;SAC/I,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACzC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,SAAS,GAAG,CAKV,OAAoE,EACA,EAAE,CACtE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxB,4FAA4F;QAC5F,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAEhD,OAAO,KAAiC,CAAA;IAC1C,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAExE;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,GAAG,CAKjB,OAAoE,EACN,EAAE;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAE5F,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,KAAK,CAAA;QAEpD,4CAA4C;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,6BAA6B;YAC7B,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,IAAI,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;YAC1D,6BAA6B;YAC7B,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QAE3B,gGAAgG;QAChG,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjD,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAA2C,CAAA;QAE5E,+BAA+B;QAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAqD,CAAA;QAChF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;aAC9B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QAEvD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3C,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,GAAG,CAKP,OAAoE,EACtD,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;YACxC,4FAA4F;YAC5F,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,CAAA;YACtC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YAClC,yEAAyE;YACzE,0EAA0E;YAC1E,mFAAmF;YACnF,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;QACrB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAE1D,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAA;IACxB,CAAC,CAAA;IAED;;;;;;;;;;;;OAYG;IACH,OAAO,GAAG,KAAK,EAKb,OAAoE,EACrD,EAAE;QACjB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACtC,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC,CAAA;IAED;;;;;;;;;;;;;;OAcG;IACH,OAAO,GAAG,KAAK,IAAmB,EAAE;QAClC,MAAM,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAA;IACrC,CAAC,CAAA;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAK1B,OAAoE,EACP,EAAE,CAAC,OAAO,CAAA"}
+{"version":3,"file":"StoreRegistry.js","sourceRoot":"","sources":["../../src/store/StoreRegistry.ts"],"names":[],"mappings":"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"}

package/dist/store/StoreRegistry.test.js

@@ -124,17 +124,17 @@ describe('StoreRegistry', () => {
         await store.shutdownPromise();
     });
     it.layer(OtelLiveDummy)('time-dependent (using TestClock)', (it) => {
-        it.scoped('disposes store after unusedCacheTime expires', () => Effect.gen(function* () {
+        it.effect('disposes store after unusedCacheTime expires', () => Effect.gen(function* () {
             const unusedCacheTime = 25;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Store should still be in cache
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(cached).toBe(store);
             // Let the idle timer fiber register its sleep with TestClock
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Advance time past unusedCacheTime → idle timer fires → entry evicted
             yield* TestClock.adjust(unusedCacheTime);
             // After eviction, a new load should produce a different store
@@ -142,9 +142,12 @@ describe('StoreRegistry', () => {
             expect(nextStore).not.toBe(store);
             expect(nextStore[StoreInternalsSymbol].clientSession.debugInstanceId).toBeDefined();
         }));
-        it.scoped('does not dispose when unusedCacheTime is Infinity', () => Effect.gen(function* () {
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime: Number.POSITIVE_INFINITY } });
+        it.effect('does not dispose when unusedCacheTime is Infinity', () => Effect.gen(function* () {
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({
+                context: services,
+                defaultOptions: { unusedCacheTime: Number.POSITIVE_INFINITY },
+            });
             const options = testStoreOptions();
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Advance a large amount of time — no idle timer was started for Infinity
@@ -153,39 +156,39 @@ describe('StoreRegistry', () => {
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(cached).toBe(store);
         }));
-        it.scoped('schedules disposal if store becomes unused during loading', () => Effect.gen(function* () {
+        it.effect('schedules disposal if store becomes unused during loading', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             // Load without retaining — disposal is scheduled when scope closes
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // Store should be disposed
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(nextStore).not.toBe(store);
         }));
-        it.scoped('allows call-site options to override default options', () => Effect.gen(function* () {
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime: 10_000 } }); // Long default
+        it.effect('allows call-site options to override default options', () => Effect.gen(function* () {
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime: 10_000 } }); // Long default
             const unusedCacheTimeOverride = 25;
             const options = testStoreOptions({ unusedCacheTime: unusedCacheTimeOverride });
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTimeOverride);
             // Should be disposed according to the override time, not default
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(nextStore).not.toBe(store);
         }));
-        it.scoped('disposes different stores according to their own unusedCacheTime', () => Effect.gen(function* () {
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime: 1000 } });
+        it.effect('disposes different stores according to their own unusedCacheTime', () => Effect.gen(function* () {
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime: 1000 } });
             const shortOptions = testStoreOptions({ storeId: 'short-lived', unusedCacheTime: 25 });
             const longOptions = testStoreOptions({ storeId: 'long-lived', unusedCacheTime: 10_000 });
             const shortStore = yield* registry.getOrLoad(shortOptions).pipe(Effect.scoped);
             const longStore = yield* registry.getOrLoad(longOptions).pipe(Effect.scoped);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Advance past short store's unusedCacheTime only
             yield* TestClock.adjust(25);
             // Short store should be disposed, long store should still be cached
@@ -196,16 +199,16 @@ describe('StoreRegistry', () => {
         }));
         // This test is skipped because we don't yet support dynamic `unusedCacheTime` updates for cached stores.
         // See https://github.com/livestorejs/livestore/issues/918
-        it.scoped.skip('keeps the longest unusedCacheTime seen for a store when options vary across calls', () => Effect.gen(function* () {
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime });
+        it.effect.skip('keeps the longest unusedCacheTime seen for a store when options vary across calls', () => Effect.gen(function* () {
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services });
             const options = testStoreOptions({ unusedCacheTime: 10 });
             const release = registry.retain(options);
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Call with longer unusedCacheTime
             yield* registry.getOrLoad(testStoreOptions({ unusedCacheTime: 100 })).pipe(Effect.scoped);
             release();
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // After 99ms, store should still be alive (100ms unusedCacheTime used)
             yield* TestClock.adjust(99);
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
@@ -215,10 +218,10 @@ describe('StoreRegistry', () => {
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(nextStore).not.toBe(store);
         }));
-        it.scoped('handles rapid retain/release cycles without errors', () => Effect.gen(function* () {
+        it.effect('handles rapid retain/release cycles without errors', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Rapidly retain and release multiple times
@@ -226,19 +229,19 @@ describe('StoreRegistry', () => {
                 const release = registry.retain(options);
                 release();
             }
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // Store should be disposed after the last release
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(nextStore).not.toBe(store);
         }));
-        it.scoped('cancels disposal when new retain', () => Effect.gen(function* () {
+        it.effect('cancels disposal when new retain', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Advance almost to disposal threshold
             yield* TestClock.adjust(unusedCacheTime - 5);
             // Add a new retain before disposal triggers
@@ -250,17 +253,17 @@ describe('StoreRegistry', () => {
             expect(cached).toBe(store);
             // Release retain — new idle timer starts
             release();
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // Now it should be disposed
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(nextStore).not.toBe(store);
         }));
-        it.scoped('aborts loading when disposal fires while store is still loading', () => Effect.gen(function* () {
+        it.effect('aborts loading when disposal fires while store is still loading', () => Effect.gen(function* () {
             const unusedCacheTime = 10;
             const loadDelay = 1000;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             // Adapter that takes time to load (controlled by TestClock)
             const baseAdapter = makeInMemoryAdapter();
             const options = testStoreOptions({
@@ -271,30 +274,30 @@ describe('StoreRegistry', () => {
             });
             // Retain triggers loading (won't complete until clock advances past loadDelay)
             const release = registry.retain(options);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Release immediately — schedules disposal after unusedCacheTime
             release();
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Advance past unusedCacheTime but NOT past loadDelay → disposal fires, interrupts loading
             yield* TestClock.adjust(unusedCacheTime);
             // Start a fresh load — since the first was aborted, this should be a new entry
-            const freshLoadFiber = yield* Effect.fork(registry.getOrLoad(options).pipe(Effect.scoped));
-            yield* Effect.yieldNow();
+            const freshLoadFiber = yield* Effect.forkChild(registry.getOrLoad(options).pipe(Effect.scoped));
+            yield* Effect.yieldNow;
             // Advance enough for the fresh load to complete
             yield* TestClock.adjust(loadDelay);
             const store = yield* Fiber.join(freshLoadFiber);
             expect(store).toBeDefined();
         }));
-        it.scoped('retain keeps store alive past unusedCacheTime', () => Effect.gen(function* () {
+        it.effect('retain keeps store alive past unusedCacheTime', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             // Load the store
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Retain the store before disposal could fire
             const release = registry.retain(options);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // Advance past unusedCacheTime — idle timer fires but refCount > 0, so no eviction
             yield* TestClock.adjust(unusedCacheTime + 50);
             // Store should still be cached because retain keeps it alive
@@ -302,10 +305,10 @@ describe('StoreRegistry', () => {
             expect(cached).toBe(store);
             release();
         }));
-        it.scoped('manages multiple stores with different IDs independently', () => Effect.gen(function* () {
+        it.effect('manages multiple stores with different IDs independently', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options1 = testStoreOptions({ storeId: 'store-1' });
             const options2 = testStoreOptions({ storeId: 'store-2' });
             const store1 = yield* registry.getOrLoad(options1).pipe(Effect.scoped);
@@ -317,7 +320,7 @@ describe('StoreRegistry', () => {
             const cached2 = yield* registry.getOrLoad(options2).pipe(Effect.scoped);
             expect(cached1).toBe(store1);
             expect(cached2).toBe(store2);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // Both stores should be disposed
             const newStore1 = yield* registry.getOrLoad(options1).pipe(Effect.scoped);
@@ -325,46 +328,46 @@ describe('StoreRegistry', () => {
             expect(newStore1).not.toBe(store1);
             expect(newStore2).not.toBe(store2);
         }));
-        it.scoped('applies default options from constructor', () => Effect.gen(function* () {
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime: 100 } });
+        it.effect('applies default options from constructor', () => Effect.gen(function* () {
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime: 100 } });
             const options = testStoreOptions();
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Verify the store loads successfully
             expect(store).toBeDefined();
             expect(store[StoreInternalsSymbol].clientSession.debugInstanceId).toBeDefined();
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             // After 50ms, store should still be cached (default is 100ms)
             yield* TestClock.adjust(50);
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(cached).toBe(store);
         }));
-        it.scoped('does not serve a disposed store from cache', () => Effect.gen(function* () {
+        it.effect('does not serve a disposed store from cache', () => Effect.gen(function* () {
             const unusedCacheTime = 25;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             const originalStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Verify store is cached
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(cached).toBe(originalStore);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // After disposal, calling getOrLoad should produce a fresh store
             const freshStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(freshStore).not.toBe(originalStore);
         }));
-        it.scoped('schedules disposal after preload if no retainers are added', () => Effect.gen(function* () {
+        it.effect('schedules disposal after preload if no retainers are added', () => Effect.gen(function* () {
             const unusedCacheTime = 50;
-            const runtime = yield* Effect.runtime();
-            const registry = new StoreRegistry({ runtime, defaultOptions: { unusedCacheTime } });
+            const services = yield* Effect.context();
+            const registry = new StoreRegistry({ context: services, defaultOptions: { unusedCacheTime } });
             const options = testStoreOptions();
             // Preload without retaining (load + immediate release)
             const store = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             // Verify it's cached
             const cached = yield* registry.getOrLoad(options).pipe(Effect.scoped);
             expect(cached).toBe(store);
-            yield* Effect.yieldNow();
+            yield* Effect.yieldNow;
             yield* TestClock.adjust(unusedCacheTime);
             // Store should be disposed since no retainers were added
             const nextStore = yield* registry.getOrLoad(options).pipe(Effect.scoped);