@livestore/wa-sqlite 1.0.1-dev.10 → 1.0.1-dev.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/wa-sqlite",
-  "version": "1.0.1-dev.10",
+  "version": "1.0.1-dev.12",
   "type": "module",
   "main": "src/sqlite-api.js",
   "types": "src/types/index.d.ts",

package/src/sqlite-api.js

@@ -252,12 +252,12 @@ export function Factory(Module) {
   sqlite3.serialize = (function() {
     const fname = 'sqlite3_serialize';
     const f = Module.cwrap(fname, ...decl('nsnn:n'));
-    return function(db, schema, piSize, flags) {
+    return function(db, schema, flags) {
       verifyDatabase(db);
-      // TODO alloc + free memory for result?
+      const piSize = tmpPtr[0];
       const address = f(db, schema, piSize, flags);
-      const result = Module.HEAPU8.subarray(address, address + piSize);
-
+      const size = Module.getValue(piSize, '*');
+      const result = Module.HEAPU8.subarray(address, address + size);
       return result;
     };
   })();
@@ -458,7 +458,8 @@ export function Factory(Module) {
   //   return SQLite.SQLITE_OK;
   // };
   sqlite3.exec = function(db, sql, callback) {
-    for (const stmt of sqlite3.statements(db, sql)) {
+    const { stmts, finalize } = sqlite3.statements(db, sql);
+    for (const stmt of stmts) {
       let columns;
       while (sqlite3.step(stmt) === SQLite.SQLITE_ROW) {
         if (callback) {
@@ -468,6 +469,7 @@ export function Factory(Module) {
         }
       }
     }
+    finalize();
     return SQLite.SQLITE_OK;
   };
 
@@ -702,10 +704,10 @@ export function Factory(Module) {
       // { async: true });
       { async: false });
 
-      const results = [];
+      const stmts = [];
 
       const onFinally = [];
-      try {
+      // try {
         // Encode SQL string to UTF-8.
         const utf8 = new TextEncoder().encode(sql);
 
@@ -767,16 +769,22 @@ export function Factory(Module) {
           if (stmt) {
             mapStmtToDB.set(stmt, db);
             // yield stmt;
-            results.push(stmt);
+            stmts.push(stmt);
           }
         } while (stmt);
-      } finally {
+      // } finally {
+      //   while (onFinally.length) {
+      //     onFinally.pop()();
+      //   }
+      // }
+
+      const finalize = () => {
         while (onFinally.length) {
           onFinally.pop()();
         }
       }
 
-      return results;
+      return { stmts, finalize };
   };
 
   sqlite3.step = (function() {

package/src/types/index.d.ts

@@ -117,11 +117,11 @@ interface SQLiteVFS {
 }
 
 /**
- * Options object argument for {@link SQLiteAPI.statements}
+ * Options object argument for {@link SQLiteAPI['statements']}
  */
 declare interface SQLitePrepareOptions {
   /**
-   * Statement handles prepared and yielded by {@link SQLiteAPI.statements}
+   * Statement handles prepared and yielded by {@link SQLiteAPI['statements']}
    * are normally valid only within the scope of an iteration.
    * Set `unscoped` to `true` to give iterated statements an arbitrary
    * lifetime.
@@ -361,7 +361,6 @@ interface SQLiteAPI {
   serialize(
     db: number,
     zSchema: string,
-    piSize: number,
     mFlags: number
   ): Uint8Array;
 
@@ -760,7 +759,7 @@ interface SQLiteAPI {
    * @param options
    */
   // statements(db: number, sql: string, options?: SQLitePrepareOptions): AsyncIterable<number>;
-  statements(db: number, sql: string, options?: SQLitePrepareOptions): ReadonlyArray<number>;
+  statements(db: number, sql: string, options?: SQLitePrepareOptions): { stmts: ReadonlyArray<number>; finalize: () => void; };
 
   /**
    * Evaluate an SQL statement