hono 4.0.8 → 4.1.0-rc.1

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

@@ -1,7 +1,7 @@
 // src/adapter/aws-lambda/handler.ts
 import crypto from "crypto";
 import { encodeBase64 } from "../../utils/encode.js";
-globalThis.crypto ?? (globalThis.crypto = crypto);
+globalThis.crypto ??= crypto;
 var getRequestContext = (event) => {
   return event.requestContext;
 };

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

@@ -1,7 +1,7 @@
 // src/adapter/lambda-edge/handler.ts
 import crypto from "crypto";
 import { encodeBase64 } from "../../utils/encode.js";
-globalThis.crypto ?? (globalThis.crypto = crypto);
+globalThis.crypto ??= crypto;
 var convertHeaders = (headers) => {
   const cfHeaders = {};
   headers.forEach((value, key) => {

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

@@ -32,7 +32,7 @@ __export(handler_exports, {
 module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
 var import_encode = require("../../utils/encode");
-globalThis.crypto ?? (globalThis.crypto = import_crypto.default);
+globalThis.crypto ??= import_crypto.default;
 const getRequestContext = (event) => {
   return event.requestContext;
 };

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

@@ -30,7 +30,7 @@ __export(handler_exports, {
 module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
 var import_encode = require("../../utils/encode");
-globalThis.crypto ?? (globalThis.crypto = import_crypto.default);
+globalThis.crypto ??= import_crypto.default;
 const convertHeaders = (headers) => {
   const cfHeaders = {};
   headers.forEach((value, key) => {

package/dist/cjs/client/client.js

@@ -42,76 +42,79 @@ const createProxy = (callback, path) => {
   return proxy;
 };
 class ClientRequestImpl {
+  url;
+  method;
+  queryParams = void 0;
+  pathParams = {};
+  rBody;
+  cType = void 0;
   constructor(url, method) {
-    this.queryParams = void 0;
-    this.pathParams = {};
-    this.cType = void 0;
-    this.fetch = (args, opt) => {
-      if (args) {
-        if (args.query) {
-          for (const [k, v] of Object.entries(args.query)) {
-            if (v === void 0) {
-              continue;
-            }
-            this.queryParams || (this.queryParams = new URLSearchParams());
-            if (Array.isArray(v)) {
-              for (const v2 of v) {
-                this.queryParams.append(k, v2);
-              }
-            } else {
-              this.queryParams.set(k, v);
-            }
+    this.url = url;
+    this.method = method;
+  }
+  fetch = (args, opt) => {
+    if (args) {
+      if (args.query) {
+        for (const [k, v] of Object.entries(args.query)) {
+          if (v === void 0) {
+            continue;
           }
-        }
-        if (args.form) {
-          const form = new FormData();
-          for (const [k, v] of Object.entries(args.form)) {
-            form.append(k, v);
+          this.queryParams ||= new URLSearchParams();
+          if (Array.isArray(v)) {
+            for (const v2 of v) {
+              this.queryParams.append(k, v2);
+            }
+          } else {
+            this.queryParams.set(k, v);
           }
-          this.rBody = form;
-        }
-        if (args.json) {
-          this.rBody = JSON.stringify(args.json);
-          this.cType = "application/json";
-        }
-        if (args.param) {
-          this.pathParams = args.param;
         }
       }
-      let methodUpperCase = this.method.toUpperCase();
-      let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
-      const headerValues = {
-        ...args?.header ?? {},
-        ...opt?.headers ? opt.headers : {}
-      };
-      if (args?.cookie) {
-        const cookies = [];
-        for (const [key, value] of Object.entries(args.cookie)) {
-          cookies.push((0, import_cookie.serialize)(key, value, { path: "/" }));
+      if (args.form) {
+        const form = new FormData();
+        for (const [k, v] of Object.entries(args.form)) {
+          form.append(k, v);
         }
-        headerValues["Cookie"] = cookies.join(",");
+        this.rBody = form;
       }
-      if (this.cType) {
-        headerValues["Content-Type"] = this.cType;
+      if (args.json) {
+        this.rBody = JSON.stringify(args.json);
+        this.cType = "application/json";
       }
-      const headers = new Headers(headerValues ?? void 0);
-      let url = this.url;
-      url = (0, import_utils.removeIndexString)(url);
-      url = (0, import_utils.replaceUrlParam)(url, this.pathParams);
-      if (this.queryParams) {
-        url = url + "?" + this.queryParams.toString();
+      if (args.param) {
+        this.pathParams = args.param;
       }
-      methodUpperCase = this.method.toUpperCase();
-      setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
-      return (opt?.fetch || fetch)(url, {
-        body: setBody ? this.rBody : void 0,
-        method: methodUpperCase,
-        headers
-      });
+    }
+    let methodUpperCase = this.method.toUpperCase();
+    let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+    const headerValues = {
+      ...args?.header ?? {},
+      ...opt?.headers ? opt.headers : {}
     };
-    this.url = url;
-    this.method = method;
-  }
+    if (args?.cookie) {
+      const cookies = [];
+      for (const [key, value] of Object.entries(args.cookie)) {
+        cookies.push((0, import_cookie.serialize)(key, value, { path: "/" }));
+      }
+      headerValues["Cookie"] = cookies.join(",");
+    }
+    if (this.cType) {
+      headerValues["Content-Type"] = this.cType;
+    }
+    const headers = new Headers(headerValues ?? void 0);
+    let url = this.url;
+    url = (0, import_utils.removeIndexString)(url);
+    url = (0, import_utils.replaceUrlParam)(url, this.pathParams);
+    if (this.queryParams) {
+      url = url + "?" + this.queryParams.toString();
+    }
+    methodUpperCase = this.method.toUpperCase();
+    setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+    return (opt?.fetch || fetch)(url, {
+      body: setBody ? this.rBody : void 0,
+      method: methodUpperCase,
+      headers
+    });
+  };
 }
 const hc = (baseUrl, options) => createProxy((opts) => {
   const parts = [...opts.path];
@@ -132,7 +135,7 @@ const hc = (baseUrl, options) => createProxy((opts) => {
   }
   const req = new ClientRequestImpl(url, method);
   if (method) {
-    options ?? (options = {});
+    options ??= {};
     const args = (0, import_utils.deepMerge)(options, { ...opts.args[1] ?? {} });
     return req.fetch(opts.args[0], args);
   }

package/dist/cjs/context.js

@@ -16,24 +16,6 @@ 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,
@@ -41,163 +23,30 @@ __export(context_exports, {
 });
 module.exports = __toCommonJS(context_exports);
 var import_html = require("./utils/html");
-var _status, _executionCtx, _headers, _preparedHeaders, _res, _isFresh;
 const TEXT_PLAIN = "text/plain; charset=UTF-8";
 const setHeaders = (headers, map = {}) => {
   Object.entries(map).forEach(([key, value]) => headers.set(key, value));
   return headers;
 };
 class Context {
+  req;
+  env = {};
+  _var = {};
+  finalized = false;
+  error = void 0;
+  #status = 200;
+  #executionCtx;
+  #headers = void 0;
+  #preparedHeaders = void 0;
+  #res;
+  #isFresh = true;
+  layout = void 0;
+  renderer = (content) => this.html(content);
+  notFoundHandler = () => new Response();
   constructor(req, options) {
-    this.env = {};
-    this._var = {};
-    this.finalized = false;
-    this.error = void 0;
-    __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.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;
-    };
-    this.header = (name, value, options) => {
-      if (value === void 0) {
-        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);
-        }
-        return;
-      }
-      if (options?.append) {
-        if (!__privateGet(this, _headers)) {
-          __privateSet(this, _isFresh, false);
-          __privateSet(this, _headers, new Headers(__privateGet(this, _preparedHeaders)));
-          __privateSet(this, _preparedHeaders, {});
-        }
-        __privateGet(this, _headers).append(name, value);
-      } else {
-        if (__privateGet(this, _headers)) {
-          __privateGet(this, _headers).set(name, value);
-        } else {
-          __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
-          __privateGet(this, _preparedHeaders)[name.toLowerCase()] = value;
-        }
-      }
-      if (this.finalized) {
-        if (options?.append) {
-          this.res.headers.append(name, value);
-        } else {
-          this.res.headers.set(name, value);
-        }
-      }
-    };
-    this.status = (status) => {
-      __privateSet(this, _isFresh, false);
-      __privateSet(this, _status, status);
-    };
-    this.set = (key, value) => {
-      this._var ?? (this._var = {});
-      this._var[key] = value;
-    };
-    this.get = (key) => {
-      return this._var ? this._var[key] : void 0;
-    };
-    this.newResponse = (data, arg, headers) => {
-      if (__privateGet(this, _isFresh) && !headers && !arg && __privateGet(this, _status) === 200) {
-        return new Response(data, {
-          headers: __privateGet(this, _preparedHeaders)
-        });
-      }
-      if (arg && typeof arg !== "number") {
-        const headers2 = setHeaders(new Headers(arg.headers), __privateGet(this, _preparedHeaders));
-        return new Response(data, {
-          headers: headers2,
-          status: arg.status ?? __privateGet(this, _status)
-        });
-      }
-      const status = typeof arg === "number" ? arg : __privateGet(this, _status);
-      __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
-      __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
-      setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
-      if (__privateGet(this, _res)) {
-        __privateGet(this, _res).headers.forEach((v, k) => {
-          __privateGet(this, _headers)?.set(k, v);
-        });
-        setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
-      }
-      headers ?? (headers = {});
-      for (const [k, v] of Object.entries(headers)) {
-        if (typeof v === "string") {
-          __privateGet(this, _headers).set(k, v);
-        } else {
-          __privateGet(this, _headers).delete(k);
-          for (const v2 of v) {
-            __privateGet(this, _headers).append(k, v2);
-          }
-        }
-      }
-      return new Response(data, {
-        status,
-        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 (!__privateGet(this, _preparedHeaders)) {
-        if (__privateGet(this, _isFresh) && !headers && !arg) {
-          return new Response(text);
-        }
-        __privateSet(this, _preparedHeaders, {});
-      }
-      __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);
-      __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.html = (html, arg, headers) => {
-      __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) => (0, import_html.resolveCallback)(html2, import_html.HtmlEscapedCallbackPhase.Stringify, false, {})).then((html2) => {
-            return typeof arg === "number" ? this.newResponse(html2, arg, headers) : this.newResponse(html2, arg);
-          });
-        }
-      }
-      return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
-    };
-    this.redirect = (location, status = 302) => {
-      __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
-      __privateGet(this, _headers).set("Location", location);
-      return this.newResponse(null, status);
-    };
-    this.notFound = () => {
-      return this.notFoundHandler(this);
-    };
     this.req = req;
     if (options) {
-      __privateSet(this, _executionCtx, options.executionCtx);
+      this.#executionCtx = options.executionCtx;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
@@ -205,52 +54,179 @@ class Context {
     }
   }
   get event() {
-    if (__privateGet(this, _executionCtx) && "respondWith" in __privateGet(this, _executionCtx)) {
-      return __privateGet(this, _executionCtx);
+    if (this.#executionCtx && "respondWith" in this.#executionCtx) {
+      return this.#executionCtx;
     } else {
       throw Error("This context has no FetchEvent");
     }
   }
   get executionCtx() {
-    if (__privateGet(this, _executionCtx)) {
-      return __privateGet(this, _executionCtx);
+    if (this.#executionCtx) {
+      return this.#executionCtx;
     } else {
       throw Error("This context has no ExecutionContext");
     }
   }
   get res() {
-    __privateSet(this, _isFresh, false);
-    return __privateGet(this, _res) || __privateSet(this, _res, new Response("404 Not Found", { status: 404 }));
+    this.#isFresh = false;
+    return this.#res ||= new Response("404 Not Found", { status: 404 });
   }
-  set res(_res2) {
-    __privateSet(this, _isFresh, false);
-    if (__privateGet(this, _res) && _res2) {
-      __privateGet(this, _res).headers.delete("content-type");
-      for (const [k, v] of __privateGet(this, _res).headers.entries()) {
+  set res(_res) {
+    this.#isFresh = false;
+    if (this.#res && _res) {
+      this.#res.headers.delete("content-type");
+      for (const [k, v] of this.#res.headers.entries()) {
         if (k === "set-cookie") {
-          const cookies = __privateGet(this, _res).headers.getSetCookie();
-          _res2.headers.delete("set-cookie");
+          const cookies = this.#res.headers.getSetCookie();
+          _res.headers.delete("set-cookie");
           for (const cookie of cookies) {
-            _res2.headers.append("set-cookie", cookie);
+            _res.headers.append("set-cookie", cookie);
           }
         } else {
-          _res2.headers.set(k, v);
+          _res.headers.set(k, v);
         }
       }
     }
-    __privateSet(this, _res, _res2);
+    this.#res = _res;
     this.finalized = true;
   }
+  render = (...args) => this.renderer(...args);
+  setLayout = (layout) => this.layout = layout;
+  getLayout = () => this.layout;
+  setRenderer = (renderer) => {
+    this.renderer = renderer;
+  };
+  header = (name, value, options) => {
+    if (value === void 0) {
+      if (this.#headers) {
+        this.#headers.delete(name);
+      } else if (this.#preparedHeaders) {
+        delete this.#preparedHeaders[name.toLocaleLowerCase()];
+      }
+      if (this.finalized) {
+        this.res.headers.delete(name);
+      }
+      return;
+    }
+    if (options?.append) {
+      if (!this.#headers) {
+        this.#isFresh = false;
+        this.#headers = new Headers(this.#preparedHeaders);
+        this.#preparedHeaders = {};
+      }
+      this.#headers.append(name, value);
+    } else {
+      if (this.#headers) {
+        this.#headers.set(name, value);
+      } else {
+        this.#preparedHeaders ??= {};
+        this.#preparedHeaders[name.toLowerCase()] = value;
+      }
+    }
+    if (this.finalized) {
+      if (options?.append) {
+        this.res.headers.append(name, value);
+      } else {
+        this.res.headers.set(name, value);
+      }
+    }
+  };
+  status = (status) => {
+    this.#isFresh = false;
+    this.#status = status;
+  };
+  set = (key, value) => {
+    this._var ??= {};
+    this._var[key] = value;
+  };
+  get = (key) => {
+    return this._var ? this._var[key] : void 0;
+  };
   get var() {
     return { ...this._var };
   }
+  newResponse = (data, arg, headers) => {
+    if (this.#isFresh && !headers && !arg && this.#status === 200) {
+      return new Response(data, {
+        headers: this.#preparedHeaders
+      });
+    }
+    if (arg && typeof arg !== "number") {
+      const headers2 = setHeaders(new Headers(arg.headers), this.#preparedHeaders);
+      return new Response(data, {
+        headers: headers2,
+        status: arg.status ?? this.#status
+      });
+    }
+    const status = typeof arg === "number" ? arg : this.#status;
+    this.#preparedHeaders ??= {};
+    this.#headers ??= new Headers();
+    setHeaders(this.#headers, this.#preparedHeaders);
+    if (this.#res) {
+      this.#res.headers.forEach((v, k) => {
+        this.#headers?.set(k, v);
+      });
+      setHeaders(this.#headers, this.#preparedHeaders);
+    }
+    headers ??= {};
+    for (const [k, v] of Object.entries(headers)) {
+      if (typeof v === "string") {
+        this.#headers.set(k, v);
+      } else {
+        this.#headers.delete(k);
+        for (const v2 of v) {
+          this.#headers.append(k, v2);
+        }
+      }
+    }
+    return new Response(data, {
+      status,
+      headers: this.#headers
+    });
+  };
+  body = (data, arg, headers) => {
+    return typeof arg === "number" ? this.newResponse(data, arg, headers) : this.newResponse(data, arg);
+  };
+  text = (text, arg, headers) => {
+    if (!this.#preparedHeaders) {
+      if (this.#isFresh && !headers && !arg) {
+        return new Response(text);
+      }
+      this.#preparedHeaders = {};
+    }
+    this.#preparedHeaders["content-type"] = TEXT_PLAIN;
+    return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
+  };
+  json = (object, arg, headers) => {
+    const body = JSON.stringify(object);
+    this.#preparedHeaders ??= {};
+    this.#preparedHeaders["content-type"] = "application/json; charset=UTF-8";
+    return typeof arg === "number" ? this.newResponse(body, arg, headers) : this.newResponse(body, arg);
+  };
+  html = (html, arg, headers) => {
+    this.#preparedHeaders ??= {};
+    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) => (0, import_html.resolveCallback)(html2, import_html.HtmlEscapedCallbackPhase.Stringify, false, {})).then((html2) => {
+          return typeof arg === "number" ? this.newResponse(html2, arg, headers) : this.newResponse(html2, arg);
+        });
+      }
+    }
+    return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
+  };
+  redirect = (location, status = 302) => {
+    this.#headers ??= new Headers();
+    this.#headers.set("Location", location);
+    return this.newResponse(null, status);
+  };
+  notFound = () => {
+    return this.notFoundHandler(this);
+  };
 }
-_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/adapter/index.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(adapter_exports);
 const env = (c, runtime) => {
   const global = globalThis;
   const globalEnv = global?.process?.env;
-  runtime ?? (runtime = getRuntimeKey());
+  runtime ??= getRuntimeKey();
   const runtimeEnvHandlers = {
     bun: () => globalEnv,
     node: () => globalEnv,