@livestore/livestore 0.3.1 → 0.3.2-dev.1

package/src/live-queries/signal.ts

@@ -1,9 +1,9 @@
 import { nanoid } from '@livestore/utils/nanoid'
 
-import type * as RG from '../reactive.js'
-import type { RefreshReason } from '../store/store-types.js'
-import type { ISignal, ReactivityGraph, ReactivityGraphContext, SignalDef } from './base-class.js'
-import { LiveStoreQueryBase, withRCMap } from './base-class.js'
+import type * as RG from '../reactive.ts'
+import type { RefreshReason } from '../store/store-types.ts'
+import type { ISignal, ReactivityGraph, ReactivityGraphContext, SignalDef } from './base-class.ts'
+import { LiveStoreQueryBase, withRCMap } from './base-class.ts'
 
 export const signal = <T>(
   defaultValue: T,

package/src/mod.ts

@@ -1,51 +1,45 @@
-export { Store } from './store/store.js'
-export { createStore, createStorePromise, type CreateStoreOptions } from './store/create-store.js'
-export type { QueryDebugInfo, RefreshReason, OtelOptions } from './store/store-types.js'
-// We're re-exporting `Schema` from `effect` for convenience
-export { Schema } from '@livestore/utils/effect'
-
-export {
-  type LiveStoreContext,
-  type LiveStoreContextRunning,
-  type ShutdownDeferred,
-  makeShutdownDeferred,
-} from './store/store-types.js'
-
-export { SqliteDbWrapper, emptyDebugInfo } from './SqliteDbWrapper.js'
-
-export {
-  queryDb,
-  computed,
-  signal,
-  type LiveQuery,
-  type LiveQueryDef,
-  type Signal,
-  type SignalDef,
-  type RcRef,
-} from './live-queries/mod.js'
-
-export * from '@livestore/common/schema'
+export type { Adapter, ClientSession, PreparedStatement } from '@livestore/common'
 export {
-  sql,
-  SessionIdSymbol,
+  type Bindable,
   type BootStatus,
-  type SqliteDb,
   type DebugInfo,
+  IntentionalShutdownCause,
   type MutableDebugInfo,
-  prepareBindValues,
-  type Bindable,
   type PreparedBindValues,
-  type QueryBuilderAst,
+  prepareBindValues,
+  provideOtel,
   type QueryBuilder,
+  type QueryBuilderAst,
   type RowQuery,
+  SessionIdSymbol,
+  type SqliteDb,
   StoreInterrupted,
-  IntentionalShutdownCause,
-  provideOtel,
+  sql,
 } from '@livestore/common'
-
+export * from '@livestore/common/schema'
 export { deepEqual } from '@livestore/utils'
+// We're re-exporting `Schema` from `effect` for convenience
+export { Schema } from '@livestore/utils/effect'
 export { nanoid } from '@livestore/utils/nanoid'
 
-export * from './utils/stack-info.js'
-
-export type { ClientSession, Adapter, PreparedStatement } from '@livestore/common'
+export {
+  computed,
+  type LiveQuery,
+  type LiveQueryDef,
+  queryDb,
+  type RcRef,
+  type Signal,
+  type SignalDef,
+  signal,
+} from './live-queries/mod.ts'
+export { emptyDebugInfo, SqliteDbWrapper } from './SqliteDbWrapper.ts'
+export { type CreateStoreOptions, createStore, createStorePromise } from './store/create-store.ts'
+export { Store } from './store/store.ts'
+export type { OtelOptions, QueryDebugInfo, RefreshReason } from './store/store-types.ts'
+export {
+  type LiveStoreContext,
+  type LiveStoreContextRunning,
+  makeShutdownDeferred,
+  type ShutdownDeferred,
+} from './store/store-types.ts'
+export * from './utils/stack-info.ts'

package/src/reactive.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { ReactiveGraph } from './reactive.js'
+import { ReactiveGraph } from './reactive.ts'
 
 describe('a trivial graph', () => {
   const makeGraph = () => {

package/src/reactive.ts

@@ -21,13 +21,11 @@
 //   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.
 
-/* eslint-disable prefer-arrow/prefer-arrow-functions */
-
 import { BoundArray } from '@livestore/common'
 import { deepEqual, shouldNeverHappen } from '@livestore/utils'
 import type { Types } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
-// import { getDurationMsFromSpan } from './otel.js'
+// import { getDurationMsFromSpan } from './otel.ts'
 
 export const NOT_REFRESHED_YET = Symbol.for('NOT_REFRESHED_YET')
 export type NOT_REFRESHED_YET = typeof NOT_REFRESHED_YET
@@ -279,7 +277,7 @@ export class ReactiveGraph<
             return compute(atom, otelContext, debugRefreshReason)
           }
 
-          let debugInfo: TDebugThunkInfo | undefined = undefined
+          let debugInfo: TDebugThunkInfo | undefined
           const setDebugInfo = (debugInfo_: TDebugThunkInfo) => {
             debugInfo = debugInfo_
           }

package/src/store/create-store.ts

@@ -3,6 +3,7 @@ import type {
   BootStatus,
   ClientSession,
   ClientSessionDevtoolsChannel,
+  ClientSessionSyncProcessorSimulationParams,
   IntentionalShutdownCause,
   MigrationsReport,
 } from '@livestore/common'
@@ -29,13 +30,13 @@ import {
 import { nanoid } from '@livestore/utils/nanoid'
 import * as otel from '@opentelemetry/api'
 
-import { connectDevtoolsToStore } from './devtools.js'
-import { Store } from './store.js'
+import { connectDevtoolsToStore } from './devtools.ts'
+import { Store } from './store.ts'
 import type {
   LiveStoreContextRunning as LiveStoreContextRunning_,
   OtelOptions,
   ShutdownDeferred,
-} from './store-types.js'
+} from './store-types.ts'
 
 export const DEFAULT_PARAMS = {
   leaderPushBatchSize: 100,
@@ -120,6 +121,9 @@ export interface CreateStoreOptions<TSchema extends LiveStoreSchema, TContext =
   syncPayload?: Schema.JsonValue
   params?: {
     leaderPushBatchSize?: number
+    simulation?: {
+      clientSessionSyncProcessor: typeof ClientSessionSyncProcessorSimulationParams.Type
+    }
   }
   debug?: {
     instanceId?: string
@@ -274,6 +278,7 @@ export const createStore = <TSchema extends LiveStoreSchema = LiveStoreSchema, T
         storeId,
         params: {
           leaderPushBatchSize: params?.leaderPushBatchSize ?? DEFAULT_PARAMS.leaderPushBatchSize,
+          simulation: params?.simulation,
         },
       })
 

package/src/store/devtools.ts

@@ -5,11 +5,11 @@ import type { WebChannel } from '@livestore/utils/effect'
 import { Effect, Stream } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 
-import type { LiveQuery, ReactivityGraph } from '../live-queries/base-class.js'
-import { NOT_REFRESHED_YET } from '../reactive.js'
-import type { SqliteDbWrapper } from '../SqliteDbWrapper.js'
-import { emptyDebugInfo as makeEmptyDebugInfo } from '../SqliteDbWrapper.js'
-import type { ReferenceCountedSet } from '../utils/data-structures.js'
+import type { LiveQuery, ReactivityGraph } from '../live-queries/base-class.ts'
+import { NOT_REFRESHED_YET } from '../reactive.ts'
+import type { SqliteDbWrapper } from '../SqliteDbWrapper.ts'
+import { emptyDebugInfo as makeEmptyDebugInfo } from '../SqliteDbWrapper.ts'
+import type { ReferenceCountedSet } from '../utils/data-structures.ts'
 
 type IStore = {
   clientSession: ClientSession

package/src/store/store-types.ts

@@ -1,12 +1,18 @@
-import type { ClientSession, IntentionalShutdownCause, StoreInterrupted, UnexpectedError } from '@livestore/common'
+import type {
+  ClientSession,
+  ClientSessionSyncProcessorSimulationParams,
+  IntentionalShutdownCause,
+  StoreInterrupted,
+  UnexpectedError,
+} from '@livestore/common'
 import type { EventSequenceNumber, LiveStoreEvent, LiveStoreSchema } from '@livestore/common/schema'
 import type { Effect, Runtime, Scope } from '@livestore/utils/effect'
 import { Deferred } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 
-import type { DebugRefreshReasonBase } from '../reactive.js'
-import type { StackInfo } from '../utils/stack-info.js'
-import type { Store } from './store.js'
+import type { DebugRefreshReasonBase } from '../reactive.ts'
+import type { StackInfo } from '../utils/stack-info.ts'
+import type { Store } from './store.ts'
 
 export type LiveStoreContext =
   | LiveStoreContextRunning
@@ -49,6 +55,9 @@ export type StoreOptions<TSchema extends LiveStoreSchema = LiveStoreSchema, TCon
   batchUpdates: (runUpdates: () => void) => void
   params: {
     leaderPushBatchSize: number
+    simulation?: {
+      clientSessionSyncProcessor: typeof ClientSessionSyncProcessorSimulationParams.Type
+    }
   }
   __runningInDevtools: boolean
 }

package/src/store/store.ts

@@ -1,12 +1,7 @@
 import {
+  type Bindable,
   type ClientSession,
   type ClientSessionSyncProcessor,
-  type ParamsObject,
-  type PreparedBindValues,
-  type QueryBuilder,
-  UnexpectedError,
-} from '@livestore/common'
-import {
   Devtools,
   getDurationMsFromSpan,
   getExecStatementsFromMaterializer,
@@ -16,9 +11,12 @@ import {
   isQueryBuilder,
   liveStoreVersion,
   makeClientSessionSyncProcessor,
+  type PreparedBindValues,
   prepareBindValues,
+  type QueryBuilder,
   QueryBuilderAstSymbol,
   replaceSessionIdSymbol,
+  UnexpectedError,
 } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import { getEventDef, LiveStoreEvent, SystemTables } from '@livestore/common/schema'
@@ -34,14 +32,15 @@ import type {
   ReactivityGraph,
   ReactivityGraphContext,
   SignalDef,
-} from '../live-queries/base-class.js'
-import { makeReactivityGraph } from '../live-queries/base-class.js'
-import { makeExecBeforeFirstRun } from '../live-queries/client-document-get-query.js'
-import type { Ref } from '../reactive.js'
-import { SqliteDbWrapper } from '../SqliteDbWrapper.js'
-import { ReferenceCountedSet } from '../utils/data-structures.js'
-import { downloadBlob, exposeDebugUtils } from '../utils/dev.js'
-import type { StackInfo } from '../utils/stack-info.js'
+} from '../live-queries/base-class.ts'
+import { makeReactivityGraph } from '../live-queries/base-class.ts'
+import { makeExecBeforeFirstRun } from '../live-queries/client-document-get-query.ts'
+import { queryDb } from '../live-queries/db-query.ts'
+import type { Ref } from '../reactive.ts'
+import { SqliteDbWrapper } from '../SqliteDbWrapper.ts'
+import { ReferenceCountedSet } from '../utils/data-structures.ts'
+import { downloadBlob, exposeDebugUtils } from '../utils/dev.ts'
+import type { StackInfo } from '../utils/stack-info.ts'
 import type {
   RefreshReason,
   StoreCommitOptions,
@@ -49,7 +48,7 @@ import type {
   StoreOptions,
   StoreOtel,
   Unsubscribe,
-} from './store-types.js'
+} from './store-types.ts'
 
 if (isDevEnv()) {
   exposeDebugUtils()
@@ -163,6 +162,8 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
             for (const table of writeTables) {
               writeTablesForEvent.add(table)
             }
+
+            this.sqliteDbWrapper.debug.head = eventDecoded.seqNum
           }
         }
 
@@ -194,6 +195,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       span: syncSpan,
       params: {
         leaderPushBatchSize: params.leaderPushBatchSize,
+        simulation: params.simulation?.clientSessionSyncProcessor,
       },
       confirmUnsavedChanges,
     })
@@ -290,7 +292,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
    * ```
    */
   subscribe = <TResult>(
-    query: LiveQueryDef<TResult, 'def' | 'signal-def'> | LiveQuery<TResult>,
+    query: LiveQueryDef<TResult, 'def' | 'signal-def'> | LiveQuery<TResult> | QueryBuilder<TResult, any, any>,
     options: {
       /** Called when the query result has changed */
       onUpdate: (value: TResult) => void
@@ -310,14 +312,15 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
   ): Unsubscribe =>
     this.otel.tracer.startActiveSpan(
       `LiveStore.subscribe`,
-      { attributes: { label: options?.label, queryLabel: query.label } },
+      { attributes: { label: options?.label, queryLabel: isQueryBuilder(query) ? query.toString() : query.label } },
       options?.otelContext ?? this.otel.queriesSpanContext,
       (span) => {
         // console.debug('store sub', query$.id, query$.label)
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
-        const queryRcRef =
-          query._tag === 'def' || query._tag === 'signal-def'
+        const queryRcRef = isQueryBuilder(query)
+          ? queryDb(query).make(this.reactivityGraph.context!)
+          : query._tag === 'def' || query._tag === 'signal-def'
             ? query.make(this.reactivityGraph.context!)
             : {
                 value: query as LiveQuery<TResult>,
@@ -411,13 +414,17 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       | LiveQuery<TResult>
       | LiveQueryDef<TResult>
       | SignalDef<TResult>
-      | { query: string; bindValues: ParamsObject },
+      | { query: string; bindValues: Bindable; schema?: Schema.Schema<TResult> },
     options?: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason },
   ): TResult => {
     if (typeof query === 'object' && 'query' in query && 'bindValues' in query) {
-      return this.sqliteDbWrapper.cachedSelect(query.query, prepareBindValues(query.bindValues, query.query), {
+      const res = this.sqliteDbWrapper.cachedSelect(query.query, prepareBindValues(query.bindValues, query.query), {
         otelContext: options?.otelContext,
       }) as any
+      if (query.schema) {
+        return Schema.decodeSync(query.schema)(res)
+      }
+      return res
     } else if (isQueryBuilder(query)) {
       const ast = query[QueryBuilderAstSymbol]
       if (ast._tag === 'RowQuery') {

package/src/utils/dev.ts

@@ -1,7 +1,6 @@
 import { isDevEnv } from '@livestore/utils'
 import { Effect } from '@livestore/utils/effect'
 
-/* eslint-disable unicorn/prefer-global-this */
 export const downloadBlob = (
   data: Uint8Array | Blob | string,
   fileName: string,

package/src/utils/stack-info.test.ts

@@ -1,6 +1,6 @@
 import { expect, it } from 'vitest'
 
-import { extractStackInfoFromStackTrace } from './stack-info.js'
+import { extractStackInfoFromStackTrace } from './stack-info.ts'
 
 it('RouteLink stacktrace', async () => {
   const stackTrace = `\
@@ -19,7 +19,9 @@ Error
 
   const stackInfo = extractStackInfoFromStackTrace(stackTrace)
   // Replacing file paths for snapshot testing as they are not stable
-  stackInfo.frames.forEach((_) => (_.filePath = '__REPLACED_FOR_SNAPSHOT__'))
+  stackInfo.frames.forEach((_) => {
+    _.filePath = '__REPLACED_FOR_SNAPSHOT__'
+  })
   expect(stackInfo).toMatchInlineSnapshot(`
     {
       "frames": [
@@ -61,7 +63,9 @@ Error
 
   const stackInfo = extractStackInfoFromStackTrace(stackTrace)
   // Replacing file paths for snapshot testing as they are not stable
-  stackInfo.frames.forEach((_) => (_.filePath = '__REPLACED_FOR_SNAPSHOT__'))
+  stackInfo.frames.forEach((_) => {
+    _.filePath = '__REPLACED_FOR_SNAPSHOT__'
+  })
   expect(stackInfo).toMatchInlineSnapshot(`
     {
       "frames": [

package/src/utils/stack-info.ts

@@ -32,7 +32,11 @@ export const extractStackInfoFromStackTrace = (stackTrace: string): StackInfo =>
   const frames: StackFrame[] = []
   let hasReachedStart = false
 
-  while ((match = namePattern.exec(stackTrace)) !== null) {
+  while (true) {
+    match = namePattern.exec(stackTrace)
+    if (match === null) {
+      break
+    }
     const [, name, filePath] = match as any as [string, string, string]
     // console.debug(name, filePath)
 

package/src/utils/tests/mod.ts

@@ -1,3 +1,3 @@
-export * from './fixture.js'
-export * from './otel.js'
-export * as RG from '../../reactive.js'
+export * as RG from '../../reactive.ts'
+export * from './fixture.ts'
+export * from './otel.ts'

package/src/utils/tests/otel.ts

@@ -1,6 +1,7 @@
 import { identity } from '@livestore/utils/effect'
 import type { Attributes } from '@opentelemetry/api'
 import type { InMemorySpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base'
+
 type SimplifiedNestedSpan = { _name: string; attributes: any; children: SimplifiedNestedSpan[] }
 
 export const getSimplifiedRootSpan = (
@@ -24,7 +25,7 @@ export const getSimplifiedRootSpan = (
   const createStoreSpanData = spans.find((_) => _.name === 'createStore')
   if (createStoreSpanData === undefined) {
     throw new Error(
-      "Could not find the root span named 'createStore'. Available spans: " + spans.map((s) => s.name).join(', '),
+      `Could not find the root span named 'createStore'. Available spans: ${spans.map((s) => s.name).join(', ')}`,
     )
   }
   const rootSpan = spansMap.get(createStoreSpanData.spanContext().spanId)!