hono 2.0.3 → 2.0.6

package/dist/context.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
-import type { NotFoundHandler } from './hono';
+import type { ContextVariableMap, NotFoundHandler } from './hono';
 import type { CookieOptions } from './utils/cookie';
 import type { StatusCode } from './utils/http-status';
 declare type Headers = Record<string, string>;
@@ -15,8 +15,14 @@ export interface Context<RequestParamKeyType extends string = string, E = Env> {
     set res(_res: Response);
     header: (name: string, value: string) => void;
     status: (status: StatusCode) => void;
-    set: (key: string, value: any) => void;
-    get: <T = any>(key: string) => T;
+    set: {
+        <Key extends keyof ContextVariableMap>(key: Key, value: ContextVariableMap[Key]): void;
+        (key: string, value: any): void;
+    };
+    get: {
+        <Key extends keyof ContextVariableMap>(key: Key): ContextVariableMap[Key];
+        <T = any>(key: string): T;
+    };
     pretty: (prettyJSON: boolean, space?: number) => void;
     newResponse: (data: Data | null, status: StatusCode, headers: Headers) => Response;
     body: (data: Data | null, status?: StatusCode, headers?: Headers) => Response;

package/dist/hono.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="@cloudflare/workers-types" />
 import type { Context } from './context';
 import type { Router } from './router';
+export interface ContextVariableMap {
+}
 declare type Env = Record<string, any>;
 export declare type Handler<RequestParamKeyType extends string = string, E = Env> = (c: Context<RequestParamKeyType, E>, next: Next) => Response | Promise<Response> | Promise<void> | Promise<Response | undefined>;
 export declare type NotFoundHandler<E = Env> = (c: Context<string, E>) => Response | Promise<Response>;

package/dist/middleware/jsx/index.js

@@ -19,6 +19,12 @@ const emptyTags = [
     'track',
     'wbr',
 ];
+const booleanAttributes = ['checked', 'selected', 'disabled', 'readonly', 'multiple'];
+const newHtmlEscapedString = (str) => {
+    const escapedString = new String(str);
+    escapedString.isEscaped = true;
+    return escapedString;
+};
 const jsxFn = (tag, props, ...children) => {
     if (typeof tag === 'function') {
         return tag.call(null, { ...props, children: children.length <= 1 ? children[0] : children });
@@ -27,24 +33,35 @@ const jsxFn = (tag, props, ...children) => {
     const propsKeys = Object.keys(props || {});
     for (let i = 0, len = propsKeys.length; i < len; i++) {
         const v = props[propsKeys[i]];
-        if (propsKeys[i] === 'dangerouslySetInnerHTML') {
+        if (typeof v === 'string') {
+            result += ` ${propsKeys[i]}="${(0, html_1.escape)(v)}"`;
+        }
+        else if (typeof v === 'number') {
+            result += ` ${propsKeys[i]}="${v}"`;
+        }
+        else if (v === null || v === undefined) {
+            // Do nothing
+        }
+        else if (typeof v === 'boolean' && booleanAttributes.includes(propsKeys[i])) {
+            if (v) {
+                result += ` ${propsKeys[i]}=""`;
+            }
+        }
+        else if (propsKeys[i] === 'dangerouslySetInnerHTML') {
             if (children.length > 0) {
                 throw 'Can only set one of `children` or `props.dangerouslySetInnerHTML`.';
             }
-            const escapedString = new String(v.__html);
-            escapedString.isEscaped = true;
-            children = [escapedString];
-            continue;
+            children = [newHtmlEscapedString(v.__html)];
         }
-        else if (v === null || v === undefined) {
-            continue;
+        else {
+            result += ` ${propsKeys[i]}="${(0, html_1.escape)(v.toString())}"`;
         }
-        result += ` ${propsKeys[i]}="${(0, html_1.escape)(v.toString())}"`;
+    }
+    if (emptyTags.includes(tag)) {
+        result += '/>';
+        return newHtmlEscapedString(result);
     }
     if (tag !== '') {
-        if (emptyTags.includes(tag)) {
-            result += '/';
-        }
         result += '>';
     }
     const flattenChildren = children.flat(Infinity);
@@ -60,12 +77,10 @@ const jsxFn = (tag, props, ...children) => {
             result += (0, html_1.escape)(child.toString());
         }
     }
-    if (tag !== '' && !emptyTags.includes(tag)) {
+    if (tag !== '') {
         result += `</${tag}>`;
     }
-    const escapedString = new String(result);
-    escapedString.isEscaped = true;
-    return escapedString;
+    return newHtmlEscapedString(result);
 };
 exports.jsx = jsxFn;
 const shallowEqual = (a, b) => {

package/dist/middleware/jsx/jsx-dev-runtime.js

@@ -5,6 +5,6 @@ const _1 = require(".");
 function jsxDEV(tag, props) {
     const children = props.children ?? [];
     delete props['children'];
-    return (0, _1.jsx)(tag, props, ...children);
+    return (0, _1.jsx)(tag, props, children);
 }
 exports.jsxDEV = jsxDEV;

package/dist/utils/body.js

@@ -4,7 +4,12 @@ exports.parseBody = void 0;
 const parseBody = async (r) => {
     const contentType = r.headers.get('Content-Type') || '';
     if (contentType.includes('application/json')) {
-        return await r.json();
+        let body = {};
+        try {
+            body = await r.json();
+        }
+        catch { } // Do nothing
+        return body;
     }
     else if (contentType.includes('application/text')) {
         return await r.text();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -70,10 +70,10 @@
       "jsx": [
         "./dist/middleware/jsx"
       ],
-      "jsx-runtime": [
+      "jsx/jsx-runtime": [
         "./dist/middleware/jsx/jsx-runtime.d.ts"
       ],
-      "jsx-dev-runtime": [
+      "jsx/jsx-dev-runtime": [
         "./dist/middleware/jsx/jsx-dev-runtime.d.ts"
       ],
       "jwt": [