Fix tests to work in both NodeJS and browser.

Author: rkistner

packages/api/test/src/impl-tests.ts

@@ -12,13 +12,13 @@ export function describeImplTests(
     let dbPath: string;
 
     const open = async () => {
-      // const dir = path.dirname(dbPath);
-      // try {
-      //   await fs.mkdir(dir);
-      // } catch (e) {}
-      // try {
-      //   await fs.rm(dbPath);
-      // } catch (e) {}
+      const dir = path.dirname(dbPath);
+      try {
+        await fs.mkdir(dir);
+      } catch (e) {}
+      try {
+        await fs.rm(dbPath);
+      } catch (e) {}
       return factory(dbPath);
     };
 

packages/better-sqlite3-driver/test/src/better-sqlite3-async.test.ts

@@ -1,8 +1,12 @@
 import { describeDriverTests } from '@sqlite-js/driver-tests';
 import { BetterSqliteDriver } from '../../lib/index.js';
+import { deleteDb } from './util.js';
 
 describeDriverTests(
   'better-sqlite3-async-pool',
   { getColumns: true, rawResults: true, allowsMissingParameters: false },
-  (path) => BetterSqliteDriver.open(path)
+  async (path) => {
+    await deleteDb(path);
+    return BetterSqliteDriver.open(path);
+  }
 );

packages/better-sqlite3-driver/test/src/better-sqlite3.test.ts

@@ -1,8 +1,12 @@
 import { BetterSqliteDriver } from '../../lib/index.js';
 import { describeDriverTests } from '@sqlite-js/driver-tests';
+import { deleteDb } from './util.js';
 
 describeDriverTests(
   'better-sqlite3',
   { getColumns: true, rawResults: true, allowsMissingParameters: false },
-  (path) => BetterSqliteDriver.openInProcess(path)
+  async (path) => {
+    await deleteDb(path);
+    return BetterSqliteDriver.openInProcess(path);
+  }
 );

packages/better-sqlite3-driver/test/src/util.ts

@@ -0,0 +1,12 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+export async function deleteDb(dbPath: string) {
+  const dir = path.dirname(dbPath);
+  try {
+    await fs.mkdir(dir);
+  } catch (e) {}
+  try {
+    await fs.rm(dbPath);
+  } catch (e) {}
+}

packages/driver-tests/src/driver-tests.ts

@@ -1,5 +1,3 @@
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import { beforeEach, describe, test, expect } from './test.js';
 import { SqliteDriverConnectionPool } from '@sqlite-js/driver';
 
@@ -12,20 +10,13 @@ export interface DriverFeatures {
 export function describeDriverTests(
   name: string,
   features: DriverFeatures,
-  factory: (path: string) => SqliteDriverConnectionPool
+  factory: (path: string) => Promise<SqliteDriverConnectionPool>
 ) {
   describe(`${name} - driver tests`, () => {
     let dbPath: string;
 
     const open = async () => {
-      // const dir = path.dirname(dbPath);
-      // try {
-      //   await fs.mkdir(dir);
-      // } catch (e) {}
-      // try {
-      //   await fs.rm(dbPath);
-      // } catch (e) {}
-      const db = factory(dbPath);
+      const db = await factory(dbPath);
       return db;
     };
 

packages/driver-tests/src/test.ts

@@ -9,7 +9,7 @@ export interface TestContext {
   fullName: string;
 }
 
-export const isVitest = true || process.env.VITEST == 'true';
+export const isVitest = process.env.VITEST == 'true';
 export const isMocha = !isVitest;
 
 let testImpl, describeImpl, beforeEachImpl, expectImpl;

packages/driver-tests/test/src/node-sqlite-async.test.ts

@@ -1,8 +1,12 @@
 import { NodeSqliteDriver } from '@sqlite-js/driver/node';
 import { describeDriverTests } from '../../lib/index.js';
+import { deleteDb } from './util.js';
 
 describeDriverTests(
   'node:sqlite worker',
   { getColumns: false, rawResults: false, allowsMissingParameters: true },
-  (path) => NodeSqliteDriver.open(path)
+  async (path) => {
+    await deleteDb(path);
+    return NodeSqliteDriver.open(path);
+  }
 );

packages/driver-tests/test/src/node-sqlite-sync.test.ts

@@ -2,12 +2,16 @@ import { NodeSqliteDriver } from '@sqlite-js/driver/node';
 import { describeDriverTests } from '../../lib/index.js';
 
 import { isMocha, test } from '../../lib/test.js';
+import { deleteDb } from './util.js';
 
 if (isMocha) {
   describeDriverTests(
     'node:sqlite direct',
     { getColumns: false, rawResults: false, allowsMissingParameters: true },
-    (path) => NodeSqliteDriver.openInProcess(path)
+    async (path) => {
+      await deleteDb(path);
+      return NodeSqliteDriver.openInProcess(path);
+    }
   );
 } else {
   test.skip('only running in mocha');

packages/driver-tests/test/src/util.ts

@@ -0,0 +1,12 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+export async function deleteDb(dbPath: string) {
+  const dir = path.dirname(dbPath);
+  try {
+    await fs.mkdir(dir);
+  } catch (e) {}
+  try {
+    await fs.rm(dbPath);
+  } catch (e) {}
+}

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

@@ -4,5 +4,7 @@ import { waSqlitePool } from '../../lib/index.js';
 describeDriverTests(
   'wa-sqlite',
   { getColumns: true, rawResults: true, allowsMissingParameters: false },
-  (path) => waSqlitePool(':memory:')
+  async (path) => {
+    return waSqlitePool(':memory:');
+  }
 );