@livestore/livestore 0.0.42 → 0.0.44

package/src/effect/LiveStore.ts

@@ -1,10 +1,11 @@
-import type { DatabaseFactory, MainDatabase } from '@livestore/common'
+import type { DatabaseFactory } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import type { Scope } from '@livestore/utils/effect'
 import { Context, Deferred, Duration, Effect, Layer, OtelTracer, pipe, Runtime } from '@livestore/utils/effect'
 import * as otel from '@opentelemetry/api'
 import type { GraphQLSchema } from 'graphql'
 
+import type { MainDatabaseWrapper } from '../MainDatabaseWrapper.js'
 import type { LiveQuery } from '../reactiveQueries/base-class.js'
 import type { BaseGraphQLContext, BootDb, GraphQLOptions, Store } from '../store.js'
 import { createStore } from '../store.js'
@@ -39,7 +40,7 @@ export type LiveStoreContextProps<GraphQLContext extends BaseGraphQLContext> = {
   schema: LiveStoreSchema
   graphQLOptions?: {
     schema: Effect.Effect<GraphQLSchema, never, otel.Tracer>
-    makeContext: (db: MainDatabase) => GraphQLContext
+    makeContext: (db: MainDatabaseWrapper) => GraphQLContext
   }
   boot?: (db: BootDb) => Effect.Effect<void>
   makeDb: DatabaseFactory

package/src/index.ts

@@ -3,7 +3,7 @@ export type { BaseGraphQLContext, QueryDebugInfo, RefreshReason, BootDb } from '
 
 export type { QueryDefinition, LiveStoreCreateStoreOptions, LiveStoreContext } from './effect/LiveStore.js'
 
-export { MainDatabaseWrapper as InMemoryDatabase, type DebugInfo, emptyDebugInfo } from './MainDatabaseWrapper.js'
+export { MainDatabaseWrapper, type DebugInfo, emptyDebugInfo } from './MainDatabaseWrapper.js'
 
 export type { GetAtom, AtomDebugInfo, RefreshDebugInfo, SerializedAtom, Atom, Node, Ref, Effect } from './reactive.js'
 export { LiveStoreJSQuery, computed } from './reactiveQueries/js.js'

package/src/query-info.ts

@@ -77,8 +77,12 @@ export const mutationForQueryInfo = <const TPath extends QueryInfo>(
       const partialStructSchema = updatePath.table.schema.pipe(Schema.pick(...columnNames))
 
       // const columnNames = Object.keys(value)
-      const bindValues = Schema.encodeSync(partialStructSchema)(value)
-      return { columnNames, bindValues }
+      const encodedBindValues = Schema.encodeEither(partialStructSchema)(value)
+      if (encodedBindValues._tag === 'Left') {
+        return shouldNeverHappen(encodedBindValues.left.toString())
+      } else {
+        return { columnNames, bindValues: encodedBindValues.right }
+      }
     } else if (updatePath._tag === 'Col') {
       const columnName = updatePath.column
       const columnSchema =

package/src/reactiveQueries/sql.ts

@@ -95,10 +95,28 @@ export class LiveStoreSQLQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo
       map === undefined
         ? (rows: any) => rows as TResult
         : Schema.isSchema(map)
-          ? (rows: any) => {
+          ? (rows: any, opts: { sqlString: string }) => {
               const parseResult = Schema.decodeEither(map as Schema.Schema<TResult, ReadonlyArray<any>>)(rows)
               if (parseResult._tag === 'Left') {
-                console.error(`Error parsing SQL query result: ${TreeFormatter.formatError(parseResult.left)}`)
+                const parseErrorStr = TreeFormatter.formatError(parseResult.left)
+                const expectedSchemaStr = String(map.ast)
+                const bindValuesStr = bindValues === undefined ? '' : `\nBind values: ${JSON.stringify(bindValues)}`
+
+                console.error(
+                  `\
+Error parsing SQL query result.
+
+Query: ${opts.sqlString}\
+${bindValuesStr}
+
+Expected schema: ${expectedSchemaStr}
+
+Error: ${parseErrorStr}
+
+Result:`,
+                  rows,
+                )
+                // console.error(`Error parsing SQL query result: ${TreeFormatter.formatError(parseResult.left)}`)
                 return shouldNeverHappen(`Error parsing SQL query result: ${parseResult.left}`)
               } else {
                 return parseResult.right as TResult
@@ -167,7 +185,7 @@ export class LiveStoreSQLQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo
 
             span.setAttribute('sql.rowsCount', rawResults.length)
 
-            const result = this.mapRows(rawResults)
+            const result = this.mapRows(rawResults, { sqlString })
 
             span.end()
 

package/src/store.ts

@@ -1,11 +1,11 @@
-import type { DatabaseFactory, DatabaseImpl, MainDatabase, PreparedBindValues } from '@livestore/common'
+import type { DatabaseFactory, DatabaseImpl, PreparedBindValues } from '@livestore/common'
 import { type LiveStoreSchema, makeMutationEventSchema, type MutationEvent } from '@livestore/common/schema'
 import { assertNever, isPromise, makeNoopTracer, shouldNeverHappen } from '@livestore/utils'
 import { Schema } from '@livestore/utils/effect'
 import * as otel from '@opentelemetry/api'
 import type { GraphQLSchema } from 'graphql'
 
-import { dynamicallyRegisteredTables, globalDbGraph } from './global-state.js'
+import { globalDbGraph } from './global-state.js'
 import { MainDatabaseWrapper } from './MainDatabaseWrapper.js'
 import { migrateDb } from './migrations.js'
 import type { StackInfo } from './react/utils/stack-info.js'
@@ -24,7 +24,7 @@ export type BaseGraphQLContext = {
 
 export type GraphQLOptions<TContext> = {
   schema: GraphQLSchema
-  makeContext: (db: MainDatabase, tracer: otel.Tracer) => TContext
+  makeContext: (db: MainDatabaseWrapper, tracer: otel.Tracer) => TContext
 }
 
 export type StoreOptions<
@@ -145,11 +145,11 @@ export class Store<
     }
 
     // Need a set here since `schema.tables` might contain duplicates and some componentStateTables
-    const allTableNames = new Set([
-      ...this.schema.tables.keys(),
+    const allTableNames = new Set(
+      this.schema.tables.keys(),
       // TODO activate dynamic tables
-      ...Array.from(dynamicallyRegisteredTables.values()).map((_) => _.sqliteDef.name),
-    ])
+      // ...Array.from(dynamicallyRegisteredTables.values()).map((_) => _.sqliteDef.name),
+    )
     const existingTableRefs = new Map(
       Array.from(this.graph.atoms.values())
         .filter((_): _ is Ref<any, any, any> => _._tag === 'ref' && _.label?.startsWith('tableRef:') === true)
@@ -161,7 +161,7 @@ export class Store<
 
     if (graphQLOptions) {
       this.graphQLSchema = graphQLOptions.schema
-      this.graphQLContext = graphQLOptions.makeContext(db.mainDb, this.otel.tracer)
+      this.graphQLContext = graphQLOptions.makeContext(this.mainDbWrapper, this.otel.tracer)
     }
   }
 
@@ -512,7 +512,7 @@ export const createStore = async <
 
       if (boot !== undefined) {
         let isInTxn = false
-        const txnExecuteStmnts: [string, PreparedBindValues | undefined][] = []
+        let txnExecuteStmnts: [string, PreparedBindValues | undefined][] = []
 
         const bootDbImpl: BootDb = {
           execute: (queryStr, bindValues) => {
@@ -521,9 +521,9 @@ export const createStore = async <
             stmt.execute(preparedBindValues)
 
             if (isInTxn === true) {
-              void db.storageDb.execute(queryStr, preparedBindValues, undefined)
-            } else {
               txnExecuteStmnts.push([queryStr, preparedBindValues])
+            } else {
+              void db.storageDb.execute(queryStr, preparedBindValues, undefined)
             }
           },
           select: (queryStr, bindValues) => {
@@ -548,6 +548,9 @@ export const createStore = async <
             } catch (e: any) {
               db.mainDb.execute('ROLLBACK', undefined)
               throw e
+            } finally {
+              isInTxn = false
+              txnExecuteStmnts = []
             }
           },
         }

package/vitest.config.js

@@ -11,7 +11,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      'sqlite-esm': 'sqlite-esm/node',
+      '@livestore/sqlite-wasm': '@livestore/sqlite-wasm/node',
     },
   },
 })