two-stroke 1.0.13 → 1.0.15

package/package.json

@@ -51,7 +51,7 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.1.0",
   "type": "module",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "devDependencies": {
     "@types/eslint": "^8.56.9",
     "@types/node": "^20.12.7",

package/src/test.ts

@@ -1,11 +1,13 @@
-import { Miniflare, createFetchMock } from "miniflare";
-import toml from "toml";
 import fs from "fs";
-import { Env } from "./types";
+import { JWTPayload, SignJWT, exportJWK, generateKeyPair } from "jose";
+import { Miniflare, createFetchMock } from "miniflare";
+import nodefs from "node:fs/promises";
+import path from "node:path";
+import createClient from "openapi-fetch";
 import consumers from "stream/consumers";
+import toml from "toml";
 import { URLSearchParams } from "url";
-import createClient from "openapi-fetch";
-import { generateKeyPair, SignJWT, JWTPayload, exportJWK } from "jose";
+import { Env } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 export const setupTests = async <Paths extends {}>(bindings: Env) => {
@@ -23,38 +25,79 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
       ...bindings,
     },
     queueConsumers: (config.queues?.consumers ?? []).map(
-      ({ queue }: { queue: string }) => queue,
+      ({ queue }: { queue: string }) => queue
     ),
     queueProducers: Object.fromEntries(
       (config.queues?.producers ?? []).map(
         ({ binding, queue }: { queue: string; binding: string }) => [
           binding,
           queue,
-        ],
-      ),
+        ]
+      )
     ),
     r2Buckets: (config.r2_buckets ?? []).map(
-      ({ binding }: { binding: string }) => binding,
+      ({ binding }: { binding: string }) => binding
     ),
     kvNamespaces: (config.kv_namespaces ?? []).map(
-      ({ binding }: { binding: string }) => binding,
+      ({ binding }: { binding: string }) => binding
     ),
     d1Databases: (config.d1_databases ?? []).map(
-      ({ binding }: { binding: string }) => binding,
+      ({ binding }: { binding: string }) => binding
     ),
     serviceBindings: Object.fromEntries(
       (config.services ?? []).map(
         ({ binding, service }: { binding: string; service: string }) => [
           binding,
           service,
-        ],
-      ),
+        ]
+      )
     ),
     fetchMock,
   });
 
   const url = await miniflare.ready;
 
+  // Hack until miniflare supports auto running D1 migrations.
+  // Note: Each migration file can contain only a single statement.
+  await Promise.all(
+    (config.d1_databases ?? []).map(
+      async ({ binding }: { binding: string }) => {
+        const d1 = await miniflare.getD1Database(binding);
+
+        const migrationsDir = "./migrations";
+        let fileNames: string[] = [];
+        try {
+          fileNames = await nodefs.readdir(migrationsDir);
+        } catch (error) {
+          console.log("Error loading migrations", error);
+        }
+
+        if (fileNames.length === 0)
+          console.log("No migrations found in ./migrations");
+
+        for (const migrationName of fileNames.sort((a, b) => {
+          const migrationNumberA = parseInt(a.split("_")[0]!);
+          const migrationNumberB = parseInt(b.split("_")[0]!);
+          if (migrationNumberA < migrationNumberB) {
+            return -1;
+          }
+          if (migrationNumberA > migrationNumberB) {
+            return 1;
+          }
+
+          // numbers must be equal
+          return 0;
+        })) {
+          const migrationPath = path.join(migrationsDir, migrationName);
+          let migration = await nodefs.readFile(migrationPath, "utf8");
+          // Remove migration comment
+          migration = migration.split("\n").slice(1).join(" ");
+          await d1.exec(migration);
+        }
+      }
+    )
+  );
+
   const client = createClient<Paths>({ baseUrl: url.toString() });
 
   return {
@@ -91,7 +134,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
             headers: {
               "Content-Type": "application/json",
             },
-          },
+          }
         )
         .persist();
       fetchMock
@@ -106,7 +149,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
             headers: {
               "Content-Type": "application/json",
             },
-          },
+          }
         )
         .persist();
       return await new SignJWT(claims)
@@ -138,7 +181,7 @@ export function recordRequest(
   data: string | object | Buffer | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
-  },
+  }
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {
@@ -154,7 +197,7 @@ export function recordFormRequest(
   data: string | object | Buffer | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
-  },
+  }
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {
@@ -162,7 +205,7 @@ export function recordFormRequest(
       .text(body)
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .then((data: any) =>
-        cb(Object.fromEntries(new URLSearchParams(data).entries())),
+        cb(Object.fromEntries(new URLSearchParams(data).entries()))
       );
     return { statusCode, data, responseOptions };
   };
@@ -175,7 +218,7 @@ export function recordFirehoseRequest(
   data: string | object | Buffer | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
-  },
+  }
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {