@livestore/livestore 0.0.0-snapshot-8fd59846e2580d37bdd37ae607e9db2a458a8b63 → 0.0.0-snapshot-9d9745f6fc391ab1a695b44e8fad6c460c7b3b77

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,15 +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 { queryDb } from '../live-queries/db-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,
@@ -50,7 +48,7 @@ import type {
   StoreOptions,
   StoreOtel,
   Unsubscribe,
-} from './store-types.js'
+} from './store-types.ts'
 
 if (isDevEnv()) {
   exposeDebugUtils()
@@ -164,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
           }
         }
 
@@ -195,6 +195,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
       span: syncSpan,
       params: {
         leaderPushBatchSize: params.leaderPushBatchSize,
+        simulation: params.simulation?.clientSessionSyncProcessor,
       },
       confirmUnsavedChanges,
     })
@@ -413,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') {
@@ -433,6 +438,12 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
 
       const sqlRes = query.asSql()
       const schema = getResultSchema(query)
+      
+      // Replace SessionIdSymbol in bind values before executing the query
+      if (sqlRes.bindValues) {
+        replaceSessionIdSymbol(sqlRes.bindValues, this.clientSession.sessionId)
+      }
+      
       const rawRes = this.sqliteDbWrapper.cachedSelect(sqlRes.query, sqlRes.bindValues as any as PreparedBindValues, {
         otelContext: options?.otelContext,
         queriedTables: new Set([query[QueryBuilderAstSymbol].tableDef.sqliteDef.name]),

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/fixture.ts

@@ -1,6 +1,6 @@
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
-import { createStore, makeSchema, State } from '@livestore/livestore'
+import { createStore, Events, makeSchema, State } from '@livestore/livestore'
 import { Effect, Schema } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 
@@ -37,8 +37,23 @@ export const app = State.SQLite.clientDocument({
 
 export const tables = { todos, app }
 
-export const state = State.SQLite.makeState({ tables, materializers: {} })
-export const schema = makeSchema({ state, events: {} })
+export const events = {
+  todoCreated: Events.synced({
+    name: 'todo.created',
+    schema: Schema.Struct({
+      id: Schema.String,
+      text: Schema.String,
+      completed: Schema.Boolean,
+    }),
+  }),
+}
+
+const materializers = State.SQLite.materializers(events, {
+  'todo.created': ({ id, text, completed }) => tables.todos.insert({ id, text, completed }),
+})
+
+export const state = State.SQLite.makeState({ tables, materializers })
+export const schema = makeSchema({ state, events })
 
 export const makeTodoMvc = ({
   otelTracer,

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)!