two-stroke 5.4.0 → 5.6.0

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(`${service}/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.replace("https://", "")}-definitions.ts`,
+      "",
+      ts.ScriptTarget.Latest,
+    );
+    const result = printer.printNode(
+      ts.EmitHint.Unspecified,
+      output[0],
+      resultFile,
+    );
+    fs.writeFileSync(
+      `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
+      await prettier.format(
+        `// Autogenerated by two-stroke
+
+${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf-8")}
+
+${result}`,
+        { parser: "typescript", printWidth: 100 },
+      ),
+    );
+  }),
+);

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",
@@ -51,7 +52,7 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.6.0",
   "type": "module",
-  "version": "5.4.0",
+  "version": "5.6.0",
   "devDependencies": {
     "@types/eslint": "^9.6.1",
     "eslint": "^9.32.0",

package/src/index.ts

@@ -92,12 +92,32 @@ export function twoStroke<T extends Env>(title: string, release: string) {
               });
             }
             if (route.method === "POST" || route.method === "PUT") {
-              const rawBody = route.input
-                ? req.headers.get("Content-Type") ===
-                  "application/x-www-form-urlencoded"
-                  ? Object.fromEntries(new URLSearchParams(await req.text()))
-                  : await req.json()
-                : undefined;
+              let rawBody;
+              try {
+                rawBody = route.input
+                  ? req.headers.get("Content-Type") ===
+                    "application/x-www-form-urlencoded"
+                    ? Object.fromEntries(new URLSearchParams(await req.text()))
+                    : await req.json()
+                  : undefined;
+              } catch (e) {
+                console.error({
+                  message: "Request body is required'",
+                  error: e instanceof Error ? e.message : "Error",
+                });
+                return new Response(
+                  JSON.stringify({
+                    error: "Request body is required",
+                    issues: [],
+                  }),
+                  {
+                    status: 400,
+                    headers: {
+                      "Access-Control-Allow-Origin": "*",
+                    },
+                  },
+                );
+              }
               const body = route.input
                 ? route.input.safeParse(rawBody)
                 : {