hono 3.10.4 → 3.11.0

package/dist/adapter/aws-lambda/handler.js

@@ -20,6 +20,7 @@ var streamHandle = (app) => {
         const req = createRequest(event);
         const requestContext = getRequestContext(event);
         const res = await app.fetch(req, {
+          event,
           requestContext,
           context
         });
@@ -47,6 +48,7 @@ var handle = (app) => {
     const req = createRequest(event);
     const requestContext = getRequestContext(event);
     const res = await app.fetch(req, {
+      event,
       requestContext,
       lambdaContext
     });
@@ -81,7 +83,9 @@ var createResult = async (event, res) => {
 };
 var createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
+  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
+  const path = isProxyEventV2(event) ? event.rawPath : event.path;
+  const urlPath = `https://${domainName}${path}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   getCookies(event, headers);
@@ -89,7 +93,7 @@ var createRequest = (event) => {
     if (v)
       headers.set(k, v);
   }
-  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
+  const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;
   const requestInit = {
     headers,
     method
@@ -100,10 +104,7 @@ var createRequest = (event) => {
   return new Request(url, requestInit);
 };
 var extractQueryString = (event) => {
-  if (isProxyEvent(event)) {
-    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
-  }
-  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+  return isProxyEventV2(event) ? event.rawQueryString : Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
 };
 var getCookies = (event, headers) => {
   if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
@@ -125,9 +126,6 @@ var setCookies = (event, res, result) => {
     }
   }
 };
-var isProxyEvent = (event) => {
-  return Object.prototype.hasOwnProperty.call(event, "path");
-};
 var isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
 };

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -51,6 +51,7 @@ const streamHandle = (app) => {
         const req = createRequest(event);
         const requestContext = getRequestContext(event);
         const res = await app.fetch(req, {
+          event,
           requestContext,
           context
         });
@@ -78,6 +79,7 @@ const handle = (app) => {
     const req = createRequest(event);
     const requestContext = getRequestContext(event);
     const res = await app.fetch(req, {
+      event,
       requestContext,
       lambdaContext
     });
@@ -112,7 +114,9 @@ const createResult = async (event, res) => {
 };
 const createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
+  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
+  const path = isProxyEventV2(event) ? event.rawPath : event.path;
+  const urlPath = `https://${domainName}${path}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   getCookies(event, headers);
@@ -120,7 +124,7 @@ const createRequest = (event) => {
     if (v)
       headers.set(k, v);
   }
-  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
+  const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;
   const requestInit = {
     headers,
     method
@@ -131,10 +135,7 @@ const createRequest = (event) => {
   return new Request(url, requestInit);
 };
 const extractQueryString = (event) => {
-  if (isProxyEvent(event)) {
-    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
-  }
-  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+  return isProxyEventV2(event) ? event.rawQueryString : Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
 };
 const getCookies = (event, headers) => {
   if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
@@ -156,9 +157,6 @@ const setCookies = (event, res, result) => {
     }
   }
 };
-const isProxyEvent = (event) => {
-  return Object.prototype.hasOwnProperty.call(event, "path");
-};
 const isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
 };

package/dist/cjs/compose.js

@@ -35,9 +35,9 @@ const compose = (middleware, onError, onNotFound) => {
       let isError = false;
       let handler;
       if (middleware[i]) {
-        handler = middleware[i][0];
+        handler = middleware[i][0][0];
         if (context instanceof import_context.Context) {
-          context.req.setParams(middleware[i][1]);
+          context.req.routeIndex = i;
         }
       } else {
         handler = i === middleware.length && next || void 0;
@@ -61,9 +61,6 @@ const compose = (middleware, onError, onNotFound) => {
           }
         }
       }
-      if (res !== void 0 && "response" in res) {
-        res = res["response"];
-      }
       if (res && (context.finalized === false || isError)) {
         context.res = res;
       }

package/dist/cjs/context.js

@@ -16,13 +16,33 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __accessCheck = (obj, member, msg) => {
+  if (!member.has(obj))
+    throw TypeError("Cannot " + msg);
+};
+var __privateGet = (obj, member, getter) => {
+  __accessCheck(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
+var __privateAdd = (obj, member, value) => {
+  if (member.has(obj))
+    throw TypeError("Cannot add the same private member more than once");
+  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+};
+var __privateSet = (obj, member, value, setter) => {
+  __accessCheck(obj, member, "write to private field");
+  setter ? setter.call(obj, value) : member.set(obj, value);
+  return value;
+};
 var context_exports = {};
 __export(context_exports, {
   Context: () => Context
 });
 module.exports = __toCommonJS(context_exports);
 var import_cookie = require("./utils/cookie");
+var import_html = require("./utils/html");
 var import_stream = require("./utils/stream");
+var _status, _executionCtx, _headers, _preparedHeaders, _res, _isFresh;
 const TEXT_PLAIN = "text/plain; charset=UTF-8";
 class Context {
   constructor(req, options) {
@@ -30,22 +50,24 @@ class Context {
     this._var = {};
     this.finalized = false;
     this.error = void 0;
-    this._status = 200;
-    this._h = void 0;
-    this._pH = void 0;
-    this._init = true;
-    this._renderer = (content) => this.html(content);
+    __privateAdd(this, _status, 200);
+    __privateAdd(this, _executionCtx, void 0);
+    __privateAdd(this, _headers, void 0);
+    __privateAdd(this, _preparedHeaders, void 0);
+    __privateAdd(this, _res, void 0);
+    __privateAdd(this, _isFresh, true);
+    this.renderer = (content) => this.html(content);
     this.notFoundHandler = () => new Response();
-    this.render = (...args) => this._renderer(...args);
+    this.render = (...args) => this.renderer(...args);
     this.setRenderer = (renderer) => {
-      this._renderer = renderer;
+      this.renderer = renderer;
     };
     this.header = (name, value, options) => {
       if (value === void 0) {
-        if (this._h) {
-          this._h.delete(name);
-        } else if (this._pH) {
-          delete this._pH[name.toLocaleLowerCase()];
+        if (__privateGet(this, _headers)) {
+          __privateGet(this, _headers).delete(name);
+        } else if (__privateGet(this, _preparedHeaders)) {
+          delete __privateGet(this, _preparedHeaders)[name.toLocaleLowerCase()];
         }
         if (this.finalized) {
           this.res.headers.delete(name);
@@ -53,18 +75,18 @@ class Context {
         return;
       }
       if (options?.append) {
-        if (!this._h) {
-          this._init = false;
-          this._h = new Headers(this._pH);
-          this._pH = {};
+        if (!__privateGet(this, _headers)) {
+          __privateSet(this, _isFresh, false);
+          __privateSet(this, _headers, new Headers(__privateGet(this, _preparedHeaders)));
+          __privateSet(this, _preparedHeaders, {});
         }
-        this._h.append(name, value);
+        __privateGet(this, _headers).append(name, value);
       } else {
-        if (this._h) {
-          this._h.set(name, value);
+        if (__privateGet(this, _headers)) {
+          __privateGet(this, _headers).set(name, value);
         } else {
-          this._pH ?? (this._pH = {});
-          this._pH[name.toLowerCase()] = value;
+          __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
+          __privateGet(this, _preparedHeaders)[name.toLowerCase()] = value;
         }
       }
       if (this.finalized) {
@@ -76,8 +98,8 @@ class Context {
       }
     };
     this.status = (status) => {
-      this._init = false;
-      this._status = status;
+      __privateSet(this, _isFresh, false);
+      __privateSet(this, _status, status);
     };
     this.set = (key, value) => {
       this._var ?? (this._var = {});
@@ -87,86 +109,80 @@ class Context {
       return this._var ? this._var[key] : void 0;
     };
     this.newResponse = (data, arg, headers) => {
-      if (this._init && !headers && !arg && this._status === 200) {
+      if (__privateGet(this, _isFresh) && !headers && !arg && __privateGet(this, _status) === 200) {
         return new Response(data, {
-          headers: this._pH
+          headers: __privateGet(this, _preparedHeaders)
         });
       }
       if (arg && typeof arg !== "number") {
         const res = new Response(data, arg);
-        const contentType = this._pH?.["content-type"];
+        const contentType = __privateGet(this, _preparedHeaders)?.["content-type"];
         if (contentType) {
           res.headers.set("content-type", contentType);
         }
         return res;
       }
-      const status = arg ?? this._status;
-      this._pH ?? (this._pH = {});
-      this._h ?? (this._h = new Headers());
-      for (const [k, v] of Object.entries(this._pH)) {
-        this._h.set(k, v);
+      const status = arg ?? __privateGet(this, _status);
+      __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
+      __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
+      for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
+        __privateGet(this, _headers).set(k, v);
       }
-      if (this._res) {
-        this._res.headers.forEach((v, k) => {
-          this._h?.set(k, v);
+      if (__privateGet(this, _res)) {
+        __privateGet(this, _res).headers.forEach((v, k) => {
+          __privateGet(this, _headers)?.set(k, v);
         });
-        for (const [k, v] of Object.entries(this._pH)) {
-          this._h.set(k, v);
+        for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
+          __privateGet(this, _headers).set(k, v);
         }
       }
       headers ?? (headers = {});
       for (const [k, v] of Object.entries(headers)) {
         if (typeof v === "string") {
-          this._h.set(k, v);
+          __privateGet(this, _headers).set(k, v);
         } else {
-          this._h.delete(k);
+          __privateGet(this, _headers).delete(k);
           for (const v2 of v) {
-            this._h.append(k, v2);
+            __privateGet(this, _headers).append(k, v2);
           }
         }
       }
       return new Response(data, {
         status,
-        headers: this._h
+        headers: __privateGet(this, _headers)
       });
     };
     this.body = (data, arg, headers) => {
       return typeof arg === "number" ? this.newResponse(data, arg, headers) : this.newResponse(data, arg);
     };
     this.text = (text, arg, headers) => {
-      if (!this._pH) {
-        if (this._init && !headers && !arg) {
+      if (!__privateGet(this, _preparedHeaders)) {
+        if (__privateGet(this, _isFresh) && !headers && !arg) {
           return new Response(text);
         }
-        this._pH = {};
+        __privateSet(this, _preparedHeaders, {});
       }
-      this._pH["content-type"] = TEXT_PLAIN;
+      __privateGet(this, _preparedHeaders)["content-type"] = TEXT_PLAIN;
       return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
     };
     this.json = (object, arg, headers) => {
       const body = JSON.stringify(object);
-      this._pH ?? (this._pH = {});
-      this._pH["content-type"] = "application/json; charset=UTF-8";
+      __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
+      __privateGet(this, _preparedHeaders)["content-type"] = "application/json; charset=UTF-8";
       return typeof arg === "number" ? this.newResponse(body, arg, headers) : this.newResponse(body, arg);
     };
     this.jsonT = (object, arg, headers) => {
-      const response = typeof arg === "number" ? this.json(object, arg, headers) : this.json(object, arg);
-      return {
-        response,
-        data: object,
-        format: "json",
-        status: response.status
-      };
+      return this.json(object, arg, headers);
     };
     this.html = (html, arg, headers) => {
-      this._pH ?? (this._pH = {});
-      this._pH["content-type"] = "text/html; charset=UTF-8";
+      __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
+      __privateGet(this, _preparedHeaders)["content-type"] = "text/html; charset=UTF-8";
       if (typeof html === "object") {
         if (!(html instanceof Promise)) {
           html = html.toString();
         }
         if (html instanceof Promise) {
-          return html.then((html2) => {
+          return html.then((html2) => (0, import_html.resolveStream)(html2)).then((html2) => {
             return typeof arg === "number" ? this.newResponse(html2, arg, headers) : this.newResponse(html2, arg);
           });
         }
@@ -174,8 +190,8 @@ class Context {
       return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
     };
     this.redirect = (location, status = 302) => {
-      this._h ?? (this._h = new Headers());
-      this._h.set("Location", location);
+      __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
+      __privateGet(this, _headers).set("Location", location);
       return this.newResponse(null, status);
     };
     this.streamText = (cb, arg, headers) => {
@@ -200,7 +216,7 @@ class Context {
     };
     this.req = req;
     if (options) {
-      this._exCtx = options.executionCtx;
+      __privateSet(this, _executionCtx, options.executionCtx);
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
@@ -208,32 +224,32 @@ class Context {
     }
   }
   get event() {
-    if (this._exCtx && "respondWith" in this._exCtx) {
-      return this._exCtx;
+    if (__privateGet(this, _executionCtx) && "respondWith" in __privateGet(this, _executionCtx)) {
+      return __privateGet(this, _executionCtx);
     } else {
       throw Error("This context has no FetchEvent");
     }
   }
   get executionCtx() {
-    if (this._exCtx) {
-      return this._exCtx;
+    if (__privateGet(this, _executionCtx)) {
+      return __privateGet(this, _executionCtx);
     } else {
       throw Error("This context has no ExecutionContext");
     }
   }
   get res() {
-    this._init = false;
-    return this._res || (this._res = new Response("404 Not Found", { status: 404 }));
+    __privateSet(this, _isFresh, false);
+    return __privateGet(this, _res) || __privateSet(this, _res, new Response("404 Not Found", { status: 404 }));
   }
-  set res(_res) {
-    this._init = false;
-    if (this._res && _res) {
-      this._res.headers.delete("content-type");
-      this._res.headers.forEach((v, k) => {
-        _res.headers.set(k, v);
+  set res(_res2) {
+    __privateSet(this, _isFresh, false);
+    if (__privateGet(this, _res) && _res2) {
+      __privateGet(this, _res).headers.delete("content-type");
+      __privateGet(this, _res).headers.forEach((v, k) => {
+        _res2.headers.set(k, v);
       });
     }
-    this._res = _res;
+    __privateSet(this, _res, _res2);
     this.finalized = true;
   }
   get var() {
@@ -265,6 +281,12 @@ class Context {
     return "other";
   }
 }
+_status = new WeakMap();
+_executionCtx = new WeakMap();
+_headers = new WeakMap();
+_preparedHeaders = new WeakMap();
+_res = new WeakMap();
+_isFresh = new WeakMap();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Context

package/dist/cjs/helper/dev/index.js

@@ -0,0 +1,68 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dev_exports = {};
+__export(dev_exports, {
+  inspectRoutes: () => inspectRoutes,
+  showRoutes: () => showRoutes
+});
+module.exports = __toCommonJS(dev_exports);
+const isMiddleware = (handler) => handler.length > 1;
+const handlerName = (handler) => {
+  return handler.name || (isMiddleware(handler) ? "[middleware]" : "[handler]");
+};
+const inspectRoutes = (hono) => {
+  return hono.routes.map(({ path, method, handler }) => ({
+    path,
+    method,
+    name: handlerName(handler),
+    isMiddleware: isMiddleware(handler)
+  }));
+};
+const showRoutes = (hono, opts) => {
+  const routeData = {};
+  let maxMethodLength = 0;
+  let maxPathLength = 0;
+  inspectRoutes(hono).filter(({ isMiddleware: isMiddleware2 }) => opts?.verbose || !isMiddleware2).map((route) => {
+    const key = `${route.method}-${route.path}`;
+    (routeData[key] || (routeData[key] = [])).push(route);
+    if (routeData[key].length > 1) {
+      return;
+    }
+    maxMethodLength = Math.max(maxMethodLength, route.method.length);
+    maxPathLength = Math.max(maxPathLength, route.path.length);
+    return { method: route.method, path: route.path, routes: routeData[key] };
+  }).forEach((data) => {
+    if (!data) {
+      return;
+    }
+    const { method, path, routes } = data;
+    console.log(`\x1B[32m${method}\x1B[0m ${" ".repeat(maxMethodLength - method.length)} ${path}`);
+    if (!opts?.verbose) {
+      return;
+    }
+    routes.forEach(({ name }) => {
+      console.log(`${" ".repeat(maxMethodLength + 3)} ${name}`);
+    });
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  inspectRoutes,
+  showRoutes
+});

package/dist/cjs/helper/factory/index.js

@@ -18,11 +18,24 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var factory_exports = {};
 __export(factory_exports, {
+  Factory: () => Factory,
+  createFactory: () => createFactory,
   createMiddleware: () => createMiddleware
 });
 module.exports = __toCommonJS(factory_exports);
-const createMiddleware = (middleware) => middleware;
+class Factory {
+  constructor() {
+    this.createMiddleware = (middleware) => middleware;
+  }
+  createHandlers(...handlers) {
+    return handlers.filter((handler) => handler !== void 0);
+  }
+}
+const createFactory = () => new Factory();
+const createMiddleware = (middleware) => createFactory().createMiddleware(middleware);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  Factory,
+  createFactory,
   createMiddleware
 });

package/dist/cjs/helper/html/index.js

@@ -23,10 +23,10 @@ __export(html_exports, {
 });
 module.exports = __toCommonJS(html_exports);
 var import_html = require("../../utils/html");
-const raw = (value, promises) => {
+const raw = (value, callbacks) => {
   const escapedString = new String(value);
   escapedString.isEscaped = true;
-  escapedString.promises = promises;
+  escapedString.callbacks = callbacks;
   return escapedString;
 };
 const html = (strings, ...values) => {

package/dist/cjs/helper.js

@@ -21,3 +21,4 @@ __reExport(helper_exports, require("./helper/factory"), module.exports);
 __reExport(helper_exports, require("./helper/html"), module.exports);
 __reExport(helper_exports, require("./helper/streaming"), module.exports);
 __reExport(helper_exports, require("./helper/testing"), module.exports);
+__reExport(helper_exports, require("./helper/dev"), module.exports);