hono 4.6.11 → 4.6.12

package/dist/adapter/aws-lambda/handler.js

@@ -251,7 +251,10 @@ var getProcessor = (event) => {
   return v1Processor;
 };
 var isProxyEventALB = (event) => {
-  return Object.hasOwn(event.requestContext, "elb");
+  if (event.requestContext) {
+    return Object.hasOwn(event.requestContext, "elb");
+  }
+  return false;
 };
 var isProxyEventV2 = (event) => {
   return Object.hasOwn(event, "rawPath");
@@ -268,6 +271,10 @@ var isContentEncodingBinary = (contentEncoding) => {
   return /^(gzip|deflate|compress|br)/.test(contentEncoding);
 };
 export {
+  ALBProcessor,
+  EventProcessor,
+  EventV1Processor,
+  EventV2Processor,
   getProcessor,
   handle,
   isContentEncodingBinary,

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -24,6 +24,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
+  ALBProcessor: () => ALBProcessor,
+  EventProcessor: () => EventProcessor,
+  EventV1Processor: () => EventV1Processor,
+  EventV2Processor: () => EventV2Processor,
   getProcessor: () => getProcessor,
   handle: () => handle,
   isContentEncodingBinary: () => isContentEncodingBinary,
@@ -283,7 +287,10 @@ const getProcessor = (event) => {
   return v1Processor;
 };
 const isProxyEventALB = (event) => {
-  return Object.hasOwn(event.requestContext, "elb");
+  if (event.requestContext) {
+    return Object.hasOwn(event.requestContext, "elb");
+  }
+  return false;
 };
 const isProxyEventV2 = (event) => {
   return Object.hasOwn(event, "rawPath");
@@ -301,6 +308,10 @@ const isContentEncodingBinary = (contentEncoding) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ALBProcessor,
+  EventProcessor,
+  EventV1Processor,
+  EventV2Processor,
   getProcessor,
   handle,
   isContentEncodingBinary,

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

@@ -35,7 +35,8 @@ var import_common2 = require("./common");
 const createCssContext = ({ id }) => {
   const [cssJsxDomObject, StyleRenderToDom] = (0, import_css.createCssJsxDomObjects)({ id });
   const contextMap = /* @__PURE__ */ new WeakMap();
-  const replaceStyleRe = new RegExp(`(<style id="${id}">.*?)(</style>)`);
+  const nonceMap = /* @__PURE__ */ new WeakMap();
+  const replaceStyleRe = new RegExp(`(<style id="${id}"(?: nonce="[^"]*")?>.*?)(</style>)`);
   const newCssClassNameObject = (cssClassName) => {
     const appendStyle = ({ buffer, context }) => {
       const [toAdd, added] = contextMap.get(context);
@@ -53,9 +54,8 @@ const createCssContext = ({ id }) => {
         buffer[0] = buffer[0].replace(replaceStyleRe, (_, pre, post) => `${pre}${stylesStr}${post}`);
         return;
       }
-      const appendStyleScript = `<script>document.querySelector('#${id}').textContent+=${JSON.stringify(
-        stylesStr
-      )}<\/script>`;
+      const nonce = nonceMap.get(context);
+      const appendStyleScript = `<script${nonce ? ` nonce="${nonce}"` : ""}>document.querySelector('#${id}').textContent+=${JSON.stringify(stylesStr)}<\/script>`;
       if (buffer) {
         buffer[0] = `${appendStyleScript}${buffer[0]}`;
         return;
@@ -63,7 +63,7 @@ const createCssContext = ({ id }) => {
       return Promise.resolve(appendStyleScript);
     };
     const addClassNameToContext = ({ context }) => {
-      if (!contextMap.get(context)) {
+      if (!contextMap.has(context)) {
         contextMap.set(context, [{}, {}]);
       }
       const [toAdd, added] = contextMap.get(context);
@@ -105,7 +105,15 @@ const createCssContext = ({ id }) => {
   const viewTransition2 = (strings, ...values) => {
     return newCssClassNameObject((0, import_common.viewTransitionCommon)(strings, values));
   };
-  const Style2 = ({ children } = {}) => children ? (0, import_html.raw)(`<style id="${id}">${children[import_common.STYLE_STRING]}</style>`) : (0, import_html.raw)(`<style id="${id}"></style>`);
+  const Style2 = ({ children, nonce } = {}) => (0, import_html.raw)(
+    `<style id="${id}"${nonce ? ` nonce="${nonce}"` : ""}>${children ? children[import_common.STYLE_STRING] : ""}</style>`,
+    [
+      ({ context }) => {
+        nonceMap.set(context, nonce);
+        return void 0;
+      }
+    ]
+  );
   Style2[import_constants.DOM_RENDERER] = StyleRenderToDom;
   return {
     css: css2,

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

@@ -105,10 +105,11 @@ const createCssJsxDomObjects = ({ id }) => {
       return this[import_common.CLASS_NAME];
     }
   };
-  const Style2 = ({ children }) => ({
+  const Style2 = ({ children, nonce }) => ({
     tag: "style",
     props: {
       id,
+      nonce,
       children: children && (Array.isArray(children) ? children : [children]).map(
         (c) => c[import_common.STYLE_STRING]
       )

package/dist/cjs/router/trie-router/node.js

@@ -166,10 +166,12 @@ class Node {
       }
       curNodes = tempNodes;
     }
-    const results = handlerSets.sort((a, b) => {
-      return a.score - b.score;
-    });
-    return [results.map(({ handler, params }) => [handler, params])];
+    if (handlerSets.length > 1) {
+      handlerSets.sort((a, b) => {
+        return a.score - b.score;
+      });
+    }
+    return [handlerSets.map(({ handler, params }) => [handler, params])];
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/helper/css/index.js

@@ -18,7 +18,8 @@ import { rawCssString } from "./common.js";
 var createCssContext = ({ id }) => {
   const [cssJsxDomObject, StyleRenderToDom] = createCssJsxDomObjects({ id });
   const contextMap = /* @__PURE__ */ new WeakMap();
-  const replaceStyleRe = new RegExp(`(<style id="${id}">.*?)(</style>)`);
+  const nonceMap = /* @__PURE__ */ new WeakMap();
+  const replaceStyleRe = new RegExp(`(<style id="${id}"(?: nonce="[^"]*")?>.*?)(</style>)`);
   const newCssClassNameObject = (cssClassName) => {
     const appendStyle = ({ buffer, context }) => {
       const [toAdd, added] = contextMap.get(context);
@@ -36,9 +37,8 @@ var createCssContext = ({ id }) => {
         buffer[0] = buffer[0].replace(replaceStyleRe, (_, pre, post) => `${pre}${stylesStr}${post}`);
         return;
       }
-      const appendStyleScript = `<script>document.querySelector('#${id}').textContent+=${JSON.stringify(
-        stylesStr
-      )}<\/script>`;
+      const nonce = nonceMap.get(context);
+      const appendStyleScript = `<script${nonce ? ` nonce="${nonce}"` : ""}>document.querySelector('#${id}').textContent+=${JSON.stringify(stylesStr)}<\/script>`;
       if (buffer) {
         buffer[0] = `${appendStyleScript}${buffer[0]}`;
         return;
@@ -46,7 +46,7 @@ var createCssContext = ({ id }) => {
       return Promise.resolve(appendStyleScript);
     };
     const addClassNameToContext = ({ context }) => {
-      if (!contextMap.get(context)) {
+      if (!contextMap.has(context)) {
         contextMap.set(context, [{}, {}]);
       }
       const [toAdd, added] = contextMap.get(context);
@@ -88,7 +88,15 @@ var createCssContext = ({ id }) => {
   const viewTransition2 = (strings, ...values) => {
     return newCssClassNameObject(viewTransitionCommon(strings, values));
   };
-  const Style2 = ({ children } = {}) => children ? raw(`<style id="${id}">${children[STYLE_STRING]}</style>`) : raw(`<style id="${id}"></style>`);
+  const Style2 = ({ children, nonce } = {}) => raw(
+    `<style id="${id}"${nonce ? ` nonce="${nonce}"` : ""}>${children ? children[STYLE_STRING] : ""}</style>`,
+    [
+      ({ context }) => {
+        nonceMap.set(context, nonce);
+        return void 0;
+      }
+    ]
+  );
   Style2[DOM_RENDERER] = StyleRenderToDom;
   return {
     css: css2,

package/dist/jsx/dom/css.js

@@ -87,10 +87,11 @@ var createCssJsxDomObjects = ({ id }) => {
       return this[CLASS_NAME];
     }
   };
-  const Style2 = ({ children }) => ({
+  const Style2 = ({ children, nonce }) => ({
     tag: "style",
     props: {
       id,
+      nonce,
       children: children && (Array.isArray(children) ? children : [children]).map(
         (c) => c[STYLE_STRING]
       )

package/dist/router/trie-router/node.js

@@ -144,10 +144,12 @@ var Node = class {
       }
       curNodes = tempNodes;
     }
-    const results = handlerSets.sort((a, b) => {
-      return a.score - b.score;
-    });
-    return [results.map(({ handler, params }) => [handler, params])];
+    if (handlerSets.length > 1) {
+      handlerSets.sort((a, b) => {
+        return a.score - b.score;
+      });
+    }
+    return [handlerSets.map(({ handler, params }) => [handler, params])];
   }
 };
 export {

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

@@ -71,7 +71,7 @@ export declare const streamHandle: <E extends Env = Env, S extends Schema = {},
  * Accepts events from API Gateway/ELB(`APIGatewayProxyEvent`) and directly through Function Url(`APIGatewayProxyEventV2`)
  */
 export declare const handle: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => ((event: LambdaEvent, lambdaContext?: LambdaContext) => Promise<APIGatewayProxyResult>);
-declare abstract class EventProcessor<E extends LambdaEvent> {
+export declare abstract class EventProcessor<E extends LambdaEvent> {
     protected abstract getPath(event: E): string;
     protected abstract getMethod(event: E): string;
     protected abstract getQueryString(event: E): string;
@@ -82,7 +82,30 @@ declare abstract class EventProcessor<E extends LambdaEvent> {
     createResult(event: E, res: Response): Promise<APIGatewayProxyResult>;
     setCookies(event: E, res: Response, result: APIGatewayProxyResult): void;
 }
+export declare class EventV2Processor extends EventProcessor<APIGatewayProxyEventV2> {
+    protected getPath(event: APIGatewayProxyEventV2): string;
+    protected getMethod(event: APIGatewayProxyEventV2): string;
+    protected getQueryString(event: APIGatewayProxyEventV2): string;
+    protected getCookies(event: APIGatewayProxyEventV2, headers: Headers): void;
+    protected setCookiesToResult(_: APIGatewayProxyEventV2, result: APIGatewayProxyResult, cookies: string[]): void;
+    protected getHeaders(event: APIGatewayProxyEventV2): Headers;
+}
+export declare class EventV1Processor extends EventProcessor<Exclude<LambdaEvent, APIGatewayProxyEventV2>> {
+    protected getPath(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>): string;
+    protected getMethod(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>): string;
+    protected getQueryString(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>): string;
+    protected getCookies(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>, headers: Headers): void;
+    protected getHeaders(event: APIGatewayProxyEvent): Headers;
+    protected setCookiesToResult(_: APIGatewayProxyEvent, result: APIGatewayProxyResult, cookies: string[]): void;
+}
+export declare class ALBProcessor extends EventProcessor<ALBProxyEvent> {
+    protected getHeaders(event: ALBProxyEvent): Headers;
+    protected getPath(event: ALBProxyEvent): string;
+    protected getMethod(event: ALBProxyEvent): string;
+    protected getQueryString(event: ALBProxyEvent): string;
+    protected getCookies(event: ALBProxyEvent, headers: Headers): void;
+    protected setCookiesToResult(event: ALBProxyEvent, result: APIGatewayProxyResult, cookies: string[]): void;
+}
 export declare const getProcessor: (event: LambdaEvent) => EventProcessor<LambdaEvent>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export declare const isContentEncodingBinary: (contentEncoding: string | null) => boolean;
-export {};

package/dist/types/helper/css/index.d.ts

@@ -23,6 +23,7 @@ interface ViewTransitionType {
 interface StyleType {
     (args?: {
         children?: Promise<string>;
+        nonce?: string;
     }): HtmlEscapedString;
 }
 /**

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

@@ -12,7 +12,7 @@ type HtmlEscapedCallbackOpts = {
         string
     ];
     phase: (typeof HtmlEscapedCallbackPhase)[keyof typeof HtmlEscapedCallbackPhase];
-    context: object;
+    context: Readonly<object>;
 };
 export type HtmlEscapedCallback = (opts: HtmlEscapedCallbackOpts) => Promise<string> | undefined;
 export type HtmlEscaped = {

package/package.json

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