two-stroke 7.5.0 → 7.6.0

package/src/open-api.ts

@@ -1,13 +1,8 @@
 import { z, ZodType } from "zod/v4";
-import { type Env, type Route } from "./types";
+import { type Route } from "./types";
 
 export const openAPI =
-  <T extends Env, A>(
-    title: string,
-    release: string,
-    noAuth: () => A,
-    routes: Route<T, A>[],
-  ) =>
+  <T, A>(title: string, release: string, noAuth: () => A, routes: Route<T, A>[]) =>
   // eslint-disable-next-line @typescript-eslint/require-await
   async () => ({
     body: {
@@ -25,68 +20,63 @@ export const openAPI =
         },
       },
       paths: Object.fromEntries(
-        Object.entries(Object.groupBy(routes, ({ path }) => path)).map(
-          ([path, rs]) => [
-            path,
-            Object.fromEntries(
-              (rs ?? []).map((r) => [
-                r.method.toLocaleLowerCase(),
-                {
-                  parameters: [
-                    ...Object.entries(
-                      (r.params?.shape ?? {}) as Record<string, ZodType>,
-                    ).map(([k, v]) => ({
+        Object.entries(Object.groupBy(routes, ({ path }) => path)).map(([path, rs]) => [
+          path,
+          Object.fromEntries(
+            (rs ?? []).map((r) => [
+              r.method.toLocaleLowerCase(),
+              {
+                parameters: [
+                  ...Object.entries((r.params?.shape ?? {}) as Record<string, ZodType>).map(
+                    ([k, v]) => ({
                       name: k,
                       in: "query",
                       required: !v.safeParse(undefined).success,
                       schema: z.toJSONSchema(v, { io: "input" }),
-                    })),
-                    ...Array.from(
-                      r.path.matchAll(/\/{(?<name>[^}]*)}/g),
-                      (match) => ({
-                        name: match.groups!.name,
-                        in: "path",
+                    }),
+                  ),
+                  ...Array.from(r.path.matchAll(/\/{(?<name>[^}]*)}/g), (match) => ({
+                    name: match.groups!.name,
+                    in: "path",
+                    required: true,
+                    schema: {
+                      type: "string",
+                    },
+                  })),
+                ],
+                ...(r.auth === noAuth ? {} : { security: [{ auth: [] }] }),
+                ...(r.method === "POST" || r.method === "PUT"
+                  ? {
+                      requestBody: {
                         required: true,
-                        schema: {
-                          type: "string",
-                        },
-                      }),
-                    ),
-                  ],
-                  ...(r.auth === noAuth ? {} : { security: [{ auth: [] }] }),
-                  ...(r.method === "POST" || r.method === "PUT"
-                    ? {
-                        requestBody: {
-                          required: true,
-                          content: {
-                            "application/json": r.input
-                              ? {
-                                  schema: z.toJSONSchema(r.input, {
-                                    io: "input",
-                                  }),
-                                }
-                              : undefined,
-                          },
-                        },
-                      }
-                    : {}),
-                  responses: {
-                    "200": {
-                      description: "OK",
-                      content: {
-                        "application/json": {
-                          schema: z.toJSONSchema(r.output),
+                        content: {
+                          "application/json": r.input
+                            ? {
+                                schema: z.toJSONSchema(r.input, {
+                                  io: "input",
+                                }),
+                              }
+                            : undefined,
                         },
                       },
+                    }
+                  : {}),
+                responses: {
+                  "200": {
+                    description: "OK",
+                    content: {
+                      "application/json": {
+                        schema: z.toJSONSchema(r.output),
+                      },
                     },
-                    "400": status400,
-                    "500": status500,
                   },
+                  "400": status400,
+                  "500": status500,
                 },
-              ]),
-            ),
-          ],
-        ),
+              },
+            ]),
+          ),
+        ]),
       ),
     },
   });

package/src/test.ts

@@ -1,8 +1,8 @@
 import { env, exports } from "cloudflare:workers";
 import { type JWTPayload, SignJWT, exportJWK, generateKeyPair } from "jose";
 import createClient from "openapi-fetch";
-import { http, HttpResponse } from 'msw'
-import { setupServer } from 'msw/node'
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
 
 const msw = setupServer();
 msw.listen();
@@ -32,11 +32,7 @@ export const setupTests = async <Paths extends {}>() => {
       await waitUntil(() => expect(log).contains("Queue batch finished"));
       console.log = orig;
     },
-    async fakeJWK(
-      issuer: keyof typeof env,
-      audience: keyof typeof env,
-      claims: JWTPayload,
-    ) {
+    async fakeJWK(issuer: keyof typeof env, audience: keyof typeof env, claims: JWTPayload) {
       const { publicKey, privateKey } = await generateKeyPair("RS256");
       // Hack around Cloudflare not setting
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -49,16 +45,20 @@ export const setupTests = async <Paths extends {}>() => {
       jwk.kid = "test";
       jwk.alg = "RS256";
       beforeAll(() => {
-        msw.use(...[
-          http.get(`${env[issuer]}/.well-known/openid-configuration`, () =>
-            HttpResponse.json({
-              jwks_uri: `${env[issuer]}/.well-known/jwks`,
-            })),
-          http.get(`${env[issuer]}/.well-known/jwks`, () =>
-            HttpResponse.json({
-              keys: [jwk],
-            }))
-        ])
+        msw.use(
+          ...[
+            http.get(`${env[issuer]}/.well-known/openid-configuration`, () =>
+              HttpResponse.json({
+                jwks_uri: `${env[issuer]}/.well-known/jwks`,
+              }),
+            ),
+            http.get(`${env[issuer]}/.well-known/jwks`, () =>
+              HttpResponse.json({
+                keys: [jwk],
+              }),
+            ),
+          ],
+        );
       });
       return await new SignJWT(claims)
         .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: jwk.kid })
@@ -107,11 +107,7 @@ export function recordFormRequest(
   },
 ) {
   return ({ body }: { body?: BodyInit }) => {
-    cb(
-      Object.fromEntries(
-        new URLSearchParams((body?.valueOf() as string) ?? "").entries(),
-      ),
-    );
+    cb(Object.fromEntries(new URLSearchParams((body?.valueOf() as string) ?? "").entries()));
     return { statusCode, data, responseOptions: responseOptions ?? {} };
   };
 }

package/src/types.ts

@@ -1,20 +1,7 @@
 import { Toucan } from "toucan-js";
 import { ZodType, ZodObject, z } from "zod/v4";
-export type Env = {
-  [k: string]:
-    | string
-    | Queue
-    | KVNamespace
-    | R2Bucket
-    | D1Database
-    | Fetcher
-    | Hyperdrive
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    | DurableObjectNamespace<any>
-    | Vectorize
-    | ImagesBinding;
-};
-export type Route<T extends Env, A> =
+
+export type Route<T, A> =
   | {
       auth: (c: { req: Request; env: T }) => Promise<A>;
       method: "GET" | "DELETE";
@@ -41,12 +28,11 @@ export type Route<T extends Env, A> =
 
 export type ExtractParameterNames<S extends string> =
   S extends `${string}{${infer Name}}${infer Rest}`
-    ?  
-      Record<Name, string> & ExtractParameterNames<Rest>
+    ? Record<Name, string> & ExtractParameterNames<Rest>
     : Record<string, string>;
 
 export type Handler<
-  T extends Env,
+  T,
   I extends ZodType | undefined,
   O extends ZodType,
   A,

package/tsconfig.json

@@ -3,9 +3,7 @@
     "erasableSyntaxOnly": true,
     "esModuleInterop": true,
     "isolatedModules": true,
-    "lib": [
-      "ESNext"
-    ],
+    "lib": ["ESNext"],
     "module": "ESNext",
     "moduleResolution": "bundler",
     "noUncheckedIndexedAccess": true,
@@ -20,7 +18,5 @@
     ],
     "verbatimModuleSyntax": true
   },
-  "exclude": [
-    "../../dist"
-  ]
+  "exclude": ["../../dist"]
 }