hono 3.12.5 → 4.0.0-rc.1

package/README.md

@@ -26,7 +26,7 @@
 [![Discord badge](https://img.shields.io/discord/1011308539819597844?label=Discord&logo=Discord)](https://discord.gg/KMh2eNSdxV)
 
 Hono - _**\[炎\] means flame🔥 in Japanese**_ - is a small, simple, and ultrafast web framework for the Edges.
-It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute, Deno, Bun, Vercel, Lagon, AWS Lambda, Lambda@Edge, and Node.js.
+It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute, Deno, Bun, Vercel, AWS Lambda, Lambda@Edge, and Node.js.
 
 Fast, but not only fast.
 
@@ -49,7 +49,7 @@ npm create hono@latest my-app
 
 - **Ultrafast** 🚀 - The router `RegExpRouter` is really fast. Not using linear loops. Fast.
 - **Lightweight** 🪶 - The `hono/tiny` preset is under 14kB. Hono has zero dependencies and uses only the Web Standard API.
-- **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute, Deno, Bun, Lagon, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
+- **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute, Deno, Bun, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
 - **Batteries Included** 🔋 - Hono has built-in middleware, custom middleware, and third-party middleware. Batteries included.
 - **Delightful DX** 😃 - Super clean APIs. First-class TypeScript support. Now, we've got "Types".
 

package/dist/adapter/bun/index.js

@@ -1,5 +1,8 @@
 // src/adapter/bun/index.ts
 import { serveStatic } from "./serve-static.js";
+import { bunFileSystemModule, toSSG } from "./ssg.js";
 export {
-  serveStatic
+  bunFileSystemModule,
+  serveStatic,
+  toSSG
 };

package/dist/adapter/bun/ssg.js

@@ -0,0 +1,18 @@
+// src/adapter/bun/ssg.ts
+import { mkdir, writeFile } from "fs/promises";
+import { toSSG as baseToSSG } from "../../helper/ssg/index.js";
+var bunFileSystemModule = {
+  writeFile: (path, data) => {
+    return writeFile(path, data);
+  },
+  mkdir: async (path, options) => {
+    await mkdir(path, options);
+  }
+};
+var toSSG = async (app, options) => {
+  return baseToSSG(app, bunFileSystemModule, options);
+};
+export {
+  bunFileSystemModule,
+  toSSG
+};

package/dist/adapter/cloudflare-pages/handler.js

@@ -1,7 +1,5 @@
 // src/adapter/cloudflare-pages/handler.ts
-import { Hono } from "../../hono.js";
-var handle = (subApp, path) => (eventContext) => {
-  const app = path ? new Hono().route(path, subApp) : subApp;
+var handle = (app) => (eventContext) => {
   return app.fetch(
     eventContext.request,
     { ...eventContext.env, eventContext },

package/dist/adapter/cloudflare-workers/serve-static-module.js

@@ -1,8 +1,6 @@
 // src/adapter/cloudflare-workers/serve-static-module.ts
-import manifest from "__STATIC_CONTENT_MANIFEST";
 import { serveStatic } from "./serve-static.js";
-var module = (options = { root: "" }) => {
-  options.manifest ?? (options.manifest = manifest);
+var module = (options) => {
   return serveStatic(options);
 };
 export {

package/dist/adapter/cloudflare-workers/serve-static.js

@@ -3,7 +3,7 @@ import { getFilePath } from "../../utils/filepath.js";
 import { getMimeType } from "../../utils/mime.js";
 import { getContentFromKVAsset } from "./utils.js";
 var DEFAULT_DOCUMENT = "index.html";
-var serveStatic = (options = { root: "" }) => {
+var serveStatic = (options) => {
   return async (c, next) => {
     if (c.finalized) {
       await next();

package/dist/adapter/deno/index.js

@@ -1,5 +1,8 @@
 // src/adapter/deno/index.ts
 import { serveStatic } from "./serve-static.js";
+import { toSSG, denoFileSystemModule } from "./ssg.js";
 export {
-  serveStatic
+  denoFileSystemModule,
+  serveStatic,
+  toSSG
 };

package/dist/adapter/deno/ssg.js

@@ -0,0 +1,18 @@
+// src/adapter/deno/ssg.ts
+import { toSSG as baseToSSG } from "../../helper/ssg/index.js";
+var denoFileSystemModule = {
+  writeFile: async (path, data) => {
+    const uint8Data = typeof data === "string" ? new TextEncoder().encode(data) : data;
+    await Deno.writeFile(path, uint8Data);
+  },
+  mkdir: async (path, options) => {
+    return Deno.mkdir(path, { recursive: options?.recursive ?? false });
+  }
+};
+var toSSG = async (app, options) => {
+  return baseToSSG(app, denoFileSystemModule, options);
+};
+export {
+  denoFileSystemModule,
+  toSSG
+};

package/dist/cjs/adapter/bun/index.js

@@ -18,11 +18,16 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var bun_exports = {};
 __export(bun_exports, {
-  serveStatic: () => import_serve_static.serveStatic
+  bunFileSystemModule: () => import_ssg.bunFileSystemModule,
+  serveStatic: () => import_serve_static.serveStatic,
+  toSSG: () => import_ssg.toSSG
 });
 module.exports = __toCommonJS(bun_exports);
 var import_serve_static = require("./serve-static");
+var import_ssg = require("./ssg");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  serveStatic
+  bunFileSystemModule,
+  serveStatic,
+  toSSG
 });

package/dist/cjs/adapter/bun/ssg.js

@@ -0,0 +1,42 @@
+"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 ssg_exports = {};
+__export(ssg_exports, {
+  bunFileSystemModule: () => bunFileSystemModule,
+  toSSG: () => toSSG
+});
+module.exports = __toCommonJS(ssg_exports);
+var import_promises = require("fs/promises");
+var import_ssg = require("../../helper/ssg");
+const bunFileSystemModule = {
+  writeFile: (path, data) => {
+    return (0, import_promises.writeFile)(path, data);
+  },
+  mkdir: async (path, options) => {
+    await (0, import_promises.mkdir)(path, options);
+  }
+};
+const toSSG = async (app, options) => {
+  return (0, import_ssg.toSSG)(app, bunFileSystemModule, options);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  bunFileSystemModule,
+  toSSG
+});

package/dist/cjs/adapter/cloudflare-pages/handler.js

@@ -22,9 +22,7 @@ __export(handler_exports, {
   serveStatic: () => serveStatic
 });
 module.exports = __toCommonJS(handler_exports);
-var import_hono = require("../../hono");
-const handle = (subApp, path) => (eventContext) => {
-  const app = path ? new import_hono.Hono().route(path, subApp) : subApp;
+const handle = (app) => (eventContext) => {
   return app.fetch(
     eventContext.request,
     { ...eventContext.env, eventContext },

package/dist/cjs/adapter/cloudflare-workers/serve-static-module.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,20 +15,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serve_static_module_exports = {};
 __export(serve_static_module_exports, {
   serveStatic: () => module2
 });
 module.exports = __toCommonJS(serve_static_module_exports);
-var import_STATIC_CONTENT_MANIFEST = __toESM(require("__STATIC_CONTENT_MANIFEST"), 1);
 var import_serve_static = require("./serve-static");
-const module2 = (options = { root: "" }) => {
-  options.manifest ?? (options.manifest = import_STATIC_CONTENT_MANIFEST.default);
+const module2 = (options) => {
   return (0, import_serve_static.serveStatic)(options);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/adapter/cloudflare-workers/serve-static.js

@@ -25,7 +25,7 @@ var import_filepath = require("../../utils/filepath");
 var import_mime = require("../../utils/mime");
 var import_utils = require("./utils");
 const DEFAULT_DOCUMENT = "index.html";
-const serveStatic = (options = { root: "" }) => {
+const serveStatic = (options) => {
   return async (c, next) => {
     if (c.finalized) {
       await next();

package/dist/cjs/adapter/deno/deno.d.js

@@ -0,0 +1 @@
+"use strict";

package/dist/cjs/adapter/deno/index.js

@@ -18,11 +18,16 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var deno_exports = {};
 __export(deno_exports, {
-  serveStatic: () => import_serve_static.serveStatic
+  denoFileSystemModule: () => import_ssg.denoFileSystemModule,
+  serveStatic: () => import_serve_static.serveStatic,
+  toSSG: () => import_ssg.toSSG
 });
 module.exports = __toCommonJS(deno_exports);
 var import_serve_static = require("./serve-static");
+var import_ssg = require("./ssg");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  serveStatic
+  denoFileSystemModule,
+  serveStatic,
+  toSSG
 });

package/dist/cjs/adapter/deno/ssg.js

@@ -0,0 +1,42 @@
+"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 ssg_exports = {};
+__export(ssg_exports, {
+  denoFileSystemModule: () => denoFileSystemModule,
+  toSSG: () => toSSG
+});
+module.exports = __toCommonJS(ssg_exports);
+var import_ssg = require("../../helper/ssg/index");
+const denoFileSystemModule = {
+  writeFile: async (path, data) => {
+    const uint8Data = typeof data === "string" ? new TextEncoder().encode(data) : data;
+    await Deno.writeFile(path, uint8Data);
+  },
+  mkdir: async (path, options) => {
+    return Deno.mkdir(path, { recursive: options?.recursive ?? false });
+  }
+};
+const toSSG = async (app, options) => {
+  return (0, import_ssg.toSSG)(app, denoFileSystemModule, options);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  denoFileSystemModule,
+  toSSG
+});

package/dist/cjs/client/client.js

@@ -62,14 +62,6 @@ class ClientRequestImpl {
             }
           }
         }
-        if (args.queries) {
-          for (const [k, v] of Object.entries(args.queries)) {
-            for (const v2 of v) {
-              this.queryParams || (this.queryParams = new URLSearchParams());
-              this.queryParams.append(k, v2);
-            }
-          }
-        }
         if (args.form) {
           const form = new FormData();
           for (const [k, v] of Object.entries(args.form)) {

package/dist/cjs/context.js

@@ -40,9 +40,7 @@ __export(context_exports, {
   TEXT_PLAIN: () => TEXT_PLAIN
 });
 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 {
@@ -57,9 +55,12 @@ class Context {
     __privateAdd(this, _preparedHeaders, void 0);
     __privateAdd(this, _res, void 0);
     __privateAdd(this, _isFresh, true);
+    this.layout = void 0;
     this.renderer = (content) => this.html(content);
     this.notFoundHandler = () => new Response();
     this.render = (...args) => this.renderer(...args);
+    this.setLayout = (layout) => this.layout = layout;
+    this.getLayout = () => this.layout;
     this.setRenderer = (renderer) => {
       this.renderer = renderer;
     };
@@ -167,9 +168,6 @@ class Context {
       __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) => {
-      return this.json(object, arg, headers);
-    };
     this.html = (html, arg, headers) => {
       __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
       __privateGet(this, _preparedHeaders)["content-type"] = "text/html; charset=UTF-8";
@@ -190,23 +188,6 @@ class Context {
       __privateGet(this, _headers).set("Location", location);
       return this.newResponse(null, status);
     };
-    this.streamText = (cb, arg, headers) => {
-      headers ?? (headers = {});
-      this.header("content-type", TEXT_PLAIN);
-      this.header("x-content-type-options", "nosniff");
-      this.header("transfer-encoding", "chunked");
-      return this.stream(cb, arg, headers);
-    };
-    this.stream = (cb, arg, headers) => {
-      const { readable, writable } = new TransformStream();
-      const stream = new import_stream.StreamingApi(writable, readable);
-      cb(stream).finally(() => stream.close());
-      return typeof arg === "number" ? this.newResponse(stream.responseReadable, arg, headers) : this.newResponse(stream.responseReadable, arg);
-    };
-    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);
     };
@@ -259,31 +240,6 @@ class Context {
   get var() {
     return { ...this._var };
   }
-  get runtime() {
-    const global = globalThis;
-    if (global?.Deno !== void 0) {
-      return "deno";
-    }
-    if (global?.Bun !== void 0) {
-      return "bun";
-    }
-    if (typeof global?.WebSocketPair === "function") {
-      return "workerd";
-    }
-    if (typeof global?.EdgeRuntime === "string") {
-      return "edge-light";
-    }
-    if (global?.fastly !== void 0) {
-      return "fastly";
-    }
-    if (global?.__lagon__ !== void 0) {
-      return "lagon";
-    }
-    if (global?.process?.release?.name === "node") {
-      return "node";
-    }
-    return "other";
-  }
 }
 _status = new WeakMap();
 _executionCtx = new WeakMap();

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

@@ -27,6 +27,7 @@ __export(css_exports, {
 });
 module.exports = __toCommonJS(css_exports);
 var import_html = require("../../helper/html");
+var import_html2 = require("../../utils/html");
 const IS_CSS_CLASS_NAME = Symbol("IS_CSS_CLASS_NAME");
 const STYLE_STRING = Symbol("STYLE_STRING");
 const SELECTORS = Symbol("SELECTORS");
@@ -36,6 +37,8 @@ const rawCssString = (value) => {
   escapedString.isCssEscaped = true;
   return escapedString;
 };
+const PSEUDO_GLOBAL_SELECTOR = ":-hono-global";
+const isPseudoGlobalSelectorRe = new RegExp(`^${PSEUDO_GLOBAL_SELECTOR}{(.*)}$`);
 const DEFAULT_STYLE_ID = "hono-css";
 const toHash = (str) => {
   let i = 0, out = 11;
@@ -67,8 +70,9 @@ const minify = (css2) => {
   return css2.replace(minifyCssRe, (_, $1, $2, $3, $4) => $1 || $2 || $3 || $4 || "");
 };
 const buildStyleString = async (strings, values, selectors, externalClassNames) => {
+  const label = strings[0].match(/^\s*\/\*(.*?)\*\//)?.[1] || "";
   let styleString = "";
-  for (let i = 0; i < strings.length; i++) {
+  for (let i = 0, len = strings.length; i < len; i++) {
     styleString += strings[i];
     let vArray = values[i];
     if (typeof vArray === "boolean" || vArray === null || vArray === void 0) {
@@ -77,7 +81,7 @@ const buildStyleString = async (strings, values, selectors, externalClassNames)
     if (!Array.isArray(vArray)) {
       vArray = [vArray];
     }
-    for (let j = 0; j < vArray.length; j++) {
+    for (let j = 0, len2 = vArray.length; j < len2; j++) {
       let value = vArray[j] instanceof Promise ? await vArray[j] : vArray[j];
       if (typeof value === "boolean" || value === null || value === void 0) {
         continue;
@@ -89,13 +93,19 @@ const buildStyleString = async (strings, values, selectors, externalClassNames)
         styleString += ` ${value.substring(11)} `;
       } else {
         if (value[IS_CSS_CLASS_NAME]) {
-          selectors.push(...value[SELECTORS]);
-          externalClassNames.push(...value[EXTERNAL_CLASS_NAMES]);
-          value = value[STYLE_STRING];
-          if (value.length > 0) {
-            const lastChar = value[value.length - 1];
-            if (lastChar !== ";" && lastChar !== "}") {
-              value += ";";
+          if (strings[i + 1]?.match(/^\s*{/)) {
+            selectors.push(value);
+            value = `.${value}`;
+          } else {
+            selectors.push(...value[SELECTORS]);
+            externalClassNames.push(...value[EXTERNAL_CLASS_NAMES]);
+            value = value[STYLE_STRING];
+            const valueLen = value.length;
+            if (valueLen > 0) {
+              const lastChar = value[valueLen - 1];
+              if (lastChar !== ";" && lastChar !== "}") {
+                value += ";";
+              }
             }
           }
         } else if (!value.isCssEscaped && /([\\"'\/])/.test(value)) {
@@ -105,7 +115,7 @@ const buildStyleString = async (strings, values, selectors, externalClassNames)
       }
     }
   }
-  return minify(styleString);
+  return [label, minify(styleString)];
 };
 const createCssContext = ({ id }) => {
   const contextMap = /* @__PURE__ */ new WeakMap();
@@ -113,9 +123,20 @@ const createCssContext = ({ id }) => {
   const css2 = async (strings, ...values) => {
     const selectors = [];
     const externalClassNames = [];
-    const thisStyleString = await buildStyleString(strings, values, selectors, externalClassNames);
-    const thisSelector = toHash(thisStyleString);
-    const className = new String([thisSelector, ...externalClassNames].join(" "));
+    let [label, thisStyleString] = await buildStyleString(
+      strings,
+      values,
+      selectors,
+      externalClassNames
+    );
+    const isPseudoGlobal = isPseudoGlobalSelectorRe.exec(thisStyleString);
+    if (isPseudoGlobal) {
+      thisStyleString = isPseudoGlobal[1];
+    }
+    const thisSelector = (isPseudoGlobal ? PSEUDO_GLOBAL_SELECTOR : "") + toHash(label + thisStyleString);
+    const className = new String(
+      (isPseudoGlobal ? selectors.map(String) : [thisSelector, ...externalClassNames]).join(" ")
+    );
     const appendStyle = ({ buffer, context }) => {
       const [toAdd, added] = contextMap.get(context);
       const names = Object.keys(toAdd);
@@ -125,7 +146,7 @@ const createCssContext = ({ id }) => {
       let stylesStr = "";
       names.forEach((className2) => {
         added[className2] = true;
-        stylesStr += `${className2[0] === "@" ? "" : "."}${className2}{${toAdd[className2]}}`;
+        stylesStr += className2.startsWith(PSEUDO_GLOBAL_SELECTOR) ? toAdd[className2] : `${className2[0] === "@" ? "" : "."}${className2}{${toAdd[className2]}}`;
       });
       contextMap.set(context, [{}, added]);
       if (buffer && replaceStyleRe.test(buffer[0])) {
@@ -141,7 +162,20 @@ const createCssContext = ({ id }) => {
       }
       return Promise.resolve(appendStyleScript);
     };
-    const addClassNameToContext = ({ context }) => {
+    const addClassNameToContext = ({ context, phase }) => {
+      if (phase === import_html2.HtmlEscapedCallbackPhase.BeforeDom) {
+        const styleSheets = document.styleSheets;
+        for (let i = 0, len = styleSheets.length; i < len; i++) {
+          const sheet = styleSheets[i];
+          if (sheet.ownerNode?.id === id) {
+            if (!sheet.cssRules?.[0]?.cssText?.includes(thisSelector)) {
+              sheet.insertRule(`.${thisSelector}{${thisStyleString}}`);
+              break;
+            }
+          }
+        }
+        return;
+      }
       if (!contextMap.get(context)) {
         contextMap.set(context, [{}, {}]);
       }
@@ -174,7 +208,7 @@ const createCssContext = ({ id }) => {
   };
   const cx2 = async (...args) => {
     const resolvedArgs = await Promise.all(args);
-    for (let i = 0; i < resolvedArgs.length; i++) {
+    for (let i = 0, len = resolvedArgs.length; i < len; i++) {
       const arg = resolvedArgs[i];
       if (typeof arg === "string" && !arg[IS_CSS_CLASS_NAME]) {
         const externalClassName = new String(arg);
@@ -190,8 +224,8 @@ const createCssContext = ({ id }) => {
     return css2(Array(resolvedArgs.length).fill(""), ...resolvedArgs);
   };
   const keyframes2 = async (strings, ...values) => {
-    const styleString = await buildStyleString(strings, values, [], []);
-    const className = new String(`@keyframes ${toHash(styleString)}`);
+    const [label, styleString] = await buildStyleString(strings, values, [], []);
+    const className = new String(`@keyframes ${toHash(label + styleString)}`);
     Object.assign(className, {
       isEscaped: true,
       [IS_CSS_CLASS_NAME]: true,
@@ -201,7 +235,9 @@ const createCssContext = ({ id }) => {
     });
     return className;
   };
-  const Style2 = () => (0, import_html.raw)(`<style id="${id}"></style>`);
+  const Style2 = ({ children } = {}) => children ? children.then(
+    (cssData) => (0, import_html.raw)(`<style id="${id}">${cssData[STYLE_STRING]}</style>`)
+  ) : (0, import_html.raw)(`<style id="${id}"></style>`);
   return {
     css: css2,
     cx: cx2,