hono 1.5.1 → 1.5.2

package/dist/context.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="@cloudflare/workers-types" />
 import type { NotFoundHandler } from './hono';
+import type { HonoRequest } from './request';
 import type { StatusCode } from './utils/http-status';
 declare type Headers = Record<string, string>;
 export declare type Data = string | ArrayBuffer | ReadableStream;
 export declare type Env = Record<string, any>;
 export declare class Context<RequestParamKeyType extends string = string, E = Env> {
-    req: Request<RequestParamKeyType>;
+    req: HonoRequest<RequestParamKeyType>;
     env: E;
     event: FetchEvent | undefined;
     executionCtx: ExecutionContext | undefined;
@@ -18,7 +19,7 @@ export declare class Context<RequestParamKeyType extends string = string, E = En
     private _res;
     private notFoundHandler;
     render: (content: string, params?: object, options?: object) => Response | Promise<Response>;
-    constructor(req: Request<RequestParamKeyType>, env?: E | undefined, eventOrExecutionCtx?: FetchEvent | ExecutionContext | undefined, notFoundHandler?: NotFoundHandler);
+    constructor(req: HonoRequest | Request, env?: E | undefined, eventOrExecutionCtx?: FetchEvent | ExecutionContext | undefined, notFoundHandler?: NotFoundHandler);
     get res(): Response;
     set res(_res: Response);
     header(name: string, value: string): void;

package/dist/context.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
+const request_1 = require("./request");
 const url_1 = require("./utils/url");
 class Context {
     constructor(req, env = undefined, eventOrExecutionCtx = undefined, notFoundHandler = () => new Response()) {
         this._status = 200;
         this._pretty = false;
         this._prettySpace = 2;
-        this.req = req;
+        if (req instanceof Request) {
+            this.req = (0, request_1.extendHonoRequest)(req);
+        }
+        else {
+            this.req = req;
+        }
         if (env) {
             this.env = env;
         }

package/dist/hono.js

@@ -29,7 +29,6 @@ class Hono extends defineDynamicClass() {
             const message = 'Internal Server Error';
             return c.text(message, 500);
         };
-        (0, request_1.extendRequestPrototype)(); // FIXME: should be executed at a better timing
         const allMethods = [...methods, router_1.METHOD_NAME_ALL_LOWERCASE];
         allMethods.map((method) => {
             this[method] = (args1, ...args) => {
@@ -92,6 +91,7 @@ class Hono extends defineDynamicClass() {
         return this.router.match(method, path);
     }
     async dispatch(request, executionCtx, env) {
+        request = (0, request_1.extendHonoRequest)(request);
         const path = (0, url_1.getPathFromURL)(request.url, this.strict);
         const method = request.method;
         const result = this.matchRoute(method, path);

package/dist/middleware/body-parse/index.d.ts

@@ -1,7 +1,7 @@
 import type { Context } from '../../context';
 import type { Next } from '../../hono';
-declare global {
-    interface Request {
+declare module '../../request' {
+    interface HonoRequest {
         parsedBody: any;
     }
 }

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

@@ -1,7 +1,7 @@
 import type { Context } from '../../context';
 import type { Next } from '../../hono';
-declare global {
-    interface Request {
+declare module '../../request' {
+    interface HonoRequest {
         cookie: {
             (name: string): string;
             (): Record<string, string>;

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

@@ -2,7 +2,8 @@
 import type { Env } from '../../context';
 import type { Handler } from '../../hono';
 export declare type ServeStaticOptions = {
-    root: string;
+    root?: string;
+    path?: string;
     manifest?: object | string;
     namespace?: KVNamespace;
 };

package/dist/middleware/serve-static/serve-static.js

@@ -13,7 +13,7 @@ const serveStatic = (options = { root: '' }) => {
         }
         const url = new URL(c.req.url);
         const path = (0, cloudflare_1.getKVFilePath)({
-            filename: url.pathname,
+            filename: options.path ?? url.pathname,
             root: options.root,
             defaultDocument: DEFAULT_DOCUMENT,
         });

package/dist/request.d.ts

@@ -1,22 +1,20 @@
-declare global {
-    interface Request<ParamKeyType extends string = string> {
-        param: {
-            (key: ParamKeyType): string;
-            (): Record<ParamKeyType, string>;
-        };
-        paramData?: Record<ParamKeyType, string>;
-        query: {
-            (key: string): string;
-            (): Record<string, string>;
-        };
-        queries: {
-            (key: string): string[];
-            (): Record<string, string[]>;
-        };
-        header: {
-            (name: string): string;
-            (): Record<string, string>;
-        };
-    }
+export declare class HonoRequest<ParamKeyType extends string = string> extends Request {
+    param: {
+        (key: ParamKeyType): string;
+        (): Record<ParamKeyType, string>;
+    };
+    paramData?: Record<ParamKeyType, string>;
+    query: {
+        (key: string): string;
+        (): Record<string, string>;
+    };
+    queries: {
+        (key: string): string[];
+        (): Record<string, string[]>;
+    };
+    header: {
+        (name: string): string;
+        (): Record<string, string>;
+    };
 }
-export declare function extendRequestPrototype(): void;
+export declare function extendHonoRequest(request: HonoRequest): HonoRequest;

package/dist/request.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendRequestPrototype = void 0;
-function extendRequestPrototype() {
-    if (!!Request.prototype.param) {
-        // already extended
-        return;
-    }
-    Request.prototype.param = function (key) {
+exports.extendHonoRequest = exports.HonoRequest = void 0;
+class HonoRequest extends Request {
+}
+exports.HonoRequest = HonoRequest;
+function extendHonoRequest(request) {
+    request.param = function (key) {
         if (this.paramData) {
             if (key) {
                 return this.paramData[key];
@@ -17,7 +16,7 @@ function extendRequestPrototype() {
         }
         return null;
     };
-    Request.prototype.header = function (name) {
+    request.header = function (name) {
         if (name) {
             return this.headers.get(name);
         }
@@ -29,7 +28,7 @@ function extendRequestPrototype() {
             return result;
         }
     };
-    Request.prototype.query = function (key) {
+    request.query = function (key) {
         const url = new URL(this.url);
         if (key) {
             return url.searchParams.get(key);
@@ -42,7 +41,7 @@ function extendRequestPrototype() {
             return result;
         }
     };
-    Request.prototype.queries = function (key) {
+    request.queries = function (key) {
         const url = new URL(this.url);
         if (key) {
             return url.searchParams.getAll(key);
@@ -55,5 +54,6 @@ function extendRequestPrototype() {
             return result;
         }
     };
+    return request;
 }
-exports.extendRequestPrototype = extendRequestPrototype;
+exports.extendHonoRequest = extendHonoRequest;

package/dist/utils/cloudflare.js

@@ -50,7 +50,7 @@ const getKVFilePath = (options) => {
         filename = filename.concat('/' + defaultDocument);
     }
     // /foo.html => foo.html
-    filename = filename.replace(/^\//, '');
+    filename = filename.replace(/^\.?\//, '');
     // assets/ => assets
     root = root.replace(/\/$/, '');
     // ./assets/foo.html => assets/foo.html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -145,7 +145,7 @@
     "form-data": "^4.0.0",
     "graphql": "^16.4.0",
     "jest": "27.5.1",
-    "jest-environment-miniflare": "^2.5.0",
+    "jest-environment-miniflare": "^2.5.1",
     "mustache": "^4.2.0",
     "prettier": "^2.6.2",
     "prettier-plugin-md-nocjsp": "^1.2.0",