Use upstream wa-sqlite.

Author: Ralf Kistner

.node-version

@@ -1 +1 @@
-v22.5.1
+v22.20.0

packages/wa-sqlite-driver/src/wa-sqlite-driver.ts

@@ -1,8 +1,5 @@
-import * as SQLite from '@journeyapps/wa-sqlite';
-// import SQLiteESMFactory from '@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs';
-import SQLiteESMFactory from '@journeyapps/wa-sqlite/dist/wa-sqlite.mjs';
-// import * as SQLite from 'wa-sqlite';
-// import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite-async.mjs';
+import * as SQLite from 'wa-sqlite';
+import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite-async.mjs';
 import {
   PrepareOptions,
   ResetOptions,

packages/wa-sqlite-driver/src/wa-sqlite-worker.ts

@@ -1,10 +1,9 @@
 import { OPFSCoopSyncVFS2 } from './OPFSCoopSyncVFS2';
 import { sqlite3, module, WaSqliteConnection } from './wa-sqlite-driver';
 import { setupDriverWorker } from './worker_threads';
-import { IDBBatchAtomicVFS } from '@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
-import { OPFSAdaptiveVFS } from '@journeyapps/wa-sqlite/src/examples/OPFSAdaptiveVFS.js';
-import { OPFSPermutedVFS } from '@journeyapps/wa-sqlite/src/examples/OPFSPermutedVFS.js';
-import { IDBBatchAtomicVFS as IDBBatchAtomicVFS0 } from 'wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
+import { IDBBatchAtomicVFS } from 'wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
+import { OPFSAdaptiveVFS } from 'wa-sqlite/src/examples/OPFSAdaptiveVFS.js';
+import { OPFSPermutedVFS } from 'wa-sqlite/src/examples/OPFSPermutedVFS.js';
 
 let vfs: any | null = null;
 setupDriverWorker({
@@ -13,13 +12,13 @@ setupDriverWorker({
     if (vfs != null) {
       throw new Error('Can only open one connection');
     }
-    vfs = await OPFSCoopSyncVFS2.create(
-      'test.db',
-      module,
-      options.readonly ?? false
-    );
+    // vfs = await OPFSCoopSyncVFS2.create(
+    //   'test.db',
+    //   module,
+    //   options.readonly ?? false
+    // );
     // IDBBatchAtomicVFS - breaks hard (database disk image is malformed)
-    // vfs = await (IDBBatchAtomicVFS0 as any).create('test.db', module);
+    vfs = await (IDBBatchAtomicVFS as any).create('test.db', module);
     // OPFSAdaptiveVFS - works great
     // vfs = await (OPFSAdaptiveVFS as any).create('test.db', module, {
     //   ifAvailable: true,

packages/wa-sqlite-driver/vitest.config.ts

@@ -1,14 +1,13 @@
 import { defineConfig } from 'vitest/config';
 import wasm from 'vite-plugin-wasm';
-import topLevelAwait from 'vite-plugin-top-level-await';
 
 export default defineConfig({
   esbuild: { target: 'es2022' },
   plugins: [wasm()],
   optimizeDeps: {
     // Don't optimise these packages as they contain web workers and WASM files.
     // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
-    exclude: ['@journeyapps/wa-sqlite'],
+    exclude: ['wa-sqlite'],
     include: []
   },
   define: {