@livestore/livestore 0.0.0-snapshot-c70175cc471a448781cfe8f01001b0034e29a384 → 0.0.0-snapshot-057a9e3a18ca69a310d4eb8cf35a34e94fa1841e

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'
@@ -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
           }
         }
 
@@ -413,13 +413,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') {
@@ -589,9 +593,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema, TContext =
           // Materialize events to state
           const { writeTables } = (() => {
             try {
-              const materializeEvents = () => {
-                return Runtime.runSync(this.effectContext.runtime, this.syncProcessor.push(events, { otelContext }))
-              }
+              const materializeEvents = () => this.syncProcessor.push(events, { otelContext })
 
               if (events.length > 1) {
                 return this.sqliteDbWrapper.txn(materializeEvents)

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

@@ -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 * as RG from '../../reactive.js'
 export * from './fixture.js'
 export * from './otel.js'
-export * as RG from '../../reactive.js'

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