@livestore/sqlite-wasm 0.3.0-dev.10 → 0.3.0-dev.12

package/dist/browser/mod.d.ts

@@ -1,4 +1,4 @@
-import type { MakeSynchronousDatabase, PersistenceInfo, SynchronousDatabase } from '@livestore/common';
+import type { MakeSqliteDb, PersistenceInfo, SqliteDb } from '@livestore/common';
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js';
 import type { AccessHandlePoolVFS } from './opfs/AccessHandlePoolVFS.js';
 export * from './opfs/opfs-sah-pool.js';
@@ -8,7 +8,7 @@ export type WebDatabaseMetadataInMemory = {
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
     deleteDb: () => void;
-    configureDb: (db: SynchronousDatabase) => void;
+    configureDb: (db: SqliteDb) => void;
 };
 export type WebDatabaseMetadataOpfs = {
     _tag: 'opfs';
@@ -20,24 +20,24 @@ export type WebDatabaseMetadataOpfs = {
         opfsFileName: string;
     }>;
     deleteDb: () => void;
-    configureDb: (db: SynchronousDatabase) => void;
+    configureDb: (db: SqliteDb) => void;
 };
 export type WebDatabaseMetadata = WebDatabaseMetadataInMemory | WebDatabaseMetadataOpfs;
 export type WebDatabaseInputInMemory = {
     _tag: 'in-memory';
-    configureDb?: (db: SynchronousDatabase) => void;
+    configureDb?: (db: SqliteDb) => void;
 };
 export type WebDatabaseInputOpfs = {
     _tag: 'opfs';
     /** Filename of the database file (only used when exporting/downloading the database) */
     fileName: string;
     opfsDirectory: string;
-    configureDb?: (db: SynchronousDatabase) => void;
+    configureDb?: (db: SqliteDb) => void;
 };
 export type WebDatabaseInput = WebDatabaseInputInMemory | WebDatabaseInputOpfs;
-export declare const syncDbFactory: ({ sqlite3, }: {
+export declare const sqliteDbFactory: ({ sqlite3, }: {
     sqlite3: SQLiteAPI;
-}) => MakeSynchronousDatabase<{
+}) => MakeSqliteDb<{
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
 }, WebDatabaseInput, WebDatabaseMetadata>;

package/dist/browser/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/browser/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAEtG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAGxE,cAAc,yBAAyB,CAAA;AAEvC,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,mBAAmB,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAC;QAC/B,aAAa,EAAE,MAAM,CAAA;QACrB,mCAAmC;QACnC,YAAY,EAAE,MAAM,CAAA;KACrB,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAEvF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,wFAAwF;IACxF,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GAAG,oBAAoB,CAAA;AAE9E,eAAO,MAAM,aAAa,iBAGrB;IACD,OAAO,EAAE,SAAS,CAAA;CACnB,KAAG,uBAAuB,CACzB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,EACvD,gBAAgB,EAChB,mBAAmB,CAsDjB,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/browser/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAGxE,cAAc,yBAAyB,CAAA;AAEvC,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,mBAAmB,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAC;QAC/B,aAAa,EAAE,MAAM,CAAA;QACrB,mCAAmC;QACnC,YAAY,EAAE,MAAM,CAAA;KACrB,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAEvF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,wFAAwF;IACxF,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GAAG,oBAAoB,CAAA;AAE9E,eAAO,MAAM,eAAe,iBAGvB;IACD,OAAO,EAAE,SAAS,CAAA;CACnB,KAAG,YAAY,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,EAAE,gBAAgB,EAAE,mBAAmB,CAqD3G,CAAA"}

package/dist/browser/mod.js

@@ -1,12 +1,12 @@
 import { Effect, Hash } from '@livestore/utils/effect';
 import { makeInMemoryDb } from '../in-memory-vfs.js';
-import { makeSynchronousDatabase } from '../make-sync-db.js';
+import { makeSqliteDb } from '../make-sqlite-db.js';
 import { makeOpfsDb } from './opfs/index.js';
 export * from './opfs/opfs-sah-pool.js';
-export const syncDbFactory = ({ sqlite3, }) => (input) => Effect.gen(function* () {
+export const sqliteDbFactory = ({ sqlite3, }) => (input) => Effect.gen(function* () {
     if (input._tag === 'in-memory') {
         const { dbPointer, vfs } = makeInMemoryDb(sqlite3);
-        return makeSynchronousDatabase({
+        return makeSqliteDb({
             sqlite3,
             metadata: {
                 _tag: 'in-memory',
@@ -32,7 +32,7 @@ export const syncDbFactory = ({ sqlite3, }) => (input) => Effect.gen(function* (
         directory: input.opfsDirectory,
         fileName: dbFilename,
     });
-    return makeSynchronousDatabase({
+    return makeSqliteDb({
         sqlite3,
         metadata: {
             _tag: 'opfs',

package/dist/browser/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/browser/mod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAA;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,cAAc,yBAAyB,CAAA;AAyCvC,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,EACC,OAAO,GAGR,EAIC,EAAE,CACJ,CAAC,KAAuB,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QAClD,OAAO,uBAAuB,CAA8B;YAC1D,OAAO;YACP,QAAQ,EAAE;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG;gBACH,SAAS;gBACT,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;gBAClB,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;gBAC5C,eAAe,EAAE;oBACf,QAAQ,EAAE,UAAU;iBACrB;aACF;SACF,CAAQ,CAAA;IACX,CAAC;IAED,wCAAwC;IACxC,MAAM,sBAAsB,GAAG,EAAE,CAAA;IAEjC,IAAI,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAA;IAE/B,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;QACnD,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACtB,yBAAyB,KAAK,CAAC,QAAQ,UAAU,sBAAsB,eAAe,KAAK,CAAC,QAAQ,CAAC,MAAM,cAAc,CAC1H,CAAA;QACD,UAAU,GAAG,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAA;IACvD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QAC3C,OAAO;QACP,SAAS,EAAE,KAAK,CAAC,aAAa;QAC9B,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAA;IAEF,OAAO,uBAAuB,CAA0B;QACtD,OAAO;QACP,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,GAAG;YACH,SAAS;YACT,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC;YACrD,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;YAC5C,eAAe,EAAE;gBACf,QAAQ,EAAE,UAAU;gBACpB,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,YAAY,EAAE,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC;aAC9C;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/browser/mod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAA;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,cAAc,yBAAyB,CAAA;AAyCvC,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,EACC,OAAO,GAGR,EAAgH,EAAE,CACnH,CAAC,KAAuB,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QAClD,OAAO,YAAY,CAA8B;YAC/C,OAAO;YACP,QAAQ,EAAE;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG;gBACH,SAAS;gBACT,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;gBAClB,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;gBAC5C,eAAe,EAAE;oBACf,QAAQ,EAAE,UAAU;iBACrB;aACF;SACF,CAAQ,CAAA;IACX,CAAC;IAED,wCAAwC;IACxC,MAAM,sBAAsB,GAAG,EAAE,CAAA;IAEjC,IAAI,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAA;IAE/B,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;QACnD,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACtB,yBAAyB,KAAK,CAAC,QAAQ,UAAU,sBAAsB,eAAe,KAAK,CAAC,QAAQ,CAAC,MAAM,cAAc,CAC1H,CAAA;QACD,UAAU,GAAG,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAA;IACvD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QAC3C,OAAO;QACP,SAAS,EAAE,KAAK,CAAC,aAAa;QAC9B,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAA;IAEF,OAAO,YAAY,CAA0B;QAC3C,OAAO;QACP,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,GAAG;YACH,SAAS;YACT,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC;YACrD,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;YAC5C,eAAe,EAAE;gBACf,QAAQ,EAAE,UAAU;gBACpB,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,YAAY,EAAE,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC;aAC9C;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/index_.d.ts

@@ -1,3 +1,3 @@
 export * from '@livestore/wa-sqlite';
-export * from './make-sync-db.js';
+export * from './make-sqlite-db.js';
 //# sourceMappingURL=index_.d.ts.map

package/dist/index_.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index_.d.ts","sourceRoot":"","sources":["../src/index_.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index_.d.ts","sourceRoot":"","sources":["../src/index_.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA"}

package/dist/index_.js

@@ -1,3 +1,3 @@
 export * from '@livestore/wa-sqlite';
-export * from './make-sync-db.js';
+export * from './make-sqlite-db.js';
 //# sourceMappingURL=index_.js.map

package/dist/index_.js.map

@@ -1 +1 @@
-{"version":3,"file":"index_.js","sourceRoot":"","sources":["../src/index_.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index_.js","sourceRoot":"","sources":["../src/index_.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA"}

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

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

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

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

package/dist/make-sqlite-db.js

@@ -0,0 +1,181 @@
+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 makeSqliteDb = ({ sqlite3, metadata, }) => {
+    const preparedStmts = [];
+    const { dbPointer } = metadata;
+    let isClosed = false;
+    const sqliteDb = {
+        _tag: 'SqliteDb',
+        metadata,
+        prepare: (queryStr) => {
+            try {
+                const stmts = sqlite3.statements(dbPointer, queryStr.trim(), { unscoped: true });
+                let isFinalized = false;
+                const preparedStmt = {
+                    execute: (bindValues, options) => {
+                        for (const stmt of stmts) {
+                            if (bindValues !== undefined && Object.keys(bindValues).length > 0) {
+                                sqlite3.bind_collection(stmt, bindValues);
+                            }
+                            try {
+                                sqlite3.step(stmt);
+                            }
+                            finally {
+                                if (options?.onRowsChanged) {
+                                    options.onRowsChanged(sqlite3.changes(dbPointer));
+                                }
+                                sqlite3.reset(stmt); // Reset is needed for next execution
+                            }
+                        }
+                    },
+                    select: (bindValues) => {
+                        if (stmts.length !== 1) {
+                            throw new SqliteError({
+                                query: { bindValues, sql: queryStr },
+                                code: -1,
+                                cause: 'Expected only one statement when using `select`',
+                            });
+                        }
+                        const stmt = stmts[0];
+                        if (bindValues !== undefined && Object.keys(bindValues).length > 0) {
+                            sqlite3.bind_collection(stmt, bindValues);
+                        }
+                        const results = [];
+                        try {
+                            // NOTE `column_names` only works for `SELECT` statements, ignoring other statements for now
+                            let columns = undefined;
+                            try {
+                                columns = sqlite3.column_names(stmt);
+                                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                            }
+                            catch (_e) { }
+                            while (sqlite3.step(stmt) === SqliteConstants.SQLITE_ROW) {
+                                if (columns !== undefined) {
+                                    const obj = {};
+                                    for (let i = 0; i < columns.length; i++) {
+                                        obj[columns[i]] = sqlite3.column(stmt, i);
+                                    }
+                                    results.push(obj);
+                                }
+                            }
+                        }
+                        catch (e) {
+                            throw new SqliteError({
+                                query: { bindValues, sql: queryStr },
+                                code: e.code,
+                                cause: e,
+                            });
+                        }
+                        finally {
+                            // reset the cached statement so we can use it again in the future
+                            sqlite3.reset(stmt);
+                        }
+                        return results;
+                    },
+                    finalize: () => {
+                        // Avoid double finalization which leads to a crash
+                        if (isFinalized) {
+                            return;
+                        }
+                        isFinalized = true;
+                        for (const stmt of stmts) {
+                            sqlite3.finalize(stmt);
+                        }
+                    },
+                    sql: queryStr,
+                };
+                preparedStmts.push(preparedStmt);
+                return preparedStmt;
+            }
+            catch (e) {
+                throw new SqliteError({
+                    query: { sql: queryStr, bindValues: {} },
+                    code: e.code,
+                    cause: e,
+                });
+            }
+        },
+        export: () => sqlite3.serialize(dbPointer, 'main'),
+        execute: (queryStr, bindValues, options) => {
+            const stmt = sqliteDb.prepare(queryStr);
+            stmt.execute(bindValues, options);
+            stmt.finalize();
+        },
+        select: (queryStr, bindValues) => {
+            const stmt = sqliteDb.prepare(queryStr);
+            const results = stmt.select(bindValues);
+            stmt.finalize();
+            return results;
+        },
+        destroy: () => {
+            sqliteDb.close();
+            metadata.deleteDb();
+            // if (metadata._tag === 'opfs') {
+            //   metadata.vfs.resetAccessHandle(metadata.fileName)
+            // }
+        },
+        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
+            // #define SQLITE_DESERIALIZE_FREEONCLOSE 1 /* Call sqlite3_free() on close */
+            // #define SQLITE_DESERIALIZE_RESIZEABLE  2 /* Resize using sqlite3_realloc64() */
+            // #define SQLITE_DESERIALIZE_READONLY    4 /* Database is read-only */
+            const FREE_ON_CLOSE = 1;
+            const RESIZEABLE = 2;
+            // NOTE in case we'll have a future use-case where we need a read-only database, we can reuse this code below
+            // if (readOnly === true) {
+            //   sqlite3.deserialize(db, 'main', bytes, bytes.length, bytes.length, FREE_ON_CLOSE | RESIZEABLE)
+            // } else {
+            if (source instanceof Uint8Array) {
+                const tmpDb = makeInMemoryDb(sqlite3);
+                // TODO find a way to do this more efficiently with sqlite to avoid either of the deserialize + backup call
+                // Maybe this can be done via the VFS API
+                sqlite3.deserialize(tmpDb.dbPointer, 'main', source, source.length, source.length, FREE_ON_CLOSE | RESIZEABLE);
+                sqlite3.backup(dbPointer, 'main', tmpDb.dbPointer, 'main');
+                sqlite3.close(tmpDb.dbPointer);
+            }
+            else {
+                sqlite3.backup(dbPointer, 'main', source.metadata.dbPointer, 'main');
+            }
+            metadata.configureDb(sqliteDb);
+        },
+        session: () => {
+            const sessionPointer = sqlite3.session_create(dbPointer, 'main');
+            sqlite3.session_attach(sessionPointer, null);
+            return {
+                changeset: () => {
+                    const res = sqlite3.session_changeset(sessionPointer);
+                    return res.changeset ?? undefined;
+                },
+                finish: () => {
+                    sqlite3.session_delete(sessionPointer);
+                },
+            };
+        },
+        makeChangeset: (data) => {
+            const changeset = {
+                invert: () => {
+                    const inverted = sqlite3.changeset_invert(data);
+                    return sqliteDb.makeChangeset(inverted);
+                },
+                apply: () => {
+                    sqlite3.changeset_apply(dbPointer, data);
+                },
+            };
+            return changeset;
+        },
+    };
+    metadata.configureDb(sqliteDb);
+    return sqliteDb;
+};
+//# sourceMappingURL=make-sqlite-db.js.map

package/dist/make-sqlite-db.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"make-sqlite-db.js","sourceRoot":"","sources":["../src/make-sqlite-db.ts"],"names":[],"mappings":"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"}

package/dist/node/mod.d.ts

@@ -1,4 +1,4 @@
-import { type MakeSynchronousDatabase, type PersistenceInfo, type SynchronousDatabase } from '@livestore/common';
+import { type MakeSqliteDb, type PersistenceInfo, type SqliteDb } from '@livestore/common';
 import { Effect, FileSystem } from '@livestore/utils/effect';
 import type { MemoryVFS } from '@livestore/wa-sqlite/src/examples/MemoryVFS.js';
 import { NodeFS } from './NodeFS.js';
@@ -8,7 +8,7 @@ export type NodeDatabaseMetadataInMemory = {
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
     deleteDb: () => void;
-    configureDb: (db: SynchronousDatabase) => void;
+    configureDb: (db: SqliteDb) => void;
 };
 export type NodeDatabaseMetadataFs = {
     _tag: 'fs';
@@ -18,23 +18,23 @@ export type NodeDatabaseMetadataFs = {
         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 declare const syncDbFactory: ({ sqlite3, }: {
+export declare const sqliteDbFactory: ({ sqlite3, }: {
     sqlite3: SQLiteAPI;
-}) => Effect.Effect<MakeSynchronousDatabase<{
+}) => Effect.Effect<MakeSqliteDb<{
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
 }, NodeDatabaseInput, NodeDatabaseMetadata>, never, FileSystem.FileSystem>;

package/dist/node/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,eAAe,EACpB,KAAK,mBAAmB,EAEzB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAI/E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,IAAI,CAAA;IACV,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACvD,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,sBAAsB,CAAA;AAExF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,IAAI,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,yBAAyB,GAAG,mBAAmB,CAAA;AAE/E,eAAO,MAAM,aAAa,iBAEvB;IACD,OAAO,EAAE,SAAS,CAAA;CACnB,KAAG,MAAM,CAAC,MAAM,CACf,uBAAuB,CACrB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,EACvD,iBAAiB,EACjB,oBAAoB,CACrB,EACD,KAAK,EACL,UAAU,CAAC,UAAU,CA0CpB,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAmB,MAAM,mBAAmB,CAAA;AAC3G,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAI/E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,IAAI,CAAA;IACV,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACvD,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,sBAAsB,CAAA;AAExF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,IAAI,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,yBAAyB,GAAG,mBAAmB,CAAA;AAE/E,eAAO,MAAM,eAAe,iBAEzB;IACD,OAAO,EAAE,SAAS,CAAA;CACnB,KAAG,MAAM,CAAC,MAAM,CACf,YAAY,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,EAAE,iBAAiB,EAAE,oBAAoB,CAAC,EAC9G,KAAK,EACL,UAAU,CAAC,UAAU,CA0CpB,CAAA"}

package/dist/node/mod.js

@@ -1,13 +1,13 @@
 import path from 'node:path';
-import { UnexpectedError, } from '@livestore/common';
+import { UnexpectedError } from '@livestore/common';
 import { Effect, FileSystem } from '@livestore/utils/effect';
 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 const syncDbFactory = ({ sqlite3, }) => Effect.andThen(FileSystem.FileSystem, (fs) => (input) => Effect.gen(function* () {
+export const sqliteDbFactory = ({ sqlite3, }) => Effect.andThen(FileSystem.FileSystem, (fs) => (input) => Effect.gen(function* () {
     if (input._tag === 'in-memory') {
         const { dbPointer, vfs } = makeInMemoryDb(sqlite3);
-        return makeSynchronousDatabase({
+        return makeSqliteDb({
             sqlite3,
             metadata: {
                 _tag: 'in-memory',
@@ -26,7 +26,7 @@ export const syncDbFactory = ({ sqlite3, }) => Effect.andThen(FileSystem.FileSys
         fs,
     });
     const filePath = path.join(input.directory, input.fileName);
-    return makeSynchronousDatabase({
+    return makeSqliteDb({
         sqlite3,
         metadata: {
             _tag: 'fs',

package/dist/node/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/sqlite-wasm",
-  "version": "0.3.0-dev.10",
+  "version": "0.3.0-dev.12",
   "type": "module",
   "exports": {
     ".": {
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@livestore/wa-sqlite": "1.0.3-dev.7",
-    "@livestore/common": "0.3.0-dev.10",
-    "@livestore/utils": "0.3.0-dev.10"
+    "@livestore/common": "0.3.0-dev.12",
+    "@livestore/utils": "0.3.0-dev.12"
   },
   "devDependencies": {
     "@types/chrome": "^0.0.299",

package/src/browser/mod.ts

@@ -1,9 +1,9 @@
-import type { MakeSynchronousDatabase, PersistenceInfo, SynchronousDatabase } from '@livestore/common'
+import type { MakeSqliteDb, PersistenceInfo, SqliteDb } from '@livestore/common'
 import { Effect, Hash } from '@livestore/utils/effect'
 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 type { AccessHandlePoolVFS } from './opfs/AccessHandlePoolVFS.js'
 import { makeOpfsDb } from './opfs/index.js'
 
@@ -15,7 +15,7 @@ export type WebDatabaseMetadataInMemory = {
   dbPointer: number
   persistenceInfo: PersistenceInfo
   deleteDb: () => void
-  configureDb: (db: SynchronousDatabase) => void
+  configureDb: (db: SqliteDb) => void
 }
 
 export type WebDatabaseMetadataOpfs = {
@@ -28,14 +28,14 @@ export type WebDatabaseMetadataOpfs = {
     opfsFileName: string
   }>
   deleteDb: () => void
-  configureDb: (db: SynchronousDatabase) => void
+  configureDb: (db: SqliteDb) => void
 }
 
 export type WebDatabaseMetadata = WebDatabaseMetadataInMemory | WebDatabaseMetadataOpfs
 
 export type WebDatabaseInputInMemory = {
   _tag: 'in-memory'
-  configureDb?: (db: SynchronousDatabase) => void
+  configureDb?: (db: SqliteDb) => void
 }
 
 export type WebDatabaseInputOpfs = {
@@ -43,26 +43,22 @@ export type WebDatabaseInputOpfs = {
   /** Filename of the database file (only used when exporting/downloading the database) */
   fileName: string
   opfsDirectory: string
-  configureDb?: (db: SynchronousDatabase) => void
+  configureDb?: (db: SqliteDb) => void
 }
 
 export type WebDatabaseInput = WebDatabaseInputInMemory | WebDatabaseInputOpfs
 
-export const syncDbFactory =
+export const sqliteDbFactory =
   ({
     sqlite3,
   }: {
     sqlite3: SQLiteAPI
-  }): MakeSynchronousDatabase<
-    { dbPointer: number; persistenceInfo: PersistenceInfo },
-    WebDatabaseInput,
-    WebDatabaseMetadata
-  > =>
+  }): MakeSqliteDb<{ dbPointer: number; persistenceInfo: PersistenceInfo }, WebDatabaseInput, WebDatabaseMetadata> =>
   (input: WebDatabaseInput) =>
     Effect.gen(function* () {
       if (input._tag === 'in-memory') {
         const { dbPointer, vfs } = makeInMemoryDb(sqlite3)
-        return makeSynchronousDatabase<WebDatabaseMetadataInMemory>({
+        return makeSqliteDb<WebDatabaseMetadataInMemory>({
           sqlite3,
           metadata: {
             _tag: 'in-memory',
@@ -95,7 +91,7 @@ export const syncDbFactory =
         fileName: dbFilename,
       })
 
-      return makeSynchronousDatabase<WebDatabaseMetadataOpfs>({
+      return makeSqliteDb<WebDatabaseMetadataOpfs>({
         sqlite3,
         metadata: {
           _tag: 'opfs',

package/src/index_.ts

@@ -1,2 +1,2 @@
 export * from '@livestore/wa-sqlite'
-export * from './make-sync-db.js'
+export * from './make-sqlite-db.js'

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,14 +23,14 @@ export const makeSynchronousDatabase = <
 }: {
   sqlite3: SQLiteAPI
   metadata: TMetadata
-}): SynchronousDatabase<TMetadata> => {
+}): SqliteDb<TMetadata> => {
   const preparedStmts: PreparedStatement[] = []
   const { dbPointer } = metadata
 
   let isClosed = false
 
-  const syncDb: SynchronousDatabase<TMetadata> = {
-    _tag: 'SynchronousDatabase',
+  const sqliteDb: SqliteDb<TMetadata> = {
+    _tag: 'SqliteDb',
     metadata,
     prepare: (queryStr) => {
       try {
@@ -131,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') {
@@ -183,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')
@@ -203,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
 }