hono 4.5.2 → 4.5.4

package/dist/adapter/service-worker/handler.js

@@ -1,6 +1,6 @@
 // src/adapter/service-worker/handler.ts
 var handle = (app, opts = {
-  fetch
+  fetch: globalThis.self !== void 0 ? globalThis.self.fetch : fetch
 }) => {
   return (evt) => {
     evt.respondWith(

package/dist/cjs/adapter/service-worker/handler.js

@@ -22,7 +22,7 @@ __export(handler_exports, {
 });
 module.exports = __toCommonJS(handler_exports);
 const handle = (app, opts = {
-  fetch
+  fetch: globalThis.self !== void 0 ? globalThis.self.fetch : fetch
 }) => {
   return (evt) => {
     evt.respondWith(

package/dist/cjs/client/client.js

@@ -167,7 +167,13 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
         }
       });
     }
-    return new WebSocket(targetUrl.toString());
+    const establishWebSocket = (...args) => {
+      if (options?.webSocket !== void 0 && typeof options.webSocket === "function") {
+        return options.webSocket(...args);
+      }
+      return new WebSocket(...args);
+    };
+    return establishWebSocket(targetUrl.toString());
   }
   const req = new ClientRequestImpl(url, method);
   if (method) {

package/dist/cjs/jsx/base.js

@@ -28,6 +28,7 @@ __export(base_exports, {
   JSXFragmentNode: () => JSXFragmentNode,
   JSXNode: () => JSXNode,
   cloneElement: () => cloneElement,
+  getNameSpaceContext: () => getNameSpaceContext,
   isValidElement: () => isValidElement,
   jsx: () => jsx,
   jsxFn: () => jsxFn,
@@ -42,6 +43,11 @@ var import_constants = require("./constants");
 var import_utils = require("./utils");
 var intrinsicElementTags = __toESM(require("./intrinsic-element/components"), 1);
 var import_common = require("./intrinsic-element/common");
+let nameSpaceContext = void 0;
+const getNameSpaceContext = () => nameSpaceContext;
+const toSVGAttributeName = (key) => /[A-Z]/.test(key) && key.match(
+  /^(?:al|basel|clip(?:Path|Rule)$|co|do|fill|fl|fo|gl|let|lig|i|marker[EMS]|o|pai|pointe|sh|st[or]|text[^L]|tr|u|ve|w)/
+) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 const emptyTags = [
   "area",
   "base",
@@ -143,8 +149,9 @@ class JSXNode {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
+    const normalizeKey = nameSpaceContext && (0, import_context.useContext)(nameSpaceContext) === "svg" ? (key) => toSVGAttributeName((0, import_utils.normalizeIntrinsicElementKey)(key)) : (key) => (0, import_utils.normalizeIntrinsicElementKey)(key);
     for (let [key, v] of Object.entries(props)) {
-      key = (0, import_utils.normalizeIntrinsicElementKey)(key);
+      key = normalizeKey(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -262,6 +269,17 @@ const jsxFn = (tag, props, children) => {
       props,
       children
     );
+  } else if (tag === "svg") {
+    nameSpaceContext ||= (0, import_context.createContext)("");
+    return new JSXNode(tag, props, [
+      new JSXFunctionNode(
+        nameSpaceContext,
+        {
+          value: tag
+        },
+        children
+      )
+    ]);
   } else {
     return new JSXNode(tag, props, children);
   }
@@ -323,6 +341,7 @@ const reactAPICompatVersion = "19.0.0-hono-jsx";
   JSXFragmentNode,
   JSXNode,
   cloneElement,
+  getNameSpaceContext,
   isValidElement,
   jsx,
   jsxFn,

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

@@ -187,22 +187,7 @@ const getNextChildren = (node, container, nextChildren, childrenToRemove, callba
   });
 };
 const findInsertBefore = (node) => {
-  if (!node) {
-    return null;
-  } else if (node.tag === HONO_PORTAL_ELEMENT) {
-    return findInsertBefore(node.nN);
-  } else if (node.e) {
-    return node.e;
-  }
-  if (node.vC) {
-    for (let i = 0, len = node.vC.length; i < len; i++) {
-      const e = findInsertBefore(node.vC[i]);
-      if (e) {
-        return e;
-      }
-    }
-  }
-  return findInsertBefore(node.nN);
+  return !node ? null : node.tag === HONO_PORTAL_ELEMENT ? findInsertBefore(node.nN) : node.e || node.vC && node.pP && findInsertBefore(node.vC[0]) || findInsertBefore(node.nN);
 };
 const removeNode = (node) => {
   if (!isNodeString(node)) {

package/dist/cjs/jsx/intrinsic-element/components.js

@@ -29,6 +29,7 @@ __export(components_exports, {
 });
 module.exports = __toCommonJS(components_exports);
 var import_base = require("../base");
+var import_context = require("../context");
 var import_html = require("../../helper/html");
 var import_common = require("./common");
 var import_constants = require("../constants");
@@ -105,6 +106,10 @@ const documentMetadataTag = (tag, children, props, sort) => {
   }
 };
 const title = ({ children, ...props }) => {
+  const nameSpaceContext = (0, import_base.getNameSpaceContext)();
+  if (nameSpaceContext && (0, import_context.useContext)(nameSpaceContext) === "svg") {
+    new import_base.JSXNode("title", props, (0, import_children.toArray)(children ?? []));
+  }
   return documentMetadataTag("title", children, props, false);
 };
 const script = ({

package/dist/cjs/validator/validator.js

@@ -24,8 +24,8 @@ module.exports = __toCommonJS(validator_exports);
 var import_cookie = require("../helper/cookie");
 var import_http_exception = require("../http-exception");
 var import_buffer = require("../utils/buffer");
-const jsonRegex = /^application\/([a-z-\.]+\+)?json$/;
-const multipartRegex = /^multipart\/form-data(; boundary=[A-Za-z0-9'()+_,\-./:=?]+)?$/;
+const jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
+const multipartRegex = /^multipart\/form-data(; boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
 const urlencodedRegex = /^application\/x-www-form-urlencoded$/;
 const validator = (target, validationFunc) => {
   return async (c, next) => {

package/dist/client/client.js

@@ -151,7 +151,13 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
         }
       });
     }
-    return new WebSocket(targetUrl.toString());
+    const establishWebSocket = (...args) => {
+      if (options?.webSocket !== void 0 && typeof options.webSocket === "function") {
+        return options.webSocket(...args);
+      }
+      return new WebSocket(...args);
+    };
+    return establishWebSocket(targetUrl.toString());
   }
   const req = new ClientRequestImpl(url, method);
   if (method) {

package/dist/jsx/base.js

@@ -1,11 +1,16 @@
 // src/jsx/base.ts
 import { raw } from "../helper/html/index.js";
 import { escapeToBuffer, resolveCallbackSync, stringBufferToString } from "../utils/html.js";
-import { globalContexts } from "./context.js";
+import { createContext, globalContexts, useContext } from "./context.js";
 import { DOM_RENDERER } from "./constants.js";
 import { normalizeIntrinsicElementKey, styleObjectForEach } from "./utils.js";
 import * as intrinsicElementTags from "./intrinsic-element/components.js";
 import { domRenderers } from "./intrinsic-element/common.js";
+var nameSpaceContext = void 0;
+var getNameSpaceContext = () => nameSpaceContext;
+var toSVGAttributeName = (key) => /[A-Z]/.test(key) && key.match(
+  /^(?:al|basel|clip(?:Path|Rule)$|co|do|fill|fl|fo|gl|let|lig|i|marker[EMS]|o|pai|pointe|sh|st[or]|text[^L]|tr|u|ve|w)/
+) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 var emptyTags = [
   "area",
   "base",
@@ -107,8 +112,9 @@ var JSXNode = class {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
+    const normalizeKey = nameSpaceContext && useContext(nameSpaceContext) === "svg" ? (key) => toSVGAttributeName(normalizeIntrinsicElementKey(key)) : (key) => normalizeIntrinsicElementKey(key);
     for (let [key, v] of Object.entries(props)) {
-      key = normalizeIntrinsicElementKey(key);
+      key = normalizeKey(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -226,6 +232,17 @@ var jsxFn = (tag, props, children) => {
       props,
       children
     );
+  } else if (tag === "svg") {
+    nameSpaceContext ||= createContext("");
+    return new JSXNode(tag, props, [
+      new JSXFunctionNode(
+        nameSpaceContext,
+        {
+          value: tag
+        },
+        children
+      )
+    ]);
   } else {
     return new JSXNode(tag, props, children);
   }
@@ -286,6 +303,7 @@ export {
   JSXFragmentNode,
   JSXNode,
   cloneElement,
+  getNameSpaceContext,
   isValidElement,
   jsx,
   jsxFn,

package/dist/jsx/dom/render.js

@@ -157,22 +157,7 @@ var getNextChildren = (node, container, nextChildren, childrenToRemove, callback
   });
 };
 var findInsertBefore = (node) => {
-  if (!node) {
-    return null;
-  } else if (node.tag === HONO_PORTAL_ELEMENT) {
-    return findInsertBefore(node.nN);
-  } else if (node.e) {
-    return node.e;
-  }
-  if (node.vC) {
-    for (let i = 0, len = node.vC.length; i < len; i++) {
-      const e = findInsertBefore(node.vC[i]);
-      if (e) {
-        return e;
-      }
-    }
-  }
-  return findInsertBefore(node.nN);
+  return !node ? null : node.tag === HONO_PORTAL_ELEMENT ? findInsertBefore(node.nN) : node.e || node.vC && node.pP && findInsertBefore(node.vC[0]) || findInsertBefore(node.nN);
 };
 var removeNode = (node) => {
   if (!isNodeString(node)) {

package/dist/jsx/intrinsic-element/components.js

@@ -1,5 +1,6 @@
 // src/jsx/intrinsic-element/components.ts
-import { JSXNode } from "../base.js";
+import { JSXNode, getNameSpaceContext } from "../base.js";
+import { useContext } from "../context.js";
 import { raw } from "../../helper/html/index.js";
 import { dataPrecedenceAttr, deDupeKeyMap } from "./common.js";
 import { PERMALINK } from "../constants.js";
@@ -76,6 +77,10 @@ var documentMetadataTag = (tag, children, props, sort) => {
   }
 };
 var title = ({ children, ...props }) => {
+  const nameSpaceContext = getNameSpaceContext();
+  if (nameSpaceContext && useContext(nameSpaceContext) === "svg") {
+    new JSXNode("title", props, toArray(children ?? []));
+  }
   return documentMetadataTag("title", children, props, false);
 };
 var script = ({

package/dist/types/client/types.d.ts

@@ -5,6 +5,7 @@ import type { HasRequiredKeys } from '../utils/types';
 type HonoRequest = (typeof Hono.prototype)['request'];
 export type ClientRequestOptions<T = unknown> = {
     fetch?: typeof fetch | HonoRequest;
+    webSocket?: (...args: ConstructorParameters<typeof WebSocket>) => WebSocket;
     /**
      * Standard `RequestInit`, caution that this take highest priority
      * and could be used to overwrite things that Hono sets for you, like `body | method | headers`.

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

@@ -17,6 +17,7 @@ export declare namespace JSX {
         [tagName: string]: Props;
     }
 }
+export declare const getNameSpaceContext: () => Context<string> | undefined;
 type LocalContexts = [Context<unknown>, unknown][];
 export type Child = string | Promise<string> | number | JSXNode | null | undefined | boolean | Child[];
 export declare class JSXNode implements HtmlEscaped {

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

@@ -6,7 +6,9 @@
  */
 export declare namespace JSX {
     export type CrossOrigin = 'anonymous' | 'use-credentials' | '' | undefined;
-    export type CSSProperties = {};
+    export interface CSSProperties {
+        [propertyKey: string]: unknown;
+    }
     type AnyAttributes = {
         [attributeName: string]: any;
     };
@@ -147,7 +149,7 @@ export declare namespace JSX {
         contenteditable?: boolean | 'inherit' | undefined;
         contextmenu?: string | undefined;
         dir?: string | undefined;
-        draggable?: boolean | undefined;
+        draggable?: 'true' | 'false' | undefined;
         enterkeyhint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send' | undefined;
         hidden?: boolean | undefined;
         id?: string | undefined;
@@ -165,7 +167,7 @@ export declare namespace JSX {
         popover?: string | undefined;
         slot?: string | undefined;
         spellcheck?: boolean | undefined;
-        style?: CSSProperties | undefined;
+        style?: CSSProperties | string | undefined;
         tabindex?: number | undefined;
         title?: string | undefined;
         translate?: 'yes' | 'no' | undefined;

package/dist/types/types.d.ts

@@ -458,7 +458,7 @@ type ChangePathOfSchema<S extends Schema, Path extends string> = keyof S extends
     [K in keyof S as Path]: S[K];
 };
 export type Endpoint = {
-    input: Partial<ValidationTargets>;
+    input: any;
     output: any;
     outputFormat: ResponseFormat;
     status: StatusCode;
@@ -514,11 +514,11 @@ export type TypedResponse<T = unknown, U extends StatusCode = StatusCode, F exte
 type MergeTypedResponse<T> = T extends Promise<infer T2> ? T2 extends TypedResponse ? T2 : TypedResponse : T extends TypedResponse ? T : TypedResponse;
 export type FormValue = string | Blob;
 export type ParsedFormValue = string | File;
-export type ValidationTargets<T extends FormValue = ParsedFormValue> = {
+export type ValidationTargets<T extends FormValue = ParsedFormValue, P extends string = string> = {
     json: any;
     form: Record<string, T | T[]>;
     query: Record<string, string | string[]>;
-    param: Record<string, string> | Record<string, string | undefined>;
+    param: Record<P, P extends `${infer _}?` ? string | undefined : string>;
     header: Record<string, string>;
     cookie: Record<string, string>;
 };

package/dist/validator/validator.js

@@ -2,8 +2,8 @@
 import { getCookie } from "../helper/cookie/index.js";
 import { HTTPException } from "../http-exception.js";
 import { bufferToFormData } from "../utils/buffer.js";
-var jsonRegex = /^application\/([a-z-\.]+\+)?json$/;
-var multipartRegex = /^multipart\/form-data(; boundary=[A-Za-z0-9'()+_,\-./:=?]+)?$/;
+var jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
+var multipartRegex = /^multipart\/form-data(; boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
 var urlencodedRegex = /^application\/x-www-form-urlencoded$/;
 var validator = (target, validationFunc) => {
   return async (c, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",