two-stroke 5.3.2 → 5.5.0

package/README.md

@@ -48,7 +48,7 @@ app.get(
     return {
       body: { message: "Hello, World!" },
     };
-  }
+  },
 );
 
 // Define a route with path parameters
@@ -60,7 +60,7 @@ app.get(
     return {
       body: { user: { id: params.userId, name: "John Doe" } },
     };
-  }
+  },
 );
 
 // Define a POST route with request validation
@@ -73,7 +73,7 @@ app.post(
     return {
       body: { id: "msg_123" },
     };
-  }
+  },
 );
 
 // Export the worker handlers
@@ -95,7 +95,7 @@ app.get(
   app.pbkdf("API_KEY"),
   "/protected",
   z.object({ message: z.string() }),
-  async () => ({ body: { message: "Protected endpoint" } })
+  async () => ({ body: { message: "Protected endpoint" } }),
 );
 
 // JWT authentication
@@ -103,7 +103,7 @@ app.get(
   app.jwt<{ userId: string }>("JWT_SECRET", "JWT_AUDIENCE"),
   "/user-data",
   z.object({ userId: z.string() }),
-  async ({ claims }) => ({ body: { userId: claims.userId } })
+  async ({ claims }) => ({ body: { userId: claims.userId } }),
 );
 ```
 
@@ -121,7 +121,7 @@ app.queueHandler(
         console.log(`Processing message: ${data.id}`);
       }
     }
-  }
+  },
 );
 
 // Add to queue with retry logic
@@ -133,7 +133,7 @@ await addToQueue(
   {
     retries: 3,
     backoffFactor: 2,
-  }
+  },
 );
 ```
 

package/bin/api-types.mjs

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+import fs from "node:fs";
+import openapiTS from "openapi-typescript";
+import prettier from "prettier";
+import ts from "typescript";
+
+const services = process.argv[2].split(",");
+
+const UUID = ts.factory.createTypeReferenceNode(
+  ts.factory.createIdentifier("UUID"),
+);
+const NULL = ts.factory.createLiteralTypeNode(ts.factory.createNull());
+
+await Promise.all(
+  services.map(async (service) => {
+    const output = await openapiTS(`https://${service}.changeengine.com/doc`, {
+      transform(schemaObject) {
+        if ("format" in schemaObject && schemaObject.format === "uuid") {
+          return schemaObject.nullable
+            ? ts.factory.createUnionTypeNode([UUID, NULL])
+            : UUID;
+        }
+      },
+    });
+    const printer = ts.createPrinter({});
+    const resultFile = ts.createSourceFile(
+      `src/__definitions__/${service}-definitions.ts`,
+      "",
+      ts.ScriptTarget.Latest,
+    );
+    const result = printer.printNode(
+      ts.EmitHint.Unspecified,
+      output[0],
+      resultFile,
+    );
+    fs.writeFileSync(
+      `src/__definitions__/${service}-definitions.ts`,
+      await prettier.format(
+        `// Autogenerated by two-stroke
+
+${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf-8")}
+
+${result}`,
+        { parser: "typescript", printWidth: 100 },
+      ),
+    );
+  }),
+);

package/bin/bulk.mjs

@@ -8,7 +8,10 @@ import mime from "mime";
 const entryOrRest = process.argv[2];
 const entry = process.argv[3];
 
-const ents = await fs.promises.readdir("dist", { withFileTypes: true, recursive: true });
+const ents = await fs.promises.readdir("dist", {
+  withFileTypes: true,
+  recursive: true,
+});
 const files = await Promise.all(
   ents
     .filter((ent) => ent.isFile())
@@ -20,9 +23,9 @@ const files = await Promise.all(
       const key = `${ent.parentPath.substring(4)}/${ent.name}`;
       return (async () => ({
         key: ent.name === entry ? `${process.env.DOMAIN}${key}` : key,
-        value: (await fs.promises.readFile(`${ent.parentPath}/${ent.name}`)).toString(
-          "base64",
-        ),
+        value: (
+          await fs.promises.readFile(`${ent.parentPath}/${ent.name}`)
+        ).toString("base64"),
         base64: true,
         metadata: {
           "Content-Type":

package/package.json

@@ -1,5 +1,6 @@
 {
   "bin": {
+    "api-types": "./bin/api-types.mjs",
     "bulk": "./bin/bulk.mjs",
     "deploy": "./bin/deploy.mjs",
     "dev": "./bin/dev.mjs",
@@ -9,25 +10,25 @@
     "type-check": "./bin/type-check.mjs"
   },
   "dependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.8.56",
-    "@cloudflare/workers-types": "^4.20250723.0",
+    "@cloudflare/vitest-pool-workers": "^0.8.57",
+    "@cloudflare/workers-types": "^4.20250726.0",
     "@sentry/cli": "^2.50.2",
     "@types/node": "^24.1.0",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
     "@vitest/coverage-istanbul": "^3.2.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-config-two-stroke": "^1.2.2",
+    "eslint-config-two-stroke": "^1.2.3",
     "eslint-config-typescript": "^3.0.0",
     "jose": "^6.0.12",
     "jwk-subtle": "^1.0.7",
     "mime": "^4.0.7",
-    "miniflare": "^4.20250712.1",
+    "miniflare": "^4.20250712.2",
     "openapi-fetch": "^0.14.0",
     "openapi-typescript": "^7.8.0",
     "pbkdf-subtle": "^1.0.0",
     "toucan-js": "^4.1.1",
-    "zod": "^4.0.5"
+    "zod": "^4.0.10"
   },
   "peerDependencies": {
     "@sentry/cli": ">=2",
@@ -51,10 +52,10 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.6.0",
   "type": "module",
-  "version": "5.3.2",
+  "version": "5.5.0",
   "devDependencies": {
     "@types/eslint": "^9.6.1",
-    "eslint": "^9.31.0",
+    "eslint": "^9.32.0",
     "prettier": "^3.6.2",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"

package/src/test.ts

@@ -1,7 +1,6 @@
 import { JWTPayload, SignJWT, exportJWK, generateKeyPair } from "jose";
 import { fetchMock, SELF, env } from "cloudflare:test";
 import createClient from "openapi-fetch";
-import consumers from "stream/consumers";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/require-await
 export const setupTests = async <Paths extends {}>() => {
@@ -116,11 +115,9 @@ export function recordRequest(
     headers: Record<string, string | string[] | undefined>;
   },
 ) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return ({ body }: any) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    void consumers.json(body).then(cb);
-    return { statusCode, data, responseOptions };
+  return ({ body }: { body?: BodyInit }) => {
+    cb(JSON.parse((body?.valueOf() as string) ?? ""));
+    return { statusCode, data, responseOptions: responseOptions ?? {} };
   };
 }
 
@@ -133,17 +130,13 @@ export function recordFormRequest(
     headers: Record<string, string | string[] | undefined>;
   },
 ) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return ({ body }: any) => {
-    void consumers
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      .text(body)
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-shadow
-      .then((data: any) =>
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        cb(Object.fromEntries(new URLSearchParams(data).entries())),
-      );
-    return { statusCode, data, responseOptions };
+  return ({ body }: { body?: BodyInit }) => {
+    cb(
+      Object.fromEntries(
+        new URLSearchParams((body?.valueOf() as string) ?? "").entries(),
+      ),
+    );
+    return { statusCode, data, responseOptions: responseOptions ?? {} };
   };
 }
 
@@ -156,13 +149,14 @@ export function recordFirehoseRequest(
     headers: Record<string, string | string[] | undefined>;
   },
 ) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return ({ body }: any) => {
-    void consumers
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      .json(body)
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-shadow, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-      .then((data: any) => cb(JSON.parse(atob(data["Record"]["Data"]))));
-    return { statusCode, data, responseOptions };
+  return ({ body }: { body?: BodyInit }) => {
+    cb(JSON.parse((body?.valueOf() as string) ?? ""));
+    cb(
+      JSON.parse(
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+        atob(JSON.parse((body?.valueOf() as string) ?? "")["Record"]["Data"]),
+      ),
+    );
+    return { statusCode, data, responseOptions: responseOptions ?? {} };
   };
 }