@livestore/sqlite-wasm 0.3.0-dev.1 → 0.3.0-dev.11

package/src/{make-sync-db.ts → make-sqlite-db.ts}

@@ -2,20 +2,20 @@ import type {
   PersistenceInfo,
   PreparedBindValues,
   PreparedStatement,
-  SynchronousDatabase,
-  SynchronousDatabaseChangeset,
+  SqliteDb,
+  SqliteDbChangeset,
 } from '@livestore/common'
 import { SqliteError } from '@livestore/common'
 import * as SqliteConstants from '@livestore/wa-sqlite/src/sqlite-constants.js'
 
 import { makeInMemoryDb } from './in-memory-vfs.js'
 
-export const makeSynchronousDatabase = <
+export const makeSqliteDb = <
   TMetadata extends {
     dbPointer: number
     persistenceInfo: PersistenceInfo
     deleteDb: () => void
-    configureDb: (db: SynchronousDatabase<TMetadata>) => void
+    configureDb: (db: SqliteDb<TMetadata>) => void
   },
 >({
   sqlite3,
@@ -23,12 +23,14 @@ export const makeSynchronousDatabase = <
 }: {
   sqlite3: SQLiteAPI
   metadata: TMetadata
-}): SynchronousDatabase<TMetadata> => {
+}): SqliteDb<TMetadata> => {
   const preparedStmts: PreparedStatement[] = []
   const { dbPointer } = metadata
 
-  const syncDb: SynchronousDatabase<TMetadata> = {
-    _tag: 'SynchronousDatabase',
+  let isClosed = false
+
+  const sqliteDb: SqliteDb<TMetadata> = {
+    _tag: 'SqliteDb',
     metadata,
     prepare: (queryStr) => {
       try {
@@ -129,18 +131,18 @@ export const makeSynchronousDatabase = <
     },
     export: () => sqlite3.serialize(dbPointer, 'main'),
     execute: (queryStr, bindValues, options) => {
-      const stmt = syncDb.prepare(queryStr)
+      const stmt = sqliteDb.prepare(queryStr)
       stmt.execute(bindValues, options)
       stmt.finalize()
     },
     select: (queryStr, bindValues) => {
-      const stmt = syncDb.prepare(queryStr)
+      const stmt = sqliteDb.prepare(queryStr)
       const results = stmt.select(bindValues)
       stmt.finalize()
       return results as ReadonlyArray<any>
     },
     destroy: () => {
-      syncDb.close()
+      sqliteDb.close()
 
       metadata.deleteDb()
       // if (metadata._tag === 'opfs') {
@@ -148,10 +150,15 @@ export const makeSynchronousDatabase = <
       // }
     },
     close: () => {
+      if (isClosed) {
+        return
+      }
+
       for (const stmt of preparedStmts) {
         stmt.finalize()
       }
       sqlite3.close(dbPointer)
+      isClosed = true
     },
     import: (source) => {
       // https://www.sqlite.org/c3ref/c_deserialize_freeonclose.html
@@ -176,7 +183,7 @@ export const makeSynchronousDatabase = <
         sqlite3.backup(dbPointer, 'main', source.metadata.dbPointer, 'main')
       }
 
-      metadata.configureDb(syncDb)
+      metadata.configureDb(sqliteDb)
     },
     session: () => {
       const sessionPointer = sqlite3.session_create(dbPointer, 'main')
@@ -196,18 +203,18 @@ export const makeSynchronousDatabase = <
       const changeset = {
         invert: () => {
           const inverted = sqlite3.changeset_invert(data)
-          return syncDb.makeChangeset(inverted)
+          return sqliteDb.makeChangeset(inverted)
         },
         apply: () => {
           sqlite3.changeset_apply(dbPointer, data)
         },
-      } satisfies SynchronousDatabaseChangeset
+      } satisfies SqliteDbChangeset
 
       return changeset
     },
-  } satisfies SynchronousDatabase<TMetadata>
+  } satisfies SqliteDb<TMetadata>
 
-  metadata.configureDb(syncDb)
+  metadata.configureDb(sqliteDb)
 
-  return syncDb
+  return sqliteDb
 }

package/src/node/mod.ts

@@ -1,17 +1,12 @@
 import path from 'node:path'
 
-import {
-  type MakeSynchronousDatabase,
-  type PersistenceInfo,
-  type SynchronousDatabase,
-  UnexpectedError,
-} from '@livestore/common'
+import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb, UnexpectedError } from '@livestore/common'
 import { Effect, FileSystem } from '@livestore/utils/effect'
 import type * as WaSqlite from '@livestore/wa-sqlite'
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js'
 
 import { makeInMemoryDb } from '../in-memory-vfs.js'
-import { makeSynchronousDatabase } from '../make-sync-db.js'
+import { makeSqliteDb } from '../make-sqlite-db.js'
 import { NodeFS } from './NodeFS.js'
 
 export type NodeDatabaseMetadataInMemory = {
@@ -20,7 +15,7 @@ export type NodeDatabaseMetadataInMemory = {
   dbPointer: number
   persistenceInfo: PersistenceInfo
   deleteDb: () => void
-  configureDb: (db: SynchronousDatabase) => void
+  configureDb: (db: SqliteDb) => void
 }
 
 export type NodeDatabaseMetadataFs = {
@@ -29,35 +24,31 @@ export type NodeDatabaseMetadataFs = {
   dbPointer: number
   persistenceInfo: PersistenceInfo<{ directory: string }>
   deleteDb: () => void
-  configureDb: (db: SynchronousDatabase) => void
+  configureDb: (db: SqliteDb) => void
 }
 
 export type NodeDatabaseMetadata = NodeDatabaseMetadataInMemory | NodeDatabaseMetadataFs
 
 export type NodeDatabaseInputInMemory = {
   _tag: 'in-memory'
-  configureDb?: (db: SynchronousDatabase) => void
+  configureDb?: (db: SqliteDb) => void
 }
 
 export type NodeDatabaseInputFs = {
   _tag: 'fs'
   directory: string
   fileName: string
-  configureDb?: (db: SynchronousDatabase) => void
+  configureDb?: (db: SqliteDb) => void
 }
 
 export type NodeDatabaseInput = NodeDatabaseInputInMemory | NodeDatabaseInputFs
 
-export const syncDbFactory = ({
+export const sqliteDbFactory = ({
   sqlite3,
 }: {
   sqlite3: SQLiteAPI
 }): Effect.Effect<
-  MakeSynchronousDatabase<
-    { dbPointer: number; persistenceInfo: PersistenceInfo },
-    NodeDatabaseInput,
-    NodeDatabaseMetadata
-  >,
+  MakeSqliteDb<{ dbPointer: number; persistenceInfo: PersistenceInfo }, NodeDatabaseInput, NodeDatabaseMetadata>,
   never,
   FileSystem.FileSystem
 > =>
@@ -67,7 +58,7 @@ export const syncDbFactory = ({
       Effect.gen(function* () {
         if (input._tag === 'in-memory') {
           const { dbPointer, vfs } = makeInMemoryDb(sqlite3)
-          return makeSynchronousDatabase<NodeDatabaseMetadataInMemory>({
+          return makeSqliteDb<NodeDatabaseMetadataInMemory>({
             sqlite3,
             metadata: {
               _tag: 'in-memory',
@@ -89,7 +80,7 @@ export const syncDbFactory = ({
 
         const filePath = path.join(input.directory, input.fileName)
 
-        return makeSynchronousDatabase<NodeDatabaseMetadataFs>({
+        return makeSqliteDb<NodeDatabaseMetadataFs>({
           sqlite3,
           metadata: {
             _tag: 'fs',