hono 2.5.3 → 2.5.5

package/dist/cjs/context.js

@@ -30,7 +30,7 @@ class Context {
     this._prettySpace = 2;
     this._executionCtx = executionCtx;
     this.req = req;
-    this.env = env || {};
+    this.env = env;
     this.notFoundHandler = notFoundHandler;
     this.finalized = false;
   }
@@ -97,7 +97,7 @@ class Context {
   }
   newResponse(data, status, headers = {}) {
     return new Response(data, {
-      status: status || this._status || 200,
+      status,
       headers: this._finalizeHeaders(headers)
     });
   }
@@ -133,16 +133,16 @@ class Context {
   }
   text(text, status = this._status, headers = {}) {
     headers["content-type"] = "text/plain; charset=UTF-8";
-    return this.body(text, status, headers);
+    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.body(body, status, headers);
+    return this.newResponse(body, status, headers);
   }
   html(html, status = this._status, headers = {}) {
     headers["content-type"] = "text/html; charset=UTF-8";
-    return this.body(html, status, headers);
+    return this.newResponse(html, status, headers);
   }
   redirect(location, status = 302) {
     return this.newResponse(null, status, {

package/dist/cjs/request.js

@@ -45,9 +45,9 @@ function extendRequestPrototype() {
   Request.prototype.header = function(name) {
     if (!this.headerData) {
       this.headerData = {};
-      for (const [key, value] of this.headers) {
+      this.headers.forEach((value, key) => {
         this.headerData[key] = value;
-      }
+      });
     }
     if (name) {
       return this.headerData[name.toLowerCase()];

package/dist/cjs/utils/body.js

@@ -26,10 +26,10 @@ async function parseBody(r) {
   const contentType = r.headers.get("Content-Type");
   if (contentType && (contentType.startsWith("multipart/form-data") || contentType === "application/x-www-form-urlencoded")) {
     const form = {};
-    body = [...await r.formData()].reduce((acc, cur) => {
-      acc[cur[0]] = cur[1];
-      return acc;
-    }, form);
+    (await r.formData()).forEach((value, key) => {
+      form[key] = value;
+    });
+    body = form;
   }
   return body;
 }

package/dist/cjs/utils/cloudflare.js

@@ -46,9 +46,9 @@ const getContentFromKVAsset = async (path, options) => {
   if (!key) {
     return null;
   }
-  let content = await ASSET_NAMESPACE.get(key, { type: "arrayBuffer" });
-  if (content) {
-    content = content;
+  const content = await ASSET_NAMESPACE.get(key, { type: "arrayBuffer" });
+  if (!content) {
+    return null;
   }
   return content;
 };

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@cloudflare/workers-types" />
+import type { ExecutionContext } from './types';
 import type { Environment, NotFoundHandler, ContextVariableMap } from './types';
 import type { CookieOptions } from './utils/cookie';
 import type { StatusCode } from './utils/http-status';
@@ -7,11 +7,11 @@ declare type Headers = Record<string, string | string[]>;
 declare type Runtime = 'node' | 'deno' | 'bun' | 'cloudflare' | 'fastly' | 'vercel' | 'other';
 export declare type Data = string | ArrayBuffer | ReadableStream;
 export declare class Context<P extends string = string, E extends Partial<Environment> = Environment, S extends Partial<Schema> = Schema> {
-    req: Request<P, S extends Schema ? SchemaToProp<S> : S>;
+    req: Request<unknown, P, S extends Schema ? SchemaToProp<S> : S>;
     env: E['Bindings'];
     finalized: boolean;
     error: Error | undefined;
-    _status: StatusCode;
+    private _status;
     private _executionCtx;
     private _pretty;
     private _prettySpace;
@@ -19,7 +19,7 @@ export declare class Context<P extends string = string, E extends Partial<Enviro
     private _headers;
     private _res;
     private notFoundHandler;
-    constructor(req: Request<P>, env?: E['Bindings'], executionCtx?: FetchEvent | ExecutionContext | undefined, notFoundHandler?: NotFoundHandler<E>);
+    constructor(req: Request<unknown, P>, env?: E['Bindings'], executionCtx?: FetchEvent | ExecutionContext | undefined, notFoundHandler?: NotFoundHandler<E>);
     get event(): FetchEvent;
     get executionCtx(): ExecutionContext;
     get res(): Response;

package/dist/context.js

@@ -8,7 +8,7 @@ var Context = class {
     this._prettySpace = 2;
     this._executionCtx = executionCtx;
     this.req = req;
-    this.env = env || {};
+    this.env = env;
     this.notFoundHandler = notFoundHandler;
     this.finalized = false;
   }
@@ -75,7 +75,7 @@ var Context = class {
   }
   newResponse(data, status, headers = {}) {
     return new Response(data, {
-      status: status || this._status || 200,
+      status,
       headers: this._finalizeHeaders(headers)
     });
   }
@@ -111,16 +111,16 @@ var Context = class {
   }
   text(text, status = this._status, headers = {}) {
     headers["content-type"] = "text/plain; charset=UTF-8";
-    return this.body(text, status, headers);
+    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.body(body, status, headers);
+    return this.newResponse(body, status, headers);
   }
   html(html, status = this._status, headers = {}) {
     headers["content-type"] = "text/html; charset=UTF-8";
-    return this.body(html, status, headers);
+    return this.newResponse(html, status, headers);
   }
   redirect(location, status = 302) {
     return this.newResponse(null, status, {

package/dist/hono.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="@cloudflare/workers-types" />
 import type { Router } from './router';
+import type { ExecutionContext } from './types';
 import type { Handler, Environment, ParamKeys, ErrorHandler, NotFoundHandler } from './types';
 import type { Schema } from './validator/schema';
 interface HandlerInterface<P extends string, E extends Partial<Environment>, S extends Partial<Schema>, U = Hono<E, P, S>> {

package/dist/middleware/serve-static/serve-static.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@cloudflare/workers-types" />
+import type { KVNamespace } from '@cloudflare/workers-types';
 import type { MiddlewareHandler } from '../../types';
 export declare type ServeStaticOptions = {
     root?: string;

package/dist/request.d.ts

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

package/dist/request.js

@@ -23,9 +23,9 @@ function extendRequestPrototype() {
   Request.prototype.header = function(name) {
     if (!this.headerData) {
       this.headerData = {};
-      for (const [key, value] of this.headers) {
+      this.headers.forEach((value, key) => {
         this.headerData[key] = value;
-      }
+      });
     }
     if (name) {
       return this.headerData[name.toLowerCase()];

package/dist/types.d.ts

@@ -19,4 +19,8 @@ export declare type ParamKeys<Path> = Path extends `${infer Component}/${infer R
 export interface CustomHandler<P extends string | Partial<Environment> | Schema = string, E = Partial<Environment> | Partial<Schema>, S = Partial<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;
+    passThroughOnException(): void;
+}
 export {};

package/dist/utils/body.js

@@ -4,10 +4,10 @@ async function parseBody(r) {
   const contentType = r.headers.get("Content-Type");
   if (contentType && (contentType.startsWith("multipart/form-data") || contentType === "application/x-www-form-urlencoded")) {
     const form = {};
-    body = [...await r.formData()].reduce((acc, cur) => {
-      acc[cur[0]] = cur[1];
-      return acc;
-    }, form);
+    (await r.formData()).forEach((value, key) => {
+      form[key] = value;
+    });
+    body = form;
   }
   return body;
 }

package/dist/utils/cloudflare.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@cloudflare/workers-types" />
+import type { KVNamespace } from '@cloudflare/workers-types';
 export declare type KVAssetOptions = {
     manifest?: object | string;
     namespace?: KVNamespace;

package/dist/utils/cloudflare.js

@@ -24,9 +24,9 @@ var getContentFromKVAsset = async (path, options) => {
   if (!key) {
     return null;
   }
-  let content = await ASSET_NAMESPACE.get(key, { type: "arrayBuffer" });
-  if (content) {
-    content = content;
+  const content = await ASSET_NAMESPACE.get(key, { type: "arrayBuffer" });
+  if (!content) {
+    return null;
   }
   return content;
 };

package/dist/validator/validator.d.ts

@@ -72,7 +72,7 @@ export declare abstract class VBase {
     asNumber: () => VNumber | VNumberArray;
     asBoolean: () => VBoolean | VBooleanArray;
     get(value: string): this;
-    validate: <R extends Request<string, {
+    validate: <R extends Request<unknown, string, {
         [x: string]: any;
     }>>(req: R) => Promise<ValidateResult[]>;
     protected getTypeRuleName(): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hono",
-  "version": "2.5.3",
-  "description": "Ultrafast web framework for Cloudflare Workers.",
+  "version": "2.5.5",
+  "description": "Ultrafast web framework for Cloudflare Workers, Deno, and Bun.",
   "main": "dist/cjs/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -147,6 +147,82 @@
       "require": "./dist/cjs/utils/*.js"
     }
   },
+  "typesVersions": {
+    "*": {
+      "basic-auth": [
+        "./dist/middleware/basic-auth"
+      ],
+      "bearer-auth": [
+        "./dist/middleware/bearer-auth"
+      ],
+      "cache": [
+        "./dist/middleware/cache"
+      ],
+      "compress": [
+        "./dist/middleware/compress"
+      ],
+      "cors": [
+        "./dist/middleware/cors"
+      ],
+      "etag": [
+        "./dist/middleware/etag"
+      ],
+      "html": [
+        "./dist/middleware/html"
+      ],
+      "jsx": [
+        "./dist/middleware/jsx"
+      ],
+      "jsx/jsx-runtime": [
+        "./dist/middleware/jsx/jsx-runtime.d.ts"
+      ],
+      "jsx/jsx-dev-runtime": [
+        "./dist/middleware/jsx/jsx-dev-runtime.d.ts"
+      ],
+      "jwt": [
+        "./dist/middleware/jwt"
+      ],
+      "logger": [
+        "./dist/middleware/logger"
+      ],
+      "powered-by": [
+        "./dist/middleware/powered-by"
+      ],
+      "pretty-json": [
+        "./dist/middleware/pretty-json"
+      ],
+      "serve-static": [
+        "./dist/middleware/serve-static/index.d.ts"
+      ],
+      "serve-static.bun": [
+        "./dist/middleware/serve-static/bun.d.ts"
+      ],
+      "serve-static.module": [
+        "./dist/middleware/serve-static/module.d.ts"
+      ],
+      "validator": [
+        "./dist/middleware/validator"
+      ],
+      "router/reg-exp-router": [
+        "./dist/router/reg-exp-router/router.d.ts"
+      ],
+      "router/smart-router": [
+        "./dist/router/smart-router/router.d.ts"
+      ],
+      "router/static-router": [
+        "./dist/router/static-router/router.d.ts"
+      ],
+      "router/trie-router": [
+        "./dist/router/trie-router/router.d.ts"
+      ],
+      "utils/jwt": [
+        "./dist/utils/jwt/index.d.ts"
+      ],
+      "utils/*": [
+        "./dist/utils/*"
+      ]
+    }
+  },
   "author": "Yusuke Wada <yusuke@kamawada.com> (https://github.com/yusukebe)",
   "license": "MIT",
   "repository": {
@@ -173,7 +249,7 @@
     "bun"
   ],
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.16.0",
+    "@cloudflare/workers-types": "^4.20221111.1",
     "@types/crypto-js": "^4.1.1",
     "@types/glob": "^8.0.0",
     "@types/jest": "^29.0.2",