@livestore/common 0.0.56-dev.2 → 0.0.56-dev.3

package/src/rehydrate-from-mutationlog.ts

@@ -1,12 +1,7 @@
 import { memoizeByRef, shouldNeverHappen } from '@livestore/utils'
 import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect'
 
-import {
-  type MigrationOptionsFromMutationLog,
-  SqliteError,
-  type SynchronousDatabase,
-  UnexpectedError,
-} from './adapter-types.js'
+import { type MigrationOptionsFromMutationLog, type SynchronousDatabase, UnexpectedError } from './adapter-types.js'
 import { getExecArgsFromMutation } from './mutation.js'
 import type { LiveStoreSchema, MutationDef, MutationLogMetaRow } from './schema/index.js'
 import { MUTATION_LOG_META_TABLE } from './schema/index.js'
@@ -73,26 +68,22 @@ This likely means the schema has changed in an incompatible way.
 
         const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded })
 
-        for (const { statementSql, bindValues } of execArgsArr) {
-          try {
-            // TODO cache prepared statements for mutations
-            const getRowsChanged = db.execute(statementSql, bindValues)
-            if (
-              import.meta.env.DEV &&
-              getRowsChanged() === 0 &&
-              migrationOptions.logging?.excludeAffectedRows?.(statementSql) !== true
-            ) {
+        const makeExecuteOptions = (statementSql: string, bindValues: any) => ({
+          onRowsChanged: (rowsChanged: number) => {
+            if (rowsChanged === 0 && migrationOptions.logging?.excludeAffectedRows?.(statementSql) !== true) {
               console.warn(`Mutation "${mutationDef.name}" did not affect any rows:`, statementSql, bindValues)
             }
-            // console.log(`Re-executed mutation ${mutationSql}`, bindValues)
-          } catch (e) {
-            yield* new SqliteError({
-              sql: statementSql,
-              bindValues,
-              code: (e as any).resultCode,
-              cause: e,
-            })
-          }
+          },
+        })
+
+        for (const { statementSql, bindValues } of execArgsArr) {
+          // TODO cache prepared statements for mutations
+          db.execute(
+            statementSql,
+            bindValues,
+            import.meta.env.DEV ? makeExecuteOptions(statementSql, bindValues) : undefined,
+          )
+          // console.log(`Re-executed mutation ${mutationSql}`, bindValues)
         }
       }).pipe(Effect.withSpan(`@livestore/common:rehydrateFromMutationLog:processMutation`))
 

package/src/schema/index.ts

@@ -39,6 +39,9 @@ export type LiveStoreSchema<
 
   migrationOptions: MigrationOptions
 
+  /**
+   * @default 'default'
+   */
   key: string
 }
 
@@ -47,9 +50,6 @@ export type InputSchema = {
   readonly mutations?: ReadonlyArray<MutationDef.Any> | Record<string, MutationDef.Any>
   /**
    * Can be used to isolate multiple LiveStore apps running in the same origin
-   *
-   * Make sure you also use this key in the `storage` options (e.g. directory, prefix etc) to make sure
-   * different instances of LiveStore aren't overlapping on the storage level.
    */
   readonly key?: string
 }
@@ -118,7 +118,7 @@ export const makeSchema = <TInputSchema extends InputSchema>(
     mutations,
     migrationOptions: inputSchema.migrations ?? { strategy: 'hard-reset' },
     hash,
-    key: inputSchema.key ?? '',
+    key: inputSchema.key ?? 'default',
   } satisfies LiveStoreSchema
 }
 

package/src/schema-management/common.ts

@@ -16,6 +16,8 @@ export const dbExecute = (db: SynchronousDatabase, queryStr: string, bindValues?
   const preparedBindValues = bindValues ? prepareBindValues(bindValues, queryStr) : undefined
 
   stmt.execute(preparedBindValues)
+
+  stmt.finalize()
 }
 
 export const dbSelect = <T>(db: SynchronousDatabase, queryStr: string, bindValues?: ParamsObject) => {
@@ -25,7 +27,9 @@ export const dbSelect = <T>(db: SynchronousDatabase, queryStr: string, bindValue
   // cachedStmts.set(queryStr, stmt)
   // }
 
-  return stmt.select<T>(bindValues ? prepareBindValues(bindValues, queryStr) : undefined)
+  const res = stmt.select<T>(bindValues ? prepareBindValues(bindValues, queryStr) : undefined)
+  stmt.finalize()
+  return res
 }
 
 export interface SchemaManager {

package/src/schema-management/migrations.ts

@@ -28,14 +28,9 @@ export const makeSchemaManager = (db: SynchronousDatabase): Effect.Effect<Schema
     })
 
     return {
-      getMutationDefInfos: () => {
-        const schemaMutationsMetaRows = dbSelect<SchemaMutationsMetaRow>(
-          db,
-          sql`SELECT * FROM ${SCHEMA_MUTATIONS_META_TABLE}`,
-        )
+      getMutationDefInfos: () =>
+        dbSelect<SchemaMutationsMetaRow>(db, sql`SELECT * FROM ${SCHEMA_MUTATIONS_META_TABLE}`),
 
-        return schemaMutationsMetaRows
-      },
       setMutationDefInfo: (info) => {
         dbExecute(
           db,
@@ -128,7 +123,7 @@ export const migrateTable = ({
   skipMetaTable?: boolean
 }) =>
   Effect.gen(function* () {
-    console.log(`Migrating table '${tableAst.name}'...`)
+    // console.log(`Migrating table '${tableAst.name}'...`)
     const tableName = tableAst.name
     const columnSpec = makeColumnSpec(tableAst)