@livestore/livestore 0.3.0-dev.46 → 0.3.0-dev.48

package/src/store/create-store.ts

@@ -15,6 +15,7 @@ import {
   Deferred,
   Effect,
   Exit,
+  Fiber,
   identity,
   Layer,
   Logger,
@@ -210,7 +211,7 @@ export const createStore = <TSchema extends LiveStoreSchema = LiveStoreSchema, T
 
       const runtime = yield* Effect.runtime<Scope.Scope>()
 
-      const shutdown = (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) => {
+      const shutdown = (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) =>
         Effect.gen(function* () {
           yield* Scope.close(lifetimeScope, Exit.failCause(cause)).pipe(
             Effect.logWarnIfTakesLongerThan({ label: '@livestore/livestore:shutdown', duration: 500 }),
@@ -232,8 +233,8 @@ export const createStore = <TSchema extends LiveStoreSchema = LiveStoreSchema, T
           // Given that the shutdown flow might also interrupt the effect that is calling the shutdown,
           // we want to detach the shutdown effect so it's not interrupted by itself
           Effect.runFork,
+          Fiber.join,
         )
-      }
 
       const clientSession: ClientSession = yield* adapter({
         schema,

package/src/store/store.ts

@@ -23,7 +23,7 @@ import type { LiveStoreSchema } from '@livestore/common/schema'
 import { getEventDef, LiveStoreEvent, SystemTables } from '@livestore/common/schema'
 import { assertNever, isDevEnv } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
-import { Cause, Effect, Inspectable, OtelTracer, Runtime, Schema, Stream } from '@livestore/utils/effect'
+import { Cause, Effect, Fiber, Inspectable, OtelTracer, Runtime, Schema, Stream } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 import * as otel from '@opentelemetry/api'
 
@@ -375,6 +375,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       | QueryBuilder<TResult, any, any>
       | LiveQuery<TResult>
       | LiveQueryDef<TResult>
+      | SignalDef<TResult>
       | { query: string; bindValues: ParamsObject },
     options?: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason },
   ): TResult => {
@@ -406,14 +407,33 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       const result = this.query(query$.value, options)
       query$.deref()
       return result
+    } else if (query._tag === 'signal-def') {
+      const signal$ = query.make(this.reactivityGraph.context!)
+      return signal$.value.get()
     } else {
       return query.run({ otelContext: options?.otelContext, debugRefreshReason: options?.debugRefreshReason })
     }
   }
 
-  setSignal = <T>(signalDef: SignalDef<T>, value: T): void => {
+  /**
+   * Set the value of a signal
+   *
+   * @example
+   * ```ts
+   * const count$ = signal(0, { label: 'count$' })
+   * store.setSignal(count$, 2)
+   * ```
+   *
+   * @example
+   * ```ts
+   * const count$ = signal(0, { label: 'count$' })
+   * store.setSignal(count$, (prev) => prev + 1)
+   * ```
+   */
+  setSignal = <T>(signalDef: SignalDef<T>, value: T | ((prev: T) => T)): void => {
     const signalRef = signalDef.make(this.reactivityGraph.context!)
-    signalRef.value.set(value)
+    const newValue: T = typeof value === 'function' ? (value as any)(signalRef.value.get()) : value
+    signalRef.value.set(newValue)
 
     // The current implementation of signals i.e. the separation into `signal-def` and `signal`
     // can lead to a situation where a reffed signal is immediately de-reffed when calling `store.setSignal`,
@@ -508,8 +528,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
     const commitsSpan = otel.trace.getSpan(this.otel.commitsSpanContext)!
     commitsSpan.addEvent('commit')
 
-    // console.group('LiveStore.commit', { skipRefresh, wasSyncMessage, label })
-    // events.forEach((_) => console.debug(_.name, _.id, _.args))
+    // console.group('LiveStore.commit', { skipRefresh })
+    // events.forEach((_) => console.debug(_.name, _.args))
     // console.groupEnd()
 
     let durationMs: number
@@ -602,8 +622,11 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
    *
    * This is called automatically when the store was created using the React or Effect API.
    */
-  shutdown = (cause?: Cause.Cause<UnexpectedError>) =>
-    this.clientSession.shutdown(cause ?? Cause.fail(IntentionalShutdownCause.make({ reason: 'manual' })))
+  shutdown = async (cause?: Cause.Cause<UnexpectedError>) => {
+    await this.clientSession
+      .shutdown(cause ?? Cause.fail(IntentionalShutdownCause.make({ reason: 'manual' })))
+      .pipe(this.runEffectFork, Fiber.join, Effect.runPromise)
+  }
 
   /**
    * Helper methods useful during development
@@ -634,6 +657,20 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       }).pipe(this.runEffectFork)
     },
 
+    overrideNetworkStatus: (status: 'online' | 'offline') => {
+      const clientId = this.clientSession.clientId
+      this.clientSession.leaderThread
+        .sendDevtoolsMessage(
+          Devtools.Leader.SetSyncLatch.Request.make({
+            clientId,
+            closeLatch: status === 'offline',
+            liveStoreVersion,
+            requestId: nanoid(),
+          }),
+        )
+        .pipe(this.runEffectFork)
+    },
+
     syncStates: () => {
       Effect.gen(this, function* () {
         const session = yield* this.syncProcessor.syncState