From dfbca2e1eea579186e1815cd9f112f70e36fb1b2 Mon Sep 17 00:00:00 2001
From: Glen Maddern <glen@cloudflare.com>
Date: Thu, 4 Aug 2022 16:35:32 +0100
Subject: [PATCH] fixed tests and removed type alias

---
 package-lock.json                    | 4 ++--
 packages/d1/package.json             | 2 +-
 packages/d1/test/database.spec.ts    | 3 ++-
 packages/shared/src/storage.ts       | 5 -----
 packages/storage-file/src/index.ts   | 6 +++---
 packages/storage-memory/src/local.ts | 6 +++---
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a845bc0e1..fc3f5baa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8184,7 +8184,7 @@
       "version": "2.6.0",
       "license": "MIT",
       "dependencies": {
-        "@miniflare/core": "^2.6.0",
+        "@miniflare/core": "2.6.0",
         "@miniflare/shared": "2.6.0"
       },
       "devDependencies": {
@@ -10646,7 +10646,7 @@
     "@miniflare/d1": {
       "version": "file:packages/d1",
       "requires": {
-        "@miniflare/core": "^2.6.0",
+        "@miniflare/core": "2.6.0",
         "@miniflare/shared": "2.6.0",
         "@miniflare/shared-test": "2.6.0"
       }
diff --git a/packages/d1/package.json b/packages/d1/package.json
index bb9662589..9c7e1592d 100644
--- a/packages/d1/package.json
+++ b/packages/d1/package.json
@@ -36,7 +36,7 @@
     "extends": "../../package.json"
   },
   "dependencies": {
-    "@miniflare/core": "^2.6.0",
+    "@miniflare/core": "2.6.0",
     "@miniflare/shared": "2.6.0"
   },
   "devDependencies": {
diff --git a/packages/d1/test/database.spec.ts b/packages/d1/test/database.spec.ts
index 997f4a4d4..26f02e693 100644
--- a/packages/d1/test/database.spec.ts
+++ b/packages/d1/test/database.spec.ts
@@ -11,9 +11,10 @@ interface Context {
 
 const test = anyTest as TestInterface<Context>;
 
-test.beforeEach((t) => {
+test.beforeEach(async (t) => {
   const storage = new MemoryStorage(undefined, testClock);
   const db = new BetaDatabase(storage);
+  await db.init();
   t.context = { storage, db };
 });
 
diff --git a/packages/shared/src/storage.ts b/packages/shared/src/storage.ts
index b05051db3..bf2e6f09b 100644
--- a/packages/shared/src/storage.ts
+++ b/packages/shared/src/storage.ts
@@ -167,11 +167,6 @@ export interface StorageFactory {
   dispose?(): Awaitable<void>;
 }
 
-// @types/better-sqlite3 doesn't seem to export DatabaseConstructor, so we do this
-export type BetterSqlite3Exports = {
-  new (filename: string, options?: Database.Options): Database.Database;
-};
-
 export function getSQLiteNativeBindingLocation(sqliteResolvePath: string) {
   return path.resolve(
     path.dirname(sqliteResolvePath),
diff --git a/packages/storage-file/src/index.ts b/packages/storage-file/src/index.ts
index 0d3ac926a..1af15587c 100644
--- a/packages/storage-file/src/index.ts
+++ b/packages/storage-file/src/index.ts
@@ -109,9 +109,9 @@ export class FileStorage extends LocalStorage {
   }
 
   async getSqliteDatabase(): Promise<Database.Database> {
-    const DatabaseConstructor = await npxImport<BetterSqlite3Exports>(
-      "better-sqlite3@^7.5.3"
-    );
+    const DatabaseConstructor = await npxImport<
+      typeof import("better-sqlite3")
+    >("better-sqlite3@^7.5.3");
     fs.mkdirSync(path.dirname(this.root), { recursive: true });
     return new DatabaseConstructor(this.root + ".sqlite3", {
       nativeBinding: getSQLiteNativeBindingLocation(
diff --git a/packages/storage-memory/src/local.ts b/packages/storage-memory/src/local.ts
index 32e8260d6..20c76c7e8 100644
--- a/packages/storage-memory/src/local.ts
+++ b/packages/storage-memory/src/local.ts
@@ -122,9 +122,9 @@ export abstract class LocalStorage extends Storage {
   }
 
   async getSqliteDatabase(): Promise<Database.Database> {
-    const DatabaseConstructor = await npxImport<BetterSqlite3Exports>(
-      "better-sqlite3@^7.5.3"
-    );
+    const DatabaseConstructor = await npxImport<
+      typeof import("better-sqlite3")
+    >("better-sqlite3@^7.5.3");
     return new DatabaseConstructor(":memory:", {
       nativeBinding: getSQLiteNativeBindingLocation(
         npxResolve("better-sqlite3")