hono 4.3.0 → 4.3.2

package/dist/types/types.d.ts

@@ -1,7 +1,7 @@
 import type { Context } from './context';
 import type { Hono } from './hono';
 import type { StatusCode } from './utils/http-status';
-import type { IfAnyThenEmptyObject, JSONValue, Prettify, RemoveBlankRecord, UnionToIntersection } from './utils/types';
+import type { IfAnyThenEmptyObject, IsAny, JSONValue, Prettify, RemoveBlankRecord, Simplify, UnionToIntersection } from './utils/types';
 export type Bindings = Record<string, unknown>;
 export type Variables = Record<string, unknown>;
 export type Env = {
@@ -9,6 +9,7 @@ export type Env = {
     Variables?: Variables;
 };
 export type Next = () => Promise<void>;
+export type ExtractInput<I extends Input | Input['in']> = I extends Input ? unknown extends I['in'] ? {} : I['in'] : I;
 export type Input = {
     in?: {};
     out?: {};
@@ -361,16 +362,27 @@ export interface OnHandlerInterface<E extends Env = Env, S extends Schema = {},
     <I extends Input = BlankInput, R extends HandlerResponse<any> = any>(methods: string | string[], paths: string[], ...handlers: H<E, any, I, R>[]): Hono<E, S & ToSchema<string, string, I, MergeTypedResponse<R>>, BasePath>;
 }
 type ExtractKey<S> = S extends Record<infer Key, unknown> ? Key extends string ? Key : never : string;
-export type ToSchema<M extends string, P extends string, I extends Input, R extends TypedResponse> = Prettify<{
+export type ToSchema<M extends string, P extends string, I extends Input | Input['in'], RorO> = Prettify<{
     [K in P]: {
-        [K2 in M as AddDollar<K2>]: R extends TypedResponse<infer T, infer U, infer F> ? {
-            input: unknown extends I['in'] ? AddParam<{}, P> : AddParam<I['in'], P>;
+        [K2 in M as AddDollar<K2>]: Simplify<{
+            input: AddParam<ExtractInput<I>, P>;
+        } & (IsAny<RorO> extends true ? {
+            output: {};
+            outputFormat: ResponseFormat;
+            status: StatusCode;
+        } : RorO extends TypedResponse<infer T, infer U, infer F> ? {
             output: unknown extends T ? {} : T;
             outputFormat: I extends {
                 outputFormat: string;
-            } ? I['outputFormat'] : unknown extends F ? never : F;
+            } ? I['outputFormat'] : F;
             status: U;
-        } : never;
+        } : {
+            output: unknown extends RorO ? {} : RorO;
+            outputFormat: unknown extends RorO ? 'json' : I extends {
+                outputFormat: string;
+            } ? I['outputFormat'] : 'json';
+            status: StatusCode;
+        })>;
     };
 }>;
 export type Schema = {
@@ -394,29 +406,30 @@ type FlattenIfIntersect<T> = T extends infer O ? {
 } : never;
 export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = Prettify<{
     [P in keyof OrigSchema as MergePath<SubPath, P & string>]: {
-        [M in keyof OrigSchema[P]]: OrigSchema[P][M] extends {
-            input: infer Input;
-            output: infer Output;
-            outputFormat: infer OutputFormat;
-            status: infer Status;
-        } ? {
-            input: Input extends {
-                param: infer _;
-            } ? ExtractParams<SubPath> extends never ? Input : FlattenIfIntersect<Input & {
-                param: {
-                    [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}` ? Prefix : K]: string;
-                };
-            }> : RemoveBlankRecord<ExtractParams<SubPath>> extends never ? Input : Input & {
-                param: {
-                    [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}` ? Prefix : K]: string;
-                };
-            };
-            output: Output;
-            outputFormat: OutputFormat;
-            status: Status;
-        } : never;
+        [M in keyof OrigSchema[P]]: MergeEndpointParamsWithPath<OrigSchema[P][M], SubPath>;
     };
 }>;
+type MergeEndpointParamsWithPath<T, SubPath extends string> = T extends {
+    input: infer Input;
+    output: infer Output;
+    outputFormat: infer OutputFormat;
+    status: infer Status;
+} ? {
+    input: Input extends {
+        param: infer _;
+    } ? ExtractParams<SubPath> extends never ? Input : FlattenIfIntersect<Input & {
+        param: {
+            [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}` ? Prefix : K]: string;
+        };
+    }> : RemoveBlankRecord<ExtractParams<SubPath>> extends never ? Input : Input & {
+        param: {
+            [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}` ? Prefix : K]: string;
+        };
+    };
+    output: Output;
+    outputFormat: OutputFormat;
+    status: Status;
+} : never;
 export type AddParam<I, P extends string> = ParamKeys<P> extends never ? I : I extends {
     param: infer _;
 } ? I : I & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",