hono 4.4.4 → 4.4.5

package/dist/cjs/context.js

@@ -31,7 +31,7 @@ const setHeaders = (headers, map = {}) => {
 class Context {
   req;
   env = {};
-  _var = {};
+  _var;
   finalized = false;
   error = void 0;
   #status = 200;

package/dist/cjs/hono-base.js

@@ -71,9 +71,6 @@ class Hono {
       };
     });
     this.on = (method, path, ...handlers) => {
-      if (!method) {
-        return this;
-      }
       for (const p of [path].flat()) {
         this.#path = p;
         for (const m of [method].flat()) {
@@ -113,9 +110,6 @@ class Hono {
   errorHandler = errorHandler;
   route(path, app) {
     const subApp = this.basePath(path);
-    if (!app) {
-      return subApp;
-    }
     app.routes.map((r) => {
       let handler;
       if (app.errorHandler === errorHandler) {

package/dist/cjs/jsx/base.js

@@ -133,10 +133,8 @@ class JSXNode {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
-    const propsKeys = Object.keys(props || {});
-    for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const key = propsKeys[i];
-      const v = props[key];
+    for (let [key, v] of Object.entries(props)) {
+      key = (0, import_utils.normalizeIntrinsicElementKey)(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -237,7 +235,6 @@ const jsxFn = (tag, props, children) => {
   if (typeof tag === "function") {
     return new JSXFunctionNode(tag, props, children);
   } else {
-    (0, import_utils.normalizeIntrinsicElementProps)(props);
     return new JSXNode(tag, props, children);
   }
 };

package/dist/cjs/jsx/dom/jsx-dev-runtime.js

@@ -22,13 +22,9 @@ __export(jsx_dev_runtime_exports, {
   jsxDEV: () => jsxDEV
 });
 module.exports = __toCommonJS(jsx_dev_runtime_exports);
-var import_utils = require("../utils");
-var import_utils2 = require("./utils");
+var import_utils = require("./utils");
 const jsxDEV = (tag, props, key) => {
-  if (typeof tag === "string") {
-    (0, import_utils.normalizeIntrinsicElementProps)(props);
-  }
-  return (0, import_utils2.newJSXNode)({
+  return (0, import_utils.newJSXNode)({
     tag,
     props,
     key

package/dist/cjs/jsx/dom/render.js

@@ -41,8 +41,8 @@ const eventAliasMap = {
   DoubleClick: "DblClick"
 };
 const nameSpaceMap = {
-  svg: "http://www.w3.org/2000/svg",
-  math: "http://www.w3.org/1998/Math/MathML"
+  svg: "2000/svg",
+  math: "1998/Math/MathML"
 };
 const skipProps = /* @__PURE__ */ new Set(["children"]);
 const buildDataStack = [];
@@ -59,8 +59,9 @@ const getEventSpec = (key) => {
 const toAttributeName = (element, key) => element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 const applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
-  for (const [key, value] of Object.entries(attributes)) {
+  for (let [key, value] of Object.entries(attributes)) {
     if (!skipProps.has(key) && (!oldAttributes || oldAttributes[key] !== value)) {
+      key = (0, import_utils.normalizeIntrinsicElementKey)(key);
       const eventSpec = getEventSpec(key);
       if (eventSpec) {
         if (oldAttributes) {
@@ -125,8 +126,9 @@ const applyProps = (container, attributes, oldAttributes) => {
     }
   }
   if (oldAttributes) {
-    for (const [key, value] of Object.entries(oldAttributes)) {
+    for (let [key, value] of Object.entries(oldAttributes)) {
       if (!skipProps.has(key) && !(key in attributes)) {
+        key = (0, import_utils.normalizeIntrinsicElementKey)(key);
         const eventSpec = getEventSpec(key);
         if (eventSpec) {
           container.removeEventListener(eventSpec[0], value, eventSpec[1]);
@@ -386,14 +388,12 @@ const buildNode = (node) => {
     } else {
       const ns = nameSpaceMap[node.tag];
       if (ns) {
-        ;
-        node.n = ns;
         nameSpaceContext ||= (0, import_context2.createContext)("");
         node.props.children = [
           {
             tag: nameSpaceContext.Provider,
             props: {
-              value: ns,
+              value: node.n = `http://www.w3.org/${ns}`,
               children: node.props.children
             }
           }

package/dist/cjs/jsx/utils.js

@@ -18,20 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  normalizeIntrinsicElementProps: () => normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey: () => normalizeIntrinsicElementKey,
   styleObjectForEach: () => styleObjectForEach
 });
 module.exports = __toCommonJS(utils_exports);
-const normalizeIntrinsicElementProps = (props) => {
-  if (props && "className" in props) {
-    props["class"] = props["className"];
-    delete props["className"];
-  }
-  if (props && "htmlFor" in props) {
-    props["for"] = props["htmlFor"];
-    delete props["htmlFor"];
-  }
-};
+const normalizeElementKeyMap = /* @__PURE__ */ new Map([
+  ["className", "class"],
+  ["htmlFor", "for"]
+]);
+const normalizeIntrinsicElementKey = (key) => normalizeElementKeyMap.get(key) || key;
 const styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {
     const key = k[0] === "-" || !/[A-Z]/.test(k) ? k : k.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`);
@@ -45,6 +40,6 @@ const styleObjectForEach = (style, fn) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey,
   styleObjectForEach
 });

package/dist/cjs/middleware/cors/index.js

@@ -50,7 +50,12 @@ const cors = (options) => {
       set("Access-Control-Allow-Origin", allowOrigin);
     }
     if (opts.origin !== "*") {
-      set("Vary", "Origin");
+      const existingVary = c.req.header("Vary");
+      if (existingVary) {
+        set("Vary", existingVary);
+      } else {
+        set("Vary", "Origin");
+      }
     }
     if (opts.credentials) {
       set("Access-Control-Allow-Credentials", "true");

package/dist/cjs/request.js

@@ -75,12 +75,7 @@ class HonoRequest {
     return headerData;
   }
   async parseBody(options) {
-    if (this.bodyCache.parsedBody) {
-      return this.bodyCache.parsedBody;
-    }
-    const parsedBody = await (0, import_body.parseBody)(this, options);
-    this.bodyCache.parsedBody = parsedBody;
-    return parsedBody;
+    return this.bodyCache.parsedBody ??= await (0, import_body.parseBody)(this, options);
   }
   cachedBody = (key) => {
     const { bodyCache, raw } = this;
@@ -88,19 +83,14 @@ class HonoRequest {
     if (cachedBody) {
       return cachedBody;
     }
-    if (!bodyCache[key]) {
-      for (const keyOfBodyCache of Object.keys(bodyCache)) {
-        if (keyOfBodyCache === "parsedBody") {
-          continue;
+    const anyCachedKey = Object.keys(bodyCache)[0];
+    if (anyCachedKey) {
+      return bodyCache[anyCachedKey].then((body) => {
+        if (anyCachedKey === "json") {
+          body = JSON.stringify(body);
         }
-        return (async () => {
-          let body = await bodyCache[keyOfBodyCache];
-          if (keyOfBodyCache === "json") {
-            body = JSON.stringify(body);
-          }
-          return await new Response(body)[key]();
-        })();
-      }
+        return new Response(body)[key]();
+      });
     }
     return bodyCache[key] = raw[key]();
   };

package/dist/context.js

@@ -8,7 +8,7 @@ var setHeaders = (headers, map = {}) => {
 var Context = class {
   req;
   env = {};
-  _var = {};
+  _var;
   finalized = false;
   error = void 0;
   #status = 200;

package/dist/hono-base.js

@@ -48,9 +48,6 @@ var Hono = class {
       };
     });
     this.on = (method, path, ...handlers) => {
-      if (!method) {
-        return this;
-      }
       for (const p of [path].flat()) {
         this.#path = p;
         for (const m of [method].flat()) {
@@ -90,9 +87,6 @@ var Hono = class {
   errorHandler = errorHandler;
   route(path, app) {
     const subApp = this.basePath(path);
-    if (!app) {
-      return subApp;
-    }
     app.routes.map((r) => {
       let handler;
       if (app.errorHandler === errorHandler) {

package/dist/jsx/base.js

@@ -2,7 +2,7 @@
 import { raw } from "../helper/html/index.js";
 import { escapeToBuffer, stringBufferToString } from "../utils/html.js";
 import { globalContexts } from "./context.js";
-import { normalizeIntrinsicElementProps, styleObjectForEach } from "./utils.js";
+import { normalizeIntrinsicElementKey, styleObjectForEach } from "./utils.js";
 var emptyTags = [
   "area",
   "base",
@@ -103,10 +103,8 @@ var JSXNode = class {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
-    const propsKeys = Object.keys(props || {});
-    for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const key = propsKeys[i];
-      const v = props[key];
+    for (let [key, v] of Object.entries(props)) {
+      key = normalizeIntrinsicElementKey(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -207,7 +205,6 @@ var jsxFn = (tag, props, children) => {
   if (typeof tag === "function") {
     return new JSXFunctionNode(tag, props, children);
   } else {
-    normalizeIntrinsicElementProps(props);
     return new JSXNode(tag, props, children);
   }
 };

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

@@ -1,10 +1,6 @@
 // src/jsx/dom/jsx-dev-runtime.ts
-import { normalizeIntrinsicElementProps } from "../utils.js";
 import { newJSXNode } from "./utils.js";
 var jsxDEV = (tag, props, key) => {
-  if (typeof tag === "string") {
-    normalizeIntrinsicElementProps(props);
-  }
   return newJSXNode({
     tag,
     props,

package/dist/jsx/dom/render.js

@@ -3,7 +3,7 @@ import { toArray } from "../children.js";
 import { DOM_ERROR_HANDLER, DOM_INTERNAL_TAG, DOM_RENDERER, DOM_STASH } from "../constants.js";
 import { globalContexts as globalJSXContexts, useContext } from "../context.js";
 import { STASH_EFFECT } from "../hooks/index.js";
-import { styleObjectForEach } from "../utils.js";
+import { normalizeIntrinsicElementKey, styleObjectForEach } from "../utils.js";
 import { createContext } from "./context.js";
 import { newJSXNode } from "./utils.js";
 var HONO_PORTAL_ELEMENT = "_hp";
@@ -12,8 +12,8 @@ var eventAliasMap = {
   DoubleClick: "DblClick"
 };
 var nameSpaceMap = {
-  svg: "http://www.w3.org/2000/svg",
-  math: "http://www.w3.org/1998/Math/MathML"
+  svg: "2000/svg",
+  math: "1998/Math/MathML"
 };
 var skipProps = /* @__PURE__ */ new Set(["children"]);
 var buildDataStack = [];
@@ -30,8 +30,9 @@ var getEventSpec = (key) => {
 var toAttributeName = (element, key) => element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 var applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
-  for (const [key, value] of Object.entries(attributes)) {
+  for (let [key, value] of Object.entries(attributes)) {
     if (!skipProps.has(key) && (!oldAttributes || oldAttributes[key] !== value)) {
+      key = normalizeIntrinsicElementKey(key);
       const eventSpec = getEventSpec(key);
       if (eventSpec) {
         if (oldAttributes) {
@@ -96,8 +97,9 @@ var applyProps = (container, attributes, oldAttributes) => {
     }
   }
   if (oldAttributes) {
-    for (const [key, value] of Object.entries(oldAttributes)) {
+    for (let [key, value] of Object.entries(oldAttributes)) {
       if (!skipProps.has(key) && !(key in attributes)) {
+        key = normalizeIntrinsicElementKey(key);
         const eventSpec = getEventSpec(key);
         if (eventSpec) {
           container.removeEventListener(eventSpec[0], value, eventSpec[1]);
@@ -357,14 +359,12 @@ var buildNode = (node) => {
     } else {
       const ns = nameSpaceMap[node.tag];
       if (ns) {
-        ;
-        node.n = ns;
         nameSpaceContext ||= createContext("");
         node.props.children = [
           {
             tag: nameSpaceContext.Provider,
             props: {
-              value: ns,
+              value: node.n = `http://www.w3.org/${ns}`,
               children: node.props.children
             }
           }

package/dist/jsx/utils.js

@@ -1,14 +1,9 @@
 // src/jsx/utils.ts
-var normalizeIntrinsicElementProps = (props) => {
-  if (props && "className" in props) {
-    props["class"] = props["className"];
-    delete props["className"];
-  }
-  if (props && "htmlFor" in props) {
-    props["for"] = props["htmlFor"];
-    delete props["htmlFor"];
-  }
-};
+var normalizeElementKeyMap = /* @__PURE__ */ new Map([
+  ["className", "class"],
+  ["htmlFor", "for"]
+]);
+var normalizeIntrinsicElementKey = (key) => normalizeElementKeyMap.get(key) || key;
 var styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {
     const key = k[0] === "-" || !/[A-Z]/.test(k) ? k : k.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`);
@@ -21,6 +16,6 @@ var styleObjectForEach = (style, fn) => {
   }
 };
 export {
-  normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey,
   styleObjectForEach
 };

package/dist/middleware/cors/index.js

@@ -28,7 +28,12 @@ var cors = (options) => {
       set("Access-Control-Allow-Origin", allowOrigin);
     }
     if (opts.origin !== "*") {
-      set("Vary", "Origin");
+      const existingVary = c.req.header("Vary");
+      if (existingVary) {
+        set("Vary", existingVary);
+      } else {
+        set("Vary", "Origin");
+      }
     }
     if (opts.credentials) {
       set("Access-Control-Allow-Credentials", "true");

package/dist/request.js

@@ -53,12 +53,7 @@ var HonoRequest = class {
     return headerData;
   }
   async parseBody(options) {
-    if (this.bodyCache.parsedBody) {
-      return this.bodyCache.parsedBody;
-    }
-    const parsedBody = await parseBody(this, options);
-    this.bodyCache.parsedBody = parsedBody;
-    return parsedBody;
+    return this.bodyCache.parsedBody ??= await parseBody(this, options);
   }
   cachedBody = (key) => {
     const { bodyCache, raw } = this;
@@ -66,19 +61,14 @@ var HonoRequest = class {
     if (cachedBody) {
       return cachedBody;
     }
-    if (!bodyCache[key]) {
-      for (const keyOfBodyCache of Object.keys(bodyCache)) {
-        if (keyOfBodyCache === "parsedBody") {
-          continue;
+    const anyCachedKey = Object.keys(bodyCache)[0];
+    if (anyCachedKey) {
+      return bodyCache[anyCachedKey].then((body) => {
+        if (anyCachedKey === "json") {
+          body = JSON.stringify(body);
         }
-        return (async () => {
-          let body = await bodyCache[keyOfBodyCache];
-          if (keyOfBodyCache === "json") {
-            body = JSON.stringify(body);
-          }
-          return await new Response(body)[key]();
-        })();
-      }
+        return new Response(body)[key]();
+      });
     }
     return bodyCache[key] = raw[key]();
   };

package/dist/types/context.d.ts

@@ -95,8 +95,8 @@ interface BodyRespond extends NewResponse {
  * @returns {Response & TypedResponse<T, U, 'text'>} - The response after rendering the text content, typed with the provided text and status code types.
  */
 interface TextRespond {
-    <T extends string, U extends StatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'text'>;
-    <T extends string, U extends StatusCode>(text: T, init?: ResponseInit): Response & TypedResponse<T, U, 'text'>;
+    <T extends string, U extends StatusCode = StatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'text'>;
+    <T extends string, U extends StatusCode = StatusCode>(text: T, init?: ResponseInit): Response & TypedResponse<T, U, 'text'>;
 }
 /**
  * Interface for responding with JSON.
@@ -112,8 +112,8 @@ interface TextRespond {
  * @returns {JSONRespondReturn<T, U>} - The response after rendering the JSON object, typed with the provided object and status code types.
  */
 interface JSONRespond {
-    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode>(object: T, status?: U, headers?: HeaderRecord): JSONRespondReturn<T, U>;
-    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode>(object: T, init?: ResponseInit): JSONRespondReturn<T, U>;
+    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode = StatusCode>(object: T, status?: U, headers?: HeaderRecord): JSONRespondReturn<T, U>;
+    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode = StatusCode>(object: T, init?: ResponseInit): JSONRespondReturn<T, U>;
 }
 /**
  * @template T - The type of the JSON value or simplified unknown type.

package/dist/types/hono-base.d.ts

@@ -98,7 +98,7 @@ declare class Hono<E extends Env = Env, S extends Schema = {}, BasePath extends
      * app.route("/api", app2) // GET /api/user
      * ```
      */
-    route<SubPath extends string, SubEnv extends Env, SubSchema extends Schema, SubBasePath extends string>(path: SubPath, app?: Hono<SubEnv, SubSchema, SubBasePath>): Hono<E, MergeSchemaPath<SubSchema, MergePath<BasePath, SubPath>> & S, BasePath>;
+    route<SubPath extends string, SubEnv extends Env, SubSchema extends Schema, SubBasePath extends string>(path: SubPath, app: Hono<SubEnv, SubSchema, SubBasePath>): Hono<E, MergeSchemaPath<SubSchema, MergePath<BasePath, SubPath>> & S, BasePath>;
     /**
      * `.basePath()` allows base paths to be specified.
      *

package/dist/types/jsx/base.d.ts

@@ -1,13 +1,13 @@
 import type { HtmlEscaped, HtmlEscapedString, StringBuffer } from '../utils/html';
 import type { Context } from './context';
-import type { Hono, IntrinsicElements as IntrinsicElementsDefined } from './intrinsic-elements';
+import type { JSX as HonoJSX, IntrinsicElements as IntrinsicElementsDefined } from './intrinsic-elements';
 export type Props = Record<string, any>;
 export type FC<P = Props> = {
     (props: P): HtmlEscapedString | Promise<HtmlEscapedString>;
     defaultProps?: Partial<P> | undefined;
     displayName?: string | undefined;
 };
-export type DOMAttributes = Hono.HTMLAttributes;
+export type DOMAttributes = HonoJSX.HTMLAttributes;
 export declare namespace JSX {
     type Element = HtmlEscapedString | Promise<HtmlEscapedString>;
     interface ElementChildrenAttribute {

package/dist/types/jsx/index.d.ts

@@ -65,3 +65,4 @@ declare const _default: {
 };
 export default _default;
 export type * from './types';
+export type { JSX } from './intrinsic-elements';

package/dist/types/jsx/intrinsic-elements.d.ts

@@ -4,7 +4,7 @@
  * MIT License
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  */
-export declare namespace Hono {
+export declare namespace JSX {
     export type CrossOrigin = 'anonymous' | 'use-credentials' | '' | undefined;
     export type CSSProperties = {};
     type AnyAttributes = {
@@ -636,5 +636,5 @@ export declare namespace Hono {
     }
     export {};
 }
-export interface IntrinsicElements extends Hono.IntrinsicElements {
+export interface IntrinsicElements extends JSX.IntrinsicElements {
 }

package/dist/types/jsx/types.d.ts

@@ -2,14 +2,14 @@
  * All types exported from "hono/jsx" are in this file.
  */
 import type { Child, JSXNode } from './base';
-import type { Hono } from './intrinsic-elements';
+import type { JSX } from './intrinsic-elements';
 export type { Child, JSXNode, FC } from './base';
 export type { RefObject } from './hooks';
 export type { Context } from './context';
 export type PropsWithChildren<P = unknown> = P & {
     children?: Child | undefined;
 };
-export type CSSProperties = Hono.CSSProperties;
+export type CSSProperties = JSX.CSSProperties;
 /**
  * React types
  */

package/dist/types/jsx/utils.d.ts

@@ -1,8 +1,2 @@
-/**
- * Normalizes intrinsic element properties by converting JSX element properties
- * to their corresponding HTML attributes.
- *
- * @param props - JSX element properties.
- */
-export declare const normalizeIntrinsicElementProps: (props: Record<string, unknown>) => void;
+export declare const normalizeIntrinsicElementKey: (key: string) => string;
 export declare const styleObjectForEach: (style: Record<string, string | number>, fn: (key: string, value: string | null) => void) => void;

package/package.json

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