@taserjs/router 0.1.4 → 0.1.6

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

@@ -1,3 +1,3 @@
 import { compress as honoCompress } from 'hono/compress';
-export declare function compress(...args: Parameters<typeof honoCompress>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function compress(...args: Parameters<typeof honoCompress>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;

package/dist/cjs/middleware/cors.cjs

@@ -4,7 +4,7 @@ const require_hono_mw = require("./hono-mw.cjs");
 let hono_cors = require("hono/cors");
 //#region src/middleware/cors.ts
 function cors(...args) {
-	return require_middleware.defineMiddleware(require_hono_mw.honoMw((0, hono_cors.cors)(...args)));
+	return require_middleware.middleware(require_hono_mw.honoMw((0, hono_cors.cors)(...args)));
 }
 //#endregion
 exports.cors = cors;

package/dist/cjs/middleware/cors.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cors.cjs","names":[],"sources":["../../../src/middleware/cors.ts"],"sourcesContent":["import { cors as honoCors } from \"hono/cors\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function cors(...args: Parameters<typeof honoCors>) {\n  return defineMiddleware(honoMw(honoCors(...args)));\n}\n\nexport type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,iBAAiB,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AACnD"}
+{"version":3,"file":"cors.cjs","names":[],"sources":["../../../src/middleware/cors.ts"],"sourcesContent":["import { cors as honoCors } from \"hono/cors\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function cors(...args: Parameters<typeof honoCors>) {\n  return middleware(honoMw(honoCors(...args)));\n}\n\nexport type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,WAAW,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AAC7C"}

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

@@ -1,3 +1,3 @@
 import { cors as honoCors } from 'hono/cors';
-export declare function cors(...args: Parameters<typeof honoCors>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function cors(...args: Parameters<typeof honoCors>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;

package/dist/cjs/middleware/csrf.cjs

@@ -4,7 +4,7 @@ const require_hono_mw = require("./hono-mw.cjs");
 let hono_csrf = require("hono/csrf");
 //#region src/middleware/csrf.ts
 function csrf(...args) {
-	return require_middleware.defineMiddleware(require_hono_mw.honoMw((0, hono_csrf.csrf)(...args)));
+	return require_middleware.middleware(require_hono_mw.honoMw((0, hono_csrf.csrf)(...args)));
 }
 //#endregion
 exports.csrf = csrf;

package/dist/cjs/middleware/csrf.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"csrf.cjs","names":[],"sources":["../../../src/middleware/csrf.ts"],"sourcesContent":["import { csrf as honoCsrf } from \"hono/csrf\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function csrf(...args: Parameters<typeof honoCsrf>) {\n  return defineMiddleware(honoMw(honoCsrf(...args)));\n}\n\nexport type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,iBAAiB,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AACnD"}
+{"version":3,"file":"csrf.cjs","names":[],"sources":["../../../src/middleware/csrf.ts"],"sourcesContent":["import { csrf as honoCsrf } from \"hono/csrf\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function csrf(...args: Parameters<typeof honoCsrf>) {\n  return middleware(honoMw(honoCsrf(...args)));\n}\n\nexport type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,WAAW,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AAC7C"}

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

@@ -1,3 +1,3 @@
 import { csrf as honoCsrf } from 'hono/csrf';
-export declare function csrf(...args: Parameters<typeof honoCsrf>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function csrf(...args: Parameters<typeof honoCsrf>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;

package/dist/cjs/middleware/etag.cjs

@@ -4,7 +4,7 @@ const require_hono_mw = require("./hono-mw.cjs");
 let hono_etag = require("hono/etag");
 //#region src/middleware/etag.ts
 function etag(...args) {
-	return require_middleware.defineMiddleware(require_hono_mw.honoMw((0, hono_etag.etag)(...args)));
+	return require_middleware.middleware(require_hono_mw.honoMw((0, hono_etag.etag)(...args)));
 }
 //#endregion
 exports.etag = etag;

package/dist/cjs/middleware/etag.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"etag.cjs","names":[],"sources":["../../../src/middleware/etag.ts"],"sourcesContent":["import { etag as honoEtag } from \"hono/etag\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function etag(...args: Parameters<typeof honoEtag>) {\n  return defineMiddleware(honoMw(honoEtag(...args)));\n}\n\nexport type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,iBAAiB,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AACnD"}
+{"version":3,"file":"etag.cjs","names":[],"sources":["../../../src/middleware/etag.ts"],"sourcesContent":["import { etag as honoEtag } from \"hono/etag\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function etag(...args: Parameters<typeof honoEtag>) {\n  return middleware(honoMw(honoEtag(...args)));\n}\n\nexport type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAA,WAAW,gBAAA,QAAA,GAAA,UAAA,KAAA,CAAgB,GAAG,IAAI,CAAC,CAAC;AAC7C"}

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

@@ -1,3 +1,3 @@
 import { etag as honoEtag } from 'hono/etag';
-export declare function etag(...args: Parameters<typeof honoEtag>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function etag(...args: Parameters<typeof honoEtag>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;

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

@@ -11,7 +11,7 @@ let _taserjs_router_core = require("@taserjs/router-core");
 *
 * const app = t.get("/hello").use(honoMw(cors()));
 * // or
-* const customCors = defineMiddleware(honoMw(cors()));
+* const customCors = middleware(honoMw(cors()));
 * ```
 */
 function honoMw(middleware) {

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 = defineMiddleware(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\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"}

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

@@ -10,7 +10,7 @@ import { MiddlewareHandler } from 'hono';
  *
  * const app = t.get("/hello").use(honoMw(cors()));
  * // or
- * const customCors = defineMiddleware(honoMw(cors()));
+ * const customCors = middleware(honoMw(cors()));
  * ```
  */
 export declare function honoMw(middleware: MiddlewareHandler): (ctx: unknown, next: any) => Promise<Response>;

package/dist/cjs/middleware/jwk.cjs

@@ -19,7 +19,7 @@ function jwk(options, init) {
 	if (typeof jwksUri === "string") assertJwksScheme(jwksUri, options.allowInsecure ?? false);
 	const { allowInsecure: _allowInsecure, ...honoOptions } = options;
 	const mw = require_hono_mw.honoMw((0, hono_jwk.jwk)(honoOptions, init?.headers !== void 0 ? { headers: init.headers } : void 0));
-	return require_middleware.defineMiddleware((ctx, next) => mw(ctx, async () => {
+	return require_middleware.middleware((ctx, next) => mw(ctx, async () => {
 		const payload = ctx.var.jwtPayload;
 		return next({ jwtPayload: payload });
 	}));

package/dist/cjs/middleware/jwk.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jwk.cjs","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import { jwk as honoJwk } from \"hono/jwk\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\nimport type { JwtMiddlewareUnit, JwtPayloadState } from \"./jwt.js\";\n\nexport type JwkOptions = Parameters<typeof honoJwk>[0];\n\nexport type JwkRequestInit = Pick<RequestInit, \"headers\">;\n\nexport type JwkMiddlewareOptions = JwkOptions & {\n  /** Allow `http://` JWKS URLs (local dev). Default false — requires `https://`. */\n  allowInsecure?: boolean;\n};\n\nfunction assertJwksScheme(jwksUri: string, allowInsecure: boolean): void {\n  const scheme = new URL(jwksUri).protocol.replace(\":\", \"\");\n  if (scheme === \"https\") {\n    return;\n  }\n  if (scheme === \"http\" && allowInsecure) {\n    return;\n  }\n  throw new Error(`JWKS URL must use https:// (or http:// with allowInsecure: true): \"${jwksUri}\"`);\n}\n\n/**\n * JWK auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n * Static `jwks_uri` must use HTTPS unless `allowInsecure: true`.\n */\nexport function jwk<TPayload = Record<string, unknown>>(\n  options: JwkMiddlewareOptions,\n  init?: JwkRequestInit,\n): JwtMiddlewareUnit<TPayload> {\n  const jwksUri = options.jwks_uri;\n  if (typeof jwksUri === \"string\") {\n    assertJwksScheme(jwksUri, options.allowInsecure ?? false);\n  }\n\n  const { allowInsecure: _allowInsecure, ...honoOptions } = options;\n  const safeInit = init?.headers !== undefined ? { headers: init.headers } : undefined;\n  const mw = honoMw(honoJwk(honoOptions, safeInit));\n\n  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;;AAeA,SAAS,iBAAiB,SAAiB,eAA8B;CACvE,MAAM,SAAS,IAAI,IAAI,OAAO,CAAC,CAAC,SAAS,QAAQ,KAAK,EAAE;CACxD,IAAI,WAAW,SACb;CAEF,IAAI,WAAW,UAAU,eACvB;CAEF,MAAM,IAAI,MAAM,sEAAsE,QAAQ,EAAE;AAClG;;;;;;AAOA,SAAgB,IACd,SACA,MAC6B;CAC7B,MAAM,UAAU,QAAQ;CACxB,IAAI,OAAO,YAAY,UACrB,iBAAiB,SAAS,QAAQ,iBAAiB,KAAK;CAG1D,MAAM,EAAE,eAAe,gBAAgB,GAAG,gBAAgB;CAE1D,MAAM,KAAK,gBAAA,QAAA,GAAA,SAAA,IAAA,CAAe,aADT,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CAC5B,CAAC;CAEhD,OAAO,mBAAA,kBAA6C,KAAK,SACvD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}
+{"version":3,"file":"jwk.cjs","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import { jwk as honoJwk } from \"hono/jwk\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\nimport type { JwtMiddlewareUnit, JwtPayloadState } from \"./jwt.js\";\n\nexport type JwkOptions = Parameters<typeof honoJwk>[0];\n\nexport type JwkRequestInit = Pick<RequestInit, \"headers\">;\n\nexport type JwkMiddlewareOptions = JwkOptions & {\n  /** Allow `http://` JWKS URLs (local dev). Default false — requires `https://`. */\n  allowInsecure?: boolean;\n};\n\nfunction assertJwksScheme(jwksUri: string, allowInsecure: boolean): void {\n  const scheme = new URL(jwksUri).protocol.replace(\":\", \"\");\n  if (scheme === \"https\") {\n    return;\n  }\n  if (scheme === \"http\" && allowInsecure) {\n    return;\n  }\n  throw new Error(`JWKS URL must use https:// (or http:// with allowInsecure: true): \"${jwksUri}\"`);\n}\n\n/**\n * JWK auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n * Static `jwks_uri` must use HTTPS unless `allowInsecure: true`.\n */\nexport function jwk<TPayload = Record<string, unknown>>(\n  options: JwkMiddlewareOptions,\n  init?: JwkRequestInit,\n): JwtMiddlewareUnit<TPayload> {\n  const jwksUri = options.jwks_uri;\n  if (typeof jwksUri === \"string\") {\n    assertJwksScheme(jwksUri, options.allowInsecure ?? false);\n  }\n\n  const { allowInsecure: _allowInsecure, ...honoOptions } = options;\n  const safeInit = init?.headers !== undefined ? { headers: init.headers } : undefined;\n  const mw = honoMw(honoJwk(honoOptions, safeInit));\n\n  return middleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;;AAeA,SAAS,iBAAiB,SAAiB,eAA8B;CACvE,MAAM,SAAS,IAAI,IAAI,OAAO,CAAC,CAAC,SAAS,QAAQ,KAAK,EAAE;CACxD,IAAI,WAAW,SACb;CAEF,IAAI,WAAW,UAAU,eACvB;CAEF,MAAM,IAAI,MAAM,sEAAsE,QAAQ,EAAE;AAClG;;;;;;AAOA,SAAgB,IACd,SACA,MAC6B;CAC7B,MAAM,UAAU,QAAQ;CACxB,IAAI,OAAO,YAAY,UACrB,iBAAiB,SAAS,QAAQ,iBAAiB,KAAK;CAG1D,MAAM,EAAE,eAAe,gBAAgB,GAAG,gBAAgB;CAE1D,MAAM,KAAK,gBAAA,QAAA,GAAA,SAAA,IAAA,CAAe,aADT,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CAC5B,CAAC;CAEhD,OAAO,mBAAA,YAAuC,KAAK,SACjD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}

package/dist/cjs/middleware/jwt.cjs

@@ -9,7 +9,7 @@ let hono_jwt = require("hono/jwt");
 */
 function jwt(options) {
 	const mw = require_hono_mw.honoMw((0, hono_jwt.jwt)(options));
-	return require_middleware.defineMiddleware((ctx, next) => mw(ctx, async () => {
+	return require_middleware.middleware((ctx, next) => mw(ctx, async () => {
 		const payload = ctx.var.jwtPayload;
 		return next({ jwtPayload: payload });
 	}));

package/dist/cjs/middleware/jwt.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.cjs","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import { jwt as honoJwt } from \"hono/jwt\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport type JwtPayloadState<TPayload> = {\n  jwtPayload: TPayload;\n};\n\nexport type JwtMiddlewareUnit<TPayload> = MiddlewareUnit<\n  MiddlewareReturnFromParts<unknown, unknown, unknown, JwtPayloadState<TPayload>>\n>;\n\nexport type JwtOptions = Parameters<typeof honoJwt>[0];\n\n/**\n * JWT auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n */\nexport function jwt<TPayload = Record<string, unknown>>(\n  options: JwtOptions,\n): JwtMiddlewareUnit<TPayload> {\n  const mw = honoMw(honoJwt(options));\n  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;;;;;;AAoBA,SAAgB,IACd,SAC6B;CAC7B,MAAM,KAAK,gBAAA,QAAA,GAAA,SAAA,IAAA,CAAe,OAAO,CAAC;CAClC,OAAO,mBAAA,kBAA6C,KAAK,SACvD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}
+{"version":3,"file":"jwt.cjs","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import { jwt as honoJwt } from \"hono/jwt\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport type JwtPayloadState<TPayload> = {\n  jwtPayload: TPayload;\n};\n\nexport type JwtMiddlewareUnit<TPayload> = MiddlewareUnit<\n  MiddlewareReturnFromParts<unknown, unknown, unknown, JwtPayloadState<TPayload>>\n>;\n\nexport type JwtOptions = Parameters<typeof honoJwt>[0];\n\n/**\n * JWT auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n */\nexport function jwt<TPayload = Record<string, unknown>>(\n  options: JwtOptions,\n): JwtMiddlewareUnit<TPayload> {\n  const mw = honoMw(honoJwt(options));\n  return middleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;;;;;;AAoBA,SAAgB,IACd,SAC6B;CAC7B,MAAM,KAAK,gBAAA,QAAA,GAAA,SAAA,IAAA,CAAe,OAAO,CAAC;CAClC,OAAO,mBAAA,YAAuC,KAAK,SACjD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}

package/dist/cjs/middleware/secure-headers.cjs

@@ -4,7 +4,7 @@ const require_hono_mw = require("./hono-mw.cjs");
 let hono_secure_headers = require("hono/secure-headers");
 //#region src/middleware/secure-headers.ts
 function secureHeaders(...args) {
-	return require_middleware.defineMiddleware(require_hono_mw.honoMw((0, hono_secure_headers.secureHeaders)(...args)));
+	return require_middleware.middleware(require_hono_mw.honoMw((0, hono_secure_headers.secureHeaders)(...args)));
 }
 //#endregion
 exports.secureHeaders = secureHeaders;

package/dist/cjs/middleware/secure-headers.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"secure-headers.cjs","names":[],"sources":["../../../src/middleware/secure-headers.ts"],"sourcesContent":["import { secureHeaders as honoSecureHeaders } from \"hono/secure-headers\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function secureHeaders(...args: Parameters<typeof honoSecureHeaders>) {\n  return defineMiddleware(honoMw(honoSecureHeaders(...args)));\n}\n\nexport type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,cAAc,GAAG,MAA4C;CAC3E,OAAO,mBAAA,iBAAiB,gBAAA,QAAA,GAAA,oBAAA,cAAA,CAAyB,GAAG,IAAI,CAAC,CAAC;AAC5D"}
+{"version":3,"file":"secure-headers.cjs","names":[],"sources":["../../../src/middleware/secure-headers.ts"],"sourcesContent":["import { secureHeaders as honoSecureHeaders } from \"hono/secure-headers\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function secureHeaders(...args: Parameters<typeof honoSecureHeaders>) {\n  return middleware(honoMw(honoSecureHeaders(...args)));\n}\n\nexport type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,cAAc,GAAG,MAA4C;CAC3E,OAAO,mBAAA,WAAW,gBAAA,QAAA,GAAA,oBAAA,cAAA,CAAyB,GAAG,IAAI,CAAC,CAAC;AACtD"}

package/dist/cjs/middleware/secure-headers.d.cts

@@ -1,3 +1,3 @@
 import { secureHeaders as honoSecureHeaders } from 'hono/secure-headers';
-export declare function secureHeaders(...args: Parameters<typeof honoSecureHeaders>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function secureHeaders(...args: Parameters<typeof honoSecureHeaders>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;

package/dist/cjs/middleware/timing.cjs

@@ -4,7 +4,7 @@ const require_hono_mw = require("./hono-mw.cjs");
 let hono_timing = require("hono/timing");
 //#region src/middleware/timing.ts
 function timing(...args) {
-	return require_middleware.defineMiddleware(require_hono_mw.honoMw((0, hono_timing.timing)(...args)));
+	return require_middleware.middleware(require_hono_mw.honoMw((0, hono_timing.timing)(...args)));
 }
 //#endregion
 exports.timing = timing;

package/dist/cjs/middleware/timing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"timing.cjs","names":[],"sources":["../../../src/middleware/timing.ts"],"sourcesContent":["import { timing as honoTiming } from \"hono/timing\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function timing(...args: Parameters<typeof honoTiming>) {\n  return defineMiddleware(honoMw(honoTiming(...args)));\n}\n\nexport type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,OAAO,GAAG,MAAqC;CAC7D,OAAO,mBAAA,iBAAiB,gBAAA,QAAA,GAAA,YAAA,OAAA,CAAkB,GAAG,IAAI,CAAC,CAAC;AACrD"}
+{"version":3,"file":"timing.cjs","names":[],"sources":["../../../src/middleware/timing.ts"],"sourcesContent":["import { timing as honoTiming } from \"hono/timing\";\n\nimport { middleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function timing(...args: Parameters<typeof honoTiming>) {\n  return middleware(honoMw(honoTiming(...args)));\n}\n\nexport type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;\n"],"mappings":";;;;;AAKA,SAAgB,OAAO,GAAG,MAAqC;CAC7D,OAAO,mBAAA,WAAW,gBAAA,QAAA,GAAA,YAAA,OAAA,CAAkB,GAAG,IAAI,CAAC,CAAC;AAC/C"}

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

@@ -1,3 +1,3 @@
 import { timing as honoTiming } from 'hono/timing';
-export declare function timing(...args: Parameters<typeof honoTiming>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
+export declare function timing(...args: Parameters<typeof honoTiming>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Promise<Response>, unknown, unknown, unknown, {}, null, {}>;
 export type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;

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

@@ -1,15 +1,17 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { RouterRegister } from '../register.js';
+import { RouterRegister } 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';
-import { AppContext, ExtractState, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, ValidatorParts } from './units.js';
+import { EmptyAppContext, ExtractState, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, ValidatorParts } from './units.js';
 export type { Awaitable } from '@taserjs/router-core';
 export type { SchemaRequestShape, InferInput, InferOutput, Schema, StandardSchemaV1, } from './schema.js';
-export type { RouterRegister } from '../register.js';
 export type { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnitRuntimeContext, UnwrapPart, } from './type-utils.js';
 export type { EmptyReturns, EnforceHandlerReply, HandlerReply, HasReturns, MergeReturns, ReplyFor, ReturnsMap, StatusCode, ValidHandlerReply, } from './returns.js';
-export type { AppContext, ExtractState, HttpMethod, IsUnknown, Method, MiddlewareDefinition, MiddlewareNext, MiddlewareReturnFromParts, MiddlewareUnit, MiddlewareUnitBuilder, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
+export type { EmptyAppContext, ExtractState, HttpMethod, IsUnknown, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, MiddlewareUnitBuilder, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
+export type AppContext = RouterRegister extends {
+    AppContext: infer C;
+} ? C : EmptyAppContext;
 export type RoutePath = RouterRegister extends {
     RoutePath: infer P;
 } ? P : never;
@@ -22,6 +24,7 @@ export type LayoutTree = RouterRegister extends {
 export type RouteByPathMethod = 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>;
 type ParseParam<Segment extends string> = Segment extends "*" ? {
     _splat: string;
 } : Segment extends `:${infer Name extends string}` ? Name extends "" ? {} : {
@@ -30,14 +33,20 @@ type ParseParam<Segment extends string> = Segment extends "*" ? {
 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 ResolveParams<TPathParams, TSchemaParams> = TSchemaParams extends Record<string, unknown> ? [keyof TSchemaParams] extends [never] ? TPathParams : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams> : TPathParams;
-type LayoutParent<Layout extends LayoutId> = LayoutTree[Layout] extends {
+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 ResolveLayoutMiddlewares<Layout extends LayoutId | null> = Layout extends null ? readonly [] : Layout extends LayoutId ? readonly [
-    ...ResolveLayoutMiddlewares<LayoutParent<Layout>>,
-    ...LayoutTree[Layout]["middlewares"]
+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[] ? 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]>,
+    ...LayoutMiddlewares<Layout>
 ] : readonly [];
-export type ResolveLayoutIdChain<L extends LayoutId | null> = L extends null ? readonly [] : L extends LayoutId ? readonly [...ResolveLayoutIdChain<LayoutParent<L>>, L] : 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> : {};
 /** Fold layout middleware Acc from a route's layoutChain (shallow → deep). */
@@ -45,7 +54,7 @@ type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain ex
     infer Head extends LayoutId,
     ...infer Rest
 ] ? readonly [
-    ...LayoutTree[Head]["middlewares"],
+    ...LayoutMiddlewares<Head>,
     ...ResolveLayoutChainMiddlewares<Rest extends readonly LayoutId[] ? Rest : readonly []>
 ] : readonly [];
 type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMethod[Path] extends {
@@ -61,12 +70,11 @@ export type RouteLayoutMiddlewares<Path extends RoutePath, TMethod extends Metho
 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>;
-type RouteChainField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = RouteResolvedField<Path, TMethod, 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, RouteChainField<Path, TMethod, Acc, "query">>>;
-    params: Simplify<ResolveParams<PathParams<Path>, MergePart<TParams, RouteChainField<Path, TMethod, Acc, "params">>>>;
-    body: Simplify<MergePart<TBody, RouteChainField<Path, TMethod, Acc, "body">>>;
-    state: Simplify<RouteChainField<Path, TMethod, Acc, "state">>;
+    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">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -151,9 +159,10 @@ export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = Acc & {
+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>;
     };
@@ -171,11 +180,12 @@ export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unkn
     ]): 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>;
 };
-export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = Acc & {
+export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = {
     readonly path: Path;
     readonly method: TMethod | "ANY" | "ALL";
     readonly methods?: readonly Method[];
     readonly middlewares: readonly MiddlewareDefinition[];
+    readonly __acc?: Acc;
     readonly returns?: TReturns;
     readonly bodyMode?: "json" | "form" | "urlencoded";
     handler: (ctx: unknown) => Awaitable<Response>;

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

@@ -37,8 +37,8 @@ export type MiddlewareInputField<Middleware, Field extends MiddlewareInputFieldN
         [K in Field]: infer V;
     };
 } ? V : {};
-export type MergeMiddlewareField<Middlewares extends readonly unknown[], Field extends MiddlewareFieldName> = [Middlewares] extends [readonly []] ? {} : UnionToIntersection<MiddlewareField<Middlewares[number], Field>>;
-export type MergeMiddlewareInputField<Middlewares extends readonly unknown[], Field extends MiddlewareInputFieldName> = [Middlewares] extends [readonly []] ? {} : UnionToIntersection<MiddlewareInputField<Middlewares[number], Field>>;
+export type MergeMiddlewareField<Middlewares extends readonly unknown[], Field extends MiddlewareFieldName> = Middlewares extends readonly [] ? {} : Middlewares extends readonly [infer Head, ...infer Tail] ? MiddlewareField<Head, Field> & MergeMiddlewareField<Tail, Field> : MiddlewareField<Middlewares[number], Field>;
+export type MergeMiddlewareInputField<Middlewares extends readonly unknown[], Field extends MiddlewareInputFieldName> = Middlewares extends readonly [] ? {} : Middlewares extends readonly [infer Head, ...infer Tail] ? MiddlewareInputField<Head, Field> & MergeMiddlewareInputField<Tail, Field> : MiddlewareInputField<Middlewares[number], Field>;
 export type RuntimeContextFields = {
     request: Request;
     method: Method;

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

@@ -1,11 +1,11 @@
-import { Awaitable, MiddlewareDefinition as CoreMiddlewareDefinition, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
+import { MiddlewareDefinition as CoreMiddlewareDefinition, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
 import { RequestShape, Simplify, UnitRuntimeContext, UnwrapPart } from './type-utils.js';
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
 export type { HttpMethod, Method } from './type-utils.js';
 export type { EmptyReturns, MergeReturns, ReturnsMap, HandlerReply, HasReturns, StatusCode, ValidHandlerReply, EnforceHandlerReply, } from './returns.js';
 /** Default empty app context for standalone units without a bound router instance. */
-export type AppContext = Record<never, never>;
+export type EmptyAppContext = Record<never, never>;
 export type ValidatorParts = {
     query?: unknown;
     params?: unknown;
@@ -18,16 +18,12 @@ export declare const StateBrand: unique symbol;
 export type NextResult<TState = unknown> = Response & {
     readonly [StateBrand]?: TState;
 };
-export type ExtractState<T> = [Extract<Awaited<T>, {
-    [StateBrand]?: unknown;
-}>] extends [never] ? {} : Extract<Awaited<T>, {
-    [StateBrand]?: unknown;
-}> extends {
-    [StateBrand]?: infer S;
-} ? [S] extends [never] ? {} : S : {};
+export type ExtractStateFromUnion<T> = T extends {
+    readonly [StateBrand]?: infer S;
+} ? [S] extends [never] ? never : [unknown] extends [S] ? {} : S : never;
+export type ExtractState<T> = [ExtractStateFromUnion<Awaited<T>>] extends [never] ? {} : ExtractStateFromUnion<Awaited<T>>;
 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 MiddlewareNext = NextFn;
 export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
     query: Simplify<UnwrapPart<TQuery>>;
@@ -42,7 +38,7 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn =
     };
 };
 export type DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody, TReturns extends ReturnsMap = {}, TLayout = null, TRequires = {}> = MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, TLayout, TRequires>;
-export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext, TState = {}> = Simplify<TAppContext & UnitRuntimeContext & {
+export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = EmptyAppContext, TState = {}> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
     body: Simplify<UnwrapPart<TBody>>;
@@ -50,18 +46,20 @@ export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBo
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
+export declare const MiddlewareUnitBrand: unique symbol;
 export type MiddlewareUnit<TAcc = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = unknown> = MiddlewareDefinition & {
+    readonly [MiddlewareUnitBrand]: true;
     readonly __middlewareAcc: TAcc;
     readonly __returns?: TReturns;
     readonly __requiredLayouts?: TRequiredLayouts;
     readonly __requiredState?: TRequiredState;
 };
-export type MiddlewareUnitBuilder<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = {}, TAppContext extends Record<string, unknown> = AppContext, TInheritedState = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = {
-    query<Q, QIn = unknown>(schema: Schema<Q, QIn>): MiddlewareUnitBuilder<Q, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, QIn, TParamsIn, TBodyIn>;
-    params<P, PIn = unknown>(schema: Schema<P, PIn>): MiddlewareUnitBuilder<TQuery, P, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, PIn, TBodyIn>;
-    body<B, BIn = unknown>(schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn>;
-    body<Mode extends "json" | "form" | "urlencoded", B, BIn = unknown>(mode: Mode, schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn>;
-    returns<const M extends ReturnsMap>(map: M): MiddlewareUnitBuilder<TQuery, TParams, TBody, Omit<TReturns, keyof M> & M, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn>;
-    requires<Requires extends Record<string, unknown>>(): MiddlewareUnitBuilder<TQuery, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState & Requires, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn>;
-    handler<TState = unknown, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TInheritedState & TRequiredState>, next: NextFn<NoInfer<TState>>) => Awaitable<R>): DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, TRequiredLayouts, TRequiredState>;
+export type MiddlewareUnitBuilder<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = {}, TAppContext extends Record<string, unknown> = EmptyAppContext, TInheritedState = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TExpectedState = unknown> = MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? {} : TExpectedState, TQueryIn, TParamsIn, TBodyIn>, TReturns, TRequiredLayouts, TRequiredState> & {
+    query<Q, QIn = unknown>(schema: Schema<Q, QIn>): MiddlewareUnitBuilder<Q, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, QIn, TParamsIn, TBodyIn, TExpectedState>;
+    params<P, PIn = unknown>(schema: Schema<P, PIn>): MiddlewareUnitBuilder<TQuery, P, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, PIn, TBodyIn, TExpectedState>;
+    body<B, BIn = unknown>(schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
+    body<Mode extends "json" | "form" | "urlencoded", B, BIn = unknown>(mode: Mode, schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
+    returns<const M extends ReturnsMap>(map: M): MiddlewareUnitBuilder<TQuery, TParams, TBody, Omit<TReturns, keyof M> & M, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
+    requires<Requires extends Record<string, unknown>>(): MiddlewareUnitBuilder<TQuery, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState & Requires, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
+    handler<R>(fn: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TInheritedState & TRequiredState>, next: NextFn<TExpectedState>) => R): DefineMiddlewareResult<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? ExtractState<R> : TExpectedState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, TRequiredLayouts, TRequiredState>;
 };

package/dist/esm/builder/factories.d.ts

@@ -1,15 +1,15 @@
-import { RouteBuilder, RoutePath } from '../types/index.js';
-import { AppContext, HttpMethod } from '../types/units.js';
+import { AppContext, RouteBuilder, RoutePath } from '../types/index.js';
+import { HttpMethod } from '../types/units.js';
 export type CreateWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
 export type CreateWithBodyRoute<M extends "POST" | "PUT" | "PATCH", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
 export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(path: Path, methods: Methods) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
 export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
-export declare const createGetRoute: CreateWithoutBodyRoute<"GET", AppContext>;
-export declare const createDeleteRoute: CreateWithoutBodyRoute<"DELETE", AppContext>;
-export declare const createOptionsRoute: CreateWithoutBodyRoute<"OPTIONS", AppContext>;
-export declare const createHeadRoute: CreateWithoutBodyRoute<"HEAD", AppContext>;
-export declare const createPostRoute: CreateWithBodyRoute<"POST", AppContext>;
-export declare const createPutRoute: CreateWithBodyRoute<"PUT", AppContext>;
-export declare const createPatchRoute: CreateWithBodyRoute<"PATCH", AppContext>;
+export declare const createGetRoute: CreateWithoutBodyRoute<"GET", import('../index.js').EmptyAppContext>;
+export declare const createDeleteRoute: CreateWithoutBodyRoute<"DELETE", import('../index.js').EmptyAppContext>;
+export declare const createOptionsRoute: CreateWithoutBodyRoute<"OPTIONS", import('../index.js').EmptyAppContext>;
+export declare const createHeadRoute: CreateWithoutBodyRoute<"HEAD", import('../index.js').EmptyAppContext>;
+export declare const createPostRoute: CreateWithBodyRoute<"POST", import('../index.js').EmptyAppContext>;
+export declare const createPutRoute: CreateWithBodyRoute<"PUT", import('../index.js').EmptyAppContext>;
+export declare const createPatchRoute: CreateWithBodyRoute<"PATCH", import('../index.js').EmptyAppContext>;
 export declare const createAnyRoute: CreateAnyRoute;
 export declare const createAllRoute: CreateAllRoute;

package/dist/esm/builder/factories.js.map

@@ -1 +1 @@
-{"version":3,"file":"factories.js","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { RouteBuilder, RoutePath } from \"../types/index.js\";\nimport type { AppContext, HttpMethod } from \"../types/units.js\";\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n  const Methods extends readonly HttpMethod[],\n>(\n  path: Path,\n  methods: Methods,\n) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n>(\n  path: Path,\n) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string) =>\n    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;\n}\n\nexport const createGetRoute = createWithoutBodyRoute(\"GET\");\nexport const createDeleteRoute = createWithoutBodyRoute(\"DELETE\");\nexport const createOptionsRoute = createWithoutBodyRoute(\"OPTIONS\");\nexport const createHeadRoute = createWithoutBodyRoute(\"HEAD\");\nexport const createPostRoute = createWithBodyRoute(\"POST\");\nexport const createPutRoute = createWithBodyRoute(\"PUT\");\nexport const createPatchRoute = createWithBodyRoute(\"PATCH\");\n\nexport const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>\n  createRouteBuilder(path, \"ANY\", methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((path: string) =>\n  createRouteBuilder(path, \"ALL\")) as unknown as CreateAllRoute;\n"],"mappings":";;AAgCA,SAAS,uBACP,QAC2B;CAC3B,SAAS,SACP,mBAAmB,MAAM,MAAM;AACnC;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,SAAiB,mBAAmB,MAAM,MAAM;AAC3D;AAEA,IAAa,iBAAiB,uBAAuB,KAAK;AAC1D,IAAa,oBAAoB,uBAAuB,QAAQ;AAChE,IAAa,qBAAqB,uBAAuB,SAAS;AAClE,IAAa,kBAAkB,uBAAuB,MAAM;AAC5D,IAAa,kBAAkB,oBAAoB,MAAM;AACzD,IAAa,iBAAiB,oBAAoB,KAAK;AACvD,IAAa,mBAAmB,oBAAoB,OAAO;AAE3D,IAAa,mBAAmC,MAAc,YAC5D,mBAAmB,MAAM,OAAO,OAAO;AAEzC,IAAa,mBAAmC,SAC9C,mBAAmB,MAAM,KAAK"}
+{"version":3,"file":"factories.js","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { AppContext, RouteBuilder, RoutePath } from \"../types/index.js\";\nimport type { HttpMethod } from \"../types/units.js\";\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n  const Methods extends readonly HttpMethod[],\n>(\n  path: Path,\n  methods: Methods,\n) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n>(\n  path: Path,\n) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string) =>\n    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;\n}\n\nexport const createGetRoute = createWithoutBodyRoute(\"GET\");\nexport const createDeleteRoute = createWithoutBodyRoute(\"DELETE\");\nexport const createOptionsRoute = createWithoutBodyRoute(\"OPTIONS\");\nexport const createHeadRoute = createWithoutBodyRoute(\"HEAD\");\nexport const createPostRoute = createWithBodyRoute(\"POST\");\nexport const createPutRoute = createWithBodyRoute(\"PUT\");\nexport const createPatchRoute = createWithBodyRoute(\"PATCH\");\n\nexport const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>\n  createRouteBuilder(path, \"ANY\", methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((path: string) =>\n  createRouteBuilder(path, \"ALL\")) as unknown as CreateAllRoute;\n"],"mappings":";;AAgCA,SAAS,uBACP,QAC2B;CAC3B,SAAS,SACP,mBAAmB,MAAM,MAAM;AACnC;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,SAAiB,mBAAmB,MAAM,MAAM;AAC3D;AAEA,IAAa,iBAAiB,uBAAuB,KAAK;AAC1D,IAAa,oBAAoB,uBAAuB,QAAQ;AAChE,IAAa,qBAAqB,uBAAuB,SAAS;AAClE,IAAa,kBAAkB,uBAAuB,MAAM;AAC5D,IAAa,kBAAkB,oBAAoB,MAAM;AACzD,IAAa,iBAAiB,oBAAoB,KAAK;AACvD,IAAa,mBAAmB,oBAAoB,OAAO;AAE3D,IAAa,mBAAmC,MAAc,YAC5D,mBAAmB,MAAM,OAAO,OAAO;AAEzC,IAAa,mBAAmC,SAC9C,mBAAmB,MAAM,KAAK"}

package/dist/esm/builder/middleware-unit.d.ts

@@ -1,18 +1 @@
-import { BodyMode } from '@taserjs/router-core';
-import { ReturnsMap } from '../types/returns.js';
-import { Schema } from '../types/schema.js';
-export declare function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]): {
-    query(schema: Schema<unknown>): /*elided*/ any;
-    params(schema: Schema<unknown>): /*elided*/ any;
-    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>): /*elided*/ any;
-    returns(map: ReturnsMap): /*elided*/ any;
-    requires(): /*elided*/ any;
-    handler(fn: (ctx: any, next: any) => any): {
-        __middlewareAcc: unknown;
-        __requiredLayouts?: string | readonly string[];
-        returns?: ReturnsMap;
-        __returns?: ReturnsMap;
-        bodyMode?: BodyMode;
-        handler: (ctx: any, next: any) => any;
-    };
-};
+export declare function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]): any;

package/dist/esm/builder/middleware-unit.js

@@ -4,6 +4,20 @@ function createMiddlewareUnitBuilder(requiredLayouts) {
 	const validators = {};
 	let bodyMode;
 	let returnsMap;
+	function toUnit(fn) {
+		const schemas = pickDefinedSchemas(validators);
+		return {
+			...fn ? { handler: fn } : {},
+			...schemas,
+			...bodyMode ? { bodyMode } : {},
+			...returnsMap ? {
+				returns: returnsMap,
+				__returns: returnsMap
+			} : {},
+			...requiredLayouts !== void 0 ? { __requiredLayouts: requiredLayouts } : {},
+			__middlewareAcc: void 0
+		};
+	}
 	const builder = {
 		query(schema) {
 			validators.query = schema;
@@ -34,19 +48,14 @@ function createMiddlewareUnitBuilder(requiredLayouts) {
 			return builder;
 		},
 		handler(fn) {
-			return {
-				handler: fn,
-				...pickDefinedSchemas(validators),
-				...bodyMode ? { bodyMode } : {},
-				...returnsMap ? {
-					returns: returnsMap,
-					__returns: returnsMap
-				} : {},
-				...requiredLayouts !== void 0 ? { __requiredLayouts: requiredLayouts } : {},
-				__middlewareAcc: void 0
-			};
-		}
+			return toUnit(fn);
+		},
+		toUnit() {
+			return toUnit();
+		},
+		__middlewareAcc: void 0
 	};
+	if (requiredLayouts !== void 0) builder.__requiredLayouts = requiredLayouts;
 	return builder;
 }
 //#endregion

package/dist/esm/builder/middleware-unit.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-unit.js","names":[],"sources":["../../../src/builder/middleware-unit.ts"],"sourcesContent":["import type { BodyMode } from \"@taserjs/router-core\";\n\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type { Schema } from \"../types/schema.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nexport function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]) {\n  const validators: SchemaValidators = {};\n  let bodyMode: BodyMode | undefined;\n  let returnsMap: ReturnsMap | undefined;\n\n  const builder = {\n    query(schema: Schema<unknown>) {\n      validators.query = schema;\n      return builder;\n    },\n    params(schema: Schema<unknown>) {\n      validators.params = schema;\n      return builder;\n    },\n    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {\n      if (typeof modeOrSchema === \"string\") {\n        bodyMode = modeOrSchema as BodyMode;\n        if (schema !== undefined) {\n          validators.body = schema;\n        }\n      } else {\n        bodyMode = \"json\";\n        validators.body = modeOrSchema;\n      }\n      return builder;\n    },\n    returns(map: ReturnsMap) {\n      returnsMap = { ...returnsMap, ...map };\n      return builder;\n    },\n    requires() {\n      return builder;\n    },\n    handler(fn: (ctx: any, next: any) => any) {\n      const schemas = pickDefinedSchemas(validators);\n      const unit = {\n        handler: fn,\n        ...schemas,\n        ...(bodyMode ? { bodyMode } : {}),\n        ...(returnsMap ? { returns: returnsMap, __returns: returnsMap } : {}),\n        ...(requiredLayouts !== undefined ? { __requiredLayouts: requiredLayouts } : {}),\n        __middlewareAcc: undefined as unknown,\n      };\n      return unit;\n    },\n  };\n\n  return builder;\n}\n"],"mappings":";;AAMA,SAAgB,4BAA4B,iBAA8C;CACxF,MAAM,aAA+B,CAAC;CACtC,IAAI;CACJ,IAAI;CAEJ,MAAM,UAAU;EACd,MAAM,QAAyB;GAC7B,WAAW,QAAQ;GACnB,OAAO;EACT;EACA,OAAO,QAAyB;GAC9B,WAAW,SAAS;GACpB,OAAO;EACT;EACA,KAAK,cAA0C,QAA0B;GACvE,IAAI,OAAO,iBAAiB,UAAU;IACpC,WAAW;IACX,IAAI,WAAW,KAAA,GACb,WAAW,OAAO;GAEtB,OAAO;IACL,WAAW;IACX,WAAW,OAAO;GACpB;GACA,OAAO;EACT;EACA,QAAQ,KAAiB;GACvB,aAAa;IAAE,GAAG;IAAY,GAAG;GAAI;GACrC,OAAO;EACT;EACA,WAAW;GACT,OAAO;EACT;EACA,QAAQ,IAAkC;GAUxC,OAAO;IAPL,SAAS;IACT,GAHc,mBAAmB,UAG9B;IACH,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;IAC/B,GAAI,aAAa;KAAE,SAAS;KAAY,WAAW;IAAW,IAAI,CAAC;IACnE,GAAI,oBAAoB,KAAA,IAAY,EAAE,mBAAmB,gBAAgB,IAAI,CAAC;IAC9E,iBAAiB,KAAA;GAEZ;EACT;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"middleware-unit.js","names":[],"sources":["../../../src/builder/middleware-unit.ts"],"sourcesContent":["import type { BodyMode } from \"@taserjs/router-core\";\n\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type { Schema } from \"../types/schema.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nexport function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]) {\n  const validators: SchemaValidators = {};\n  let bodyMode: BodyMode | undefined;\n  let returnsMap: ReturnsMap | undefined;\n\n  function toUnit(fn?: (ctx: any, next: any) => any) {\n    const schemas = pickDefinedSchemas(validators);\n    return {\n      ...(fn ? { handler: fn } : {}),\n      ...schemas,\n      ...(bodyMode ? { bodyMode } : {}),\n      ...(returnsMap ? { returns: returnsMap, __returns: returnsMap } : {}),\n      ...(requiredLayouts !== undefined ? { __requiredLayouts: requiredLayouts } : {}),\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  const builder: any = {\n    query(schema: Schema<unknown>) {\n      validators.query = schema;\n      return builder;\n    },\n    params(schema: Schema<unknown>) {\n      validators.params = schema;\n      return builder;\n    },\n    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {\n      if (typeof modeOrSchema === \"string\") {\n        bodyMode = modeOrSchema as BodyMode;\n        if (schema !== undefined) {\n          validators.body = schema;\n        }\n      } else {\n        bodyMode = \"json\";\n        validators.body = modeOrSchema;\n      }\n      return builder;\n    },\n    returns(map: ReturnsMap) {\n      returnsMap = { ...returnsMap, ...map };\n      return builder;\n    },\n    requires() {\n      return builder;\n    },\n    handler(fn: (ctx: any, next: any) => any) {\n      return toUnit(fn);\n    },\n    toUnit() {\n      return toUnit();\n    },\n    __middlewareAcc: undefined as unknown,\n  };\n\n  if (requiredLayouts !== undefined) {\n    builder.__requiredLayouts = requiredLayouts;\n  }\n\n  return builder;\n}\n"],"mappings":";;AAMA,SAAgB,4BAA4B,iBAA8C;CACxF,MAAM,aAA+B,CAAC;CACtC,IAAI;CACJ,IAAI;CAEJ,SAAS,OAAO,IAAmC;EACjD,MAAM,UAAU,mBAAmB,UAAU;EAC7C,OAAO;GACL,GAAI,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;GAC5B,GAAG;GACH,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;GAC/B,GAAI,aAAa;IAAE,SAAS;IAAY,WAAW;GAAW,IAAI,CAAC;GACnE,GAAI,oBAAoB,KAAA,IAAY,EAAE,mBAAmB,gBAAgB,IAAI,CAAC;GAC9E,iBAAiB,KAAA;EACnB;CACF;CAEA,MAAM,UAAe;EACnB,MAAM,QAAyB;GAC7B,WAAW,QAAQ;GACnB,OAAO;EACT;EACA,OAAO,QAAyB;GAC9B,WAAW,SAAS;GACpB,OAAO;EACT;EACA,KAAK,cAA0C,QAA0B;GACvE,IAAI,OAAO,iBAAiB,UAAU;IACpC,WAAW;IACX,IAAI,WAAW,KAAA,GACb,WAAW,OAAO;GAEtB,OAAO;IACL,WAAW;IACX,WAAW,OAAO;GACpB;GACA,OAAO;EACT;EACA,QAAQ,KAAiB;GACvB,aAAa;IAAE,GAAG;IAAY,GAAG;GAAI;GACrC,OAAO;EACT;EACA,WAAW;GACT,OAAO;EACT;EACA,QAAQ,IAAkC;GACxC,OAAO,OAAO,EAAE;EAClB;EACA,SAAS;GACP,OAAO,OAAO;EAChB;EACA,iBAAiB,KAAA;CACnB;CAEA,IAAI,oBAAoB,KAAA,GACtB,QAAQ,oBAAoB;CAG9B,OAAO;AACT"}

package/dist/esm/builder/middleware.js

@@ -6,6 +6,7 @@ function createMiddleware(layout) {
 		middlewares: entries,
 		use(definition) {
 			if (typeof definition === "function") entries.push({ handler: definition });
+			else if (typeof definition?.toUnit === "function") entries.push(definition.toUnit());
 			else entries.push(definition);
 			return chain;
 		}

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

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/builder/middleware.ts"],"sourcesContent":["import type { LayoutId, MiddlewareBuilder } from \"../types/index.js\";\nimport type { MiddlewareDefinition } from \"../types/units.js\";\n\nexport function createMiddleware<const Layout extends LayoutId>(\n  layout: Layout,\n): MiddlewareBuilder<Layout, readonly []> {\n  const entries: MiddlewareDefinition[] = [];\n\n  const chain = {\n    layout,\n    middlewares: entries,\n    use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)) {\n      if (typeof definition === \"function\") {\n        entries.push({ handler: definition as any });\n      } else {\n        entries.push(definition);\n      }\n      return chain;\n    },\n  };\n\n  return chain as unknown as MiddlewareBuilder<Layout, readonly []>;\n}\n"],"mappings":";AAGA,SAAgB,iBACd,QACwC;CACxC,MAAM,UAAkC,CAAC;CAEzC,MAAM,QAAQ;EACZ;EACA,aAAa;EACb,IAAI,YAAmE;GACrE,IAAI,OAAO,eAAe,YACxB,QAAQ,KAAK,EAAE,SAAS,WAAkB,CAAC;QAE3C,QAAQ,KAAK,UAAU;GAEzB,OAAO;EACT;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/builder/middleware.ts"],"sourcesContent":["import type { LayoutId, MiddlewareBuilder } from \"../types/index.js\";\nimport type { MiddlewareDefinition } from \"../types/units.js\";\n\nexport function createMiddleware<const Layout extends LayoutId>(\n  layout: Layout,\n): MiddlewareBuilder<Layout, readonly []> {\n  const entries: MiddlewareDefinition[] = [];\n\n  const chain = {\n    layout,\n    middlewares: entries,\n    use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)) {\n      if (typeof definition === \"function\") {\n        entries.push({ handler: definition as any });\n      } else if (typeof (definition as any)?.toUnit === \"function\") {\n        entries.push((definition as any).toUnit());\n      } else {\n        entries.push(definition);\n      }\n      return chain;\n    },\n  };\n\n  return chain as unknown as MiddlewareBuilder<Layout, readonly []>;\n}\n"],"mappings":";AAGA,SAAgB,iBACd,QACwC;CACxC,MAAM,UAAkC,CAAC;CAEzC,MAAM,QAAQ;EACZ;EACA,aAAa;EACb,IAAI,YAAmE;GACrE,IAAI,OAAO,eAAe,YACxB,QAAQ,KAAK,EAAE,SAAS,WAAkB,CAAC;QACtC,IAAI,OAAQ,YAAoB,WAAW,YAChD,QAAQ,KAAM,WAAmB,OAAO,CAAC;QAEzC,QAAQ,KAAK,UAAU;GAEzB,OAAO;EACT;CACF;CAEA,OAAO;AACT"}

package/dist/esm/builder/route.js

@@ -55,6 +55,7 @@ function createRouteBuilder(path, method, methods) {
 		},
 		use(definition) {
 			if (typeof definition === "function") middlewares.push({ handler: definition });
+			else if (typeof definition?.toUnit === "function") middlewares.push(definition.toUnit());
 			else middlewares.push(definition);
 			return builder;
 		},