Port wa-sqlite driver to new api; other tweaks.

Author: rkistner

benchmarks/src/implementations/better-sqlite3.ts

@@ -3,14 +3,13 @@ import DatabaseConstructor from 'better-sqlite3';
 import { promises as fs } from 'fs';
 import assert from 'node:assert';
 import { join } from 'path';
-import Prando from 'prando';
 import { Benchmark } from '../Benchmark.js';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 
 export class BetterSqlite3Impl extends Benchmark {
   private db!: bsqlite.Database;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/implementations/node-sqlite.ts

@@ -1,17 +1,16 @@
 import { promises as fs } from 'fs';
 import assert from 'node:assert';
 import { join } from 'path';
-import Prando from 'prando';
 import { Benchmark } from '../Benchmark.js';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 
 //@ts-ignore
 import * as sqlite from 'node:sqlite';
 
 export class NodeSqliteImpl extends Benchmark {
   private db!: sqlite.DatabaseSync;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/implementations/node-sqlite3.ts

@@ -1,16 +1,15 @@
 import { Benchmark } from '../Benchmark.js';
 import { join } from 'path';
 import { promises as fs } from 'fs';
-import Prando from 'prando';
 import assert from 'node:assert';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 import sqlite3 from 'sqlite3';
 import { open, Database } from 'sqlite';
 
 export class NodeSqlite3Impl extends Benchmark {
   private db!: Database;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/implementations/sjp-json.ts

@@ -1,15 +1,14 @@
 import { promises as fs } from 'fs';
 import assert from 'node:assert';
 import { join } from 'path';
-import Prando from 'prando';
 import { SqliteConnectionPool } from '@sqlite-js/api';
 import { Benchmark } from '../Benchmark.js';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 
 export class JSPJsonImpl extends Benchmark {
   private db!: SqliteConnectionPool;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/implementations/sjp-optimized.ts

@@ -1,15 +1,14 @@
 import { promises as fs } from 'fs';
 import assert from 'node:assert';
 import { join } from 'path';
-import Prando from 'prando';
 import { SqliteConnectionPool } from '@sqlite-js/api';
 import { Benchmark } from '../Benchmark.js';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 
 export class JSPOptimizedImpl extends Benchmark {
   private db!: SqliteConnectionPool;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/implementations/sjp.ts

@@ -1,15 +1,14 @@
 import { promises as fs } from 'fs';
 import assert from 'node:assert';
 import { join } from 'path';
-import Prando from 'prando';
 import { SqliteConnectionPool } from '@sqlite-js/api';
 import { Benchmark } from '../Benchmark.js';
-import { numberName } from '../util.js';
+import { numberName, createRandom } from '../util.js';
 
 export class JSPImpl extends Benchmark {
   private db!: SqliteConnectionPool;
   private dir: string;
-  private random = new Prando.default(0);
+  private random = createRandom(0);
 
   constructor(
     public name: string,

benchmarks/src/util.ts

@@ -1,3 +1,5 @@
+import * as Prando from 'prando';
+
 const digits = [
   '',
   'one',
@@ -34,6 +36,28 @@ const names100 = [
   ...digits.map((digit) => `ninety${digit != '' ? '-' + digit : ''}`)
 ];
 
+type PrandoInstance = import('prando').default;
+type PrandoConstructor = new (seed?: number | string) => PrandoInstance;
+
+function resolvePrandoConstructor(): PrandoConstructor {
+  const mod = Prando as unknown as {
+    default?: PrandoConstructor;
+  };
+  if (typeof (Prando as unknown) === 'function') {
+    return Prando as unknown as PrandoConstructor;
+  }
+  if (mod.default) {
+    return mod.default;
+  }
+  throw new Error('Unable to locate Prando constructor');
+}
+
+const PRANDO_CTOR = resolvePrandoConstructor();
+
+export function createRandom(seed?: number | string): PrandoInstance {
+  return new PRANDO_CTOR(seed);
+}
+
 export function numberName(n: number): string {
   if (n == 0) {
     return 'zero';

benchmarks/tsconfig.json

@@ -5,11 +5,14 @@
     "target": "ES2022",
     "strict": true,
     "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "outDir": "lib",
     "sourceMap": true,
     "declaration": true,
     "rootDir": "src",
-    "typeRoots": ["./src/types", "./node_modules/@types"]
+    "typeRoots": ["./src/types", "./node_modules/@types"],
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
   },
   "include": ["src"],
   "references": [{ "path": "../packages/api" }]

packages/api/package.json

@@ -8,8 +8,12 @@
     "test": "vitest",
     "clean": "tsc -b --clean && rm -rf lib"
   },
+  "types": "./lib/index.d.ts",
   "exports": {
-    ".": "./lib/index.js"
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    }
   },
   "keywords": [],
   "author": "",

packages/better-sqlite3-driver/package.json

@@ -8,8 +8,12 @@
     "test": "pnpm build && vitest",
     "clean": "tsc -b --clean && tsc -b ./test/tsconfig.json --clean && rm -rf lib test/lib"
   },
+  "types": "./lib/index.d.ts",
   "exports": {
-    ".": "./lib/index.js"
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    }
   },
   "keywords": [],
   "author": "",