@livestore/sqlite-wasm 0.3.0-dev.8 → 0.3.0

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,45 +24,43 @@ 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 type MakeNodeSqliteDb = MakeSqliteDb<
+  { dbPointer: number; persistenceInfo: PersistenceInfo },
+  NodeDatabaseInput,
+  NodeDatabaseMetadata
+>
+
+export const sqliteDbFactory = ({
   sqlite3,
 }: {
   sqlite3: SQLiteAPI
-}): Effect.Effect<
-  MakeSynchronousDatabase<
-    { dbPointer: number; persistenceInfo: PersistenceInfo },
-    NodeDatabaseInput,
-    NodeDatabaseMetadata
-  >,
-  never,
-  FileSystem.FileSystem
-> =>
+}): Effect.Effect<MakeNodeSqliteDb, never, FileSystem.FileSystem> =>
   Effect.andThen(
     FileSystem.FileSystem,
     (fs) => (input) =>
       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 +82,7 @@ export const syncDbFactory = ({
 
         const filePath = path.join(input.directory, input.fileName)
 
-        return makeSynchronousDatabase<NodeDatabaseMetadataFs>({
+        return makeSqliteDb<NodeDatabaseMetadataFs>({
           sqlite3,
           metadata: {
             _tag: 'fs',
@@ -103,7 +96,7 @@ export const syncDbFactory = ({
       }),
   )
 
-let nodeFsVfs: NodeFS | undefined
+const nodeFsVfsMap = new Map<string, NodeFS>()
 
 const makeNodeFsDb = ({
   sqlite3,
@@ -120,11 +113,12 @@ const makeNodeFsDb = ({
     // NOTE to keep the filePath short, we use the directory name in the vfs name
     // If this is becoming a problem, we can use a hashed version of the directory name
     const vfsName = `node-fs-${directory}`
-    if (nodeFsVfs === undefined) {
+    if (nodeFsVfsMap.has(vfsName) === false) {
       // TODO refactor with Effect FileSystem instead of using `node:fs` directly inside of NodeFS
-      nodeFsVfs = new NodeFS(vfsName, (sqlite3 as any).module, directory)
+      const nodeFsVfs = new NodeFS(vfsName, (sqlite3 as any).module, directory)
       // @ts-expect-error TODO fix types
       sqlite3.vfs_register(nodeFsVfs, false)
+      nodeFsVfsMap.set(vfsName, nodeFsVfs)
     }
 
     yield* fs.makeDirectory(directory, { recursive: true })
@@ -137,5 +131,7 @@ const makeNodeFsDb = ({
     // NOTE SQLite will return a "disk I/O error" if the file path is too long.
     const dbPointer = sqlite3.open_v2Sync(fileName, undefined, vfsName)
 
-    return { dbPointer, vfs: nodeFsVfs }
+    const vfs = nodeFsVfsMap.get(vfsName)!
+
+    return { dbPointer, vfs }
   }).pipe(UnexpectedError.mapToUnexpectedError)

package/.netlify/state.json

@@ -1,3 +0,0 @@
-{
-	"siteId": "7d10806a-dc4e-4216-a781-adde1adc649f"
-}

package/dist/make-sync-db.d.ts

@@ -1,11 +0,0 @@
-import type { PersistenceInfo, SynchronousDatabase } from '@livestore/common';
-export declare const makeSynchronousDatabase: <TMetadata extends {
-    dbPointer: number;
-    persistenceInfo: PersistenceInfo;
-    deleteDb: () => void;
-    configureDb: (db: SynchronousDatabase<TMetadata>) => void;
-}>({ sqlite3, metadata, }: {
-    sqlite3: SQLiteAPI;
-    metadata: TMetadata;
-}) => SynchronousDatabase<TMetadata>;
-//# sourceMappingURL=make-sync-db.d.ts.map

package/dist/make-sync-db.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"make-sync-db.d.ts","sourceRoot":"","sources":["../src/make-sync-db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAGf,mBAAmB,EAEpB,MAAM,mBAAmB,CAAA;AAM1B,eAAO,MAAM,uBAAuB,GAClC,SAAS,SAAS;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,mBAAmB,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;CAC1D,0BAIA;IACD,OAAO,EAAE,SAAS,CAAA;IAClB,QAAQ,EAAE,SAAS,CAAA;CACpB,KAAG,mBAAmB,CAAC,SAAS,CAkMhC,CAAA"}

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo",
-  },
-  "include": ["./src"],
-  "references": [{ "path": "../common" }, { "path": "../utils" }]
-}