hono 3.10.1 → 3.10.3

package/dist/cjs/compose.js

@@ -44,7 +44,7 @@ const compose = (middleware, onError, onNotFound) => {
       }
       if (!handler) {
         if (context instanceof import_context.Context && context.finalized === false && onNotFound) {
-          res = onNotFound(context);
+          res = await onNotFound(context);
         }
       } else {
         try {
@@ -54,7 +54,7 @@ const compose = (middleware, onError, onNotFound) => {
         } catch (err) {
           if (err instanceof Error && context instanceof import_context.Context && onError) {
             context.error = err;
-            res = onError(err, context);
+            res = await onError(err, context);
             isError = true;
           } else {
             throw err;

package/dist/cjs/helper/cookie/index.js

@@ -53,11 +53,11 @@ const getSignedCookie = async (c, secret, key) => {
   return obj;
 };
 const setCookie = (c, name, value, opt) => {
-  const cookie = (0, import_cookie.serialize)(name, value, opt);
+  const cookie = (0, import_cookie.serialize)(name, value, { path: "/", ...opt });
   c.header("set-cookie", cookie, { append: true });
 };
 const setSignedCookie = async (c, name, value, secret, opt) => {
-  const cookie = await (0, import_cookie.serializeSigned)(name, value, secret, opt);
+  const cookie = await (0, import_cookie.serializeSigned)(name, value, secret, { path: "/", ...opt });
   c.header("set-cookie", cookie, { append: true });
 };
 const deleteCookie = (c, name, opt) => {

package/dist/cjs/hono-base.js

@@ -212,7 +212,7 @@ class Hono extends defineDynamicClass() {
     }
     const path = this.getPath(request, { env });
     const [handlers, paramStash] = this.matchRoute(method, path);
-    const c = new import_context.Context(new import_request.HonoRequest(request, path, paramStash || []), {
+    const c = new import_context.Context(new import_request.HonoRequest(request, path, paramStash), {
       env,
       executionCtx,
       notFoundHandler: this.notFoundHandler

package/dist/cjs/jsx/index.js

@@ -122,9 +122,9 @@ class JSXNode {
         buffer[0] += ` ${key}="`;
         (0, import_html2.escapeToBuffer)(v, buffer);
         buffer[0] += '"';
-      } else if (typeof v === "number") {
-        buffer[0] += ` ${key}="${v}"`;
       } else if (v === null || v === void 0) {
+      } else if (typeof v === "number" || v.isEscaped) {
+        buffer[0] += ` ${key}="${v}"`;
       } else if (typeof v === "boolean" && booleanAttributes.includes(key)) {
         if (v) {
           buffer[0] += ` ${key}=""`;

package/dist/cjs/request.js

@@ -25,7 +25,7 @@ var import_body = require("./utils/body");
 var import_cookie = require("./utils/cookie");
 var import_url = require("./utils/url");
 class HonoRequest {
-  constructor(request, path = "/", paramStash = []) {
+  constructor(request, path = "/", paramStash = void 0) {
     this._p = {};
     this.bodyCache = {};
     this.cachedBody = (key) => {
@@ -49,24 +49,21 @@ class HonoRequest {
     this._p = params;
   }
   param(key) {
-    if (this._s) {
-      if (key) {
-        const param = this._s[this._p[key]] ?? this._p[key];
-        return param ? /\%/.test(param) ? (0, import_url.decodeURIComponent_)(param) : param : void 0;
-      } else {
-        const decoded = {};
-        const keys = Object.keys(this._p);
-        for (let i = 0, len = keys.length; i < len; i++) {
-          const key2 = keys[i];
-          const value = this._s[this._p[key2]] ?? this._p[key2];
-          if (value && typeof value === "string") {
-            decoded[key2] = /\%/.test(value) ? (0, import_url.decodeURIComponent_)(value) : value;
-          }
+    if (key) {
+      const param = this._s ? this._s[this._p[key]] : this._p[key];
+      return param ? /\%/.test(param) ? (0, import_url.decodeURIComponent_)(param) : param : void 0;
+    } else {
+      const decoded = {};
+      const keys = Object.keys(this._p);
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key2 = keys[i];
+        const value = this._s ? this._s[this._p[key2]] : this._p[key2];
+        if (value && typeof value === "string") {
+          decoded[key2] = /\%/.test(value) ? (0, import_url.decodeURIComponent_)(value) : value;
         }
-        return decoded;
       }
+      return decoded;
     }
-    return null;
   }
   query(key) {
     return (0, import_url.getQueryParam)(this.url, key);

package/dist/cjs/validator/validator.js

@@ -26,13 +26,21 @@ var import_buffer = require("../utils/buffer");
 const validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
+    const contentType = c.req.header("Content-Type");
     switch (target) {
       case "json":
+        if (!contentType || !contentType.startsWith("application/json")) {
+          const message = `Invalid HTTP header: Content-Type=${contentType}`;
+          console.error(message);
+          return c.json(
+            {
+              success: false,
+              message
+            },
+            400
+          );
+        }
         try {
-          const contentType = c.req.header("Content-Type");
-          if (!contentType || !contentType.startsWith("application/json")) {
-            throw new Error(`Invalid HTTP header: Content-Type=${contentType}`);
-          }
           const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
@@ -50,10 +58,10 @@ const validator = (target, validationFunc) => {
         break;
       case "form": {
         try {
-          const contentType = c.req.header("Content-Type");
-          if (contentType) {
+          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, contentType);
+            const formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType2);
             const form = {};
             formData.forEach((value2, key) => {
               form[key] = value2;

package/dist/compose.js

@@ -22,7 +22,7 @@ var compose = (middleware, onError, onNotFound) => {
       }
       if (!handler) {
         if (context instanceof Context && context.finalized === false && onNotFound) {
-          res = onNotFound(context);
+          res = await onNotFound(context);
         }
       } else {
         try {
@@ -32,7 +32,7 @@ var compose = (middleware, onError, onNotFound) => {
         } catch (err) {
           if (err instanceof Error && context instanceof Context && onError) {
             context.error = err;
-            res = onError(err, context);
+            res = await onError(err, context);
             isError = true;
           } else {
             throw err;

package/dist/helper/cookie/index.js

@@ -27,11 +27,11 @@ var getSignedCookie = async (c, secret, key) => {
   return obj;
 };
 var setCookie = (c, name, value, opt) => {
-  const cookie = serialize(name, value, opt);
+  const cookie = serialize(name, value, { path: "/", ...opt });
   c.header("set-cookie", cookie, { append: true });
 };
 var setSignedCookie = async (c, name, value, secret, opt) => {
-  const cookie = await serializeSigned(name, value, secret, opt);
+  const cookie = await serializeSigned(name, value, secret, { path: "/", ...opt });
   c.header("set-cookie", cookie, { append: true });
 };
 var deleteCookie = (c, name, opt) => {

package/dist/hono-base.js

@@ -190,7 +190,7 @@ var Hono = class extends defineDynamicClass() {
     }
     const path = this.getPath(request, { env });
     const [handlers, paramStash] = this.matchRoute(method, path);
-    const c = new Context(new HonoRequest(request, path, paramStash || []), {
+    const c = new Context(new HonoRequest(request, path, paramStash), {
       env,
       executionCtx,
       notFoundHandler: this.notFoundHandler

package/dist/jsx/index.js

@@ -95,9 +95,9 @@ var JSXNode = class {
         buffer[0] += ` ${key}="`;
         escapeToBuffer(v, buffer);
         buffer[0] += '"';
-      } else if (typeof v === "number") {
-        buffer[0] += ` ${key}="${v}"`;
       } else if (v === null || v === void 0) {
+      } else if (typeof v === "number" || v.isEscaped) {
+        buffer[0] += ` ${key}="${v}"`;
       } else if (typeof v === "boolean" && booleanAttributes.includes(key)) {
         if (v) {
           buffer[0] += ` ${key}=""`;

package/dist/request.js

@@ -3,7 +3,7 @@ import { parseBody } from "./utils/body.js";
 import { parse } from "./utils/cookie.js";
 import { getQueryParam, getQueryParams, decodeURIComponent_ } from "./utils/url.js";
 var HonoRequest = class {
-  constructor(request, path = "/", paramStash = []) {
+  constructor(request, path = "/", paramStash = void 0) {
     this._p = {};
     this.bodyCache = {};
     this.cachedBody = (key) => {
@@ -27,24 +27,21 @@ var HonoRequest = class {
     this._p = params;
   }
   param(key) {
-    if (this._s) {
-      if (key) {
-        const param = this._s[this._p[key]] ?? this._p[key];
-        return param ? /\%/.test(param) ? decodeURIComponent_(param) : param : void 0;
-      } else {
-        const decoded = {};
-        const keys = Object.keys(this._p);
-        for (let i = 0, len = keys.length; i < len; i++) {
-          const key2 = keys[i];
-          const value = this._s[this._p[key2]] ?? this._p[key2];
-          if (value && typeof value === "string") {
-            decoded[key2] = /\%/.test(value) ? decodeURIComponent_(value) : value;
-          }
+    if (key) {
+      const param = this._s ? this._s[this._p[key]] : this._p[key];
+      return param ? /\%/.test(param) ? decodeURIComponent_(param) : param : void 0;
+    } else {
+      const decoded = {};
+      const keys = Object.keys(this._p);
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key2 = keys[i];
+        const value = this._s ? this._s[this._p[key2]] : this._p[key2];
+        if (value && typeof value === "string") {
+          decoded[key2] = /\%/.test(value) ? decodeURIComponent_(value) : value;
         }
-        return decoded;
       }
+      return decoded;
     }
-    return null;
   }
   query(key) {
     return getQueryParam(this.url, key);

package/dist/types/adapter/aws-lambda/handler.d.ts

@@ -32,7 +32,7 @@ export interface LambdaFunctionUrlEvent {
     isBase64Encoded: boolean;
     requestContext: LambdaFunctionUrlRequestContext;
 }
-interface APIGatewayProxyResult {
+export interface APIGatewayProxyResult {
     statusCode: number;
     body: string;
     headers: Record<string, string>;
@@ -49,4 +49,3 @@ export declare const streamHandle: <E extends Env = Env, S extends Schema = {},
 export declare const handle: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => (event: APIGatewayProxyEvent | APIGatewayProxyEventV2 | LambdaFunctionUrlEvent, lambdaContext?: LambdaContext) => Promise<APIGatewayProxyResult>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export declare const isContentEncodingBinary: (contentEncoding: string | null) => boolean;
-export {};

package/dist/types/adapter/aws-lambda/index.d.ts

@@ -1,3 +1,4 @@
 export { handle, streamHandle } from './handler';
+export type { APIGatewayProxyResult } from './handler';
 export type { ApiGatewayRequestContext, LambdaFunctionUrlRequestContext } from './custom-context';
 export type { LambdaContext } from './types';

package/dist/types/request.d.ts

@@ -20,7 +20,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
     private _p;
     path: string;
     bodyCache: BodyCache;
-    constructor(request: Request, path?: string, paramStash?: ParamStash);
+    constructor(request: Request, path?: string, paramStash?: ParamStash | undefined);
     setParams(params: ParamIndexMap | Params): void;
     param<P2 extends string = P>(key: RemoveQuestion<ParamKeys<P2>>): UndefinedIfHavingQuestion<ParamKeys<P2>>;
     param<P2 extends string = P>(): UnionToIntersection<ParamKeyToRecord<ParamKeys<P2>>>;

package/dist/types/types.d.ts

@@ -25,7 +25,7 @@ export interface HandlerInterface<E extends Env = Env, M extends string = string
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = {}, R extends HandlerResponse<any> = any, E2 extends Env = E>(handler: H<E2, P, I, R>): Hono<E & E2, S & ToSchema<M, P, I['in'], MergeTypedResponseData<R>>, BasePath>;
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = {}, R extends HandlerResponse<any> = any, E2 extends Env = E, E3 extends Env = IntersectNonAnyTypes<[E, E2]>>(...handlers: [H<E2, P, I, R>, H<E3, P, I, R>]): Hono<E & E2 & E3, S & ToSchema<M, P, I['in'], MergeTypedResponseData<R>>, BasePath>;
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, R extends HandlerResponse<any> = any, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, E2 extends Env = E, E3 extends Env = E, E4 extends Env = IntersectNonAnyTypes<[E, E2, E3]>>(...handlers: [H<E2, P, I, R>, H<E3, P, I2, R>, H<E4, P, I3, R>]): Hono<E & E2 & E3 & E4, S & ToSchema<M, P, I3['in'], MergeTypedResponseData<R>>, BasePath>;
-    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, R extends HandlerResponse<any> = any, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I & I2 & I3, E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4]>>(...handlers: [H<E2, P, I, R>, H<E3, P, I2, R>, H<E4, P, I3, R>, H<E5, P, I3, R>]): Hono<E & E2 & E3 & E4 & E5, S & ToSchema<M, P, I4['in'], MergeTypedResponseData<R>>, BasePath>;
+    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, R extends HandlerResponse<any> = any, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I & I2 & I3, E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4]>>(...handlers: [H<E2, P, I, R>, H<E3, P, I2, R>, H<E4, P, I3, R>, H<E5, P, I4, R>]): Hono<E & E2 & E3 & E4 & E5, S & ToSchema<M, P, I4['in'], MergeTypedResponseData<R>>, BasePath>;
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, R extends HandlerResponse<any> = any, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3, I5 extends Input = I & I2 & I3 & I4, E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5]>>(...handlers: [
         H<E2, P, I, R>,
         H<E3, P, I2, R>,

package/dist/validator/validator.js

@@ -4,13 +4,21 @@ import { bufferToFormData } from "../utils/buffer.js";
 var validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
+    const contentType = c.req.header("Content-Type");
     switch (target) {
       case "json":
+        if (!contentType || !contentType.startsWith("application/json")) {
+          const message = `Invalid HTTP header: Content-Type=${contentType}`;
+          console.error(message);
+          return c.json(
+            {
+              success: false,
+              message
+            },
+            400
+          );
+        }
         try {
-          const contentType = c.req.header("Content-Type");
-          if (!contentType || !contentType.startsWith("application/json")) {
-            throw new Error(`Invalid HTTP header: Content-Type=${contentType}`);
-          }
           const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
@@ -28,10 +36,10 @@ var validator = (target, validationFunc) => {
         break;
       case "form": {
         try {
-          const contentType = c.req.header("Content-Type");
-          if (contentType) {
+          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, contentType);
+            const formData = await bufferToFormData(arrayBuffer, contentType2);
             const form = {};
             formData.forEach((value2, key) => {
               form[key] = value2;

package/package.json

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