@livestore/sqlite-wasm 0.4.0-dev.18 → 0.4.0-dev.19

package/src/browser/opfs/index.ts

@@ -1,4 +1,5 @@
-import { Effect } from '@livestore/utils/effect'
+import { Effect, type Scope } from '@livestore/utils/effect'
+import type { Opfs } from '@livestore/utils/effect/browser'
 import type * as WaSqlite from '@livestore/wa-sqlite'
 
 import { AccessHandlePoolVFS } from './AccessHandlePoolVFS.ts'
@@ -14,7 +15,7 @@ export const makeOpfsDb = ({
   sqlite3: WaSqlite.SQLiteAPI
   directory: string
   fileName: string
-}) =>
+}): Effect.Effect<{ dbPointer: number; vfs: AccessHandlePoolVFS }, never, Opfs.Opfs | Scope.Scope> =>
   Effect.gen(function* () {
     // Replace all special characters with underscores
     const safePath = directory.replaceAll(/["*/:<>?\\|]/g, '_')
@@ -22,7 +23,7 @@ export const makeOpfsDb = ({
     const vfsName = `opfs${pathSegment}`
 
     if (sqlite3.vfs_registered.has(vfsName) === false) {
-      const vfs = yield* Effect.promise(() => AccessHandlePoolVFS.create(vfsName, directory, (sqlite3 as any).module))
+      const vfs = yield* AccessHandlePoolVFS.create(vfsName, directory, (sqlite3 as any).module)
 
       sqlite3.vfs_register(vfs, false)
       opfsVfsMap.set(vfsName, vfs)

package/src/browser/opfs/opfs-sah-pool.ts

@@ -14,7 +14,7 @@ const PERSISTENT_FILE_TYPES =
 
 const textDecoder = new TextDecoder()
 
-export const decodeSAHPoolFilename = async (file: File): Promise<string> => {
+export const decodeAccessHandlePoolFilename = async (file: File): Promise<string> => {
   // Read the path and digest of the path from the file.
   const corpus = new Uint8Array(await file.slice(0, HEADER_CORPUS_SIZE).arrayBuffer())
 

package/src/cf/mod.ts

@@ -1,6 +1,6 @@
 // import path from 'node:path'
 
-import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb, UnexpectedError } from '@livestore/common'
+import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb, UnknownError } from '@livestore/common'
 import type { CfTypes } from '@livestore/common-cf'
 import { Effect } from '@livestore/utils/effect'
 import type * as WaSqlite from '@livestore/wa-sqlite'
@@ -140,4 +140,4 @@ const makeCloudflareFsDb = ({
     const dbPointer = sqlite3.open_v2Sync(fileName, undefined, vfsName)
 
     return { dbPointer, vfs: {} as UNUSED<'only needed in web adapter currently and should longer-term be removed'> }
-  }).pipe(UnexpectedError.mapToUnexpectedError)
+  }).pipe(UnknownError.mapToUnknownError)

package/src/make-sqlite-db.ts

@@ -35,7 +35,7 @@ export const makeSqliteDb = <
     metadata,
     debug: {
       // Setting initially to root but will be set to correct value shortly after
-      head: EventSequenceNumber.ROOT,
+      head: EventSequenceNumber.Client.ROOT,
     },
     prepare: (queryStr) => {
       try {
@@ -149,9 +149,6 @@ export const makeSqliteDb = <
       sqliteDb.close()
 
       metadata.deleteDb()
-      // if (metadata._tag === 'opfs') {
-      //   metadata.vfs.resetAccessHandle(metadata.fileName)
-      // }
     },
     close: () => {
       if (isClosed) {

package/src/node/mod.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 
-import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb, UnexpectedError } from '@livestore/common'
+import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb, UnknownError } 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'
@@ -129,4 +129,4 @@ const makeNodeFsDb = ({
     const dbPointer = sqlite3.open_v2Sync(fileName, undefined, vfsName)
 
     return { dbPointer, vfs: {} as UNUSED<'only needed in web adapter currently and should longer-term be removed'> }
-  }).pipe(UnexpectedError.mapToUnexpectedError)
+  }).pipe(UnknownError.mapToUnknownError)

package/src/ambient.d.ts

@@ -1,18 +0,0 @@
-// https://developer.mozilla.org/en-US/docs/Web/API/FileSystemSyncAccessHandle
-interface FileSystemSyncAccessHandle {
-  close: () => void
-  flush: () => Promise<void>
-  getSize: () => number
-  read: (buffer: Uint8Array<ArrayBuffer> | Uint32Array, options?: FileSystemReadWriteOptions) => number
-  truncate: (newSize: number) => void
-  write: (buffer: Uint8Array<ArrayBuffer> | Uint32Array, options?: FileSystemReadWriteOptions) => number
-  seek: (offset: number) => void
-}
-
-interface FileSystemReadWriteOptions {
-  at?: number
-}
-
-interface FileSystemFileHandle {
-  createSyncAccessHandle: () => Promise<FileSystemSyncAccessHandle>
-}