hono 2.7.1 → 2.7.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Yusuke Wada
+Copyright (c) 2021 - present, Yusuke Wada and Hono contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cjs/context.js

@@ -28,6 +28,75 @@ class Context {
     this._status = 200;
     this._pretty = false;
     this._prettySpace = 2;
+    this.header = (name, value, options) => {
+      this._headers || (this._headers = {});
+      const key = name.toLowerCase();
+      let shouldAppend = false;
+      if (options && options.append) {
+        const vAlreadySet = this._headers[key];
+        if (vAlreadySet && vAlreadySet.length) {
+          shouldAppend = true;
+        }
+      }
+      if (shouldAppend) {
+        this._headers[key].push(value);
+      } else {
+        this._headers[key] = [value];
+      }
+      if (this.finalized) {
+        if (shouldAppend) {
+          this.res.headers.append(name, value);
+        } else {
+          this.res.headers.set(name, value);
+        }
+      }
+    };
+    this.status = (status) => {
+      this._status = status;
+    };
+    this.pretty = (prettyJSON, space = 2) => {
+      this._pretty = prettyJSON;
+      this._prettySpace = space;
+    };
+    this.newResponse = (data, status, headers = {}) => {
+      return new Response(data, {
+        status,
+        headers: this._finalizeHeaders(headers)
+      });
+    };
+    this.body = (data, status = this._status, headers = {}) => {
+      return this.newResponse(data, status, headers);
+    };
+    this.text = (text, status, headers) => {
+      if (!headers && !status && !this._res && !this._headers) {
+        return new Response(text);
+      }
+      status || (status = this._status);
+      headers || (headers = {});
+      headers["content-type"] = "text/plain; charset=UTF-8";
+      return this.newResponse(text, status, headers);
+    };
+    this.json = (object, status = this._status, headers = {}) => {
+      const body = this._pretty ? JSON.stringify(object, null, this._prettySpace) : JSON.stringify(object);
+      headers["content-type"] = "application/json; charset=UTF-8";
+      return this.newResponse(body, status, headers);
+    };
+    this.html = (html, status = this._status, headers = {}) => {
+      headers["content-type"] = "text/html; charset=UTF-8";
+      return this.newResponse(html, status, headers);
+    };
+    this.redirect = (location, status = 302) => {
+      return this.newResponse(null, status, {
+        Location: location
+      });
+    };
+    this.cookie = (name, value, opt) => {
+      const cookie = (0, import_cookie.serialize)(name, value, opt);
+      this.header("set-cookie", cookie, { append: true });
+    };
+    this.notFound = () => {
+      return this.notFoundHandler(this);
+    };
     this._executionCtx = executionCtx;
     this.req = req;
     this.env = env;
@@ -55,32 +124,6 @@ class Context {
     this._res = _res;
     this.finalized = true;
   }
-  header(name, value, options) {
-    this._headers || (this._headers = {});
-    const key = name.toLowerCase();
-    let shouldAppend = false;
-    if (options && options.append) {
-      const vAlreadySet = this._headers[key];
-      if (vAlreadySet && vAlreadySet.length) {
-        shouldAppend = true;
-      }
-    }
-    if (shouldAppend) {
-      this._headers[key].push(value);
-    } else {
-      this._headers[key] = [value];
-    }
-    if (this.finalized) {
-      if (shouldAppend) {
-        this.res.headers.append(name, value);
-      } else {
-        this.res.headers.set(name, value);
-      }
-    }
-  }
-  status(status) {
-    this._status = status;
-  }
   set(key, value) {
     this._map || (this._map = {});
     this._map[key] = value;
@@ -91,16 +134,6 @@ class Context {
     }
     return this._map[key];
   }
-  pretty(prettyJSON, space = 2) {
-    this._pretty = prettyJSON;
-    this._prettySpace = space;
-  }
-  newResponse(data, status, headers = {}) {
-    return new Response(data, {
-      status,
-      headers: this._finalizeHeaders(headers)
-    });
-  }
   _finalizeHeaders(incomingHeaders) {
     const finalizedHeaders = [];
     const headersKv = this._headers || {};
@@ -128,39 +161,6 @@ class Context {
     }
     return finalizedHeaders;
   }
-  body(data, status = this._status, headers = {}) {
-    return this.newResponse(data, status, headers);
-  }
-  text(text, status, headers) {
-    if (!headers && !status && !this._res && !this._headers) {
-      return new Response(text);
-    }
-    status || (status = this._status);
-    headers || (headers = {});
-    headers["content-type"] = "text/plain; charset=UTF-8";
-    return this.newResponse(text, status, headers);
-  }
-  json(object, status = this._status, headers = {}) {
-    const body = this._pretty ? JSON.stringify(object, null, this._prettySpace) : JSON.stringify(object);
-    headers["content-type"] = "application/json; charset=UTF-8";
-    return this.newResponse(body, status, headers);
-  }
-  html(html, status = this._status, headers = {}) {
-    headers["content-type"] = "text/html; charset=UTF-8";
-    return this.newResponse(html, status, headers);
-  }
-  redirect(location, status = 302) {
-    return this.newResponse(null, status, {
-      Location: location
-    });
-  }
-  cookie(name, value, opt) {
-    const cookie = (0, import_cookie.serialize)(name, value, opt);
-    this.header("set-cookie", cookie, { append: true });
-  }
-  notFound() {
-    return this.notFoundHandler(this);
-  }
   get runtime() {
     const global = globalThis;
     if (global?.Deno !== void 0) {

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

@@ -80,7 +80,7 @@ const cors = (options) => {
       }
       c.res.headers.delete("Content-Length");
       c.res.headers.delete("Content-Type");
-      c.res = new Response(null, {
+      return new Response(null, {
         headers: c.res.headers,
         status: 204,
         statusText: c.res.statusText

package/dist/context.js

@@ -6,6 +6,75 @@ var Context = class {
     this._status = 200;
     this._pretty = false;
     this._prettySpace = 2;
+    this.header = (name, value, options) => {
+      this._headers || (this._headers = {});
+      const key = name.toLowerCase();
+      let shouldAppend = false;
+      if (options && options.append) {
+        const vAlreadySet = this._headers[key];
+        if (vAlreadySet && vAlreadySet.length) {
+          shouldAppend = true;
+        }
+      }
+      if (shouldAppend) {
+        this._headers[key].push(value);
+      } else {
+        this._headers[key] = [value];
+      }
+      if (this.finalized) {
+        if (shouldAppend) {
+          this.res.headers.append(name, value);
+        } else {
+          this.res.headers.set(name, value);
+        }
+      }
+    };
+    this.status = (status) => {
+      this._status = status;
+    };
+    this.pretty = (prettyJSON, space = 2) => {
+      this._pretty = prettyJSON;
+      this._prettySpace = space;
+    };
+    this.newResponse = (data, status, headers = {}) => {
+      return new Response(data, {
+        status,
+        headers: this._finalizeHeaders(headers)
+      });
+    };
+    this.body = (data, status = this._status, headers = {}) => {
+      return this.newResponse(data, status, headers);
+    };
+    this.text = (text, status, headers) => {
+      if (!headers && !status && !this._res && !this._headers) {
+        return new Response(text);
+      }
+      status || (status = this._status);
+      headers || (headers = {});
+      headers["content-type"] = "text/plain; charset=UTF-8";
+      return this.newResponse(text, status, headers);
+    };
+    this.json = (object, status = this._status, headers = {}) => {
+      const body = this._pretty ? JSON.stringify(object, null, this._prettySpace) : JSON.stringify(object);
+      headers["content-type"] = "application/json; charset=UTF-8";
+      return this.newResponse(body, status, headers);
+    };
+    this.html = (html, status = this._status, headers = {}) => {
+      headers["content-type"] = "text/html; charset=UTF-8";
+      return this.newResponse(html, status, headers);
+    };
+    this.redirect = (location, status = 302) => {
+      return this.newResponse(null, status, {
+        Location: location
+      });
+    };
+    this.cookie = (name, value, opt) => {
+      const cookie = serialize(name, value, opt);
+      this.header("set-cookie", cookie, { append: true });
+    };
+    this.notFound = () => {
+      return this.notFoundHandler(this);
+    };
     this._executionCtx = executionCtx;
     this.req = req;
     this.env = env;
@@ -33,32 +102,6 @@ var Context = class {
     this._res = _res;
     this.finalized = true;
   }
-  header(name, value, options) {
-    this._headers || (this._headers = {});
-    const key = name.toLowerCase();
-    let shouldAppend = false;
-    if (options && options.append) {
-      const vAlreadySet = this._headers[key];
-      if (vAlreadySet && vAlreadySet.length) {
-        shouldAppend = true;
-      }
-    }
-    if (shouldAppend) {
-      this._headers[key].push(value);
-    } else {
-      this._headers[key] = [value];
-    }
-    if (this.finalized) {
-      if (shouldAppend) {
-        this.res.headers.append(name, value);
-      } else {
-        this.res.headers.set(name, value);
-      }
-    }
-  }
-  status(status) {
-    this._status = status;
-  }
   set(key, value) {
     this._map || (this._map = {});
     this._map[key] = value;
@@ -69,16 +112,6 @@ var Context = class {
     }
     return this._map[key];
   }
-  pretty(prettyJSON, space = 2) {
-    this._pretty = prettyJSON;
-    this._prettySpace = space;
-  }
-  newResponse(data, status, headers = {}) {
-    return new Response(data, {
-      status,
-      headers: this._finalizeHeaders(headers)
-    });
-  }
   _finalizeHeaders(incomingHeaders) {
     const finalizedHeaders = [];
     const headersKv = this._headers || {};
@@ -106,39 +139,6 @@ var Context = class {
     }
     return finalizedHeaders;
   }
-  body(data, status = this._status, headers = {}) {
-    return this.newResponse(data, status, headers);
-  }
-  text(text, status, headers) {
-    if (!headers && !status && !this._res && !this._headers) {
-      return new Response(text);
-    }
-    status || (status = this._status);
-    headers || (headers = {});
-    headers["content-type"] = "text/plain; charset=UTF-8";
-    return this.newResponse(text, status, headers);
-  }
-  json(object, status = this._status, headers = {}) {
-    const body = this._pretty ? JSON.stringify(object, null, this._prettySpace) : JSON.stringify(object);
-    headers["content-type"] = "application/json; charset=UTF-8";
-    return this.newResponse(body, status, headers);
-  }
-  html(html, status = this._status, headers = {}) {
-    headers["content-type"] = "text/html; charset=UTF-8";
-    return this.newResponse(html, status, headers);
-  }
-  redirect(location, status = 302) {
-    return this.newResponse(null, status, {
-      Location: location
-    });
-  }
-  cookie(name, value, opt) {
-    const cookie = serialize(name, value, opt);
-    this.header("set-cookie", cookie, { append: true });
-  }
-  notFound() {
-    return this.notFoundHandler(this);
-  }
   get runtime() {
     const global = globalThis;
     if (global?.Deno !== void 0) {

package/dist/middleware/cors/index.js

@@ -58,7 +58,7 @@ var cors = (options) => {
       }
       c.res.headers.delete("Content-Length");
       c.res.headers.delete("Content-Type");
-      c.res = new Response(null, {
+      return new Response(null, {
         headers: c.res.headers,
         status: 204,
         statusText: c.res.statusText

package/dist/types/context.d.ts

@@ -24,26 +24,26 @@ export declare class Context<P extends string = string, E extends Partial<Enviro
     get executionCtx(): ExecutionContext;
     get res(): Response;
     set res(_res: Response);
-    header(name: string, value: string, options?: {
+    header: (name: string, value: string, options?: {
         append?: boolean;
-    }): void;
-    status(status: StatusCode): void;
+    }) => void;
+    status: (status: StatusCode) => void;
     set<Key extends keyof ContextVariableMap>(key: Key, value: ContextVariableMap[Key]): void;
     set<Key extends keyof E['Variables']>(key: Key, value: E['Variables'][Key]): void;
     set(key: string, value: unknown): void;
     get<Key extends keyof ContextVariableMap>(key: Key): ContextVariableMap[Key];
     get<Key extends keyof E['Variables']>(key: Key): E['Variables'][Key];
     get<T>(key: string): T;
-    pretty(prettyJSON: boolean, space?: number): void;
-    newResponse(data: Data | null, status: StatusCode, headers?: Headers): Response;
+    pretty: (prettyJSON: boolean, space?: number) => void;
+    newResponse: (data: Data | null, status: StatusCode, headers?: Headers) => Response;
     private _finalizeHeaders;
-    body(data: Data | null, status?: StatusCode, headers?: Headers): Response;
-    text(text: string, status?: StatusCode, headers?: Headers): Response;
-    json<T>(object: T, status?: StatusCode, headers?: Headers): Response;
-    html(html: string, status?: StatusCode, headers?: Headers): Response;
-    redirect(location: string, status?: StatusCode): Response;
-    cookie(name: string, value: string, opt?: CookieOptions): void;
-    notFound(): Response | Promise<Response>;
+    body: (data: Data | null, status?: StatusCode, headers?: Headers) => Response;
+    text: (text: string, status?: StatusCode, headers?: Headers) => Response;
+    json: <T>(object: T, status?: StatusCode, headers?: Headers) => Response;
+    html: (html: string, status?: StatusCode, headers?: Headers) => Response;
+    redirect: (location: string, status?: StatusCode) => Response;
+    cookie: (name: string, value: string, opt?: CookieOptions) => void;
+    notFound: () => Response | Promise<Response>;
     get runtime(): Runtime;
 }
 export {};

package/dist/types/types.d.ts

@@ -13,7 +13,7 @@ export declare type NotFoundHandler<E extends Partial<Environment> = Environment
 export declare type ErrorHandler<E extends Partial<Environment> = Environment> = (err: Error, c: Context<string, E>) => Response;
 export declare type Next = () => Promise<void>;
 declare type ParamKeyName<NameWithPattern> = NameWithPattern extends `${infer Name}{${infer _Pattern}` ? Name : NameWithPattern;
-declare type ParamKey<Component> = Component extends `:${infer NameWithPattern}` ? ParamKeyName<NameWithPattern> : never;
+declare type ParamKey<Component> = Component extends `:${infer NameWithPattern}?` ? ParamKeyName<NameWithPattern> : Component extends `:${infer NameWithPattern}` ? ParamKeyName<NameWithPattern> : never;
 export declare type ParamKeys<Path> = Path extends `${infer Component}/${infer Rest}` ? ParamKey<Component> | ParamKeys<Rest> : ParamKey<Path>;
 export interface CustomHandler<P = string, E = Partial<Environment>, S = any> {
     (c: Context<P extends string ? P : string, P extends Partial<Environment> ? P : E extends Partial<Environment> ? E : never, P extends string ? E extends Partial<Environment> ? S : P extends Partial<Environment> ? E : never : P extends Partial<Environment> ? E extends Partial<Environment> ? S : E : P>, next: Next): Response | Promise<Response | undefined | void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "description": "Ultrafast web framework for Cloudflare Workers, Deno, and Bun.",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -130,7 +130,8 @@
       "require": "./dist/cjs/router/smart-router/index.js"
     },
     "./router/static-router": {
-      "import": "./dist/types/router/static-router/index.js",
+      "types": "./dist/types/router/static-router/index.d.ts",
+      "import": "./dist/router/static-router/index.js",
       "require": "./dist/cjs/router/static-router/index.js"
     },
     "./router/trie-router": {