typespec-hono 0.13.0 → 0.14.0

package/dist/src/app.js

@@ -207,14 +207,19 @@ function inputTypeOf(entry) {
      * query parameter of that name.
      */
     const bodyProperty = entry.route.bodyProperty;
+    /**
+     * **The body validator is found by its SCHEMA, never by its target.** A JSON body validates under
+     * `"json"` and a form body under `"form"`, so keying on the JSON target silently missed every
+     * form - measured on a clean install, `@header contentType: "application/x-www-form-urlencoded"`
+     * with a `Record` body still emitted the intersection and still did not compile. The schema
+     * identifier is the same fact whichever parser reads it.
+     */
+    const bodyName = entry.names.body;
     const parts = entry.validators
-        .filter(([target]) => bodyProperty === undefined || target !== VALIDATOR_TARGET.body)
+        .filter(([, name]) => bodyProperty === undefined || name !== bodyName)
         .map(([, name]) => `z.infer<typeof ${name}>`);
-    if (bodyProperty !== undefined) {
-        const bodySchema = entry.validators.find(([target]) => target === VALIDATOR_TARGET.body)?.[1];
-        if (bodySchema !== undefined) {
-            parts.push(`{ ${objectKey(bodyProperty)}: z.infer<typeof ${bodySchema}> }`);
-        }
+    if (bodyProperty !== undefined && bodyName !== undefined) {
+        parts.push(`{ ${objectKey(bodyProperty)}: z.infer<typeof ${bodyName}> }`);
     }
     if (entry.route.rawBodyProperty !== undefined) {
         const reader = rawBodyReaderFor(entry.route.requestContentTypes);
@@ -539,12 +544,14 @@ securityFor) {
         }
         // A dispatched body is in `validators` under the body target like any other, so there is
         // nothing extra to spread: `byContentType` published it there whichever parser ran.
+        // Same rule as `inputTypeOf`: the body is identified by its schema, not by its target.
+        const bodyTarget = validators.find(([, name]) => name === entry.names.body)?.[0];
         const pieces = validators.map(([target]) => 
         /**
          * A named body is assigned rather than spread, matching the input type above and the
          * document, which states the parameters and the body as separate things.
          */
-        route.bodyProperty !== undefined && target === VALIDATOR_TARGET.body
+        route.bodyProperty !== undefined && target === bodyTarget
             ? `${objectKey(route.bodyProperty)}: c.req.valid(${JSON.stringify(target)})`
             : `...c.req.valid(${JSON.stringify(target)})`);
         if (route.rawBodyProperty !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-hono",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "TypeSpec emitter: generate a Hono server, and the Zod validators it enforces, from an HTTP service definition, agreeing with the OpenAPI document @typespec/openapi3 publishes from the same source.",
   "keywords": [
     "cloudflare-workers",
@@ -44,7 +44,7 @@
     "provenance": true
   },
   "dependencies": {
-    "typespec-http-zod": "^0.15.0"
+    "typespec-http-zod": "^0.16.0"
   },
   "devDependencies": {
     "@hono/zod-openapi": "^1.4.0",