hono 2.6.2 → 3.0.0-0

package/README.md

@@ -13,7 +13,7 @@
 
 <hr />
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/honojs/hono/ci)](https://github.com/honojs/hono/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/honojs/hono/ci.yml?branch=main)](https://github.com/honojs/hono/actions)
 [![GitHub](https://img.shields.io/github/license/honojs/hono)](https://github.com/honojs/hono/blob/main/LICENSE)
 [![npm](https://img.shields.io/npm/v/hono)](https://www.npmjs.com/package/hono)
 [![npm](https://img.shields.io/npm/dm/hono)](https://www.npmjs.com/package/hono)

package/dist/cjs/compose.js

@@ -57,7 +57,13 @@ const compose = (middleware, onNotFound, onError) => {
           }
         }
       }
+      if (res instanceof Response && "response" in res) {
+        res = res["response"];
+      }
       if (!(res instanceof Promise)) {
+        if (res !== void 0 && "response" in res) {
+          res = res["response"];
+        }
         if (res && (context.finalized === false || isError)) {
           context.res = res;
         }

package/dist/cjs/context.js

@@ -21,18 +21,34 @@ __export(context_exports, {
   Context: () => Context
 });
 module.exports = __toCommonJS(context_exports);
+var import_request = require("./request");
 var import_cookie = require("./utils/cookie");
 class Context {
-  constructor(req, env = {}, executionCtx = void 0, notFoundHandler = () => new Response()) {
+  constructor(req, options) {
+    this.env = {};
+    this.finalized = false;
     this.error = void 0;
     this._status = 200;
     this._pretty = false;
     this._prettySpace = 2;
-    this._executionCtx = executionCtx;
-    this.req = req;
-    this.env = env;
-    this.notFoundHandler = notFoundHandler;
-    this.finalized = false;
+    this.notFoundHandler = () => new Response();
+    this.rawRequest = req;
+    if (options) {
+      this._executionCtx = options.executionCtx;
+      this._paramData = options.paramData;
+      this.env = options.env;
+      if (options.notFoundHandler) {
+        this.notFoundHandler = options.notFoundHandler;
+      }
+    }
+  }
+  get req() {
+    if (this._req) {
+      return this._req;
+    } else {
+      this._req = new import_request.HonoRequest(this.rawRequest, this._paramData);
+      return this._req;
+    }
   }
   get event() {
     if (this._executionCtx instanceof FetchEvent) {
@@ -145,6 +161,13 @@ class Context {
     headers["content-type"] = "application/json; charset=UTF-8";
     return this.newResponse(body, status, headers);
   }
+  jsonT(object, status = this._status, headers = {}) {
+    return {
+      response: this.json(object, status, headers),
+      data: object,
+      format: "json"
+    };
+  }
   html(html, status = this._status, headers = {}) {
     headers["content-type"] = "text/html; charset=UTF-8";
     return this.newResponse(html, status, headers);
@@ -181,6 +204,9 @@ class Context {
     if (global?.process?.release?.name === "node") {
       return "node";
     }
+    if (global?.__lagon__ !== void 0) {
+      return "lagon";
+    }
     return "other";
   }
 }

package/dist/cjs/hono.js

@@ -23,7 +23,6 @@ __export(hono_exports, {
 module.exports = __toCommonJS(hono_exports);
 var import_compose = require("./compose");
 var import_context = require("./context");
-var import_request = require("./request");
 var import_router = require("./router");
 var import_reg_exp_router = require("./router/reg-exp-router");
 var import_smart_router = require("./router/smart-router");
@@ -52,6 +51,10 @@ class Hono extends defineDynamicClass() {
       const message = "Internal Server Error";
       return c.text(message, 500);
     };
+    this.build = () => {
+      const app = {};
+      return {};
+    };
     this.handleEvent = (event) => {
       return this.dispatch(event.request, event);
     };
@@ -62,7 +65,6 @@ class Hono extends defineDynamicClass() {
       const req = input instanceof Request ? input : new Request(input, requestInit);
       return await this.fetch(req);
     };
-    (0, import_request.extendRequestPrototype)();
     const allMethods = [...import_router.METHODS, import_router.METHOD_NAME_ALL_LOWERCASE];
     allMethods.map((method) => {
       this[method] = (args1, ...args) => {
@@ -149,25 +151,38 @@ class Hono extends defineDynamicClass() {
     const path = (0, import_url.getPathFromURL)(request.url, this.strict);
     const method = request.method;
     const result = this.matchRoute(method, path);
-    request.paramData = result?.params;
-    const c = new import_context.Context(request, env, eventOrExecutionCtx, this.notFoundHandler);
+    const paramData = result?.params;
+    const c = new import_context.Context(request, {
+      env,
+      executionCtx: eventOrExecutionCtx,
+      notFoundHandler: this.notFoundHandler,
+      paramData
+    });
     if (result && result.handlers.length === 1) {
       const handler = result.handlers[0];
       let res;
       try {
         res = handler(c, async () => {
         });
-        if (!res)
+        if (!res) {
           return this.notFoundHandler(c);
+        }
       } catch (err) {
         return this.handleError(err, c);
       }
-      if (res instanceof Response)
+      if ("response" in res) {
+        res = res.response;
+      }
+      if (res instanceof Response) {
         return res;
+      }
       return (async () => {
         let awaited;
         try {
           awaited = await res;
+          if (awaited !== void 0 && "response" in awaited) {
+            awaited = awaited["response"];
+          }
           if (!awaited) {
             return this.notFoundHandler(c);
           }

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

@@ -30,7 +30,7 @@ const cache = (options) => {
       response.headers.append("Cache-Control", options.cacheControl);
   };
   return async (c, next) => {
-    const key = c.req;
+    const key = c.req.raw;
     const cache2 = await caches.open(options.cacheName);
     const response = await cache2.match(key);
     if (!response) {

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

@@ -18,10 +18,37 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var validator_exports = {};
 __export(validator_exports, {
-  validator: () => import_middleware.validatorMiddleware
+  validator: () => validator
 });
 module.exports = __toCommonJS(validator_exports);
-var import_middleware = require("./middleware");
+var import_object = require("../../utils/object");
+const validator = (type, validationFunc) => {
+  return async (c, next) => {
+    let value = {};
+    switch (type) {
+      case "json":
+        value = await c.req.json();
+        break;
+      case "form":
+        value = await c.req.parseBody();
+        break;
+      case "query":
+        value = c.req.query();
+        break;
+      case "queries":
+        value = c.req.queries();
+        break;
+    }
+    const res = validationFunc(value, c);
+    if (res instanceof Response || res instanceof Promise) {
+      return res;
+    }
+    const target = c.req.valid();
+    const newObject = (0, import_object.mergeObjects)(target, res);
+    c.req.valid(newObject);
+    await next();
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   validator

package/dist/cjs/request.js

@@ -18,17 +18,19 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var request_exports = {};
 __export(request_exports, {
-  extendRequestPrototype: () => extendRequestPrototype
+  HonoRequest: () => HonoRequest
 });
 module.exports = __toCommonJS(request_exports);
 var import_body = require("./utils/body");
 var import_cookie = require("./utils/cookie");
 var import_url = require("./utils/url");
-function extendRequestPrototype() {
-  if (!!Request.prototype.param) {
-    return;
+class HonoRequest {
+  constructor(request, paramData) {
+    this.raw = request;
+    this.paramData = paramData;
+    this.data = {};
   }
-  Request.prototype.param = function(key) {
+  param(key) {
     if (this.paramData) {
       if (key) {
         const param = this.paramData[key];
@@ -36,7 +38,7 @@ function extendRequestPrototype() {
       } else {
         const decoded = {};
         for (const [key2, value] of Object.entries(this.paramData)) {
-          if (value) {
+          if (value && typeof value === "string") {
             decoded[key2] = decodeURIComponent(value);
           }
         }
@@ -44,21 +46,8 @@ function extendRequestPrototype() {
       }
     }
     return null;
-  };
-  Request.prototype.header = function(name) {
-    if (!this.headerData) {
-      this.headerData = {};
-      this.headers.forEach((value, key) => {
-        this.headerData[key] = value;
-      });
-    }
-    if (name) {
-      return this.headerData[name.toLowerCase()];
-    } else {
-      return this.headerData;
-    }
-  };
-  Request.prototype.query = function(key) {
+  }
+  query(key) {
     const queryString = (0, import_url.getQueryStringFromURL)(this.url);
     const searchParams = new URLSearchParams(queryString);
     if (!this.queryData) {
@@ -72,8 +61,8 @@ function extendRequestPrototype() {
     } else {
       return this.queryData;
     }
-  };
-  Request.prototype.queries = function(key) {
+  }
+  queries(key) {
     const queryString = (0, import_url.getQueryStringFromURL)(this.url);
     const searchParams = new URLSearchParams(queryString);
     if (key) {
@@ -85,9 +74,24 @@ function extendRequestPrototype() {
       }
       return result;
     }
-  };
-  Request.prototype.cookie = function(key) {
-    const cookie = this.headers.get("Cookie") || "";
+  }
+  header(name) {
+    if (!this.headerData) {
+      this.headerData = {};
+      this.raw.headers.forEach((value, key) => {
+        this.headerData[key] = value;
+      });
+    }
+    if (name) {
+      return this.headerData[name.toLowerCase()];
+    } else {
+      return this.headerData;
+    }
+  }
+  cookie(key) {
+    const cookie = this.raw.headers.get("Cookie");
+    if (!cookie)
+      return;
     const obj = (0, import_cookie.parse)(cookie);
     if (key) {
       const value = obj[key];
@@ -95,28 +99,40 @@ function extendRequestPrototype() {
     } else {
       return obj;
     }
-  };
-  Request.prototype.parseBody = async function() {
+  }
+  async parseBody() {
     let body;
     if (!this.bodyData) {
-      body = await (0, import_body.parseBody)(this);
+      body = await (0, import_body.parseBody)(this.raw);
       this.bodyData = body;
     } else {
       body = this.bodyData;
     }
     return body;
-  };
-  Request.prototype.json = async function() {
+  }
+  async json() {
     let jsonData;
     if (!this.jsonData) {
-      jsonData = JSON.parse(await this.text());
+      jsonData = this.raw.json();
       this.jsonData = jsonData;
     } else {
       jsonData = this.jsonData;
     }
     return jsonData;
-  };
-  Request.prototype.valid = function(data) {
+  }
+  async text() {
+    return this.raw.text();
+  }
+  async arrayBuffer() {
+    return this.raw.arrayBuffer();
+  }
+  async blob() {
+    return this.raw.blob();
+  }
+  async formData() {
+    return this.raw.formData();
+  }
+  valid(data) {
     if (!this.data) {
       this.data = {};
     }
@@ -124,9 +140,51 @@ function extendRequestPrototype() {
       this.data = data;
     }
     return this.data;
-  };
+  }
+  get url() {
+    return this.raw.url;
+  }
+  get method() {
+    return this.raw.method;
+  }
+  get headers() {
+    return this.raw.headers;
+  }
+  get redirect() {
+    return this.raw.redirect;
+  }
+  get body() {
+    return this.raw.body;
+  }
+  get bodyUsed() {
+    return this.raw.bodyUsed;
+  }
+  get cache() {
+    return this.raw.cache;
+  }
+  get credentials() {
+    return this.raw.credentials;
+  }
+  get integrity() {
+    return this.raw.integrity;
+  }
+  get keepalive() {
+    return this.raw.keepalive;
+  }
+  get mode() {
+    return this.raw.mode;
+  }
+  get referrer() {
+    return this.raw.referrer;
+  }
+  get refererPolicy() {
+    return this.raw.referrerPolicy;
+  }
+  get signal() {
+    return this.raw.signal;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  extendRequestPrototype
+  HonoRequest
 });

package/dist/compose.js

@@ -35,7 +35,13 @@ var compose = (middleware, onNotFound, onError) => {
           }
         }
       }
+      if (res instanceof Response && "response" in res) {
+        res = res["response"];
+      }
       if (!(res instanceof Promise)) {
+        if (res !== void 0 && "response" in res) {
+          res = res["response"];
+        }
         if (res && (context.finalized === false || isError)) {
           context.res = res;
         }

package/dist/context.js

@@ -1,16 +1,32 @@
 // src/context.ts
+import { HonoRequest } from "./request.js";
 import { serialize } from "./utils/cookie.js";
 var Context = class {
-  constructor(req, env = {}, executionCtx = void 0, notFoundHandler = () => new Response()) {
+  constructor(req, options) {
+    this.env = {};
+    this.finalized = false;
     this.error = void 0;
     this._status = 200;
     this._pretty = false;
     this._prettySpace = 2;
-    this._executionCtx = executionCtx;
-    this.req = req;
-    this.env = env;
-    this.notFoundHandler = notFoundHandler;
-    this.finalized = false;
+    this.notFoundHandler = () => new Response();
+    this.rawRequest = req;
+    if (options) {
+      this._executionCtx = options.executionCtx;
+      this._paramData = options.paramData;
+      this.env = options.env;
+      if (options.notFoundHandler) {
+        this.notFoundHandler = options.notFoundHandler;
+      }
+    }
+  }
+  get req() {
+    if (this._req) {
+      return this._req;
+    } else {
+      this._req = new HonoRequest(this.rawRequest, this._paramData);
+      return this._req;
+    }
   }
   get event() {
     if (this._executionCtx instanceof FetchEvent) {
@@ -123,6 +139,13 @@ var Context = class {
     headers["content-type"] = "application/json; charset=UTF-8";
     return this.newResponse(body, status, headers);
   }
+  jsonT(object, status = this._status, headers = {}) {
+    return {
+      response: this.json(object, status, headers),
+      data: object,
+      format: "json"
+    };
+  }
   html(html, status = this._status, headers = {}) {
     headers["content-type"] = "text/html; charset=UTF-8";
     return this.newResponse(html, status, headers);
@@ -159,6 +182,9 @@ var Context = class {
     if (global?.process?.release?.name === "node") {
       return "node";
     }
+    if (global?.__lagon__ !== void 0) {
+      return "lagon";
+    }
     return "other";
   }
 };

package/dist/hono.js

@@ -1,7 +1,6 @@
 // src/hono.ts
 import { compose } from "./compose.js";
 import { Context } from "./context.js";
-import { extendRequestPrototype } from "./request.js";
 import { METHOD_NAME_ALL, METHOD_NAME_ALL_LOWERCASE, METHODS } from "./router.js";
 import { RegExpRouter } from "./router/reg-exp-router/index.js";
 import { SmartRouter } from "./router/smart-router/index.js";
@@ -30,6 +29,10 @@ var Hono = class extends defineDynamicClass() {
       const message = "Internal Server Error";
       return c.text(message, 500);
     };
+    this.build = () => {
+      const app = {};
+      return {};
+    };
     this.handleEvent = (event) => {
       return this.dispatch(event.request, event);
     };
@@ -40,7 +43,6 @@ var Hono = class extends defineDynamicClass() {
       const req = input instanceof Request ? input : new Request(input, requestInit);
       return await this.fetch(req);
     };
-    extendRequestPrototype();
     const allMethods = [...METHODS, METHOD_NAME_ALL_LOWERCASE];
     allMethods.map((method) => {
       this[method] = (args1, ...args) => {
@@ -127,25 +129,38 @@ var Hono = class extends defineDynamicClass() {
     const path = getPathFromURL(request.url, this.strict);
     const method = request.method;
     const result = this.matchRoute(method, path);
-    request.paramData = result?.params;
-    const c = new Context(request, env, eventOrExecutionCtx, this.notFoundHandler);
+    const paramData = result?.params;
+    const c = new Context(request, {
+      env,
+      executionCtx: eventOrExecutionCtx,
+      notFoundHandler: this.notFoundHandler,
+      paramData
+    });
     if (result && result.handlers.length === 1) {
       const handler = result.handlers[0];
       let res;
       try {
         res = handler(c, async () => {
         });
-        if (!res)
+        if (!res) {
           return this.notFoundHandler(c);
+        }
       } catch (err) {
         return this.handleError(err, c);
       }
-      if (res instanceof Response)
+      if ("response" in res) {
+        res = res.response;
+      }
+      if (res instanceof Response) {
         return res;
+      }
       return (async () => {
         let awaited;
         try {
           awaited = await res;
+          if (awaited !== void 0 && "response" in awaited) {
+            awaited = awaited["response"];
+          }
           if (!awaited) {
             return this.notFoundHandler(c);
           }

package/dist/middleware/cache/index.js

@@ -8,7 +8,7 @@ var cache = (options) => {
       response.headers.append("Cache-Control", options.cacheControl);
   };
   return async (c, next) => {
-    const key = c.req;
+    const key = c.req.raw;
     const cache2 = await caches.open(options.cacheName);
     const response = await cache2.match(key);
     if (!response) {

package/dist/middleware/validator/index.js

@@ -1,5 +1,32 @@
 // src/middleware/validator/index.ts
-import { validatorMiddleware } from "./middleware.js";
+import { mergeObjects } from "../../utils/object.js";
+var validator = (type, validationFunc) => {
+  return async (c, next) => {
+    let value = {};
+    switch (type) {
+      case "json":
+        value = await c.req.json();
+        break;
+      case "form":
+        value = await c.req.parseBody();
+        break;
+      case "query":
+        value = c.req.query();
+        break;
+      case "queries":
+        value = c.req.queries();
+        break;
+    }
+    const res = validationFunc(value, c);
+    if (res instanceof Response || res instanceof Promise) {
+      return res;
+    }
+    const target = c.req.valid();
+    const newObject = mergeObjects(target, res);
+    c.req.valid(newObject);
+    await next();
+  };
+};
 export {
-  validatorMiddleware as validator
+  validator
 };