@taserjs/router 0.1.7 → 0.1.9

package/dist/cjs/define/middleware.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.cjs","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { createMiddlewareUnitBuilder } from \"../builder/middleware-unit.js\";\nimport type {\n  DefineMiddlewareResult,\n  ExtractState,\n  IsUnknown,\n  MiddlewareRequirements,\n  MiddlewareUnitBuilder,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  AppContext,\n  LayoutId,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  /**\n   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware<{ user: string }>()\n   *   .query(z.object({ token: z.string() }))\n   *   .body(\"form\", z.object({ file: z.instanceof(File) }))\n   *   .returns({ 401: z.string() })\n   *   .handler(async (ctx, next) => next({ user: \"alice\" }));\n   * ```\n   */\n  <TState = unknown>(): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    {},\n    TAppContext,\n    {},\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.\n   */\n  <const Layout extends LayoutId, TState = unknown>(\n    layout: Layout,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    {},\n    TAppContext,\n    ResolveLayoutMiddlewaresState<Layout>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.\n   */\n  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(\n    layouts: Layouts,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    {},\n    TAppContext,\n    ResolveLayoutsState<Layouts>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <\n    const Layout extends LayoutId,\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to multiple layout branches using a short function signature.\n   */\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone, unscoped middleware using a short function signature.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware((ctx, next) => {\n   *   return next({ user: \"alice\" });\n   * });\n   * ```\n   */\n  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(\n    fn: (\n      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    TRequires\n  >;\n}\n\nexport const middleware: MiddlewareFn<AppContext> = function middleware(\n  first?: any,\n  second?: any,\n): any {\n  if (first === undefined) {\n    return createMiddlewareUnitBuilder();\n  }\n\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    if (typeof second === \"function\") {\n      return {\n        handler: second,\n        __middlewareAcc: undefined as unknown,\n        __requiredLayouts: first,\n      };\n    }\n    return createMiddlewareUnitBuilder(first);\n  }\n\n  if (typeof first === \"function\") {\n    return {\n      handler: first,\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  return createMiddlewareUnitBuilder();\n};\n"],"mappings":";;AAyLA,IAAa,aAAuC,SAAS,WAC3D,OACA,QACK;CACL,IAAI,UAAU,KAAA,GACZ,OAAO,wBAAA,4BAA4B;CAGrC,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,IAAI,OAAO,WAAW,YACpB,OAAO;GACL,SAAS;GACT,iBAAiB,KAAA;GACjB,mBAAmB;EACrB;EAEF,OAAO,wBAAA,4BAA4B,KAAK;CAC1C;CAEA,IAAI,OAAO,UAAU,YACnB,OAAO;EACL,SAAS;EACT,iBAAiB,KAAA;CACnB;CAGF,OAAO,wBAAA,4BAA4B;AACrC"}
+{"version":3,"file":"middleware.cjs","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { createMiddlewareUnitBuilder } from \"../builder/middleware-unit.js\";\nimport type {\n  DefineMiddlewareResult,\n  ExtractState,\n  IsUnknown,\n  MiddlewareRequirements,\n  MiddlewareUnitBuilder,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  AppContext,\n  LayoutId,\n  LayoutParams,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  /**\n   * Defines a standalone, unscoped middleware using a short function signature.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware((ctx, next) => {\n   *   return next({ user: \"alice\" });\n   * });\n   * ```\n   */\n  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(\n    fn: (\n      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    TRequires\n  >;\n\n  /**\n   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware<{ user: string }>()\n   *   .query(z.object({ token: z.string() }))\n   *   .body(\"form\", z.object({ file: z.instanceof(File) }))\n   *   .returns({ 401: z.string() })\n   *   .handler(async (ctx, next) => next({ user: \"alice\" }));\n   * ```\n   */\n  <TState = unknown>(): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    {},\n    TAppContext,\n    {},\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <\n    const Layout extends LayoutId,\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        LayoutParams<Layout>,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to multiple layout branches using a short function signature.\n   */\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        LayoutParams<Layouts[number]>,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    TRequires\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.\n   */\n  <const Layout extends LayoutId, TState = unknown>(\n    layout: Layout,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    LayoutParams<Layout>,\n    unknown,\n    {},\n    Layout,\n    {},\n    TAppContext,\n    ResolveLayoutMiddlewaresState<Layout>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.\n   */\n  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(\n    layouts: Layouts,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    LayoutParams<Layouts[number]>,\n    unknown,\n    {},\n    Layouts,\n    {},\n    TAppContext,\n    ResolveLayoutsState<Layouts>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n}\n\nexport const middleware: MiddlewareFn<AppContext> = function middleware(\n  first?: any,\n  second?: any,\n): any {\n  if (first === undefined) {\n    return createMiddlewareUnitBuilder();\n  }\n\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    if (typeof second === \"function\") {\n      return {\n        handler: second,\n        __middlewareAcc: undefined as unknown,\n        __requiredLayouts: first,\n      };\n    }\n    return createMiddlewareUnitBuilder(first);\n  }\n\n  if (typeof first === \"function\") {\n    return {\n      handler: first,\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  return createMiddlewareUnitBuilder();\n};\n"],"mappings":";;AA0LA,IAAa,aAAuC,SAAS,WAC3D,OACA,QACK;CACL,IAAI,UAAU,KAAA,GACZ,OAAO,wBAAA,4BAA4B;CAGrC,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,IAAI,OAAO,WAAW,YACpB,OAAO;GACL,SAAS;GACT,iBAAiB,KAAA;GACjB,mBAAmB;EACrB;EAEF,OAAO,wBAAA,4BAA4B,KAAK;CAC1C;CAEA,IAAI,OAAO,UAAU,YACnB,OAAO;EACL,SAAS;EACT,iBAAiB,KAAA;CACnB;CAGF,OAAO,wBAAA,4BAA4B;AACrC"}

package/dist/cjs/define/middleware.d.cts

@@ -1,6 +1,17 @@
 import { DefineMiddlewareResult, ExtractState, IsUnknown, MiddlewareRequirements, MiddlewareUnitBuilder, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
-import { AppContext, LayoutId, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
+import { AppContext, LayoutId, LayoutParams, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
 export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
+    /**
+     * Defines a standalone, unscoped middleware using a short function signature.
+     *
+     * @example
+     * ```ts
+     * const auth = middleware((ctx, next) => {
+     *   return next({ user: "alice" });
+     * });
+     * ```
+     */
+    <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
     /**
      * Constructs a fluent unscoped middleware builder, with optional explicit State generic.
      *
@@ -14,32 +25,21 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
      * ```
      */
     <TState = unknown>(): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, null, {}, TAppContext, {}, unknown, unknown, unknown, TState>;
-    /**
-     * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
-     */
-    <const Layout extends LayoutId, TState = unknown>(layout: Layout): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layout, {}, TAppContext, ResolveLayoutMiddlewaresState<Layout>, unknown, unknown, unknown, TState>;
-    /**
-     * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
-     */
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(layouts: Layouts): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layouts, {}, TAppContext, ResolveLayoutsState<Layouts>, unknown, unknown, unknown, TState>;
     /**
      * Defines a standalone middleware scoped to a single layout branch using a short function signature.
      */
-    <const Layout extends LayoutId, TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
+    <const Layout extends LayoutId, TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, LayoutParams<Layout>, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
     /**
      * Defines a standalone middleware scoped to multiple layout branches using a short function signature.
      */
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutsState<Layouts>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, LayoutParams<Layouts[number]>, unknown, TAppContext, ResolveLayoutsState<Layouts>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
     /**
-     * Defines a standalone, unscoped middleware using a short function signature.
-     *
-     * @example
-     * ```ts
-     * const auth = middleware((ctx, next) => {
-     *   return next({ user: "alice" });
-     * });
-     * ```
+     * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
      */
-    <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
+    <const Layout extends LayoutId, TState = unknown>(layout: Layout): MiddlewareUnitBuilder<unknown, LayoutParams<Layout>, unknown, {}, Layout, {}, TAppContext, ResolveLayoutMiddlewaresState<Layout>, unknown, unknown, unknown, TState>;
+    /**
+     * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
+     */
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(layouts: Layouts): MiddlewareUnitBuilder<unknown, LayoutParams<Layouts[number]>, unknown, {}, Layouts, {}, TAppContext, ResolveLayoutsState<Layouts>, unknown, unknown, unknown, TState>;
 }
 export declare const middleware: MiddlewareFn<AppContext>;

package/dist/cjs/index.d.cts

@@ -1,6 +1,10 @@
 export interface RouterRegister {
 }
-export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
+export interface RouterMiddlewaresRegister {
+}
+export interface RouterRoutesRegister {
+}
+export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutMiddlewaresMap, LayoutParams, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
 export type { ContextDefinition, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, } from './types/app.js';
 export { ValidationError, validationErrorSchema } from '@taserjs/router-utils';
 export type { ResponseValidationFailureHandler, SuccessStatusCode } from '@taserjs/router-utils';

package/dist/cjs/middleware/hono-mw.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"hono-mw.cjs","names":[],"sources":["../../../src/middleware/hono-mw.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\n/**\n * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`\n * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.\n *\n * @example\n * ```ts\n * import { honoMw } from \"@taserjs/router\";\n * import { cors } from \"hono/cors\";\n *\n * const app = t.get(\"/hello\").use(honoMw(cors()));\n * // or\n * const customCors = middleware(honoMw(cors()));\n * ```\n */\nexport function honoMw(\n  middleware: MiddlewareHandler,\n): (ctx: unknown, next: any) => Promise<Response> {\n  return createTaserCompatHandler(middleware) as (ctx: unknown, next: any) => Promise<Response>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,SAAgB,OACd,YACgD;CAChD,QAAA,GAAA,qBAAA,yBAAA,CAAgC,UAAU;AAC5C"}
+{"version":3,"file":"hono-mw.cjs","names":[],"sources":["../../../src/middleware/hono-mw.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\nimport type { NextFn } from \"../types/units.js\";\n\n/**\n * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`\n * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.\n *\n * @example\n * ```ts\n * import { honoMw } from \"@taserjs/router\";\n * import { cors } from \"hono/cors\";\n *\n * const app = t.get(\"/hello\").use(honoMw(cors()));\n * // or\n * const customCors = middleware(honoMw(cors()));\n * ```\n */\nexport function honoMw<TState extends Record<string, unknown> = {}>(\n  middleware: MiddlewareHandler,\n): (ctx: unknown, next: NextFn<TState>) => Promise<Response> {\n  return createTaserCompatHandler(middleware) as (\n    ctx: unknown,\n    next: NextFn<TState>,\n  ) => Promise<Response>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAmBA,SAAgB,OACd,YAC2D;CAC3D,QAAA,GAAA,qBAAA,yBAAA,CAAgC,UAAU;AAI5C"}

package/dist/cjs/middleware/hono-mw.d.cts

@@ -1,4 +1,5 @@
 import { MiddlewareHandler } from 'hono';
+import { NextFn } from '../types/units.js';
 /**
  * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`
  * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.
@@ -13,4 +14,4 @@ import { MiddlewareHandler } from 'hono';
  * const customCors = middleware(honoMw(cors()));
  * ```
  */
-export declare function honoMw(middleware: MiddlewareHandler): (ctx: unknown, next: any) => Promise<Response>;
+export declare function honoMw<TState extends Record<string, unknown> = {}>(middleware: MiddlewareHandler): (ctx: unknown, next: NextFn<TState>) => Promise<Response>;

package/dist/cjs/types/index.d.cts

@@ -1,5 +1,5 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { RouterRegister } from '../index.js';
+import { RouterMiddlewaresRegister, RouterRegister, RouterRoutesRegister } from '../index.js';
 import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnionToIntersection, UnitRuntimeContext } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
@@ -21,7 +21,14 @@ export type LayoutId = RouterRegister extends {
 export type LayoutTree = RouterRegister extends {
     LayoutTree: infer T;
 } ? T : Record<never, never>;
-export type RouteByPathMethod = RouterRegister extends {
+export type LayoutMiddlewaresMap = RouterMiddlewaresRegister extends {
+    LayoutMiddlewares: infer M;
+} ? M : RouterRegister extends {
+    LayoutMiddlewares: infer M;
+} ? M : Record<never, never>;
+export type RouteByPathMethod = RouterRoutesRegister extends {
+    RouteByPathMethod: infer R;
+} ? R : RouterRegister extends {
     RouteByPathMethod: infer R;
 } ? R : Record<never, never>;
 export type LayoutBuilder<TAppContext extends Record<string, unknown> = AppContext> = <const Layout extends LayoutId>(layout: Layout) => MiddlewareBuilder<Layout, readonly [], TAppContext>;
@@ -31,21 +38,19 @@ type ParseParam<Segment extends string> = Segment extends "*" ? {
     [K in Name]: string;
 } : {};
 type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${infer Rest}` ? ParseParam<Segment> & ParseParamsFromSegments<Rest> : ParseParam<S>;
-export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : {};
+export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : ParseParamsFromSegments<Path>;
+export type LayoutParams<Layout extends string> = PathParams<Layout>;
 export type ResolveParams<TPathParams, TSchemaParams> = TSchemaParams extends Record<string, unknown> ? [keyof TSchemaParams] extends [never] ? TPathParams : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams> : TPathParams;
-type LayoutParentsMap = RouterRegister extends {
-    LayoutParents: infer LP extends Record<string, unknown>;
-} ? LP : {};
-type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutParentsMap ? LayoutParentsMap[Layout] extends LayoutId ? LayoutParentsMap[Layout] : null : LayoutTree[Layout] extends {
-    parent: infer Parent extends LayoutId | null;
-} ? Parent : null;
-type LayoutMiddlewares<Layout extends LayoutId> = LayoutTree[Layout]["middlewares"] extends {
+type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutTree ? LayoutTree[Layout] extends {
+    parent: infer P extends LayoutId;
+} ? P : null : null;
+type LayoutMiddlewares<Layout extends LayoutId> = [Layout] extends [keyof LayoutMiddlewaresMap] ? LayoutMiddlewaresMap[Layout] extends {
     readonly __acc?: infer Acc extends readonly unknown[];
-} ? Acc : LayoutTree[Layout]["middlewares"] extends infer Acc extends readonly unknown[] ? Acc : readonly [];
-type ResolveLayoutMiddlewares<Layout extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : Layout extends LayoutId ? readonly [
-    ...ResolveLayoutMiddlewares<LayoutParent<Layout>, [...Depth, unknown]>,
+} ? Acc : LayoutMiddlewaresMap[Layout] extends readonly unknown[] ? LayoutMiddlewaresMap[Layout] : readonly [] : readonly [];
+type ResolveLayoutMiddlewares<Layout extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : [Layout] extends [LayoutId] ? LayoutParent<Layout> extends infer Parent extends LayoutId ? readonly [
+    ...ResolveLayoutMiddlewares<Parent, [...Depth, unknown]>,
     ...LayoutMiddlewares<Layout>
-] : readonly [];
+] : readonly [...LayoutMiddlewares<Layout>] : readonly [];
 export type ResolveLayoutIdChain<L extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : L extends LayoutId ? readonly [...ResolveLayoutIdChain<LayoutParent<L>, [...Depth, unknown]>, L] : readonly [];
 export type ResolveLayoutMiddlewaresState<Layout extends LayoutId | null> = Layout extends LayoutId ? MergeMiddlewareField<ResolveLayoutMiddlewares<Layout>, "state"> : {};
 export type ResolveLayoutsState<Layouts extends LayoutId | readonly LayoutId[]> = Layouts extends LayoutId ? ResolveLayoutMiddlewaresState<Layouts> : Layouts extends readonly LayoutId[] ? UnionToIntersection<Layouts[number] extends infer L extends LayoutId ? ResolveLayoutMiddlewaresState<L> : never> : {};
@@ -60,21 +65,18 @@ type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain ex
 type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMethod[Path] extends {
     [K in TMethod]: infer Entry;
 } ? Entry : never;
-type RouteParent<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
-    parent: infer Parent extends LayoutId | null;
-} ? Parent : null;
 type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
-    layoutChain: infer Chain extends readonly LayoutId[];
-} ? Chain : RouteParent<Path, TMethod> extends LayoutId ? readonly [RouteParent<Path, TMethod>] : readonly [];
+    layouts: infer Chain extends readonly LayoutId[];
+} ? Chain : readonly [];
 export type RouteLayoutMiddlewares<Path extends RoutePath, TMethod extends Method> = ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>;
 export type RouteLayoutField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
 export type RouteLayoutInputField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body"> = MergeMiddlewareInputField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
 type RouteResolvedField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = RouteLayoutField<Path, TMethod, Field> & MergeMiddlewareField<Acc, Field>;
 export type RouteChainContext<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
-    query: Simplify<MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>>;
-    params: Simplify<ResolveParams<PathParams<Path>, MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>>>;
-    body: Simplify<MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>>;
-    state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
+    query: MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>;
+    params: ResolveParams<PathParams<Path>, MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>>;
+    body: MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>;
+    state: RouteResolvedField<Path, TMethod, Acc, "state">;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -167,23 +169,23 @@ export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Meth
         Input: infer I;
     };
 } ? I : never : never;
-export type MiddlewareLayoutField<Layout extends LayoutId, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
+export type MiddlewareLayoutField<Layout extends LayoutId, Field extends "query" | "params" | "body" | "state"> = [LayoutParent<Layout>] extends [infer Parent extends LayoutId] ? MergeMiddlewareField<ResolveLayoutMiddlewares<Parent>, Field> : {};
 type MiddlewareChainField<Layout extends LayoutId, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = MiddlewareLayoutField<Layout, Field> & MergeMiddlewareField<Acc, Field>;
-export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
+export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & {
+    readonly request: Request;
+    readonly method: Method;
+    readonly url: URL;
+    readonly headers: TaserHeaders;
+    readonly cookies: TaserCookieJar;
     query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
-    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
+    params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>>>;
     body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
     state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
-    headers: TaserHeaders;
-    cookies: TaserCookieJar;
 }>;
 export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = {
     readonly layout: Layout;
     readonly middlewares: readonly MiddlewareDefinition[];
     readonly __acc?: Acc;
-    readonly $Infer: {
-        Context: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>;
-    };
     use<TAcc, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}>(unit: [
         IsLayoutAllowed<TRequiredLayouts, ResolveLayoutIdChain<Layout>>,
         IsRequirementsSatisfied<{
@@ -192,19 +194,18 @@ export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unkn
             body: MiddlewareChainField<Layout, Acc, "body">;
             state: MiddlewareChainField<Layout, Acc, "state">;
         }, TRequires>
-    ] extends [true, true] ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires> : {
-        error: "Middleware cannot be attached to this layout";
-        requiredLayouts: TRequiredLayouts;
-        layoutChain: ResolveLayoutIdChain<Layout>;
-        requirements: TRequires;
-        actual: {
-            query: MiddlewareChainField<Layout, Acc, "query">;
-            params: MiddlewareChainField<Layout, Acc, "params">;
-            body: MiddlewareChainField<Layout, Acc, "body">;
-            state: MiddlewareChainField<Layout, Acc, "state">;
-        };
-    }): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
-    use<R = unknown>(fn: (ctx: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;
+    ] extends [true, true] ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires> : never): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
+    use<R = unknown>(fn: (ctx: Simplify<TAppContext & {
+        readonly request: Request;
+        readonly method: Method;
+        readonly url: URL;
+        readonly headers: TaserHeaders;
+        readonly cookies: TaserCookieJar;
+        query: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "query">>>;
+        params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>>>;
+        body: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "body">>>;
+        state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
+    }>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;
 };
 export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = {
     readonly path: Path;
@@ -274,18 +275,7 @@ export type RouteMiddlewareBuilder<Path extends RoutePath, TMethod extends Metho
             body: RouteResolvedField<Path, TMethod, Acc, "body">;
             state: RouteResolvedField<Path, TMethod, Acc, "state">;
         }, TRequires>
-    ] extends [true, true] ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires> : {
-        error: "Middleware cannot be attached to this route";
-        requiredLayouts: TRequiredLayouts;
-        routeLayoutChain: RouteLayoutChain<Path, TMethod>;
-        requirements: TRequires;
-        actual: {
-            query: RouteResolvedField<Path, TMethod, Acc, "query">;
-            params: ResolveParams<PathParams<Path>, RouteResolvedField<Path, TMethod, Acc, "params">>;
-            body: RouteResolvedField<Path, TMethod, Acc, "body">;
-            state: RouteResolvedField<Path, TMethod, Acc, "state">;
-        };
-    }): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
+    ] extends [true, true] ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires> : never): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
     use<R = unknown>(fn: (ctx: RouteChainContext<Path, TMethod, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], Validators, TReturns, TAppContext>;
 };
 export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = RouteMiddlewareBuilder<Path, TMethod, Acc, Validators, TReturns, TAppContext>;

package/dist/cjs/types/type-utils.d.cts

@@ -7,9 +7,9 @@ export type MiddlewareInputFieldName = "query" | "params" | "body";
 export type UnwrapPart<T> = unknown extends T ? {} : T;
 export type MergePart<T, Base> = unknown extends T ? Base : Base & T;
 /** Collapse intersections so `Omit`/`keyof` treat the result as one object type. */
-export type Simplify<T> = {
-    [K in keyof T]: T[K];
-} & {};
+export type Simplify<T> = [T] extends [infer U] ? {
+    [K in keyof U]: U[K];
+} : never;
 /**
  * Request prop: when schema input is `unknown` (e.g. zod coerce),
  * fall back to the validated output type.

package/dist/cjs/types/units.d.cts

@@ -26,10 +26,10 @@ export type IsUnknown<T> = [unknown] extends [T] ? true : false;
 export type NextFn<TExpectedState = unknown> = IsUnknown<TExpectedState> extends true ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>> : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;
 export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
-    query: Simplify<UnwrapPart<TQuery>>;
-    params: Simplify<UnwrapPart<TParams>>;
-    body: Simplify<UnwrapPart<TBody>>;
-    state: Simplify<UnwrapPart<TState>>;
+    query: UnwrapPart<TQuery>;
+    params: UnwrapPart<TParams>;
+    body: UnwrapPart<TBody>;
+    state: UnwrapPart<TState>;
     /** Pre-parse shapes merged into route `$Infer.Input`. */
     input: {
         query: RequestShape<TQueryIn, TQuery>;

package/dist/esm/define/middleware.d.ts

@@ -1,6 +1,17 @@
 import { DefineMiddlewareResult, ExtractState, IsUnknown, MiddlewareRequirements, MiddlewareUnitBuilder, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
-import { AppContext, LayoutId, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
+import { AppContext, LayoutId, LayoutParams, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
 export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
+    /**
+     * Defines a standalone, unscoped middleware using a short function signature.
+     *
+     * @example
+     * ```ts
+     * const auth = middleware((ctx, next) => {
+     *   return next({ user: "alice" });
+     * });
+     * ```
+     */
+    <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
     /**
      * Constructs a fluent unscoped middleware builder, with optional explicit State generic.
      *
@@ -14,32 +25,21 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
      * ```
      */
     <TState = unknown>(): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, null, {}, TAppContext, {}, unknown, unknown, unknown, TState>;
-    /**
-     * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
-     */
-    <const Layout extends LayoutId, TState = unknown>(layout: Layout): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layout, {}, TAppContext, ResolveLayoutMiddlewaresState<Layout>, unknown, unknown, unknown, TState>;
-    /**
-     * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
-     */
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(layouts: Layouts): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layouts, {}, TAppContext, ResolveLayoutsState<Layouts>, unknown, unknown, unknown, TState>;
     /**
      * Defines a standalone middleware scoped to a single layout branch using a short function signature.
      */
-    <const Layout extends LayoutId, TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
+    <const Layout extends LayoutId, TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, LayoutParams<Layout>, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
     /**
      * Defines a standalone middleware scoped to multiple layout branches using a short function signature.
      */
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutsState<Layouts>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, LayoutParams<Layouts[number]>, unknown, TAppContext, ResolveLayoutsState<Layouts>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
     /**
-     * Defines a standalone, unscoped middleware using a short function signature.
-     *
-     * @example
-     * ```ts
-     * const auth = middleware((ctx, next) => {
-     *   return next({ user: "alice" });
-     * });
-     * ```
+     * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
      */
-    <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
+    <const Layout extends LayoutId, TState = unknown>(layout: Layout): MiddlewareUnitBuilder<unknown, LayoutParams<Layout>, unknown, {}, Layout, {}, TAppContext, ResolveLayoutMiddlewaresState<Layout>, unknown, unknown, unknown, TState>;
+    /**
+     * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
+     */
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(layouts: Layouts): MiddlewareUnitBuilder<unknown, LayoutParams<Layouts[number]>, unknown, {}, Layouts, {}, TAppContext, ResolveLayoutsState<Layouts>, unknown, unknown, unknown, TState>;
 }
 export declare const middleware: MiddlewareFn<AppContext>;

package/dist/esm/define/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { createMiddlewareUnitBuilder } from \"../builder/middleware-unit.js\";\nimport type {\n  DefineMiddlewareResult,\n  ExtractState,\n  IsUnknown,\n  MiddlewareRequirements,\n  MiddlewareUnitBuilder,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  AppContext,\n  LayoutId,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  /**\n   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware<{ user: string }>()\n   *   .query(z.object({ token: z.string() }))\n   *   .body(\"form\", z.object({ file: z.instanceof(File) }))\n   *   .returns({ 401: z.string() })\n   *   .handler(async (ctx, next) => next({ user: \"alice\" }));\n   * ```\n   */\n  <TState = unknown>(): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    {},\n    TAppContext,\n    {},\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.\n   */\n  <const Layout extends LayoutId, TState = unknown>(\n    layout: Layout,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    {},\n    TAppContext,\n    ResolveLayoutMiddlewaresState<Layout>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.\n   */\n  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(\n    layouts: Layouts,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    {},\n    TAppContext,\n    ResolveLayoutsState<Layouts>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <\n    const Layout extends LayoutId,\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to multiple layout branches using a short function signature.\n   */\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone, unscoped middleware using a short function signature.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware((ctx, next) => {\n   *   return next({ user: \"alice\" });\n   * });\n   * ```\n   */\n  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(\n    fn: (\n      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    TRequires\n  >;\n}\n\nexport const middleware: MiddlewareFn<AppContext> = function middleware(\n  first?: any,\n  second?: any,\n): any {\n  if (first === undefined) {\n    return createMiddlewareUnitBuilder();\n  }\n\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    if (typeof second === \"function\") {\n      return {\n        handler: second,\n        __middlewareAcc: undefined as unknown,\n        __requiredLayouts: first,\n      };\n    }\n    return createMiddlewareUnitBuilder(first);\n  }\n\n  if (typeof first === \"function\") {\n    return {\n      handler: first,\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  return createMiddlewareUnitBuilder();\n};\n"],"mappings":";;AAyLA,IAAa,aAAuC,SAAS,WAC3D,OACA,QACK;CACL,IAAI,UAAU,KAAA,GACZ,OAAO,4BAA4B;CAGrC,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,IAAI,OAAO,WAAW,YACpB,OAAO;GACL,SAAS;GACT,iBAAiB,KAAA;GACjB,mBAAmB;EACrB;EAEF,OAAO,4BAA4B,KAAK;CAC1C;CAEA,IAAI,OAAO,UAAU,YACnB,OAAO;EACL,SAAS;EACT,iBAAiB,KAAA;CACnB;CAGF,OAAO,4BAA4B;AACrC"}
+{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { createMiddlewareUnitBuilder } from \"../builder/middleware-unit.js\";\nimport type {\n  DefineMiddlewareResult,\n  ExtractState,\n  IsUnknown,\n  MiddlewareRequirements,\n  MiddlewareUnitBuilder,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  AppContext,\n  LayoutId,\n  LayoutParams,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  /**\n   * Defines a standalone, unscoped middleware using a short function signature.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware((ctx, next) => {\n   *   return next({ user: \"alice\" });\n   * });\n   * ```\n   */\n  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(\n    fn: (\n      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    TRequires\n  >;\n\n  /**\n   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.\n   *\n   * @example\n   * ```ts\n   * const auth = middleware<{ user: string }>()\n   *   .query(z.object({ token: z.string() }))\n   *   .body(\"form\", z.object({ file: z.instanceof(File) }))\n   *   .returns({ 401: z.string() })\n   *   .handler(async (ctx, next) => next({ user: \"alice\" }));\n   * ```\n   */\n  <TState = unknown>(): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    {},\n    TAppContext,\n    {},\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <\n    const Layout extends LayoutId,\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        LayoutParams<Layout>,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to multiple layout branches using a short function signature.\n   */\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires extends MiddlewareRequirements = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        LayoutParams<Layouts[number]>,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts>,\n        TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => R,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    TRequires\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.\n   */\n  <const Layout extends LayoutId, TState = unknown>(\n    layout: Layout,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    LayoutParams<Layout>,\n    unknown,\n    {},\n    Layout,\n    {},\n    TAppContext,\n    ResolveLayoutMiddlewaresState<Layout>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.\n   */\n  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(\n    layouts: Layouts,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    LayoutParams<Layouts[number]>,\n    unknown,\n    {},\n    Layouts,\n    {},\n    TAppContext,\n    ResolveLayoutsState<Layouts>,\n    unknown,\n    unknown,\n    unknown,\n    TState\n  >;\n}\n\nexport const middleware: MiddlewareFn<AppContext> = function middleware(\n  first?: any,\n  second?: any,\n): any {\n  if (first === undefined) {\n    return createMiddlewareUnitBuilder();\n  }\n\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    if (typeof second === \"function\") {\n      return {\n        handler: second,\n        __middlewareAcc: undefined as unknown,\n        __requiredLayouts: first,\n      };\n    }\n    return createMiddlewareUnitBuilder(first);\n  }\n\n  if (typeof first === \"function\") {\n    return {\n      handler: first,\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  return createMiddlewareUnitBuilder();\n};\n"],"mappings":";;AA0LA,IAAa,aAAuC,SAAS,WAC3D,OACA,QACK;CACL,IAAI,UAAU,KAAA,GACZ,OAAO,4BAA4B;CAGrC,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,IAAI,OAAO,WAAW,YACpB,OAAO;GACL,SAAS;GACT,iBAAiB,KAAA;GACjB,mBAAmB;EACrB;EAEF,OAAO,4BAA4B,KAAK;CAC1C;CAEA,IAAI,OAAO,UAAU,YACnB,OAAO;EACL,SAAS;EACT,iBAAiB,KAAA;CACnB;CAGF,OAAO,4BAA4B;AACrC"}

package/dist/esm/index.d.ts

@@ -1,6 +1,10 @@
 export interface RouterRegister {
 }
-export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
+export interface RouterMiddlewaresRegister {
+}
+export interface RouterRoutesRegister {
+}
+export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutMiddlewaresMap, LayoutParams, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
 export type { ContextDefinition, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, } from './types/app.js';
 export { ValidationError, validationErrorSchema } from '@taserjs/router-utils';
 export type { ResponseValidationFailureHandler, SuccessStatusCode } from '@taserjs/router-utils';

package/dist/esm/middleware/hono-mw.d.ts

@@ -1,4 +1,5 @@
 import { MiddlewareHandler } from 'hono';
+import { NextFn } from '../types/units.js';
 /**
  * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`
  * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.
@@ -13,4 +14,4 @@ import { MiddlewareHandler } from 'hono';
  * const customCors = middleware(honoMw(cors()));
  * ```
  */
-export declare function honoMw(middleware: MiddlewareHandler): (ctx: unknown, next: any) => Promise<Response>;
+export declare function honoMw<TState extends Record<string, unknown> = {}>(middleware: MiddlewareHandler): (ctx: unknown, next: NextFn<TState>) => Promise<Response>;

package/dist/esm/middleware/hono-mw.js.map

@@ -1 +1 @@
-{"version":3,"file":"hono-mw.js","names":[],"sources":["../../../src/middleware/hono-mw.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\n/**\n * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`\n * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.\n *\n * @example\n * ```ts\n * import { honoMw } from \"@taserjs/router\";\n * import { cors } from \"hono/cors\";\n *\n * const app = t.get(\"/hello\").use(honoMw(cors()));\n * // or\n * const customCors = middleware(honoMw(cors()));\n * ```\n */\nexport function honoMw(\n  middleware: MiddlewareHandler,\n): (ctx: unknown, next: any) => Promise<Response> {\n  return createTaserCompatHandler(middleware) as (ctx: unknown, next: any) => Promise<Response>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,SAAgB,OACd,YACgD;CAChD,OAAO,yBAAyB,UAAU;AAC5C"}
+{"version":3,"file":"hono-mw.js","names":[],"sources":["../../../src/middleware/hono-mw.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\nimport type { NextFn } from \"../types/units.js\";\n\n/**\n * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`\n * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.\n *\n * @example\n * ```ts\n * import { honoMw } from \"@taserjs/router\";\n * import { cors } from \"hono/cors\";\n *\n * const app = t.get(\"/hello\").use(honoMw(cors()));\n * // or\n * const customCors = middleware(honoMw(cors()));\n * ```\n */\nexport function honoMw<TState extends Record<string, unknown> = {}>(\n  middleware: MiddlewareHandler,\n): (ctx: unknown, next: NextFn<TState>) => Promise<Response> {\n  return createTaserCompatHandler(middleware) as (\n    ctx: unknown,\n    next: NextFn<TState>,\n  ) => Promise<Response>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAmBA,SAAgB,OACd,YAC2D;CAC3D,OAAO,yBAAyB,UAAU;AAI5C"}

package/dist/esm/types/index.d.ts

@@ -1,5 +1,5 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { RouterRegister } from '../index.js';
+import { RouterMiddlewaresRegister, RouterRegister, RouterRoutesRegister } from '../index.js';
 import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnionToIntersection, UnitRuntimeContext } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
@@ -21,7 +21,14 @@ export type LayoutId = RouterRegister extends {
 export type LayoutTree = RouterRegister extends {
     LayoutTree: infer T;
 } ? T : Record<never, never>;
-export type RouteByPathMethod = RouterRegister extends {
+export type LayoutMiddlewaresMap = RouterMiddlewaresRegister extends {
+    LayoutMiddlewares: infer M;
+} ? M : RouterRegister extends {
+    LayoutMiddlewares: infer M;
+} ? M : Record<never, never>;
+export type RouteByPathMethod = RouterRoutesRegister extends {
+    RouteByPathMethod: infer R;
+} ? R : RouterRegister extends {
     RouteByPathMethod: infer R;
 } ? R : Record<never, never>;
 export type LayoutBuilder<TAppContext extends Record<string, unknown> = AppContext> = <const Layout extends LayoutId>(layout: Layout) => MiddlewareBuilder<Layout, readonly [], TAppContext>;
@@ -31,21 +38,19 @@ type ParseParam<Segment extends string> = Segment extends "*" ? {
     [K in Name]: string;
 } : {};
 type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${infer Rest}` ? ParseParam<Segment> & ParseParamsFromSegments<Rest> : ParseParam<S>;
-export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : {};
+export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : ParseParamsFromSegments<Path>;
+export type LayoutParams<Layout extends string> = PathParams<Layout>;
 export type ResolveParams<TPathParams, TSchemaParams> = TSchemaParams extends Record<string, unknown> ? [keyof TSchemaParams] extends [never] ? TPathParams : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams> : TPathParams;
-type LayoutParentsMap = RouterRegister extends {
-    LayoutParents: infer LP extends Record<string, unknown>;
-} ? LP : {};
-type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutParentsMap ? LayoutParentsMap[Layout] extends LayoutId ? LayoutParentsMap[Layout] : null : LayoutTree[Layout] extends {
-    parent: infer Parent extends LayoutId | null;
-} ? Parent : null;
-type LayoutMiddlewares<Layout extends LayoutId> = LayoutTree[Layout]["middlewares"] extends {
+type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutTree ? LayoutTree[Layout] extends {
+    parent: infer P extends LayoutId;
+} ? P : null : null;
+type LayoutMiddlewares<Layout extends LayoutId> = [Layout] extends [keyof LayoutMiddlewaresMap] ? LayoutMiddlewaresMap[Layout] extends {
     readonly __acc?: infer Acc extends readonly unknown[];
-} ? Acc : LayoutTree[Layout]["middlewares"] extends infer Acc extends readonly unknown[] ? Acc : readonly [];
-type ResolveLayoutMiddlewares<Layout extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : Layout extends LayoutId ? readonly [
-    ...ResolveLayoutMiddlewares<LayoutParent<Layout>, [...Depth, unknown]>,
+} ? Acc : LayoutMiddlewaresMap[Layout] extends readonly unknown[] ? LayoutMiddlewaresMap[Layout] : readonly [] : readonly [];
+type ResolveLayoutMiddlewares<Layout extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : [Layout] extends [LayoutId] ? LayoutParent<Layout> extends infer Parent extends LayoutId ? readonly [
+    ...ResolveLayoutMiddlewares<Parent, [...Depth, unknown]>,
     ...LayoutMiddlewares<Layout>
-] : readonly [];
+] : readonly [...LayoutMiddlewares<Layout>] : readonly [];
 export type ResolveLayoutIdChain<L extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : L extends LayoutId ? readonly [...ResolveLayoutIdChain<LayoutParent<L>, [...Depth, unknown]>, L] : readonly [];
 export type ResolveLayoutMiddlewaresState<Layout extends LayoutId | null> = Layout extends LayoutId ? MergeMiddlewareField<ResolveLayoutMiddlewares<Layout>, "state"> : {};
 export type ResolveLayoutsState<Layouts extends LayoutId | readonly LayoutId[]> = Layouts extends LayoutId ? ResolveLayoutMiddlewaresState<Layouts> : Layouts extends readonly LayoutId[] ? UnionToIntersection<Layouts[number] extends infer L extends LayoutId ? ResolveLayoutMiddlewaresState<L> : never> : {};
@@ -60,21 +65,18 @@ type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain ex
 type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMethod[Path] extends {
     [K in TMethod]: infer Entry;
 } ? Entry : never;
-type RouteParent<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
-    parent: infer Parent extends LayoutId | null;
-} ? Parent : null;
 type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
-    layoutChain: infer Chain extends readonly LayoutId[];
-} ? Chain : RouteParent<Path, TMethod> extends LayoutId ? readonly [RouteParent<Path, TMethod>] : readonly [];
+    layouts: infer Chain extends readonly LayoutId[];
+} ? Chain : readonly [];
 export type RouteLayoutMiddlewares<Path extends RoutePath, TMethod extends Method> = ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>;
 export type RouteLayoutField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
 export type RouteLayoutInputField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body"> = MergeMiddlewareInputField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
 type RouteResolvedField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = RouteLayoutField<Path, TMethod, Field> & MergeMiddlewareField<Acc, Field>;
 export type RouteChainContext<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
-    query: Simplify<MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>>;
-    params: Simplify<ResolveParams<PathParams<Path>, MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>>>;
-    body: Simplify<MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>>;
-    state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
+    query: MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>;
+    params: ResolveParams<PathParams<Path>, MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>>;
+    body: MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>;
+    state: RouteResolvedField<Path, TMethod, Acc, "state">;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -167,23 +169,23 @@ export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Meth
         Input: infer I;
     };
 } ? I : never : never;
-export type MiddlewareLayoutField<Layout extends LayoutId, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
+export type MiddlewareLayoutField<Layout extends LayoutId, Field extends "query" | "params" | "body" | "state"> = [LayoutParent<Layout>] extends [infer Parent extends LayoutId] ? MergeMiddlewareField<ResolveLayoutMiddlewares<Parent>, Field> : {};
 type MiddlewareChainField<Layout extends LayoutId, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = MiddlewareLayoutField<Layout, Field> & MergeMiddlewareField<Acc, Field>;
-export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
+export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & {
+    readonly request: Request;
+    readonly method: Method;
+    readonly url: URL;
+    readonly headers: TaserHeaders;
+    readonly cookies: TaserCookieJar;
     query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
-    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
+    params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>>>;
     body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
     state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
-    headers: TaserHeaders;
-    cookies: TaserCookieJar;
 }>;
 export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = {
     readonly layout: Layout;
     readonly middlewares: readonly MiddlewareDefinition[];
     readonly __acc?: Acc;
-    readonly $Infer: {
-        Context: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>;
-    };
     use<TAcc, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}>(unit: [
         IsLayoutAllowed<TRequiredLayouts, ResolveLayoutIdChain<Layout>>,
         IsRequirementsSatisfied<{
@@ -192,19 +194,18 @@ export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unkn
             body: MiddlewareChainField<Layout, Acc, "body">;
             state: MiddlewareChainField<Layout, Acc, "state">;
         }, TRequires>
-    ] extends [true, true] ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires> : {
-        error: "Middleware cannot be attached to this layout";
-        requiredLayouts: TRequiredLayouts;
-        layoutChain: ResolveLayoutIdChain<Layout>;
-        requirements: TRequires;
-        actual: {
-            query: MiddlewareChainField<Layout, Acc, "query">;
-            params: MiddlewareChainField<Layout, Acc, "params">;
-            body: MiddlewareChainField<Layout, Acc, "body">;
-            state: MiddlewareChainField<Layout, Acc, "state">;
-        };
-    }): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
-    use<R = unknown>(fn: (ctx: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;
+    ] extends [true, true] ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires> : never): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
+    use<R = unknown>(fn: (ctx: Simplify<TAppContext & {
+        readonly request: Request;
+        readonly method: Method;
+        readonly url: URL;
+        readonly headers: TaserHeaders;
+        readonly cookies: TaserCookieJar;
+        query: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "query">>>;
+        params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>>>;
+        body: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "body">>>;
+        state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
+    }>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;
 };
 export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = {
     readonly path: Path;
@@ -274,18 +275,7 @@ export type RouteMiddlewareBuilder<Path extends RoutePath, TMethod extends Metho
             body: RouteResolvedField<Path, TMethod, Acc, "body">;
             state: RouteResolvedField<Path, TMethod, Acc, "state">;
         }, TRequires>
-    ] extends [true, true] ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires> : {
-        error: "Middleware cannot be attached to this route";
-        requiredLayouts: TRequiredLayouts;
-        routeLayoutChain: RouteLayoutChain<Path, TMethod>;
-        requirements: TRequires;
-        actual: {
-            query: RouteResolvedField<Path, TMethod, Acc, "query">;
-            params: ResolveParams<PathParams<Path>, RouteResolvedField<Path, TMethod, Acc, "params">>;
-            body: RouteResolvedField<Path, TMethod, Acc, "body">;
-            state: RouteResolvedField<Path, TMethod, Acc, "state">;
-        };
-    }): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
+    ] extends [true, true] ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires> : never): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
     use<R = unknown>(fn: (ctx: RouteChainContext<Path, TMethod, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], Validators, TReturns, TAppContext>;
 };
 export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = RouteMiddlewareBuilder<Path, TMethod, Acc, Validators, TReturns, TAppContext>;

package/dist/esm/types/type-utils.d.ts

@@ -7,9 +7,9 @@ export type MiddlewareInputFieldName = "query" | "params" | "body";
 export type UnwrapPart<T> = unknown extends T ? {} : T;
 export type MergePart<T, Base> = unknown extends T ? Base : Base & T;
 /** Collapse intersections so `Omit`/`keyof` treat the result as one object type. */
-export type Simplify<T> = {
-    [K in keyof T]: T[K];
-} & {};
+export type Simplify<T> = [T] extends [infer U] ? {
+    [K in keyof U]: U[K];
+} : never;
 /**
  * Request prop: when schema input is `unknown` (e.g. zod coerce),
  * fall back to the validated output type.

package/dist/esm/types/units.d.ts

@@ -26,10 +26,10 @@ export type IsUnknown<T> = [unknown] extends [T] ? true : false;
 export type NextFn<TExpectedState = unknown> = IsUnknown<TExpectedState> extends true ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>> : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;
 export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
-    query: Simplify<UnwrapPart<TQuery>>;
-    params: Simplify<UnwrapPart<TParams>>;
-    body: Simplify<UnwrapPart<TBody>>;
-    state: Simplify<UnwrapPart<TState>>;
+    query: UnwrapPart<TQuery>;
+    params: UnwrapPart<TParams>;
+    body: UnwrapPart<TBody>;
+    state: UnwrapPart<TState>;
     /** Pre-parse shapes merged into route `$Infer.Input`. */
     input: {
         query: RequestShape<TQueryIn, TQuery>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taserjs/router",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Type-safe Node.js router with runtime validation and middleware",
   "license": "ISC",
   "repository": {
@@ -147,8 +147,8 @@
   "dependencies": {
     "@standard-schema/spec": "^1.1.0",
     "hono": "^4.10.3",
-    "@taserjs/router-core": "0.1.7",
-    "@taserjs/router-utils": "0.1.7"
+    "@taserjs/router-core": "0.1.9",
+    "@taserjs/router-utils": "0.1.9"
   },
   "devDependencies": {
     "@tanstack/vite-config": "^0.6.0",

package/src/define/middleware.ts

@@ -11,72 +11,62 @@ import type {
 import type {
   AppContext,
   LayoutId,
+  LayoutParams,
   ResolveLayoutMiddlewaresState,
   ResolveLayoutsState,
 } from "../types/index.js";
 
 export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
   /**
-   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.
+   * Defines a standalone, unscoped middleware using a short function signature.
    *
    * @example
    * ```ts
-   * const auth = middleware<{ user: string }>()
-   *   .query(z.object({ token: z.string() }))
-   *   .body("form", z.object({ file: z.instanceof(File) }))
-   *   .returns({ 401: z.string() })
-   *   .handler(async (ctx, next) => next({ user: "alice" }));
+   * const auth = middleware((ctx, next) => {
+   *   return next({ user: "alice" });
+   * });
    * ```
    */
-  <TState = unknown>(): MiddlewareUnitBuilder<
-    unknown,
-    unknown,
-    unknown,
-    {},
-    null,
-    {},
-    TAppContext,
-    {},
+  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(
+    fn: (
+      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,
+      next: NextFn<NoInfer<TState>>,
+    ) => R,
+  ): DefineMiddlewareResult<
     unknown,
     unknown,
     unknown,
-    TState
-  >;
-
-  /**
-   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
-   */
-  <const Layout extends LayoutId, TState = unknown>(
-    layout: Layout,
-  ): MiddlewareUnitBuilder<
+    IsUnknown<TState> extends true ? ExtractState<R> : TState,
+    R,
     unknown,
     unknown,
     unknown,
     {},
-    Layout,
-    {},
-    TAppContext,
-    ResolveLayoutMiddlewaresState<Layout>,
-    unknown,
-    unknown,
-    unknown,
-    TState
+    null,
+    TRequires
   >;
 
   /**
-   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
+   * Constructs a fluent unscoped middleware builder, with optional explicit State generic.
+   *
+   * @example
+   * ```ts
+   * const auth = middleware<{ user: string }>()
+   *   .query(z.object({ token: z.string() }))
+   *   .body("form", z.object({ file: z.instanceof(File) }))
+   *   .returns({ 401: z.string() })
+   *   .handler(async (ctx, next) => next({ user: "alice" }));
+   * ```
    */
-  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(
-    layouts: Layouts,
-  ): MiddlewareUnitBuilder<
+  <TState = unknown>(): MiddlewareUnitBuilder<
     unknown,
     unknown,
     unknown,
     {},
-    Layouts,
+    null,
     {},
     TAppContext,
-    ResolveLayoutsState<Layouts>,
+    {},
     unknown,
     unknown,
     unknown,
@@ -96,7 +86,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     fn: (
       ctx: StandaloneMiddlewareContext<
         unknown,
-        unknown,
+        LayoutParams<Layout>,
         unknown,
         TAppContext,
         ResolveLayoutMiddlewaresState<Layout>,
@@ -131,7 +121,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     fn: (
       ctx: StandaloneMiddlewareContext<
         unknown,
-        unknown,
+        LayoutParams<Layouts[number]>,
         unknown,
         TAppContext,
         ResolveLayoutsState<Layouts>,
@@ -154,32 +144,43 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
   >;
 
   /**
-   * Defines a standalone, unscoped middleware using a short function signature.
-   *
-   * @example
-   * ```ts
-   * const auth = middleware((ctx, next) => {
-   *   return next({ user: "alice" });
-   * });
-   * ```
+   * Constructs a fluent middleware builder scoped to a single layout branch, with optional explicit State generic.
    */
-  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(
-    fn: (
-      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,
-      next: NextFn<NoInfer<TState>>,
-    ) => R,
-  ): DefineMiddlewareResult<
+  <const Layout extends LayoutId, TState = unknown>(
+    layout: Layout,
+  ): MiddlewareUnitBuilder<
     unknown,
+    LayoutParams<Layout>,
+    unknown,
+    {},
+    Layout,
+    {},
+    TAppContext,
+    ResolveLayoutMiddlewaresState<Layout>,
     unknown,
     unknown,
-    IsUnknown<TState> extends true ? ExtractState<R> : TState,
-    R,
     unknown,
+    TState
+  >;
+
+  /**
+   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union), with optional explicit State generic.
+   */
+  <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown>(
+    layouts: Layouts,
+  ): MiddlewareUnitBuilder<
     unknown,
+    LayoutParams<Layouts[number]>,
     unknown,
     {},
-    null,
-    TRequires
+    Layouts,
+    {},
+    TAppContext,
+    ResolveLayoutsState<Layouts>,
+    unknown,
+    unknown,
+    unknown,
+    TState
   >;
 }
 

package/src/index.ts

@@ -1,4 +1,6 @@
 export interface RouterRegister {}
+export interface RouterMiddlewaresRegister {}
+export interface RouterRoutesRegister {}
 export type {
   AppContext,
   EmptyAppContext,
@@ -11,6 +13,8 @@ export type {
   InferRouteOutput,
   LayoutBuilder,
   LayoutId,
+  LayoutMiddlewaresMap,
+  LayoutParams,
   LayoutTree,
   Method,
   MiddlewareBuilder,

package/src/middleware/hono-mw.ts

@@ -1,6 +1,8 @@
 import { createTaserCompatHandler } from "@taserjs/router-core";
 import type { MiddlewareHandler } from "hono";
 
+import type { NextFn } from "../types/units.js";
+
 /**
  * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`
  * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.
@@ -15,8 +17,11 @@ import type { MiddlewareHandler } from "hono";
  * const customCors = middleware(honoMw(cors()));
  * ```
  */
-export function honoMw(
+export function honoMw<TState extends Record<string, unknown> = {}>(
   middleware: MiddlewareHandler,
-): (ctx: unknown, next: any) => Promise<Response> {
-  return createTaserCompatHandler(middleware) as (ctx: unknown, next: any) => Promise<Response>;
+): (ctx: unknown, next: NextFn<TState>) => Promise<Response> {
+  return createTaserCompatHandler(middleware) as (
+    ctx: unknown,
+    next: NextFn<TState>,
+  ) => Promise<Response>;
 }

package/src/types/index.ts

@@ -1,5 +1,5 @@
 import type { Awaitable, TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
-import type { RouterRegister } from "../index.js";
+import type { RouterMiddlewaresRegister, RouterRegister, RouterRoutesRegister } from "../index.js";
 import type {
   MergeMiddlewareField,
   MergeMiddlewareInputField,
@@ -74,9 +74,18 @@ export type AppContext = RouterRegister extends { AppContext: infer C } ? C : Em
 export type RoutePath = RouterRegister extends { RoutePath: infer P } ? P : never;
 export type LayoutId = RouterRegister extends { LayoutId: infer L } ? L : never;
 export type LayoutTree = RouterRegister extends { LayoutTree: infer T } ? T : Record<never, never>;
-export type RouteByPathMethod = RouterRegister extends { RouteByPathMethod: infer R }
+export type LayoutMiddlewaresMap = RouterMiddlewaresRegister extends {
+  LayoutMiddlewares: infer M;
+}
+  ? M
+  : RouterRegister extends { LayoutMiddlewares: infer M }
+    ? M
+    : Record<never, never>;
+export type RouteByPathMethod = RouterRoutesRegister extends { RouteByPathMethod: infer R }
   ? R
-  : Record<never, never>;
+  : RouterRegister extends { RouteByPathMethod: infer R }
+    ? R
+    : Record<never, never>;
 
 export type LayoutBuilder<TAppContext extends Record<string, unknown> = AppContext> = <
   const Layout extends LayoutId,
@@ -98,7 +107,9 @@ type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${i
 
 export type PathParams<Path extends string> = Path extends `/${infer Rest}`
   ? ParseParamsFromSegments<Rest>
-  : {};
+  : ParseParamsFromSegments<Path>;
+
+export type LayoutParams<Layout extends string> = PathParams<Layout>;
 
 export type ResolveParams<TPathParams, TSchemaParams> =
   TSchemaParams extends Record<string, unknown>
@@ -107,40 +118,32 @@ export type ResolveParams<TPathParams, TSchemaParams> =
       : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams>
     : TPathParams;
 
-type LayoutParentsMap = RouterRegister extends {
-  LayoutParents: infer LP extends Record<string, unknown>;
-}
-  ? LP
-  : {};
-
-type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutParentsMap
-  ? LayoutParentsMap[Layout] extends LayoutId
-    ? LayoutParentsMap[Layout]
+type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutTree
+  ? LayoutTree[Layout] extends { parent: infer P extends LayoutId }
+    ? P
     : null
-  : LayoutTree[Layout] extends {
-        parent: infer Parent extends LayoutId | null;
-      }
-    ? Parent
-    : null;
-
-type LayoutMiddlewares<Layout extends LayoutId> = LayoutTree[Layout]["middlewares"] extends {
-  readonly __acc?: infer Acc extends readonly unknown[];
-}
-  ? Acc
-  : LayoutTree[Layout]["middlewares"] extends infer Acc extends readonly unknown[]
+  : null;
+
+type LayoutMiddlewares<Layout extends LayoutId> = [Layout] extends [keyof LayoutMiddlewaresMap]
+  ? LayoutMiddlewaresMap[Layout] extends { readonly __acc?: infer Acc extends readonly unknown[] }
     ? Acc
-    : readonly [];
+    : LayoutMiddlewaresMap[Layout] extends readonly unknown[]
+      ? LayoutMiddlewaresMap[Layout]
+      : readonly []
+  : readonly [];
 
 type ResolveLayoutMiddlewares<
   Layout extends LayoutId | null,
   Depth extends readonly unknown[] = [],
 > = Depth["length"] extends 10
   ? readonly []
-  : Layout extends LayoutId
-    ? readonly [
-        ...ResolveLayoutMiddlewares<LayoutParent<Layout>, [...Depth, unknown]>,
-        ...LayoutMiddlewares<Layout>,
-      ]
+  : [Layout] extends [LayoutId]
+    ? LayoutParent<Layout> extends infer Parent extends LayoutId
+      ? readonly [
+          ...ResolveLayoutMiddlewares<Parent, [...Depth, unknown]>,
+          ...LayoutMiddlewares<Layout>,
+        ]
+      : readonly [...LayoutMiddlewares<Layout>]
     : readonly [];
 
 export type ResolveLayoutIdChain<
@@ -184,17 +187,10 @@ type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMet
   ? Entry
   : never;
 
-type RouteParent<Path extends RoutePath, TMethod extends Method> =
-  RouteEntry<Path, TMethod> extends { parent: infer Parent extends LayoutId | null }
-    ? Parent
-    : null;
-
 type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> =
-  RouteEntry<Path, TMethod> extends { layoutChain: infer Chain extends readonly LayoutId[] }
+  RouteEntry<Path, TMethod> extends { layouts: infer Chain extends readonly LayoutId[] }
     ? Chain
-    : RouteParent<Path, TMethod> extends LayoutId
-      ? readonly [RouteParent<Path, TMethod>]
-      : readonly [];
+    : readonly [];
 
 export type RouteLayoutMiddlewares<
   Path extends RoutePath,
@@ -231,15 +227,13 @@ export type RouteChainContext<
 > = Simplify<
   TAppContext &
     UnitRuntimeContext & {
-      query: Simplify<MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>>;
-      params: Simplify<
-        ResolveParams<
-          PathParams<Path>,
-          MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>
-        >
+      query: MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>;
+      params: ResolveParams<
+        PathParams<Path>,
+        MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>
       >;
-      body: Simplify<MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>>;
-      state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
+      body: MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>;
+      state: RouteResolvedField<Path, TMethod, Acc, "state">;
       headers: TaserHeaders;
       cookies: TaserCookieJar;
     }
@@ -496,7 +490,9 @@ export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Meth
 export type MiddlewareLayoutField<
   Layout extends LayoutId,
   Field extends "query" | "params" | "body" | "state",
-> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
+> = [LayoutParent<Layout>] extends [infer Parent extends LayoutId]
+  ? MergeMiddlewareField<ResolveLayoutMiddlewares<Parent>, Field>
+  : {};
 
 type MiddlewareChainField<
   Layout extends LayoutId,
@@ -507,20 +503,27 @@ type MiddlewareChainField<
 export type MiddlewareChainContext<
   Layout extends LayoutId,
   Acc extends readonly unknown[],
-  TQuery,
-  TParams,
-  TBody,
+  TQuery = unknown,
+  TParams = unknown,
+  TBody = unknown,
   TAppContext extends Record<string, unknown> = AppContext,
 > = Simplify<
-  TAppContext &
-    UnitRuntimeContext & {
-      query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
-      params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
-      body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
-      state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
-      headers: TaserHeaders;
-      cookies: TaserCookieJar;
-    }
+  TAppContext & {
+    readonly request: Request;
+    readonly method: Method;
+    readonly url: URL;
+    readonly headers: TaserHeaders;
+    readonly cookies: TaserCookieJar;
+    query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
+    params: Simplify<
+      ResolveParams<
+        LayoutParams<Layout>,
+        Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>
+      >
+    >;
+    body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
+    state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
+  }
 >;
 
 export type MiddlewareBuilder<
@@ -531,9 +534,6 @@ export type MiddlewareBuilder<
   readonly layout: Layout;
   readonly middlewares: readonly MiddlewareDefinition[];
   readonly __acc?: Acc;
-  readonly $Infer: {
-    Context: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>;
-  };
   use<
     TAcc,
     TReturns extends ReturnsMap = {},
@@ -553,22 +553,28 @@ export type MiddlewareBuilder<
       >,
     ] extends [true, true]
       ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires>
-      : {
-          error: "Middleware cannot be attached to this layout";
-          requiredLayouts: TRequiredLayouts;
-          layoutChain: ResolveLayoutIdChain<Layout>;
-          requirements: TRequires;
-          actual: {
-            query: MiddlewareChainField<Layout, Acc, "query">;
-            params: MiddlewareChainField<Layout, Acc, "params">;
-            body: MiddlewareChainField<Layout, Acc, "body">;
-            state: MiddlewareChainField<Layout, Acc, "state">;
-          };
-        },
+      : never,
   ): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
   use<R = unknown>(
     fn: (
-      ctx: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>,
+      ctx: Simplify<
+        TAppContext & {
+          readonly request: Request;
+          readonly method: Method;
+          readonly url: URL;
+          readonly headers: TaserHeaders;
+          readonly cookies: TaserCookieJar;
+          query: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "query">>>;
+          params: Simplify<
+            ResolveParams<
+              LayoutParams<Layout>,
+              Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>
+            >
+          >;
+          body: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "body">>>;
+          state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
+        }
+      >,
       next: NextFn,
     ) => Awaitable<R>,
   ): MiddlewareBuilder<
@@ -747,21 +753,7 @@ export type RouteMiddlewareBuilder<
       >,
     ] extends [true, true]
       ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires>
-      : {
-          error: "Middleware cannot be attached to this route";
-          requiredLayouts: TRequiredLayouts;
-          routeLayoutChain: RouteLayoutChain<Path, TMethod>;
-          requirements: TRequires;
-          actual: {
-            query: RouteResolvedField<Path, TMethod, Acc, "query">;
-            params: ResolveParams<
-              PathParams<Path>,
-              RouteResolvedField<Path, TMethod, Acc, "params">
-            >;
-            body: RouteResolvedField<Path, TMethod, Acc, "body">;
-            state: RouteResolvedField<Path, TMethod, Acc, "state">;
-          };
-        },
+      : never,
   ): RouteMiddlewareBuilder<
     Path,
     TMethod,

package/src/types/type-utils.ts

@@ -13,7 +13,7 @@ export type UnwrapPart<T> = unknown extends T ? {} : T;
 export type MergePart<T, Base> = unknown extends T ? Base : Base & T;
 
 /** Collapse intersections so `Omit`/`keyof` treat the result as one object type. */
-export type Simplify<T> = { [K in keyof T]: T[K] } & {};
+export type Simplify<T> = [T] extends [infer U] ? { [K in keyof U]: U[K] } : never;
 
 /**
  * Request prop: when schema input is `unknown` (e.g. zod coerce),

package/src/types/units.ts

@@ -68,10 +68,10 @@ export type MiddlewareReturnFromParts<
   TParamsIn = TParams,
   TBodyIn = TBody,
 > = {
-  query: Simplify<UnwrapPart<TQuery>>;
-  params: Simplify<UnwrapPart<TParams>>;
-  body: Simplify<UnwrapPart<TBody>>;
-  state: Simplify<UnwrapPart<TState>>;
+  query: UnwrapPart<TQuery>;
+  params: UnwrapPart<TParams>;
+  body: UnwrapPart<TBody>;
+  state: UnwrapPart<TState>;
   /** Pre-parse shapes merged into route `$Infer.Input`. */
   input: {
     query: RequestShape<TQueryIn, TQuery>;