@livestore/livestore 0.4.0-dev.9 → 0.5.0-dev.0

package/src/mod.ts

@@ -35,14 +35,31 @@ export {
   signal,
 } from './live-queries/mod.ts'
 export { emptyDebugInfo, SqliteDbWrapper } from './SqliteDbWrapper.ts'
-export { type CreateStoreOptions, createStore, createStorePromise } from './store/create-store.ts'
+export {
+  type CreateStoreOptions,
+  type CreateStoreOptionsPromise,
+  createStore,
+  createStorePromise,
+} from './store/create-store.ts'
+export { type RegistryStoreOptions, StoreRegistry, storeOptions } from './store/StoreRegistry.ts'
 export { Store } from './store/store.ts'
-export type { OtelOptions, QueryDebugInfo, RefreshReason, Unsubscribe } from './store/store-types.ts'
 export {
+  isLiveQueryDef,
+  isLiveQueryInstance,
+  isQueryable,
   type LiveStoreContext,
   type LiveStoreContextRunning,
   makeShutdownDeferred,
+  type OtelOptions,
+  type Queryable,
+  type QueryDebugInfo,
+  type RefreshReason,
   type ShutdownDeferred,
+  type StoreInternals,
+  StoreInternalsSymbol,
+  type SubscribeOptions,
+  type SyncStatus,
+  type Unsubscribe,
 } from './store/store-types.ts'
 export { exposeDebugUtils } from './utils/dev.ts'
 export * from './utils/stack-info.ts'

package/src/reactive.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest'
+
 import type { DebugRefreshReasonBase, DebugThunkInfo } from './reactive.ts'
 import { ReactiveGraph } from './reactive.ts'
 
@@ -142,7 +143,7 @@ describe('a trivial graph', () => {
       expect(numberOfEffectRuns).toBe(0)
       const effect = graph.makeEffect((get) => {
         // establish a dependency on thunk c and mutate an outside value
-        expect(get(c)).toBe(aHasChanged ? 3 : 4)
+        expect(get(c)).toBe(aHasChanged === true ? 3 : 4)
         numberOfEffectRuns++
       })
 
@@ -562,7 +563,7 @@ describe('bug fix: node corruption protection', () => {
 
     let firstRun = true
     const effect = graph.makeEffect((get) => {
-      if (firstRun) {
+      if (firstRun !== undefined) {
         firstRun = false
         graph.destroyNode(thunk1) // Destroy dependency mid-execution
       }

package/src/reactive.ts

@@ -21,20 +21,17 @@
 //   is maintained eagerly as edges are added and removed.)
 // - At every thunk we check value equality with the previous value and cutoff propagation if possible.
 
+import type * as otel from '@opentelemetry/api'
+
 import { BoundArray } from '@livestore/common'
 import { deepEqual, omitUndefineds, shouldNeverHappen } from '@livestore/utils'
-import type { Types } from '@livestore/utils/effect'
-import type * as otel from '@opentelemetry/api'
+import { Schema, type Types } from '@livestore/utils/effect'
 // import { getDurationMsFromSpan } from './otel.ts'
 
 export const NOT_REFRESHED_YET = Symbol.for('NOT_REFRESHED_YET')
 export type NOT_REFRESHED_YET = typeof NOT_REFRESHED_YET
 
-export type GetAtom = <T>(
-  atom: Atom<T, any, any>,
-  otelContext?: otel.Context | undefined,
-  debugRefreshReason?: TODO | undefined,
-) => T
+export type GetAtom = <T>(atom: Atom<T, any, any>, otelContext?: otel.Context, debugRefreshReason?: TODO) => T
 
 export type Ref<T, TContext, TDebugRefreshReason extends DebugRefreshReason> = {
   _tag: 'ref'
@@ -47,7 +44,7 @@ export type Ref<T, TContext, TDebugRefreshReason extends DebugRefreshReason> = {
   super: Set<Thunk<any, TContext, TDebugRefreshReason> | Effect<TDebugRefreshReason>>
   label?: string | undefined
   /** Container for meta information (e.g. the LiveStore Store) */
-  meta?: any | undefined
+  meta?: unknown
   equal: (a: T, b: T) => boolean
   refreshes: number
 }
@@ -63,7 +60,7 @@ export type Thunk<TResult, TContext, TDebugRefreshReason extends DebugRefreshRea
   super: Set<Thunk<any, TContext, TDebugRefreshReason> | Effect<TDebugRefreshReason>>
   label?: string | undefined
   /** Container for meta information (e.g. the LiveStore Store) */
-  meta?: any | undefined
+  meta?: unknown
   equal: (a: TResult, b: TResult) => boolean
   recomputations: number
 
@@ -78,7 +75,7 @@ export type Effect<TDebugRefreshReason extends DebugRefreshReason> = {
   _tag: 'effect'
   id: string
   isDestroyed: boolean
-  doEffect: (otelContext?: otel.Context | undefined, debugRefreshReason?: TDebugRefreshReason | undefined) => void
+  doEffect: (otelContext?: otel.Context, debugRefreshReason?: TDebugRefreshReason) => void
   sub: Set<Atom<any, TODO, TODO>>
   label?: string | undefined
   invocations: number
@@ -91,7 +88,7 @@ export type Node<T, TContext, TDebugRefreshReason extends DebugRefreshReason> =
 export const isThunk = <T, TContext, TDebugRefreshReason extends DebugRefreshReason>(
   obj: unknown,
 ): obj is Thunk<T, TContext, TDebugRefreshReason> => {
-  return typeof obj === 'object' && obj !== null && '_tag' in obj && (obj as any)._tag === 'thunk'
+  return typeof obj === 'object' && obj !== null && '_tag' in obj && (obj as { _tag: unknown })._tag === 'thunk'
 }
 
 export type DebugThunkInfo<T extends string = string> = {
@@ -203,9 +200,7 @@ export class ReactiveGraph<
 
   debugRefreshInfos: BoundArray<RefreshDebugInfo<TDebugRefreshReason, TDebugThunkInfo>> = new BoundArray(200)
 
-  private currentDebugRefresh:
-    | { refreshedAtoms: AtomDebugInfo<TDebugThunkInfo>[]; startMs: DOMHighResTimeStamp }
-    | undefined
+  private currentDebugRefresh: { refreshedAtoms: AtomDebugInfo<TDebugThunkInfo>[]; startMs: number } | undefined
 
   private deferredEffects: Map<Effect<TDebugRefreshReason>, Set<TDebugRefreshReason>> = new Map()
 
@@ -247,13 +242,11 @@ export class ReactiveGraph<
       otelContext: otel.Context | undefined,
       debugRefreshReason: TDebugRefreshReason | undefined,
     ) => T,
-    options?:
-      | {
-          label?: string
-          meta?: any
-          equal?: (a: T, b: T) => boolean
-        }
-      | undefined,
+    options?: {
+      label?: string
+      meta?: any
+      equal?: (a: T, b: T) => boolean
+    },
   ): Thunk<T, TContext, TDebugRefreshReason> {
     const thunk: Thunk<T, TContext, TDebugRefreshReason> = {
       _tag: 'thunk',
@@ -262,10 +255,10 @@ export class ReactiveGraph<
       isDirty: true,
       isDestroyed: false,
       computeResult: (otelContext, debugRefreshReason) => {
-        if (thunk.isDirty) {
+        if (thunk.isDirty === true) {
           const neededCurrentRefresh = this.currentDebugRefresh === undefined
           let localDebugRefresh: { refreshedAtoms: any[]; startMs: number } | undefined
-          if (neededCurrentRefresh) {
+          if (neededCurrentRefresh === true) {
             // Use local variable to prevent corruption from nested computations
             localDebugRefresh = { refreshedAtoms: [], startMs: performance.now() }
             this.currentDebugRefresh = localDebugRefresh
@@ -292,7 +285,7 @@ export class ReactiveGraph<
             debugRefreshReason,
           )
 
-          const resultChanged = thunk.equal(thunk.previousResult as T, result) === false
+          const resultChanged = !thunk.equal(thunk.previousResult as T, result)
 
           const debugInfoForAtom = {
             atom: serializeAtom(thunk, false),
@@ -302,7 +295,7 @@ export class ReactiveGraph<
 
           // Use currentDebugRefresh if available (could be from parent or local)
           const debugRefresh = localDebugRefresh ?? this.currentDebugRefresh
-          if (debugRefresh) {
+          if (debugRefresh !== undefined) {
             debugRefresh.refreshedAtoms.push(debugInfoForAtom)
           }
 
@@ -310,7 +303,7 @@ export class ReactiveGraph<
           thunk.previousResult = result
           thunk.recomputations++
 
-          if (neededCurrentRefresh && localDebugRefresh) {
+          if (neededCurrentRefresh === true && localDebugRefresh !== undefined) {
             // Use local reference which can't be corrupted by nested calls
             const refreshedAtoms = localDebugRefresh.refreshedAtoms
             const durationMs = performance.now() - localDebugRefresh.startMs
@@ -385,7 +378,7 @@ export class ReactiveGraph<
       otelContext: otel.Context | undefined,
       debugRefreshReason: DebugRefreshReason | undefined,
     ) => void,
-    options?: { label?: string } | undefined,
+    options?: { label?: string },
   ): Effect<TDebugRefreshReason> {
     const effect: Effect<TDebugRefreshReason> = {
       _tag: 'effect',
@@ -423,26 +416,22 @@ export class ReactiveGraph<
   setRef<T>(
     ref: Ref<T, TContext, TDebugRefreshReason>,
     val: T,
-    options?:
-      | {
-          skipRefresh?: boolean
-          debugRefreshReason?: TDebugRefreshReason
-          otelContext?: otel.Context
-        }
-      | undefined,
+    options?: {
+      skipRefresh?: boolean
+      debugRefreshReason?: TDebugRefreshReason
+      otelContext?: otel.Context
+    },
   ) {
     this.setRefs([[ref, val]], options)
   }
 
   setRefs<T>(
     refs: [Ref<T, TContext, TDebugRefreshReason>, T][],
-    options?:
-      | {
-          skipRefresh?: boolean
-          debugRefreshReason?: TDebugRefreshReason
-          otelContext?: otel.Context
-        }
-      | undefined,
+    options?: {
+      skipRefresh?: boolean
+      debugRefreshReason?: TDebugRefreshReason
+      otelContext?: otel.Context
+    },
   ) {
     const effectsToRefresh = new Set<Effect<TDebugRefreshReason>>()
     for (const [ref, val] of refs) {
@@ -452,7 +441,7 @@ export class ReactiveGraph<
       markSuperCompDirtyRec(ref, effectsToRefresh)
     }
 
-    if (options?.skipRefresh) {
+    if (options?.skipRefresh === true) {
       for (const effect of effectsToRefresh) {
         if (this.deferredEffects.has(effect) === false) {
           this.deferredEffects.set(effect, new Set())
@@ -598,11 +587,11 @@ const compute = <T>(
   debugRefreshReason: DebugRefreshReason | undefined,
 ): T => {
   // const __getResult = atom._tag === 'thunk' ? atom.__getResult.toString() : ''
-  if (atom.isDestroyed) {
+  if (atom.isDestroyed === true) {
     shouldNeverHappen(`LiveStore Error: Attempted to compute destroyed ${atom._tag} (${atom.id}): ${atom.label ?? ''}`)
   }
 
-  if (atom.isDirty) {
+  if (atom.isDirty === true) {
     // console.log('atom is dirty', atom.id, atom.label ?? '', atom._tag, __getResult)
     const result = atom.computeResult(otelContext, debugRefreshReason)
     atom.isDirty = false
@@ -641,11 +630,31 @@ const serializeAtom = (atom: Atom<any, unknown, any>, includeResult: boolean): S
     super_.push(a.id)
   }
 
-  const previousResult: EncodedOption<string> = includeResult
-    ? encodedOptionSome(
-        atom.previousResult === NOT_REFRESHED_YET ? '"SYMBOL_NOT_REFRESHED_YET"' : JSON.stringify(atom.previousResult),
-      )
-    : encodedOptionNone()
+  const previousResult: EncodedOption<string> =
+    includeResult === true
+      ? encodedOptionSome(
+          atom.previousResult === NOT_REFRESHED_YET
+            ? '"SYMBOL_NOT_REFRESHED_YET"'
+            : JSON.stringify(atom.previousResult, (key, nestedValue) => {
+                if (Schema.isSchema(nestedValue) === false) return nestedValue
+
+                // Query inputs carry schemas for result decoding, but graph snapshots use previousResult
+                // to explain reactive data flow. Omitting that field preserves the stable query shape
+                // without embedding Effect full schema object graph.
+                if (key === 'schema') return undefined
+
+                const annotations = Schema.resolveAnnotations(nestedValue)
+
+                return omitUndefineds({
+                  _tag: 'Schema',
+                  ast: nestedValue.ast._tag,
+                  identifier: annotations?.identifier,
+                  title: annotations?.title,
+                  hash: Schema.hash(nestedValue),
+                })
+              }),
+        )
+      : encodedOptionNone()
 
   if (atom._tag === 'ref') {
     return {