two-stroke 1.0.12 → 1.0.14

package/package.json

@@ -8,22 +8,22 @@
     "type-check": "./bin/type-check.mjs"
   },
   "dependencies": {
-    "@anatine/zod-openapi": "^2.2.3",
-    "@asteasolutions/zod-to-openapi": "^6.4.0",
-    "@cloudflare/workers-types": "^4.20240222.0",
-    "@sentry/cli": "^2.30.0",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
-    "@vitest/coverage-v8": "^1.3.1",
+    "@anatine/zod-openapi": "^2.2.5",
+    "@asteasolutions/zod-to-openapi": "^7.0.0",
+    "@cloudflare/workers-types": "^4.20240405.0",
+    "@sentry/cli": "^2.31.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
+    "@vitest/coverage-v8": "^1.5.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-two-stroke": "^1.0.0",
+    "eslint-config-two-stroke": "^1.0.1",
     "eslint-config-typescript": "^3.0.0",
-    "jose": "^5.2.3",
+    "jose": "^5.2.4",
     "jwk-subtle": "^1.0.7",
-    "miniflare": "^3.20240223.1",
+    "miniflare": "^3.20240405.1",
     "openapi-fetch": "^0.9.3",
-    "openapi-typescript": "^6.7.4",
-    "openapi3-ts": "^4.2.2",
+    "openapi-typescript": "^6.7.5",
+    "openapi3-ts": "^4.3.1",
     "pbkdf-subtle": "^1.0.0",
     "toml": "^3.0.0",
     "toucan-js": "^3.3.1",
@@ -51,13 +51,13 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.1.0",
   "type": "module",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "devDependencies": {
-    "@types/eslint": "^8.56.5",
-    "@types/node": "^20.11.25",
+    "@types/eslint": "^8.56.9",
+    "@types/node": "^20.12.7",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
-    "typescript": "^5.4.2",
-    "vitest": "^1.3.1"
+    "typescript": "^5.4.5",
+    "vitest": "^1.5.0"
   }
 }

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,71 @@ 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";
+        for (const migrationName of (await nodefs.readdir(migrationsDir)).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 +126,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
             headers: {
               "Content-Type": "application/json",
             },
-          },
+          }
         )
         .persist();
       fetchMock
@@ -106,7 +141,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
             headers: {
               "Content-Type": "application/json",
             },
-          },
+          }
         )
         .persist();
       return await new SignJWT(claims)
@@ -138,7 +173,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 +189,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 +197,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 +210,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) => {