expo-sqlite 58.0.10 → 58.0.12

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.12/expo.modules.sqlite-58.0.12.module.sha512

@@ -0,0 +1 @@
+48f8da8c6d5d961978b986c2e3c2b2326e76c82e330f2d6a5119d37a8330f4756480e0760a22c67dc74039b0e76abb796bdf07720490bfb2c2df4d912c692214

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/{58.0.10/expo.modules.sqlite-58.0.10.pom → 58.0.12/expo.modules.sqlite-58.0.12.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.sqlite</artifactId>
-  <version>58.0.10</version>
+  <version>58.0.12</version>
   <packaging>aar</packaging>
   <name>expo.modules.sqlite</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.12/expo.modules.sqlite-58.0.12.pom.md5

@@ -0,0 +1 @@
+d4b5a8aecf75b8f63eacde650b9e485a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.12/expo.modules.sqlite-58.0.12.pom.sha1

@@ -0,0 +1 @@
+da889fb033227b171fdfe2d0acce68487af479b4

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.12/expo.modules.sqlite-58.0.12.pom.sha256

@@ -0,0 +1 @@
+efe34bb452ecd1da1e59083dfef52aa7e884e163b6808b2bbc0b27bab0017754

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.12/expo.modules.sqlite-58.0.12.pom.sha512

@@ -0,0 +1 @@
+b60567105d26b5f2ed28515989f0a566ad4609df6957e35e3d0f988e011de482e86fb975aa520196abcca1a91cdbf6f422a6db01c966312cd6a98bb5dd7e8b55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sqlite",
-  "version": "58.0.10",
+  "version": "58.0.12",
   "description": "Provides access to a database using SQLite (https://www.sqlite.org/). The database is persisted across restarts of your app.",
   "keywords": [
     "async-storage",
@@ -50,13 +50,13 @@
     "await-lock": "^2.2.2"
   },
   "devDependencies": {
+    "@expo/internal-scripts": "58.0.1",
     "@expo/spawn-async": "^1.8.0",
     "@testing-library/react-native": "^14.0.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.14.0",
     "@types/react": "~19.3.0",
-    "expo": "58.0.4",
-    "expo-module-scripts": "56.0.7",
+    "expo": "58.0.8",
     "react-error-boundary": "^4.0.11",
     "tar": "^7.5.22"
   },
@@ -66,7 +66,7 @@
     "react-native": "*"
   },
   "jest": {
-    "preset": "expo-module-scripts"
+    "preset": "@expo/internal-scripts"
   },
   "scripts": {
     "precompile-android": "et prebuild-android-package-for-publish",

package/src/NativeDatabase.ts

@@ -13,7 +13,7 @@ export declare class NativeDatabase {
   public isInTransactionAsync(): Promise<boolean>;
   public closeAsync(): Promise<void>;
   public execAsync(source: string): Promise<void>;
-  public serializeAsync(databaseName: string): Promise<Uint8Array>;
+  public serializeAsync(databaseName: string): Promise<Uint8Array | ArrayBuffer>;
   public prepareAsync(nativeStatement: NativeStatement, source: string): Promise<NativeStatement>;
   public createSessionAsync(nativeSession: NativeSession, dbName: string): Promise<NativeSession>;
   public loadExtensionAsync(libPath: string, entryPoint?: string): Promise<void>;
@@ -27,7 +27,7 @@ export declare class NativeDatabase {
   public closeSync(): void;
   public interruptSync(): void;
   public execSync(source: string): void;
-  public serializeSync(databaseName: string): Uint8Array;
+  public serializeSync(databaseName: string): Uint8Array | ArrayBuffer;
   public prepareSync(nativeStatement: NativeStatement, source: string): NativeStatement;
   public createSessionSync(nativeSession: NativeSession, dbName: string): NativeSession;
   public loadExtensionSync(libPath: string, entryPoint?: string): void;

package/src/SQLiteDatabase.ts

@@ -63,8 +63,8 @@ export class SQLiteDatabase {
    *
    * @param databaseName The name of the current attached databases. The default value is `main` which is the default database name.
    */
-  public serializeAsync(databaseName: string = 'main'): Promise<Uint8Array> {
-    return this.nativeDatabase.serializeAsync(databaseName);
+  public async serializeAsync(databaseName: string = 'main'): Promise<Uint8Array> {
+    return toUint8Array(await this.nativeDatabase.serializeAsync(databaseName));
   }
 
   /**
@@ -264,7 +264,7 @@ export class SQLiteDatabase {
    * @param databaseName The name of the current attached databases. The default value is `main` which is the default database name.
    */
   public serializeSync(databaseName: string = 'main'): Uint8Array {
-    return this.nativeDatabase.serializeSync(databaseName);
+    return toUint8Array(this.nativeDatabase.serializeSync(databaseName));
   }
 
   /**
@@ -802,3 +802,11 @@ class Transaction extends SQLiteDatabase {
     return new Transaction(db.databasePath, options, nativeDatabase);
   }
 }
+
+/**
+ * The native database hands serialized bytes over as a `Uint8Array` on iOS and as an `ArrayBuffer`
+ * on Android.
+ */
+function toUint8Array(data: Uint8Array | ArrayBuffer): Uint8Array {
+  return data instanceof Uint8Array ? data : new Uint8Array(data);
+}

package/src/WebConfiguration.ts

@@ -0,0 +1,36 @@
+import ExpoSQLite from './ExpoSQLite';
+
+/**
+ * Options for [`configureWeb()`](#sqliteconfigureweboptions).
+ * @platform web
+ */
+export interface SQLiteWebOptions {
+  /**
+   * The URL of a custom wa-sqlite WebAssembly build, for example one built with FTS enabled.
+   * When omitted, `expo-sqlite` uses its bundled build.
+   *
+   * The build must come from the [`expo/wa-sqlite`](https://github.com/expo/wa-sqlite) revision that matches your `expo-sqlite` version.
+   * A build from another revision may fail to load.
+   */
+  wasmURL?: string;
+}
+
+/**
+ * Configures how `expo-sqlite` runs on web.
+ * Each call replaces the options from the previous call.
+ * It has no effect on Android, iOS, and server rendering.
+ *
+ * Call it before opening any database.
+ * It throws if `wasmURL` changes after a database is opened, because the web worker loads SQLite only once.
+ *
+ * @example
+ * ```ts
+ * SQLite.configureWeb({ wasmURL: require('./assets/wa-sqlite-fts.wasm') });
+ * const db = await SQLite.openDatabaseAsync('app.db');
+ * ```
+ *
+ * @platform web
+ */
+export function configureWeb(options: SQLiteWebOptions): void {
+  ExpoSQLite.configureWeb?.(options);
+}

package/src/index.ts

@@ -3,3 +3,4 @@ export * from './SQLiteSession';
 export * from './SQLiteStatement';
 export * from './SQLiteTaggedQuery';
 export * from './hooks';
+export { configureWeb, type SQLiteWebOptions } from './WebConfiguration';

package/web/SQLiteModule.ts

@@ -11,9 +11,12 @@ import {
   type SQLiteColumnValues,
   type SQLiteRunResult,
 } from '../src/NativeStatement';
+import { type SQLiteWebOptions } from '../src/WebConfiguration';
 import { invokeWorkerAsync, invokeWorkerSync, workerMessageHandler } from './WorkerChannel';
+import { type ConfigureWorkerMessage } from './web.types';
 
 let worker: Worker | null = null;
+let webOptions: SQLiteWebOptions = {};
 let nextNativeDatabaseId = 0;
 let nextNativeStatementId = 0;
 let nextNativeSessionId = 0;
@@ -29,6 +32,7 @@ function getWorker(): Worker {
       }
       workerMessageHandler(event);
     });
+    worker.postMessage({ type: 'configure', data: webOptions } satisfies ConfigureWorkerMessage);
   }
   return worker;
 }
@@ -427,6 +431,18 @@ export class SQLiteModule extends NativeModule {
     });
   }
 
+  configureWeb(options: SQLiteWebOptions): void {
+    if (worker != null) {
+      // Fast Refresh runs the same call again after a database is open.
+      if (options.wasmURL === webOptions.wasmURL) return;
+      throw new Error(
+        'Cannot change the SQLite WebAssembly URL because a database has already been opened, and the web worker loads SQLite only once. ' +
+          'Call `configureWeb()` before opening any database, and reload the app after you change `wasmURL`.'
+      );
+    }
+    webOptions = { ...options };
+  }
+
   async ensureDatabasePathExistsAsync(databasePath: string): Promise<void> {
     // No-op for web
   }

package/web/WorkerChannel.ts

@@ -33,21 +33,29 @@ export function sendWorkerResult({
     resultBuffer: SharedArrayBuffer;
   };
 }) {
+  // Send the message as a string. An Error doesn't survive JSON, and `String(error)` keeps it non-empty.
+  const errorMessage = error != null ? error.message || String(error) : null;
   if (syncTrait) {
     const { lockBuffer, resultBuffer } = syncTrait;
     const lock = new Int32Array(lockBuffer);
-    const resultArray = new Uint8Array(resultBuffer);
-    const resultJson = error != null ? serialize({ error }) : serialize({ result });
-    const resultBytes = new TextEncoder().encode(resultJson);
-    const length = resultBytes.length;
-    resultArray.set(new Uint32Array([length]), 0);
-    resultArray.set(resultBytes, 4);
+    let resultBytes = new TextEncoder().encode(
+      errorMessage != null ? serialize({ error: errorMessage }) : serialize({ result })
+    );
+    if (resultBytes.length + 4 > resultBuffer.byteLength) {
+      resultBytes = new TextEncoder().encode(
+        serialize({
+          error: `The synchronous result is ${resultBytes.length} bytes, which is more than the ${resultBuffer.byteLength - 4} bytes that synchronous calls can return on web. Use the async API for large results.`,
+        })
+      );
+    }
+    new Uint32Array(resultBuffer, 0, 1)[0] = resultBytes.length;
+    new Uint8Array(resultBuffer).set(resultBytes, 4);
     Atomics.store(lock, 0, RESOLVED);
   } else {
-    if (result) {
-      self.postMessage({ id, result });
+    if (error != null) {
+      self.postMessage({ id, error: errorMessage });
     } else {
-      self.postMessage({ id, error });
+      self.postMessage({ id, result });
     }
   }
 }

package/web/wa-sqlite/sqlite-api.js

@@ -300,7 +300,10 @@ export function Factory(Module) {
     return async function (db) {
       verifyDatabase(db);
       const result = await f(db);
-      databases.delete(db);
+      // expo-sqlite: SQLite keeps the connection open when close fails, so keep it usable for a retry.
+      if (result === SQLite.SQLITE_OK) {
+        databases.delete(db);
+      }
       return check(fname, result, db);
     };
   })();

package/web/web.types.ts

@@ -8,6 +8,7 @@ import {
   type SQLiteColumnNames,
   type SQLiteColumnValues,
 } from '../src/NativeStatement';
+import { type SQLiteWebOptions } from '../src/WebConfiguration';
 import { type SQLAction } from './SQLAction';
 
 export interface SyncWorkerMessage {
@@ -250,6 +251,11 @@ type SessionInvertChangesetMessage = BaseWorkerMessage & {
   };
 };
 
+export interface ConfigureWorkerMessage {
+  type: 'configure';
+  data: SQLiteWebOptions;
+}
+
 //#endregion Request messages
 
 //#region Response messages

package/web/worker.ts

@@ -4,6 +4,7 @@
 
 import { type Changeset } from '../src/NativeSession';
 import { type SQLiteColumnNames, type SQLiteColumnValues } from '../src/NativeStatement';
+import { type SQLiteWebOptions } from '../src/WebConfiguration';
 import { createSQLAction } from './SQLAction';
 import { SQLiteOptions } from './SQLiteOptions';
 import { sendWorkerResult } from './WorkerChannel';
@@ -21,6 +22,7 @@ import WaSQLiteFactory from './wa-sqlite/wa-sqlite';
 // @ts-expect-error wasm module is not typed
 import wasmModule from './wa-sqlite/wa-sqlite.wasm';
 import {
+  type ConfigureWorkerMessage,
   type SQLiteWorkerMessage,
   type SQLiteWorkerMessageType,
   type MessageTypeMap,
@@ -40,6 +42,7 @@ interface DatabaseEntity {
 }
 interface StatementEntity {
   pointer: StatementPointer;
+  databasePointer: DatabasePointer;
 }
 interface SessionEntity {
   pointer: SessionPointer;
@@ -54,6 +57,7 @@ const MIN_INT32 = -0x80000000;
 let _sqlite3: SQLiteAPI | null = null;
 let _vfs: AccessHandlePoolVFS | null = null;
 let _vfsMemory: MemoryVFS | null = null;
+let _webOptions: SQLiteWebOptions = {};
 
 const databaseIdMap = new Map<number, DatabaseEntity>();
 const statementIdMap = new Map<number, StatementEntity>();
@@ -61,7 +65,12 @@ const sessionIdMap = new Map<number, SessionEntity>();
 
 class SQLiteErrorException extends Error {}
 
-self.onmessage = async (event: MessageEvent<SQLiteWorkerMessage>) => {
+self.onmessage = async (event: MessageEvent<SQLiteWorkerMessage | ConfigureWorkerMessage>) => {
+  if (event.data.type === 'configure') {
+    _webOptions = event.data.data;
+    return;
+  }
+
   let result: ResultType | null = null;
   let error: Error | null = null;
   try {
@@ -118,7 +127,7 @@ async function handleMessageImpl<T extends SQLiteWorkerMessageType>({
     }
 
     case 'finalize': {
-      await finalize(data.nativeDatabaseId, data.nativeStatementId);
+      await finalize(data.nativeStatementId);
       break;
     }
 
@@ -253,12 +262,20 @@ async function backupDatabase(
 }
 
 async function closeDatabase(nativeDatabaseId: number) {
-  maybeFinalizeAllStatements(nativeDatabaseId);
   const { sqlite3 } = await maybeInitAsync();
   const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (dbEntity) {
-    databaseIdMap.delete(nativeDatabaseId);
+  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
+
+  databaseIdMap.delete(nativeDatabaseId);
+  if ([...databaseIdMap.values()].includes(dbEntity)) {
+    return;
+  }
+  try {
+    await maybeFinalizeAllStatements(sqlite3, dbEntity);
     await sqlite3.close(dbEntity.pointer);
+  } catch (e) {
+    databaseIdMap.set(nativeDatabaseId, dbEntity);
+    throw e;
   }
 }
 
@@ -289,10 +306,9 @@ async function exec(nativeDatabaseId: number, source: string) {
   await sqlite3.exec(dbEntity.pointer, source);
 }
 
-async function finalize(nativeDatabaseId: number, nativeStatementId: number): Promise<void> {
+// A closed handle to a shared connection may still own statements, so don't require its id here.
+async function finalize(nativeStatementId: number): Promise<void> {
   const { sqlite3 } = await maybeInitAsync();
-  const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
   const stmt = statementIdMap.get(nativeStatementId);
   if (!stmt) throw new Error(`Statement not found - nativeStatementId[${nativeStatementId}]`);
 
@@ -429,7 +445,10 @@ async function prepare(
   const { value: statementPointer } = await asyncIterator.next();
   asyncIterator.return?.();
   if (!statementPointer) throw new Error('Failed to prepare statement');
-  statementIdMap.set(nativeStatementId, { pointer: statementPointer });
+  statementIdMap.set(nativeStatementId, {
+    pointer: statementPointer,
+    databasePointer: dbEntity.pointer,
+  });
 }
 
 async function run(
@@ -736,40 +755,21 @@ async function initDb(sqlite3: SQLiteAPI, dbEntity: DatabaseEntity) {
   }
 }
 
-async function maybeFinalizeAllStatements(nativeDatabaseId: number) {
-  const { sqlite3 } = await maybeInitAsync();
-  const dbEntity = databaseIdMap.get(nativeDatabaseId);
-  if (!dbEntity) throw new Error(`Database not found - nativeDatabaseId[${nativeDatabaseId}]`);
+async function maybeFinalizeAllStatements(sqlite3: SQLiteAPI, dbEntity: DatabaseEntity) {
   if (!dbEntity.openOptions.finalizeUnusedStatementsBeforeClosing) {
     return;
   }
 
-  let error: Error | null = null;
-  const finalizedStatements: StatementPointer[] = [];
-  let stmt: StatementPointer | null = sqlite3.next_stmt(dbEntity.pointer, null);
-  while (stmt != null && stmt !== 0) {
-    const nextStmt: StatementPointer = sqlite3.next_stmt(dbEntity.pointer, stmt);
-    try {
-      sqlite3.finalize(stmt);
-      finalizedStatements.push(stmt);
-    } catch (e) {
-      error = e;
-    }
-    stmt = nextStmt;
-  }
-
-  // Delete finalized statements from the map
-  const statementsToDelete: number[] = [];
   for (const [nativeStatementId, stmtEntity] of statementIdMap.entries()) {
-    if (finalizedStatements.includes(stmtEntity.pointer)) {
-      statementsToDelete.push(nativeStatementId);
+    if (stmtEntity.databasePointer !== dbEntity.pointer) {
+      continue;
     }
-  }
-  for (const nativeStatementId of statementsToDelete) {
     statementIdMap.delete(nativeStatementId);
+    const result = await sqlite3.finalize(stmtEntity.pointer);
+    if (result !== SQLITE_OK) {
+      console.warn(`Finalizing a statement during close failed - error code[${result}]`);
+    }
   }
-
-  if (error) throw error;
 }
 
 async function maybeInitAsync(): Promise<{
@@ -778,9 +778,7 @@ async function maybeInitAsync(): Promise<{
   vfsMemory: MemoryVFS;
 }> {
   if (!_sqlite3) {
-    const module = await WaSQLiteFactory({
-      locateFile: () => wasmModule,
-    });
+    const module = await loadWaSQLiteModuleAsync();
     _sqlite3 = SQLite.Factory(module) as SQLiteAPI;
     if (!_sqlite3) {
       throw new Error('Failed to initialize wa-sqlite');
@@ -808,4 +806,18 @@ async function maybeInitAsync(): Promise<{
   return { sqlite3: _sqlite3, vfs: _vfs, vfsMemory: _vfsMemory };
 }
 
+async function loadWaSQLiteModuleAsync(): Promise<any> {
+  const { wasmURL } = _webOptions;
+  try {
+    return await WaSQLiteFactory({ locateFile: () => wasmURL ?? wasmModule });
+  } catch (e) {
+    if (wasmURL == null) throw e;
+    throw new Error(
+      `Failed to load the SQLite WebAssembly module from "${wasmURL}". ` +
+        'Check that the `wasmURL` passed to `configureWeb()` is reachable and built from the `expo/wa-sqlite` revision that this `expo-sqlite` uses. ' +
+        `Cause: ${e instanceof Error ? e.message : String(e)}`
+    );
+  }
+}
+
 //#endregion Internal helpers

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10-sources.jar.md5

@@ -1 +0,0 @@
-f9c01cec01c62d6a619fdc69f237e033

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10-sources.jar.sha1

@@ -1 +0,0 @@
-afa88d36ec945ad0442cc3582e05eb84b07cb9f1

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10-sources.jar.sha256

@@ -1 +0,0 @@
-67dbdc88a1d7fc60c31092ad150a98a30d93d8ca82bbf869609890965425524d

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10-sources.jar.sha512

@@ -1 +0,0 @@
-47d6b003042ef32b80e19b64fd015ffcfa159bb8f08971459211cd6ab971304da58dee6236c2be5319f606f9062d023530dcaa5c2e530bb17e42ab1465d5b95f

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.aar.md5

@@ -1 +0,0 @@
-fad06d1b56a5b3ce76fff8218367c30e

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.aar.sha1

@@ -1 +0,0 @@
-daaf8670dcbff2b9ab9410878e0a87e85eabad6f

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.aar.sha256

@@ -1 +0,0 @@
-c4c90adee96c2308551babad7ac1fca8e3782ab14771b68933f1151a03436333

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.aar.sha512

@@ -1 +0,0 @@
-8da2bcca001991403ad15af7ae5fe40b6f02cf613801c3c109fc64b0a25980c07019c47fca22cbfef180ce826225442d307fc3b4416cc29127fda0c3880c666c

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.module.md5

@@ -1 +0,0 @@
-ca75ac17a7818d5fc42a65c0840dfe04

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.module.sha1

@@ -1 +0,0 @@
-c83619ccf6810e1e67de33d891531e884de12020

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.module.sha256

@@ -1 +0,0 @@
-dfc2cb2d98cfef3bd6b5be8f805dd3444b34c4755dfc2f6ff0e0b653ba123cd3

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.module.sha512

@@ -1 +0,0 @@
-73ae3ffc162990e89b804689ba3d929767b2619e57e56d78c277b4c772fd8cd284ff0cda1a1418342b5f21c68fd4538548ab273f38c390a31dbd5a6e8800143f

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.pom.md5

@@ -1 +0,0 @@
-92a9db327ca2c2ad57ff6a10c3ad05bd

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.pom.sha1

@@ -1 +0,0 @@
-d104ae54dc9a284a629157c7f4bc6a76d4b1d5e3

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.pom.sha256

@@ -1 +0,0 @@
-d46287f54d70926645728cdb6a436ad843ea632fbdf9274a29c6227de2e61532

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.10/expo.modules.sqlite-58.0.10.pom.sha512

@@ -1 +0,0 @@
-584fceef6dc748071a484a1cee817dbc73fc8ce8838fbcb29a1d429a2b8eb36d608d7acd3a17c10f8e35a78ded5064bc01bb839376dc11b59e5c82937a23f4bf