hono 4.2.1 → 4.2.3

package/dist/cjs/client/client.js

@@ -52,7 +52,7 @@ class ClientRequestImpl {
     this.url = url;
     this.method = method;
   }
-  fetch = (args, opt) => {
+  fetch = async (args, opt) => {
     if (args) {
       if (args.query) {
         for (const [k, v] of Object.entries(args.query)) {
@@ -88,7 +88,7 @@ class ClientRequestImpl {
     let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     const headerValues = {
       ...args?.header ?? {},
-      ...opt?.headers ? opt.headers : {}
+      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
     };
     if (args?.cookie) {
       const cookies = [];
@@ -134,7 +134,10 @@ const hc = (baseUrl, options) => createProxy((opts) => {
     return new URL(url);
   }
   if (method === "ws") {
-    const targetUrl = opts.args[0] && opts.args[0].param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url;
+    const targetUrl = (0, import_utils.replaceUrlProtocol)(
+      opts.args[0] && opts.args[0].param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url,
+      "ws"
+    );
     return new WebSocket(targetUrl);
   }
   const req = new ClientRequestImpl(url, method);

package/dist/cjs/client/utils.js

@@ -21,7 +21,8 @@ __export(utils_exports, {
   deepMerge: () => deepMerge,
   mergePath: () => mergePath,
   removeIndexString: () => removeIndexString,
-  replaceUrlParam: () => replaceUrlParam
+  replaceUrlParam: () => replaceUrlParam,
+  replaceUrlProtocol: () => replaceUrlProtocol
 });
 module.exports = __toCommonJS(utils_exports);
 const mergePath = (base, path) => {
@@ -37,6 +38,14 @@ const replaceUrlParam = (urlString, params) => {
   }
   return urlString;
 };
+const replaceUrlProtocol = (urlString, protocol) => {
+  switch (protocol) {
+    case "ws":
+      return urlString.replace(/^http/, "ws");
+    case "http":
+      return urlString.replace(/^ws/, "http");
+  }
+};
 const removeIndexString = (urlSting) => {
   return urlSting.replace(/\/index$/, "");
 };
@@ -63,5 +72,6 @@ function deepMerge(target, source) {
   deepMerge,
   mergePath,
   removeIndexString,
-  replaceUrlParam
+  replaceUrlParam,
+  replaceUrlProtocol
 });

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

@@ -19,7 +19,7 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ssg_exports = {};
 __export(ssg_exports, {
-  SSG_DISABLED_RESPONSE: () => import_middleware.SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY: () => import_middleware.X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG: () => import_middleware.disableSSG,
   isSSGContext: () => import_middleware.isSSGContext,
   onlySSG: () => import_middleware.onlySSG,
@@ -30,7 +30,7 @@ __reExport(ssg_exports, require("./ssg"), module.exports);
 var import_middleware = require("./middleware");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG,
   isSSGContext,
   onlySSG,

package/dist/cjs/helper/ssg/middleware.js

@@ -20,6 +20,7 @@ var middleware_exports = {};
 __export(middleware_exports, {
   SSG_CONTEXT: () => SSG_CONTEXT,
   SSG_DISABLED_RESPONSE: () => SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY: () => X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG: () => disableSSG,
   isSSGContext: () => isSSGContext,
   onlySSG: () => onlySSG,
@@ -27,7 +28,17 @@ __export(middleware_exports, {
 });
 module.exports = __toCommonJS(middleware_exports);
 const SSG_CONTEXT = "HONO_SSG_CONTEXT";
-const SSG_DISABLED_RESPONSE = new Response("SSG is disabled", { status: 404 });
+const X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+const SSG_DISABLED_RESPONSE = (() => {
+  try {
+    return new Response("SSG is disabled", {
+      status: 404,
+      headers: { [X_HONO_DISABLE_SSG_HEADER_KEY]: "true" }
+    });
+  } catch (e) {
+    return null;
+  }
+})();
 const ssgParams = (params) => async (c, next) => {
   ;
   c.req.raw.ssgParams = Array.isArray(params) ? params : await params(c);
@@ -36,7 +47,8 @@ const ssgParams = (params) => async (c, next) => {
 const isSSGContext = (c) => !!c.env?.[SSG_CONTEXT];
 const disableSSG = () => async function disableSSG2(c, next) {
   if (isSSGContext(c)) {
-    return SSG_DISABLED_RESPONSE;
+    c.header(X_HONO_DISABLE_SSG_HEADER_KEY, "true");
+    return c.notFound();
   }
   await next();
 };
@@ -50,6 +62,7 @@ const onlySSG = () => async function onlySSG2(c, next) {
 0 && (module.exports = {
   SSG_CONTEXT,
   SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG,
   isSSGContext,
   onlySSG,

package/dist/cjs/helper/ssg/ssg.js

@@ -109,7 +109,7 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
                       [import_middleware.SSG_CONTEXT]: true
                     })
                   );
-                  if (response === import_middleware.SSG_DISABLED_RESPONSE) {
+                  if (response.headers.get(import_middleware.X_HONO_DISABLE_SSG_HEADER_KEY)) {
                     resolveReq(void 0);
                     return;
                   }

package/dist/cjs/middleware/jsx-renderer/index.js

@@ -30,7 +30,7 @@ const RequestContext = (0, import_jsx.createContext)(null);
 const createRenderer = (c, Layout, component, options) => (children, props) => {
   const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
   const currentLayout = component ? (0, import_jsx.jsx)(
-    component,
+    (props2) => component(props2, c),
     {
       ...{ Layout, ...props }
     },
@@ -59,7 +59,7 @@ const jsxRenderer = (component, options) => function jsxRenderer2(c, next) {
   const Layout = c.getLayout() ?? import_jsx.Fragment;
   if (component) {
     c.setLayout((props) => {
-      return component({ ...props, Layout });
+      return component({ ...props, Layout }, c);
     });
   }
   c.setRenderer(createRenderer(c, Layout, component, options));

package/dist/client/client.js

@@ -1,6 +1,12 @@
 // src/client/client.ts
 import { serialize } from "../utils/cookie.js";
-import { deepMerge, mergePath, removeIndexString, replaceUrlParam } from "./utils.js";
+import {
+  deepMerge,
+  mergePath,
+  removeIndexString,
+  replaceUrlParam,
+  replaceUrlProtocol
+} from "./utils.js";
 var createProxy = (callback, path) => {
   const proxy = new Proxy(() => {
   }, {
@@ -30,7 +36,7 @@ var ClientRequestImpl = class {
     this.url = url;
     this.method = method;
   }
-  fetch = (args, opt) => {
+  fetch = async (args, opt) => {
     if (args) {
       if (args.query) {
         for (const [k, v] of Object.entries(args.query)) {
@@ -66,7 +72,7 @@ var ClientRequestImpl = class {
     let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     const headerValues = {
       ...args?.header ?? {},
-      ...opt?.headers ? opt.headers : {}
+      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
     };
     if (args?.cookie) {
       const cookies = [];
@@ -112,7 +118,10 @@ var hc = (baseUrl, options) => createProxy((opts) => {
     return new URL(url);
   }
   if (method === "ws") {
-    const targetUrl = opts.args[0] && opts.args[0].param ? replaceUrlParam(url, opts.args[0].param) : url;
+    const targetUrl = replaceUrlProtocol(
+      opts.args[0] && opts.args[0].param ? replaceUrlParam(url, opts.args[0].param) : url,
+      "ws"
+    );
     return new WebSocket(targetUrl);
   }
   const req = new ClientRequestImpl(url, method);

package/dist/client/utils.js

@@ -12,6 +12,14 @@ var replaceUrlParam = (urlString, params) => {
   }
   return urlString;
 };
+var replaceUrlProtocol = (urlString, protocol) => {
+  switch (protocol) {
+    case "ws":
+      return urlString.replace(/^http/, "ws");
+    case "http":
+      return urlString.replace(/^ws/, "http");
+  }
+};
 var removeIndexString = (urlSting) => {
   return urlSting.replace(/\/index$/, "");
 };
@@ -37,5 +45,6 @@ export {
   deepMerge,
   mergePath,
   removeIndexString,
-  replaceUrlParam
+  replaceUrlParam,
+  replaceUrlProtocol
 };

package/dist/helper/ssg/index.js

@@ -1,8 +1,14 @@
 // src/helper/ssg/index.ts
 export * from "./ssg.js";
-import { SSG_DISABLED_RESPONSE, ssgParams, isSSGContext, disableSSG, onlySSG } from "./middleware.js";
+import {
+  X_HONO_DISABLE_SSG_HEADER_KEY,
+  ssgParams,
+  isSSGContext,
+  disableSSG,
+  onlySSG
+} from "./middleware.js";
 export {
-  SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG,
   isSSGContext,
   onlySSG,

package/dist/helper/ssg/middleware.js

@@ -1,6 +1,16 @@
 // src/helper/ssg/middleware.ts
 var SSG_CONTEXT = "HONO_SSG_CONTEXT";
-var SSG_DISABLED_RESPONSE = new Response("SSG is disabled", { status: 404 });
+var X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+var SSG_DISABLED_RESPONSE = (() => {
+  try {
+    return new Response("SSG is disabled", {
+      status: 404,
+      headers: { [X_HONO_DISABLE_SSG_HEADER_KEY]: "true" }
+    });
+  } catch (e) {
+    return null;
+  }
+})();
 var ssgParams = (params) => async (c, next) => {
   ;
   c.req.raw.ssgParams = Array.isArray(params) ? params : await params(c);
@@ -9,7 +19,8 @@ var ssgParams = (params) => async (c, next) => {
 var isSSGContext = (c) => !!c.env?.[SSG_CONTEXT];
 var disableSSG = () => async function disableSSG2(c, next) {
   if (isSSGContext(c)) {
-    return SSG_DISABLED_RESPONSE;
+    c.header(X_HONO_DISABLE_SSG_HEADER_KEY, "true");
+    return c.notFound();
   }
   await next();
 };
@@ -22,6 +33,7 @@ var onlySSG = () => async function onlySSG2(c, next) {
 export {
   SSG_CONTEXT,
   SSG_DISABLED_RESPONSE,
+  X_HONO_DISABLE_SSG_HEADER_KEY,
   disableSSG,
   isSSGContext,
   onlySSG,

package/dist/helper/ssg/ssg.js

@@ -2,7 +2,7 @@
 import { replaceUrlParam } from "../../client/utils.js";
 import { createPool } from "../../utils/concurrent.js";
 import { getExtension } from "../../utils/mime.js";
-import { SSG_DISABLED_RESPONSE, SSG_CONTEXT } from "./middleware.js";
+import { X_HONO_DISABLE_SSG_HEADER_KEY, SSG_CONTEXT } from "./middleware.js";
 import { joinPaths, dirname, filterStaticGenerateRoutes } from "./utils.js";
 var DEFAULT_CONCURRENCY = 2;
 var generateFilePath = (routePath, outDir, mimeType, extensionMap) => {
@@ -84,7 +84,7 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
                       [SSG_CONTEXT]: true
                     })
                   );
-                  if (response === SSG_DISABLED_RESPONSE) {
+                  if (response.headers.get(X_HONO_DISABLE_SSG_HEADER_KEY)) {
                     resolveReq(void 0);
                     return;
                   }

package/dist/middleware/jsx-renderer/index.js

@@ -6,7 +6,7 @@ var RequestContext = createContext(null);
 var createRenderer = (c, Layout, component, options) => (children, props) => {
   const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
   const currentLayout = component ? jsx(
-    component,
+    (props2) => component(props2, c),
     {
       ...{ Layout, ...props }
     },
@@ -35,7 +35,7 @@ var jsxRenderer = (component, options) => function jsxRenderer2(c, next) {
   const Layout = c.getLayout() ?? Fragment;
   if (component) {
     c.setLayout((props) => {
-      return component({ ...props, Layout });
+      return component({ ...props, Layout }, c);
     });
   }
   c.setRenderer(createRenderer(c, Layout, component, options));

package/dist/types/client/types.d.ts

@@ -4,10 +4,10 @@ import type { Schema } from '../types';
 import type { HasRequiredKeys } from '../utils/types';
 type HonoRequest = (typeof Hono.prototype)['request'];
 export type ClientRequestOptions<T = unknown> = keyof T extends never ? {
-    headers?: Record<string, string>;
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     fetch?: typeof fetch | HonoRequest;
 } : {
-    headers: T;
+    headers: T | (() => T | Promise<T>);
     fetch?: typeof fetch | HonoRequest;
 };
 export type ClientRequest<S extends Schema> = {
@@ -32,7 +32,7 @@ export type ClientRequest<S extends Schema> = {
         input: infer I;
     } ? (args?: Omit<I, 'json'>) => WebSocket : never : never;
 };
-type BlankRecordToNever<T> = T extends any ? (keyof T extends never ? never : T) : never;
+type BlankRecordToNever<T> = T extends any ? T extends null ? null : keyof T extends never ? never : T : never;
 export interface ClientResponse<T> {
     readonly body: ReadableStream | null;
     readonly bodyUsed: boolean;

package/dist/types/client/utils.d.ts

@@ -1,4 +1,5 @@
 export declare const mergePath: (base: string, path: string) => string;
 export declare const replaceUrlParam: (urlString: string, params: Record<string, string>) => string;
+export declare const replaceUrlProtocol: (urlString: string, protocol: 'ws' | 'http') => string;
 export declare const removeIndexString: (urlSting: string) => string;
 export declare function deepMerge<T>(target: T, source: Record<string, unknown>): T;

package/dist/types/helper/ssg/index.d.ts

@@ -1,2 +1,2 @@
 export * from './ssg';
-export { SSG_DISABLED_RESPONSE, ssgParams, isSSGContext, disableSSG, onlySSG } from './middleware';
+export { X_HONO_DISABLE_SSG_HEADER_KEY, ssgParams, isSSGContext, disableSSG, onlySSG, } from './middleware';

package/dist/types/helper/ssg/middleware.d.ts

@@ -1,6 +1,12 @@
 import type { Context } from '../../context';
 import type { Env, MiddlewareHandler } from '../../types';
 export declare const SSG_CONTEXT = "HONO_SSG_CONTEXT";
+export declare const X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+/**
+ * @deprecated
+ * Use `X_HONO_DISABLE_SSG_HEADER_KEY` instead.
+ * This constant will be removed in the next minor version.
+ */
 export declare const SSG_DISABLED_RESPONSE: Response;
 interface SSGParam {
     [key: string]: string;

package/dist/types/middleware/jsx-renderer/index.d.ts

@@ -1,13 +1,15 @@
 import type { Context, PropsForRenderer } from '../../context';
 import type { FC, PropsWithChildren } from '../../jsx';
 import type { Env, Input, MiddlewareHandler } from '../../types';
+import type { HtmlEscapedString } from '../../utils/html';
 export declare const RequestContext: import("../../jsx").Context<Context<any, any, {}> | null>;
 type RendererOptions = {
     docType?: boolean | string;
     stream?: boolean | Record<string, string>;
 };
-export declare const jsxRenderer: (component?: FC<PropsWithChildren<PropsForRenderer & {
+type ComponentWithChildren = (props: PropsWithChildren<PropsForRenderer & {
     Layout: FC;
-}>>, options?: RendererOptions) => MiddlewareHandler;
+}>, c: Context) => HtmlEscapedString | Promise<HtmlEscapedString>;
+export declare const jsxRenderer: (component?: ComponentWithChildren, options?: RendererOptions) => MiddlewareHandler;
 export declare const useRequestContext: <E extends Env = any, P extends string = any, I extends Input = {}>() => Context<E, P, I>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -382,6 +382,9 @@
       "etag": [
         "./dist/types/middleware/etag"
       ],
+      "trailing-slash": [
+        "./dist/types/middleware/trailing-slash"
+      ],
       "html": [
         "./dist/types/helper/html"
       ],