hono 4.1.2 → 4.1.3

package/dist/cjs/helper/ssg/ssg.js

@@ -74,15 +74,16 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
   for (const route of (0, import_utils2.filterStaticGenerateRoutes)(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    if (beforeRequestHook) {
-      const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
-      if (!maybeRequest) {
-        continue;
-      }
-      forGetInfoURLRequest = maybeRequest;
-    }
     yield new Promise(async (resolveGetInfo, rejectGetInfo) => {
       try {
+        if (beforeRequestHook) {
+          const maybeRequest = await beforeRequestHook(forGetInfoURLRequest);
+          if (!maybeRequest) {
+            resolveGetInfo(void 0);
+            return;
+          }
+          forGetInfoURLRequest = maybeRequest;
+        }
         await pool.run(() => app.fetch(forGetInfoURLRequest));
         if (!forGetInfoURLRequest.ssgParams) {
           if (isDynamicRoute(route.path)) {
@@ -111,7 +112,7 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
                     return;
                   }
                   if (afterResponseHook) {
-                    const maybeResponse = afterResponseHook(response);
+                    const maybeResponse = await afterResponseHook(response);
                     if (!maybeResponse) {
                       resolveReq(void 0);
                       return;

package/dist/cjs/helper.js

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -14,6 +18,11 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var helper_exports = {};
+__export(helper_exports, {
+  jwtDecode: () => import_jwt.decode,
+  jwtSign: () => import_jwt.sign,
+  jwtVerify: () => import_jwt.verify
+});
 module.exports = __toCommonJS(helper_exports);
 __reExport(helper_exports, require("./helper/accepts"), module.exports);
 __reExport(helper_exports, require("./helper/adapter"), module.exports);
@@ -26,3 +35,10 @@ __reExport(helper_exports, require("./helper/testing"), module.exports);
 __reExport(helper_exports, require("./helper/dev"), module.exports);
 __reExport(helper_exports, require("./adapter/deno/ssg"), module.exports);
 __reExport(helper_exports, require("./adapter/deno/websocket"), module.exports);
+var import_jwt = require("./middleware/jwt");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  jwtDecode,
+  jwtSign,
+  jwtVerify
+});

package/dist/cjs/jsx/base.js

@@ -135,7 +135,9 @@ class JSXNode {
           const property = k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
           return `${property}:${v[k]}`;
         }).join(";");
-        buffer[0] += ` style="${styles}"`;
+        buffer[0] += ' style="';
+        (0, import_html2.escapeToBuffer)(styles, buffer);
+        buffer[0] += '"';
       } else if (typeof v === "string") {
         buffer[0] += ` ${key}="`;
         (0, import_html2.escapeToBuffer)(v, buffer);
@@ -165,7 +167,7 @@ class JSXNode {
         buffer[0] += '"';
       }
     }
-    if (emptyTags.includes(tag)) {
+    if (emptyTags.includes(tag) && children.length === 0) {
       buffer[0] += "/>";
       return;
     }

package/dist/cjs/validator/validator.js

@@ -28,6 +28,7 @@ const validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     const contentType = c.req.header("Content-Type");
+    const bodyTypes = ["text", "arrayBuffer", "blob"];
     switch (target) {
       case "json":
         if (!contentType || !contentType.startsWith("application/json")) {
@@ -35,11 +36,19 @@ const validator = (target, validationFunc) => {
           throw new import_http_exception.HTTPException(400, { message });
         }
         if (c.req.bodyCache.json) {
-          value = await c.req.bodyCache.json;
+          value = c.req.bodyCache.json;
           break;
         }
         try {
-          const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
+          }
+          arrayBuffer ??= await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
           c.req.bodyCache.arrayBuffer = arrayBuffer;
@@ -49,23 +58,31 @@ const validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (!contentType) {
+          break;
+        }
         if (c.req.bodyCache.formData) {
           value = c.req.bodyCache.formData;
           break;
         }
         try {
-          const contentType2 = c.req.header("Content-Type");
-          if (contentType2) {
-            const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
-            const formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType2);
-            const form = {};
-            formData.forEach((value2, key) => {
-              form[key] = value2;
-            });
-            value = form;
-            c.req.bodyCache.formData = formData;
-            c.req.bodyCache.arrayBuffer = arrayBuffer;
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
           }
+          arrayBuffer ??= await c.req.arrayBuffer();
+          const formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType);
+          const form = {};
+          formData.forEach((value2, key) => {
+            form[key] = value2;
+          });
+          value = form;
+          c.req.bodyCache.formData = formData;
+          c.req.bodyCache.arrayBuffer = arrayBuffer;
         } catch (e) {
           let message = "Malformed FormData request.";
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;

package/dist/helper/ssg/ssg.js

@@ -50,15 +50,16 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
   for (const route of filterStaticGenerateRoutes(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    if (beforeRequestHook) {
-      const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
-      if (!maybeRequest) {
-        continue;
-      }
-      forGetInfoURLRequest = maybeRequest;
-    }
     yield new Promise(async (resolveGetInfo, rejectGetInfo) => {
       try {
+        if (beforeRequestHook) {
+          const maybeRequest = await beforeRequestHook(forGetInfoURLRequest);
+          if (!maybeRequest) {
+            resolveGetInfo(void 0);
+            return;
+          }
+          forGetInfoURLRequest = maybeRequest;
+        }
         await pool.run(() => app.fetch(forGetInfoURLRequest));
         if (!forGetInfoURLRequest.ssgParams) {
           if (isDynamicRoute(route.path)) {
@@ -87,7 +88,7 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
                     return;
                   }
                   if (afterResponseHook) {
-                    const maybeResponse = afterResponseHook(response);
+                    const maybeResponse = await afterResponseHook(response);
                     if (!maybeResponse) {
                       resolveReq(void 0);
                       return;

package/dist/helper.js

@@ -10,3 +10,9 @@ export * from "./helper/testing/index.js";
 export * from "./helper/dev/index.js";
 export * from "./adapter/deno/ssg.js";
 export * from "./adapter/deno/websocket.js";
+import { decode, sign, verify } from "./middleware/jwt/index.js";
+export {
+  decode as jwtDecode,
+  sign as jwtSign,
+  verify as jwtVerify
+};

package/dist/jsx/base.js

@@ -106,7 +106,9 @@ var JSXNode = class {
           const property = k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
           return `${property}:${v[k]}`;
         }).join(";");
-        buffer[0] += ` style="${styles}"`;
+        buffer[0] += ' style="';
+        escapeToBuffer(styles, buffer);
+        buffer[0] += '"';
       } else if (typeof v === "string") {
         buffer[0] += ` ${key}="`;
         escapeToBuffer(v, buffer);
@@ -136,7 +138,7 @@ var JSXNode = class {
         buffer[0] += '"';
       }
     }
-    if (emptyTags.includes(tag)) {
+    if (emptyTags.includes(tag) && children.length === 0) {
       buffer[0] += "/>";
       return;
     }

package/dist/types/helper/ssg/ssg.d.ts

@@ -21,8 +21,8 @@ export interface ToSSGResult {
     files: string[];
     error?: Error;
 }
-export type BeforeRequestHook = (req: Request) => Request | false;
-export type AfterResponseHook = (res: Response) => Response | false;
+export type BeforeRequestHook = (req: Request) => Request | false | Promise<Request | false>;
+export type AfterResponseHook = (res: Response) => Response | false | Promise<Response | false>;
 export type AfterGenerateHook = (result: ToSSGResult) => void | Promise<void>;
 export interface ToSSGOptions {
     dir?: string;

package/dist/validator/validator.js

@@ -6,6 +6,7 @@ var validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     const contentType = c.req.header("Content-Type");
+    const bodyTypes = ["text", "arrayBuffer", "blob"];
     switch (target) {
       case "json":
         if (!contentType || !contentType.startsWith("application/json")) {
@@ -13,11 +14,19 @@ var validator = (target, validationFunc) => {
           throw new HTTPException(400, { message });
         }
         if (c.req.bodyCache.json) {
-          value = await c.req.bodyCache.json;
+          value = c.req.bodyCache.json;
           break;
         }
         try {
-          const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
+          }
+          arrayBuffer ??= await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
           c.req.bodyCache.arrayBuffer = arrayBuffer;
@@ -27,23 +36,31 @@ var validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (!contentType) {
+          break;
+        }
         if (c.req.bodyCache.formData) {
           value = c.req.bodyCache.formData;
           break;
         }
         try {
-          const contentType2 = c.req.header("Content-Type");
-          if (contentType2) {
-            const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
-            const formData = await bufferToFormData(arrayBuffer, contentType2);
-            const form = {};
-            formData.forEach((value2, key) => {
-              form[key] = value2;
-            });
-            value = form;
-            c.req.bodyCache.formData = formData;
-            c.req.bodyCache.arrayBuffer = arrayBuffer;
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
           }
+          arrayBuffer ??= await c.req.arrayBuffer();
+          const formData = await bufferToFormData(arrayBuffer, contentType);
+          const form = {};
+          formData.forEach((value2, key) => {
+            form[key] = value2;
+          });
+          value = form;
+          c.req.bodyCache.formData = formData;
+          c.req.bodyCache.arrayBuffer = arrayBuffer;
         } catch (e) {
           let message = "Malformed FormData request.";
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",