@livestore/wa-sqlite 1.0.1-dev.11 → 1.0.1-dev.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/wa-sqlite",
-  "version": "1.0.1-dev.11",
+  "version": "1.0.1-dev.13",
   "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,7 @@ export function Factory(Module) {
   //   return SQLite.SQLITE_OK;
   // };
   sqlite3.exec = function(db, sql, callback) {
-    const { stmts, finalize } = sqlite3.statements(db, sql);
+    const stmts = sqlite3.statements(db, sql);
     for (const stmt of stmts) {
       let columns;
       while (sqlite3.step(stmt) === SQLite.SQLITE_ROW) {
@@ -469,7 +469,9 @@ export function Factory(Module) {
         }
       }
     }
-    finalize();
+    for (const stmt of stmts) {
+      sqlite3.finalize(stmt);
+    }
     return SQLite.SQLITE_OK;
   };
 
@@ -778,13 +780,7 @@ export function Factory(Module) {
       //   }
       // }
 
-      const finalize = () => {
-        while (onFinally.length) {
-          onFinally.pop()();
-        }
-      }
-
-      return { stmts, finalize };
+      return stmts;
   };
 
   sqlite3.step = (function() {

package/src/types/index.d.ts

@@ -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): { stmts: ReadonlyArray<number>; finalize: () => void; };
+  statements(db: number, sql: string, options?: SQLitePrepareOptions): ReadonlyArray<number>;
 
   /**
    * Evaluate an SQL statement