hono 2.5.6 → 2.5.8

package/dist/cjs/context.js

@@ -170,10 +170,10 @@ class Context {
     if (global?.fastly !== void 0) {
       return "fastly";
     }
-    if (typeof global?.EdgeRuntime !== "string") {
+    if (typeof global?.EdgeRuntime === "string") {
       return "vercel";
     }
-    if (global?.process?.title === "node") {
+    if (global?.process?.release?.name === "node") {
       return "node";
     }
     return "other";

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

@@ -42,7 +42,6 @@ const cors = (options) => {
     }
   })(opts.origin);
   return async (c, next) => {
-    await next();
     function set(key, value) {
       c.res.headers.append(key, value);
     }
@@ -59,7 +58,9 @@ const cors = (options) => {
     if (opts.exposeHeaders?.length) {
       set("Access-Control-Expose-Headers", opts.exposeHeaders.join(","));
     }
-    if (c.req.method === "OPTIONS") {
+    if (c.req.method !== "OPTIONS") {
+      await next();
+    } else {
       if (opts.maxAge != null) {
         set("Access-Control-Max-Age", opts.maxAge.toString());
       }

package/dist/cjs/router/reg-exp-router/router.js

@@ -37,6 +37,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   if (routes.length === 0) {
     return nullMatcher;
   }
+  routes = routes.sort(([a], [b]) => a.length - b.length);
   for (let i = 0, len = routes.length; i < len; i++) {
     let paramMap;
     try {
@@ -85,18 +86,26 @@ class RegExpRouter {
     }
     if (!methodNames.includes(method))
       methodNames.push(method);
+    if (!middleware[method]) {
+      ;
+      [middleware, routes].forEach((handlerMap) => {
+        handlerMap[method] = {};
+        Object.keys(handlerMap[import_router.METHOD_NAME_ALL]).forEach((p) => {
+          handlerMap[method][p] = [...handlerMap[import_router.METHOD_NAME_ALL][p]];
+        });
+      });
+    }
     if (path === "/*") {
       path = "*";
     }
     if (/\*$/.test(path)) {
-      middleware[method] || (middleware[method] = {});
       const re = buildWildcardRegExp(path);
-      (_a = middleware[method])[path] || (_a[path] = findMiddleware(middleware[import_router.METHOD_NAME_ALL], path) || []);
+      (_a = middleware[method])[path] || (_a[path] = findMiddleware(middleware[method], path) || findMiddleware(middleware[import_router.METHOD_NAME_ALL], path) || []);
       Object.keys(middleware).forEach((m) => {
         if (method === import_router.METHOD_NAME_ALL || method === m) {
           Object.keys(middleware[m]).forEach((p) => {
             ;
-            (path === "*" || path === p) && middleware[m][p].push(handler);
+            (path === "*" || re.test(p)) && middleware[m][p].push(handler);
           });
         }
       });
@@ -112,12 +121,11 @@ class RegExpRouter {
     const paths = (0, import_url.checkOptionalParameter)(path) || [path];
     for (let i = 0, len = paths.length; i < len; i++) {
       const path2 = paths[i];
-      routes[method] || (routes[method] = {});
       Object.keys(routes).forEach((m) => {
         var _a2;
         if (method === import_router.METHOD_NAME_ALL || method === m) {
           (_a2 = routes[m])[path2] || (_a2[path2] = [
-            ...routes[import_router.METHOD_NAME_ALL][path2] || findMiddleware(middleware[method], path2) || findMiddleware(middleware[import_router.METHOD_NAME_ALL], path2) || []
+            ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[import_router.METHOD_NAME_ALL], path2) || []
           ]);
           routes[m][path2].push(handler);
         }

package/dist/cjs/validator/validator.js

@@ -40,17 +40,11 @@ class VObjectBase {
     this._isOptional = false;
     this.getValidators = () => {
       const validators = [];
-      const thisKeys = [];
-      Object.assign(thisKeys, this.keys);
       const walk = (container, keys, isOptional) => {
         for (const v of Object.values(container)) {
           if (v instanceof VArray || v instanceof VObject) {
             isOptional || (isOptional = v._isOptional);
-            keys.push(...v.keys);
-            walk(v.container, keys, isOptional);
-            const tmp = [];
-            Object.assign(tmp, thisKeys);
-            keys = tmp;
+            walk(v.container, [...keys, ...v.keys], isOptional);
           } else if (v instanceof VBase) {
             if (isOptional)
               v.isOptional();
@@ -86,28 +80,28 @@ class VArray extends VObjectBase {
   }
 }
 class Validator {
-  constructor() {
-    this.isArray = false;
+  constructor(inArray = false) {
+    this.inArray = inArray;
     this.query = (key) => new VString({ target: "query", key });
     this.queries = (key) => new VStringArray({ target: "queries", key });
     this.header = (key) => new VString({ target: "header", key });
     this.body = (key) => new VString({ target: "body", key });
     this.json = (key) => {
-      if (this.isArray) {
+      if (this.inArray) {
         return new VStringArray({ target: "json", key });
       } else {
         return new VString({ target: "json", key });
       }
     };
-    this.array = (path, validator) => {
-      this.isArray = true;
-      const res = validator(this);
+    this.array = (path, validatorFn) => {
+      const validator = new Validator(true);
+      const res = validatorFn(validator);
       const arr = new VArray(res, path);
       return arr;
     };
-    this.object = (path, validator) => {
-      this.isArray = false;
-      const res = validator(this);
+    this.object = (path, validatorFn) => {
+      const validator = new Validator(this.inArray);
+      const res = validatorFn(validator);
       const obj = new VObject(res, path);
       return obj;
     };
@@ -214,7 +208,7 @@ class VBase {
     this.validateType = (value) => {
       if (this.isArray) {
         if (!Array.isArray(value)) {
-          return false;
+          return this._optional && typeof value === "undefined";
         }
         for (const val of value) {
           if (typeof val === "undefined" && this._nested()) {

package/dist/context.js

@@ -148,10 +148,10 @@ var Context = class {
     if (global?.fastly !== void 0) {
       return "fastly";
     }
-    if (typeof global?.EdgeRuntime !== "string") {
+    if (typeof global?.EdgeRuntime === "string") {
       return "vercel";
     }
-    if (global?.process?.title === "node") {
+    if (global?.process?.release?.name === "node") {
       return "node";
     }
     return "other";

package/dist/middleware/cors/index.js

@@ -20,7 +20,6 @@ var cors = (options) => {
     }
   })(opts.origin);
   return async (c, next) => {
-    await next();
     function set(key, value) {
       c.res.headers.append(key, value);
     }
@@ -37,7 +36,9 @@ var cors = (options) => {
     if (opts.exposeHeaders?.length) {
       set("Access-Control-Expose-Headers", opts.exposeHeaders.join(","));
     }
-    if (c.req.method === "OPTIONS") {
+    if (c.req.method !== "OPTIONS") {
+      await next();
+    } else {
       if (opts.maxAge != null) {
         set("Access-Control-Max-Age", opts.maxAge.toString());
       }

package/dist/middleware/html/index.d.ts

@@ -1,3 +1,3 @@
 import type { HtmlEscapedString } from '../../utils/html';
-export declare const raw: (value: any) => HtmlEscapedString;
-export declare const html: (strings: TemplateStringsArray, ...values: any[]) => HtmlEscapedString;
+export declare const raw: (value: unknown) => HtmlEscapedString;
+export declare const html: (strings: TemplateStringsArray, ...values: unknown[]) => HtmlEscapedString;

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

@@ -1,26 +1,27 @@
 import type { StringBuffer, HtmlEscaped, HtmlEscapedString } from '../../utils/html';
+declare type Props = Record<string, any>;
 declare global {
     namespace jsx.JSX {
         interface IntrinsicElements {
-            [tagName: string]: Record<string, any>;
+            [tagName: string]: Props;
         }
     }
 }
 declare type Child = string | number | JSXNode | Child[];
 export declare class JSXNode implements HtmlEscaped {
     tag: string | Function;
-    props: Record<string, any>;
+    props: Props;
     children: Child[];
     isEscaped: true;
-    constructor(tag: string | Function, props: Record<string, any>, children: Child[]);
+    constructor(tag: string | Function, props: Props, children: Child[]);
     toString(): string;
     toStringToBuffer(buffer: StringBuffer): void;
 }
 export { jsxFn as jsx };
-declare const jsxFn: (tag: string | Function, props: Record<string, any>, ...children: (string | HtmlEscapedString)[]) => JSXNode;
-declare type FC<T = Record<string, any>> = (props: T) => HtmlEscapedString;
+declare const jsxFn: (tag: string | Function, props: Props, ...children: (string | HtmlEscapedString)[]) => JSXNode;
+declare type FC<T = Props> = (props: T) => HtmlEscapedString;
 export declare const memo: <T>(component: FC<T>, propsAreEqual?: (prevProps: Readonly<T>, nextProps: Readonly<T>) => boolean) => FC<T>;
 export declare const Fragment: (props: {
     key?: string;
-    children?: any;
+    children?: Child[];
 }) => JSXNode;

package/dist/middleware/jsx/jsx-dev-runtime.d.ts

@@ -1,3 +1,3 @@
 import type { JSXNode } from '.';
 export { Fragment } from '.';
-export declare function jsxDEV(tag: string | Function, props: Record<string, any>): JSXNode;
+export declare function jsxDEV(tag: string | Function, props: Record<string, unknown>): JSXNode;

package/dist/request.d.ts

@@ -1,6 +1,6 @@
 import type { BodyData } from './utils/body';
 import type { Cookie } from './utils/cookie';
-declare type ValidatedData = Record<string, any>;
+declare type ValidatedData = Record<string, unknown>;
 declare global {
     interface Request<CfHostMetadata = unknown, ParamKeyType extends string = string, Data extends ValidatedData = ValidatedData> {
         paramData?: Record<ParamKeyType, string>;

package/dist/router/reg-exp-router/router.js

@@ -15,6 +15,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   if (routes.length === 0) {
     return nullMatcher;
   }
+  routes = routes.sort(([a], [b]) => a.length - b.length);
   for (let i = 0, len = routes.length; i < len; i++) {
     let paramMap;
     try {
@@ -63,18 +64,26 @@ var RegExpRouter = class {
     }
     if (!methodNames.includes(method))
       methodNames.push(method);
+    if (!middleware[method]) {
+      ;
+      [middleware, routes].forEach((handlerMap) => {
+        handlerMap[method] = {};
+        Object.keys(handlerMap[METHOD_NAME_ALL]).forEach((p) => {
+          handlerMap[method][p] = [...handlerMap[METHOD_NAME_ALL][p]];
+        });
+      });
+    }
     if (path === "/*") {
       path = "*";
     }
     if (/\*$/.test(path)) {
-      middleware[method] || (middleware[method] = {});
       const re = buildWildcardRegExp(path);
-      (_a = middleware[method])[path] || (_a[path] = findMiddleware(middleware[METHOD_NAME_ALL], path) || []);
+      (_a = middleware[method])[path] || (_a[path] = findMiddleware(middleware[method], path) || findMiddleware(middleware[METHOD_NAME_ALL], path) || []);
       Object.keys(middleware).forEach((m) => {
         if (method === METHOD_NAME_ALL || method === m) {
           Object.keys(middleware[m]).forEach((p) => {
             ;
-            (path === "*" || path === p) && middleware[m][p].push(handler);
+            (path === "*" || re.test(p)) && middleware[m][p].push(handler);
           });
         }
       });
@@ -90,12 +99,11 @@ var RegExpRouter = class {
     const paths = checkOptionalParameter(path) || [path];
     for (let i = 0, len = paths.length; i < len; i++) {
       const path2 = paths[i];
-      routes[method] || (routes[method] = {});
       Object.keys(routes).forEach((m) => {
         var _a2;
         if (method === METHOD_NAME_ALL || method === m) {
           (_a2 = routes[m])[path2] || (_a2[path2] = [
-            ...routes[METHOD_NAME_ALL][path2] || findMiddleware(middleware[method], path2) || findMiddleware(middleware[METHOD_NAME_ALL], path2) || []
+            ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[METHOD_NAME_ALL], path2) || []
           ]);
           routes[m][path2].push(handler);
         }

package/dist/types.d.ts

@@ -20,7 +20,7 @@ export interface CustomHandler<P extends string | Partial<Environment> | Schema
     (c: Context<P extends string ? P : P extends Partial<Environment> ? string : P extends Partial<Schema> ? string : never, P extends Partial<Environment> ? P : P extends Partial<Schema> ? Partial<Environment> : E extends Partial<Environment> ? E extends Partial<Schema> ? Environment : E : E extends Partial<Schema> ? Partial<Environment> : Environment, S extends Schema ? S : P extends Schema ? P : E extends Schema ? E : any>, next: Next): Response | Promise<Response | undefined | void>;
 }
 export interface ExecutionContext {
-    waitUntil(promise: Promise<any>): void;
+    waitUntil(promise: Promise<void>): void;
     passThroughOnException(): void;
 }
 export {};

package/dist/validator/validator.d.ts

@@ -36,14 +36,15 @@ export declare class VArray<T extends Schema> extends VObjectBase<T> {
     constructor(container: T, key: string);
 }
 export declare class Validator {
-    isArray: boolean;
+    private inArray;
+    constructor(inArray?: boolean);
     query: (key: string) => VString;
     queries: (key: string) => VStringArray;
     header: (key: string) => VString;
     body: (key: string) => VString;
     json: (key: string) => VString;
-    array: <T extends Schema>(path: string, validator: (v: Validator) => T) => VArray<T>;
-    object: <T extends Schema>(path: string, validator: (v: Validator) => T) => VObject<T>;
+    array: <T extends Schema>(path: string, validatorFn: (v: Validator) => T) => VArray<T>;
+    object: <T extends Schema>(path: string, validatorFn: (v: Validator) => T) => VObject<T>;
 }
 declare type VOptions = {
     target: Target;
@@ -73,7 +74,7 @@ export declare abstract class VBase {
     asBoolean: () => VBoolean | VBooleanArray;
     get(value: string): this;
     validate: <R extends Request<unknown, string, {
-        [x: string]: any;
+        [x: string]: unknown;
     }>>(req: R) => Promise<ValidateResult[]>;
     protected getTypeRuleName(): string;
     private sanitizeValue;

package/dist/validator/validator.js

@@ -8,17 +8,11 @@ var VObjectBase = class {
     this._isOptional = false;
     this.getValidators = () => {
       const validators = [];
-      const thisKeys = [];
-      Object.assign(thisKeys, this.keys);
       const walk = (container, keys, isOptional) => {
         for (const v of Object.values(container)) {
           if (v instanceof VArray || v instanceof VObject) {
             isOptional || (isOptional = v._isOptional);
-            keys.push(...v.keys);
-            walk(v.container, keys, isOptional);
-            const tmp = [];
-            Object.assign(tmp, thisKeys);
-            keys = tmp;
+            walk(v.container, [...keys, ...v.keys], isOptional);
           } else if (v instanceof VBase) {
             if (isOptional)
               v.isOptional();
@@ -54,28 +48,28 @@ var VArray = class extends VObjectBase {
   }
 };
 var Validator = class {
-  constructor() {
-    this.isArray = false;
+  constructor(inArray = false) {
+    this.inArray = inArray;
     this.query = (key) => new VString({ target: "query", key });
     this.queries = (key) => new VStringArray({ target: "queries", key });
     this.header = (key) => new VString({ target: "header", key });
     this.body = (key) => new VString({ target: "body", key });
     this.json = (key) => {
-      if (this.isArray) {
+      if (this.inArray) {
         return new VStringArray({ target: "json", key });
       } else {
         return new VString({ target: "json", key });
       }
     };
-    this.array = (path, validator) => {
-      this.isArray = true;
-      const res = validator(this);
+    this.array = (path, validatorFn) => {
+      const validator = new Validator(true);
+      const res = validatorFn(validator);
       const arr = new VArray(res, path);
       return arr;
     };
-    this.object = (path, validator) => {
-      this.isArray = false;
-      const res = validator(this);
+    this.object = (path, validatorFn) => {
+      const validator = new Validator(this.inArray);
+      const res = validatorFn(validator);
       const obj = new VObject(res, path);
       return obj;
     };
@@ -182,7 +176,7 @@ var VBase = class {
     this.validateType = (value) => {
       if (this.isArray) {
         if (!Array.isArray(value)) {
-          return false;
+          return this._optional && typeof value === "undefined";
         }
         for (const val of value) {
           if (typeof val === "undefined" && this._nested()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "Ultrafast web framework for Cloudflare Workers, Deno, and Bun.",
   "main": "dist/cjs/index.js",
   "type": "module",