@taserjs/router 0.0.4 → 0.0.5

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

@@ -1 +1 @@
-{"version":3,"file":"jwk.cjs","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\nimport { jwk as honoJwk } from \"hono/jwk\";\n\nimport { defineMiddleware } from \"../define/middleware.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 honoMw: MiddlewareHandler = honoJwk(honoOptions, safeInit);\n\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: (ctx, next) => {\n      return createTaserCompatHandler(honoMw)(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}\n"],"mappings":";;;;;AAgBA,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,UAAA,GAAA,SAAA,IAAA,CAAoC,aADzB,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CACZ;CAE/D,OAAO,mBAAA,iBAA4C,EACjD,UAAU,KAAK,SAAS;EACtB,QAAA,GAAA,qBAAA,yBAAA,CAAgC,MAAM,CAAC,CAAC,KAAK,YAAY;GACvD,MAAM,UAAW,IAAqD,IAAI;GAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;EACjD,CAAC;CACH,EACF,CAAC;AACH"}
+{"version":3,"file":"jwk.cjs","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import type { MiddlewareHandler } from \"hono\";\nimport { jwk as honoJwk } from \"hono/jwk\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { JwtMiddlewareUnit, JwtPayloadState } from \"./jwt.js\";\nimport { extractJwtPayload } from \"./wrap-hono.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 honoMw: MiddlewareHandler = honoJwk(honoOptions, safeInit);\n\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: extractJwtPayload<TPayload>(honoMw),\n  });\n}\n"],"mappings":";;;;;AAgBA,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;CAI1D,OAAO,mBAAA,iBAA4C,EACjD,SAAS,kBAAA,mBAAA,GAAA,SAAA,IAAA,CAH+B,aADzB,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CAIpC,CAAM,EAC7C,CAAC;AACH"}

package/dist/cjs/middleware/jwt.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_middleware = require("../define/middleware.cjs");
-let _taserjs_router_core = require("@taserjs/router-core");
+const require_wrap_hono = require("./wrap-hono.cjs");
 let hono_jwt = require("hono/jwt");
 //#region src/middleware/jwt.ts
 /**
@@ -8,13 +8,7 @@ let hono_jwt = require("hono/jwt");
 * Successfully decoded payload is placed in `ctx.state.jwtPayload`.
 */
 function jwt(options) {
-	const honoMw = (0, hono_jwt.jwt)(options);
-	return require_middleware.defineMiddleware({ handler: (ctx, next) => {
-		return (0, _taserjs_router_core.createTaserCompatHandler)(honoMw)(ctx, async () => {
-			const payload = ctx.var.jwtPayload;
-			return next({ jwtPayload: payload });
-		});
-	} });
+	return require_middleware.defineMiddleware({ handler: require_wrap_hono.extractJwtPayload((0, hono_jwt.jwt)(options)) });
 }
 //#endregion
 exports.jwt = jwt;

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

@@ -1 +1 @@
-{"version":3,"file":"jwt.cjs","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\nimport { jwt as honoJwt } from \"hono/jwt\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.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 honoMw: MiddlewareHandler = honoJwt(options);\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: (ctx, next) => {\n      return createTaserCompatHandler(honoMw)(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}\n"],"mappings":";;;;;;;;;AAqBA,SAAgB,IACd,SAC6B;CAC7B,MAAM,UAAA,GAAA,SAAA,IAAA,CAAoC,OAAO;CACjD,OAAO,mBAAA,iBAA4C,EACjD,UAAU,KAAK,SAAS;EACtB,QAAA,GAAA,qBAAA,yBAAA,CAAgC,MAAM,CAAC,CAAC,KAAK,YAAY;GACvD,MAAM,UAAW,IAAqD,IAAI;GAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;EACjD,CAAC;CACH,EACF,CAAC;AACH"}
+{"version":3,"file":"jwt.cjs","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import type { MiddlewareHandler } from \"hono\";\nimport { jwt as honoJwt } from \"hono/jwt\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\nimport { extractJwtPayload } from \"./wrap-hono.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 honoMw: MiddlewareHandler = honoJwt(options);\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: extractJwtPayload<TPayload>(honoMw),\n  });\n}\n"],"mappings":";;;;;;;;;AAqBA,SAAgB,IACd,SAC6B;CAE7B,OAAO,mBAAA,iBAA4C,EACjD,SAAS,kBAAA,mBAAA,GAAA,SAAA,IAAA,CAF+B,OAEH,CAAM,EAC7C,CAAC;AACH"}

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

@@ -2,9 +2,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_wrap_hono = require("./wrap-hono.cjs");
 let hono_secure_headers = require("hono/secure-headers");
 //#region src/middleware/secure-headers.ts
-var honoSecureHeadersMiddleware = require_wrap_hono.wrapHonoMiddleware(hono_secure_headers.secureHeaders);
+var wrapped = require_wrap_hono.wrapHonoMiddleware(hono_secure_headers.secureHeaders);
 function secureHeaders(...args) {
-	return honoSecureHeadersMiddleware(...args);
+	return wrapped(...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 { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst honoSecureHeadersMiddleware = wrapHonoMiddleware(honoSecureHeaders);\n\nexport function secureHeaders(...args: Parameters<typeof honoSecureHeaders>) {\n  return honoSecureHeadersMiddleware(...args);\n}\n\nexport type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;\n"],"mappings":";;;;AAIA,IAAM,8BAA8B,kBAAA,mBAAmB,oBAAA,aAAiB;AAExE,SAAgB,cAAc,GAAG,MAA4C;CAC3E,OAAO,4BAA4B,GAAG,IAAI;AAC5C"}
+{"version":3,"file":"secure-headers.cjs","names":[],"sources":["../../../src/middleware/secure-headers.ts"],"sourcesContent":["import { secureHeaders as honoSecureHeaders } from \"hono/secure-headers\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoSecureHeaders);\n\nexport function secureHeaders(...args: Parameters<typeof honoSecureHeaders>) {\n  return wrapped(...args);\n}\n\nexport type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;\n"],"mappings":";;;;AAIA,IAAM,UAAU,kBAAA,mBAAmB,oBAAA,aAAiB;AAEpD,SAAgB,cAAc,GAAG,MAA4C;CAC3E,OAAO,QAAQ,GAAG,IAAI;AACxB"}

package/dist/cjs/middleware/timing.cjs

@@ -2,9 +2,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_wrap_hono = require("./wrap-hono.cjs");
 let hono_timing = require("hono/timing");
 //#region src/middleware/timing.ts
-var honoTimingMiddleware = require_wrap_hono.wrapHonoMiddleware(hono_timing.timing);
+var wrapped = require_wrap_hono.wrapHonoMiddleware(hono_timing.timing);
 function timing(...args) {
-	return honoTimingMiddleware(...args);
+	return wrapped(...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 { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst honoTimingMiddleware = wrapHonoMiddleware(honoTiming);\n\nexport function timing(...args: Parameters<typeof honoTiming>) {\n  return honoTimingMiddleware(...args);\n}\n\nexport type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;\n"],"mappings":";;;;AAIA,IAAM,uBAAuB,kBAAA,mBAAmB,YAAA,MAAU;AAE1D,SAAgB,OAAO,GAAG,MAAqC;CAC7D,OAAO,qBAAqB,GAAG,IAAI;AACrC"}
+{"version":3,"file":"timing.cjs","names":[],"sources":["../../../src/middleware/timing.ts"],"sourcesContent":["import { timing as honoTiming } from \"hono/timing\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoTiming);\n\nexport function timing(...args: Parameters<typeof honoTiming>) {\n  return wrapped(...args);\n}\n\nexport type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;\n"],"mappings":";;;;AAIA,IAAM,UAAU,kBAAA,mBAAmB,YAAA,MAAU;AAE7C,SAAgB,OAAO,GAAG,MAAqC;CAC7D,OAAO,QAAQ,GAAG,IAAI;AACxB"}

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

@@ -1,9 +1,19 @@
 const require_middleware = require("../define/middleware.cjs");
+let _taserjs_router_core = require("@taserjs/router-core");
 //#region src/middleware/wrap-hono.ts
 function wrapHonoMiddleware(honoFactory) {
 	return (...args) => require_middleware.defineMiddleware(honoFactory(...args));
 }
+/** Extracts the jwtPayload from Hono's variable bag and forwards it into Taser's state via next(). */
+function extractJwtPayload(honoMw) {
+	const taserHandler = (0, _taserjs_router_core.createTaserCompatHandler)(honoMw);
+	return (ctx, next) => taserHandler(ctx, async () => {
+		const payload = ctx.var.jwtPayload;
+		return next({ jwtPayload: payload });
+	});
+}
 //#endregion
+exports.extractJwtPayload = extractJwtPayload;
 exports.wrapHonoMiddleware = wrapHonoMiddleware;
 
 //# sourceMappingURL=wrap-hono.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"wrap-hono.cjs","names":[],"sources":["../../../src/middleware/wrap-hono.ts"],"sourcesContent":["import type { MiddlewareHandler } from \"hono\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\n\nexport function wrapHonoMiddleware<F extends (...args: never[]) => MiddlewareHandler>(\n  honoFactory: F,\n): (\n  ...args: Parameters<F>\n) => MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>> {\n  return (...args) => defineMiddleware(honoFactory(...args));\n}\n"],"mappings":";;AAKA,SAAgB,mBACd,aAG4E;CAC5E,QAAQ,GAAG,SAAS,mBAAA,iBAAiB,YAAY,GAAG,IAAI,CAAC;AAC3D"}
+{"version":3,"file":"wrap-hono.cjs","names":[],"sources":["../../../src/middleware/wrap-hono.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\n\nexport function wrapHonoMiddleware<F extends (...args: never[]) => MiddlewareHandler>(\n  honoFactory: F,\n): (\n  ...args: Parameters<F>\n) => MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>> {\n  return (...args) => defineMiddleware(honoFactory(...args));\n}\n\n/** Extracts the jwtPayload from Hono's variable bag and forwards it into Taser's state via next(). */\nexport function extractJwtPayload<TPayload>(\n  honoMw: MiddlewareHandler,\n): (ctx: unknown, next: (state: { jwtPayload: TPayload }) => unknown) => unknown {\n  const taserHandler = createTaserCompatHandler(honoMw);\n  return (ctx, next) =>\n    taserHandler(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    });\n}\n"],"mappings":";;;AAMA,SAAgB,mBACd,aAG4E;CAC5E,QAAQ,GAAG,SAAS,mBAAA,iBAAiB,YAAY,GAAG,IAAI,CAAC;AAC3D;;AAGA,SAAgB,kBACd,QAC+E;CAC/E,MAAM,gBAAA,GAAA,qBAAA,yBAAA,CAAwC,MAAM;CACpD,QAAQ,KAAK,SACX,aAAa,KAAK,YAAY;EAC5B,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC;AACL"}

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

@@ -1,3 +1,7 @@
 import { MiddlewareHandler } from 'hono';
 import { MiddlewareReturnFromParts, MiddlewareUnit } from '../types/units.js';
 export declare function wrapHonoMiddleware<F extends (...args: never[]) => MiddlewareHandler>(honoFactory: F): (...args: Parameters<F>) => MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+/** Extracts the jwtPayload from Hono's variable bag and forwards it into Taser's state via next(). */
+export declare function extractJwtPayload<TPayload>(honoMw: MiddlewareHandler): (ctx: unknown, next: (state: {
+    jwtPayload: TPayload;
+}) => unknown) => unknown;

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

@@ -1,5 +1,6 @@
+import { RouteManifestShape } from '@taserjs/router-core';
 import { ResponseValidationFailureHandler } from '@taserjs/router-utils';
-import { TaserApp } from '../taser-app.js';
+import { TaserApp } from '../builder/app.js';
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
 export type CreateTaserAppOptions = {
@@ -21,19 +22,18 @@ export type CreateTaserAppOptions = {
         expires?: Date;
     };
 };
-export type CreateContextArgs = {
-    native?: import('./units.js').NativeContext;
-};
 export type ContextDefinition<TBoot extends Record<string, unknown> = Record<string, never>, TReq extends Record<string, unknown> = Record<string, never>> = {
     boot?: () => TBoot | Promise<TBoot>;
-    request?: (args: CreateContextArgs) => TReq | Promise<TReq>;
+    request?: (req: Request) => TReq | Promise<TReq>;
 };
 export type InferAppContext<T extends ContextDefinition<Record<string, unknown>, Record<string, unknown>>> = T extends ContextDefinition<infer TBoot, infer TReq> ? TBoot & TReq : Record<string, never>;
 export type OnErrorOptions<TResponses extends ReturnsMap = ReturnsMap> = {
     responses?: TResponses;
     handle: (error: unknown, ctx?: unknown) => Response | Promise<Response>;
 };
-export type InferAppManifest<TApp> = TApp extends TaserApp<infer TManifest> ? TManifest : never;
+export type InferAppManifest<TApp> = TApp extends TaserApp<infer TManifest> ? TManifest : TApp extends {
+    manifest: infer TManifest;
+} ? TManifest : TApp extends RouteManifestShape ? TApp : never;
 export type TaserHandler<TFrameworkApp> = {
     /**
      * Mount the Taser handler on a framework app.
@@ -44,4 +44,4 @@ export type TaserHandler<TFrameworkApp> = {
 };
 export type { RouteManifestShape } from '@taserjs/router-core';
 export type { Schema };
-export type { TaserApp, TaserNativeBound } from '../taser-app.js';
+export type { TaserApp } from '../builder/app.js';

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

@@ -3,13 +3,13 @@ import { RouterRegister } from '../register.js';
 import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, RuntimeContextFields, Simplify, UnionToIntersection } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
-import { AppContext, ExtractState, HandlerContext, HandlerUnit, InlineMiddlewareOptions, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NativeContext, ValidatorParts } from './units.js';
+import { AppContext, ExtractState, HandlerContext, HandlerUnit, InlineMiddlewareOptions, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, 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, UnwrapPart, } from './type-utils.js';
-export type { EmptyReturns, EnforceHandlerReply, HandlerReply, HasReturns, MergeReturns, ReplyResultFor, ReturnsMap, StatusCode, ValidHandlerReply, } from './returns.js';
-export type { AppContext, ExtractState, HandlerContext, HandlerUnit, HttpMethod, InlineMiddlewareOptions, IsUnknown, Method, MiddlewareDefinition, MiddlewareNext, MiddlewareReturnFromParts, MiddlewareUnit, NativeContext, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
+export type { EmptyReturns, EnforceHandlerReply, HandlerReply, HasReturns, MergeReturns, ReplyFor, ReturnsMap, StatusCode, ValidHandlerReply, } from './returns.js';
+export type { AppContext, ExtractState, HandlerContext, HandlerUnit, HttpMethod, InlineMiddlewareOptions, IsUnknown, Method, MiddlewareDefinition, MiddlewareNext, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
 export type RoutePath = RouterRegister extends {
     RoutePath: infer P;
 } ? P : never;
@@ -29,6 +29,7 @@ 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 {
     parent: infer Parent extends LayoutId | null;
 } ? Parent : null;
@@ -58,10 +59,10 @@ type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> = RouteEnt
 } ? Chain : RouteParent<Path, TMethod> extends LayoutId ? readonly [RouteParent<Path, TMethod>] : readonly [];
 type RouteResolvedField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<ResolveLayoutChainMiddlewares<RouteLayoutChain<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>;
-type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, "var">;
+type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;
 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<PathParams<Path> & MergePart<TParams, RouteChainField<Path, TMethod, Acc, "params">>>;
+    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">>;
     headers: TaserHeaders;
@@ -77,9 +78,9 @@ export type RouteHandleContext<Path extends RoutePath, TMethod extends Method, A
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
     } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, "query">>>;
-    params: Simplify<PathParams<Path> & MergePart<Validators extends {
+    params: Simplify<ResolveParams<PathParams<Path>, MergePart<Validators extends {
         params?: infer P;
-    } ? P : unknown, RouteResolvedField<Path, TMethod, Acc, "params">>>;
+    } ? P : unknown, RouteResolvedField<Path, TMethod, Acc, "params">>>>;
     body: Simplify<MergePart<Validators extends {
         body?: infer B;
     } ? B : unknown, RouteResolvedField<Path, TMethod, Acc, "body">>>;
@@ -96,9 +97,9 @@ export type RouteHandleContextWithoutBody<Path extends RoutePath, TMethod extend
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
     } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, "query">>>;
-    params: Simplify<PathParams<Path> & MergePart<Validators extends {
+    params: Simplify<ResolveParams<PathParams<Path>, MergePart<Validators extends {
         params?: infer P;
-    } ? P : unknown, RouteResolvedField<Path, TMethod, Acc, "params">>>;
+    } ? P : unknown, RouteResolvedField<Path, TMethod, Acc, "params">>>>;
     body: never;
     state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
     headers: TaserHeaders;
@@ -119,11 +120,11 @@ type RouteQueryInput<Path extends RoutePath, TMethod extends Method, Acc extends
 } ? QI : unknown, Validators extends {
     query?: infer Q;
 } ? Q : unknown>, RouteResolvedInputField<Path, TMethod, Acc, "query">>>;
-type RouteParamsInput<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts> = Simplify<PathParams<Path> & MergePart<RequestShape<Validators extends {
+type RouteParamsInput<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts> = Simplify<ResolveParams<PathParams<Path>, MergePart<RequestShape<Validators extends {
     paramsIn?: infer PI;
 } ? PI : unknown, Validators extends {
     params?: infer P;
-} ? P : unknown>, RouteResolvedInputField<Path, TMethod, Acc, "params">>>;
+} ? P : unknown>, RouteResolvedInputField<Path, TMethod, Acc, "params">>>>;
 type RouteBodyInput<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts> = Simplify<MergePart<RequestShape<Validators extends {
     bodyIn?: infer BI;
 } ? BI : unknown, Validators extends {
@@ -131,7 +132,7 @@ type RouteBodyInput<Path extends RoutePath, TMethod extends Method, Acc extends
 } ? B : unknown>, RouteResolvedInputField<Path, TMethod, Acc, "body">>>;
 export type RouteHandleInputWithoutBody<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts = {}> = Simplify<InputFacet<RouteQueryInput<Path, TMethod, Acc, Validators>, "query"> & InputFacet<RouteParamsInput<Path, TMethod, Acc, Validators>, "params">>;
 export type RouteHandleInput<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts = {}> = Simplify<RouteHandleInputWithoutBody<Path, TMethod, Acc, Validators> & InputFacet<RouteBodyInput<Path, TMethod, Acc, Validators>, "body">>;
-export type InferRouteInput<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
+export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
     route: infer Route;
 } ? Route extends {
     $Infer: {
@@ -180,7 +181,7 @@ export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc exte
     handler: (ctx: unknown) => Awaitable<Response>;
     readonly $Infer: {
         Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, {}> : RouteHandleContext<Path, TMethod, Acc, {}>;
-        /** Concrete handler reply (`ReplyOf` union) for client inference. */
+        Input: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleInputWithoutBody<Path, TMethod, Acc, {}> : RouteHandleInput<Path, TMethod, Acc, {}>;
         Output: TOutput;
     };
     query?: Schema<unknown>;
@@ -202,6 +203,8 @@ export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc ext
     readonly method: TMethod;
     readonly $Infer: {
         Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>;
+        Input: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleInputWithoutBody<Path, TMethod, Acc, Validators> : RouteHandleInput<Path, TMethod, Acc, Validators>;
+        Output: TReturns;
     };
     returns<const M extends ReturnsMap>(map: M): RouteBuilder<Path, TMethod, Acc, Validators, Omit<TReturns, keyof M> & M, TAppContext>;
     use<TAcc, UReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = unknown>(unit: MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequiredState>, ..._assert: [
@@ -254,3 +257,19 @@ export type HandlerBuilder<Acc extends readonly unknown[] = readonly [], Validat
         }
     ]): HandlerUnit<Acc, Validators, TReturns, R>;
 };
+export type RouteDefinition<Path extends RoutePath = RoutePath, TMethod extends Method = Method, Acc extends readonly unknown[] = readonly unknown[], Validators extends ValidatorParts = ValidatorParts, TReturns extends ReturnsMap = ReturnsMap, TOutput = Response, TAppContext extends Record<string, unknown> = AppContext> = RouteHandleResult<Path, TMethod, Acc, Validators, TReturns, TOutput, TAppContext>;
+export type InferRouteContext<R> = R extends {
+    $Infer: {
+        Context: infer C;
+    };
+} ? C : never;
+export type InferRouteInput<R> = R extends {
+    $Infer: {
+        Input: infer I;
+    };
+} ? I : never;
+export type InferRouteOutput<R> = R extends {
+    $Infer: {
+        Output: infer O;
+    };
+} ? O : never;

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

@@ -13,7 +13,7 @@ export type ReturnsMap = {
 /** Later map wins on overlapping status keys. */
 export type MergeReturns<A extends ReturnsMap, B extends ReturnsMap> = Omit<A, keyof B> & B;
 /** Typed reply union for statuses declared in a returns map. */
-export type ReplyResultFor<M extends ReturnsMap> = {
+export type ReplyFor<M extends ReturnsMap> = {
     [S in keyof M]-?: S extends StatusCode ? M[S] extends Schema<unknown> ? ReplyOf<S, Simplify<InferOutput<M[S]>>> : never : never;
 }[keyof M];
 export type EmptyReturns = {};
@@ -34,4 +34,4 @@ export type EnforceHandlerReply<R, M extends ReturnsMap> = [R] extends [ValidHan
  * Expected `.handler` return type for a returns map.
  * Prefer constraining handler generics with {@link EnforceHandlerReply}.
  */
-export type HandlerReply<M extends ReturnsMap> = HasReturns<M> extends true ? ReplyResultFor<M> | Response : Response;
+export type HandlerReply<M extends ReturnsMap> = HasReturns<M> extends true ? ReplyFor<M> | Response : Response;

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

@@ -37,13 +37,12 @@ export type MiddlewareInputField<Middleware, Field extends MiddlewareInputFieldN
 } ? 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 RuntimeContextFields<TNative = unknown> = {
+export type RuntimeContextFields = {
     request: Request;
     method: Method;
     url: URL;
     headers: import('@taserjs/router-core').TaserHeaders;
     cookies: import('@taserjs/router-core').TaserCookieJar;
     var: Record<string, unknown>;
-    native?: TNative;
 };
 export {};

package/dist/cjs/types/units.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"units.cjs","names":[],"sources":["../../../src/types/units.ts"],"sourcesContent":["import type { Awaitable, TaserCookieJar, TaserHeaders } from \"@taserjs/router-core\";\nimport type { ReplyResult } from \"@taserjs/router-utils\";\n\nimport type { RouterRegister } from \"../register.js\";\nimport type {\n  MergeMiddlewareField,\n  MergePart,\n  RequestShape,\n  RuntimeContextFields,\n  Simplify,\n  UnwrapPart,\n} from \"./type-utils.js\";\nimport type { ReturnsMap } from \"./returns.js\";\nimport type { Schema } from \"./schema.js\";\n\nexport type { HttpMethod, Method } from \"./type-utils.js\";\nexport type {\n  EmptyReturns,\n  MergeReturns,\n  ReturnsMap,\n  HandlerReply,\n  HasReturns,\n  StatusCode,\n  ValidHandlerReply,\n  EnforceHandlerReply,\n} from \"./returns.js\";\n\n/** Default empty app context for standalone units without a bound router instance. */\nexport type AppContext = Record<never, never>;\n\nexport type NativeContext = RouterRegister extends { NativeContext: infer N } ? N : unknown;\n\nexport type ValidatorParts = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  queryIn?: unknown;\n  paramsIn?: unknown;\n  bodyIn?: unknown;\n};\n\nexport declare const StateBrand: unique symbol;\n\nexport type NextResult<TState = unknown> = ReplyResult & {\n  readonly [StateBrand]?: TState;\n};\n\nexport type ExtractState<T> = [Extract<Awaited<T>, { [StateBrand]?: unknown }>] extends [never]\n  ? {}\n  : Extract<Awaited<T>, { [StateBrand]?: unknown }> extends { [StateBrand]?: infer S }\n    ? [S] extends [never]\n      ? {}\n      : S\n    : {};\n\nexport type IsUnknown<T> = [unknown] extends [T] ? true : false;\n\nexport type NextFn<TExpectedState = unknown> =\n  IsUnknown<TExpectedState> extends true\n    ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>>\n    : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;\n\nexport type MiddlewareNext = NextFn;\n\nexport type MiddlewareDefinition = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  returns?: ReturnsMap;\n  handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<ReplyResult | Response | unknown>;\n};\n\nexport type MiddlewareReturnFromParts<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  TQueryIn = TQuery,\n  TParamsIn = TParams,\n  TBodyIn = TBody,\n> = {\n  query: Simplify<UnwrapPart<TQuery>>;\n  params: Simplify<UnwrapPart<TParams>>;\n  body: Simplify<UnwrapPart<TBody>>;\n  state: Simplify<UnwrapPart<TState>>;\n  /** Pre-parse shapes merged into route `$Infer.Input`. */\n  input: {\n    query: RequestShape<TQueryIn, TQuery>;\n    params: RequestShape<TParamsIn, TParams>;\n    body: RequestShape<TBodyIn, TBody>;\n  };\n};\n\ntype UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, \"var\">;\n\nexport type StandaloneMiddlewareContext<\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n  TState = {},\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<UnwrapPart<TQuery>>;\n      params: Simplify<UnwrapPart<TParams>>;\n      body: Simplify<UnwrapPart<TBody>>;\n      state: Simplify<UnwrapPart<TState>>;\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type HandlerContext<\n  Acc extends readonly unknown[],\n  Validators extends ValidatorParts,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<\n        MergePart<\n          Validators extends { query?: infer Q } ? Q : unknown,\n          MergeMiddlewareField<Acc, \"query\">\n        >\n      >;\n      params: Simplify<\n        MergePart<\n          Validators extends { params?: infer P } ? P : unknown,\n          MergeMiddlewareField<Acc, \"params\">\n        >\n      >;\n      body: Simplify<\n        MergePart<\n          Validators extends { body?: infer B } ? B : unknown,\n          MergeMiddlewareField<Acc, \"body\">\n        >\n      >;\n      state: Simplify<MergeMiddlewareField<Acc, \"state\">>;\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type MiddlewareUnit<\n  TAcc = unknown,\n  TReturns extends ReturnsMap = {},\n  TRequiredLayouts = unknown,\n  TRequiredState = unknown,\n> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc;\n  readonly __returns?: TReturns;\n  readonly __requiredLayouts?: TRequiredLayouts;\n  readonly __requiredState?: TRequiredState;\n};\n\nexport type HandlerUnit<\n  _Acc extends readonly unknown[],\n  _Validators extends ValidatorParts,\n  TReturns extends ReturnsMap = {},\n  TOutput = Response,\n> = {\n  readonly __returns?: TReturns;\n  readonly $Infer: {\n    Output: TOutput;\n  };\n  middlewares: readonly MiddlewareDefinition[];\n  handler: (ctx: unknown) => Awaitable<ReplyResult | Response>;\n  returns?: ReturnsMap;\n  query?: Schema<unknown>;\n  params?: Schema<unknown>;\n  body?: Schema<unknown>;\n};\n\nexport type InlineMiddlewareOptions<\n  Ctx = unknown,\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (ctx: Ctx, next: NextFn) => Awaitable<R>;\n};\n\nexport function isHandlerUnit(\n  value: unknown,\n): value is HandlerUnit<readonly unknown[], ValidatorParts> {\n  return (\n    typeof value === \"object\" &&\n    value !== null &&\n    \"handler\" in value &&\n    \"middlewares\" in value &&\n    Array.isArray((value as HandlerUnit<readonly unknown[], ValidatorParts>).middlewares)\n  );\n}\n"],"mappings":";AAgMA,SAAgB,cACd,OAC0D;CAC1D,OACE,OAAO,UAAU,YACjB,UAAU,QACV,aAAa,SACb,iBAAiB,SACjB,MAAM,QAAS,MAA0D,WAAW;AAExF"}
+{"version":3,"file":"units.cjs","names":[],"sources":["../../../src/types/units.ts"],"sourcesContent":["import type { Awaitable, TaserCookieJar, TaserHeaders } from \"@taserjs/router-core\";\n\nimport type {\n  MergeMiddlewareField,\n  MergePart,\n  RequestShape,\n  RuntimeContextFields,\n  Simplify,\n  UnwrapPart,\n} from \"./type-utils.js\";\nimport type { ReturnsMap } from \"./returns.js\";\nimport type { Schema } from \"./schema.js\";\n\nexport type { HttpMethod, Method } from \"./type-utils.js\";\nexport type {\n  EmptyReturns,\n  MergeReturns,\n  ReturnsMap,\n  HandlerReply,\n  HasReturns,\n  StatusCode,\n  ValidHandlerReply,\n  EnforceHandlerReply,\n} from \"./returns.js\";\n\n/** Default empty app context for standalone units without a bound router instance. */\nexport type AppContext = Record<never, never>;\n\nexport type ValidatorParts = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  queryIn?: unknown;\n  paramsIn?: unknown;\n  bodyIn?: unknown;\n};\n\nexport declare const StateBrand: unique symbol;\n\nexport type NextResult<TState = unknown> = Response & {\n  readonly [StateBrand]?: TState;\n};\n\nexport type ExtractState<T> = [Extract<Awaited<T>, { [StateBrand]?: unknown }>] extends [never]\n  ? {}\n  : Extract<Awaited<T>, { [StateBrand]?: unknown }> extends { [StateBrand]?: infer S }\n    ? [S] extends [never]\n      ? {}\n      : S\n    : {};\n\nexport type IsUnknown<T> = [unknown] extends [T] ? true : false;\n\nexport type NextFn<TExpectedState = unknown> =\n  IsUnknown<TExpectedState> extends true\n    ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>>\n    : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;\n\nexport type MiddlewareNext = NextFn;\n\nexport type MiddlewareDefinition = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  returns?: ReturnsMap;\n  handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<Response | unknown>;\n};\n\nexport type MiddlewareReturnFromParts<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  TQueryIn = TQuery,\n  TParamsIn = TParams,\n  TBodyIn = TBody,\n> = {\n  query: Simplify<UnwrapPart<TQuery>>;\n  params: Simplify<UnwrapPart<TParams>>;\n  body: Simplify<UnwrapPart<TBody>>;\n  state: Simplify<UnwrapPart<TState>>;\n  /** Pre-parse shapes merged into route `$Infer.Input`. */\n  input: {\n    query: RequestShape<TQueryIn, TQuery>;\n    params: RequestShape<TParamsIn, TParams>;\n    body: RequestShape<TBodyIn, TBody>;\n  };\n};\n\ntype UnitRuntimeContext = Omit<RuntimeContextFields, \"var\">;\n\nexport type StandaloneMiddlewareContext<\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n  TState = {},\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<UnwrapPart<TQuery>>;\n      params: Simplify<UnwrapPart<TParams>>;\n      body: Simplify<UnwrapPart<TBody>>;\n      state: Simplify<UnwrapPart<TState>>;\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type HandlerContext<\n  Acc extends readonly unknown[],\n  Validators extends ValidatorParts,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<\n        MergePart<\n          Validators extends { query?: infer Q } ? Q : unknown,\n          MergeMiddlewareField<Acc, \"query\">\n        >\n      >;\n      params: Simplify<\n        MergePart<\n          Validators extends { params?: infer P } ? P : unknown,\n          MergeMiddlewareField<Acc, \"params\">\n        >\n      >;\n      body: Simplify<\n        MergePart<\n          Validators extends { body?: infer B } ? B : unknown,\n          MergeMiddlewareField<Acc, \"body\">\n        >\n      >;\n      state: Simplify<MergeMiddlewareField<Acc, \"state\">>;\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type MiddlewareUnit<\n  TAcc = unknown,\n  TReturns extends ReturnsMap = {},\n  TRequiredLayouts = unknown,\n  TRequiredState = unknown,\n> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc;\n  readonly __returns?: TReturns;\n  readonly __requiredLayouts?: TRequiredLayouts;\n  readonly __requiredState?: TRequiredState;\n};\n\nexport type HandlerUnit<\n  _Acc extends readonly unknown[],\n  _Validators extends ValidatorParts,\n  TReturns extends ReturnsMap = {},\n  TOutput = Response,\n> = {\n  readonly __returns?: TReturns;\n  readonly $Infer: {\n    Output: TOutput;\n  };\n  middlewares: readonly MiddlewareDefinition[];\n  handler: (ctx: unknown) => Awaitable<Response>;\n  returns?: ReturnsMap;\n  query?: Schema<unknown>;\n  params?: Schema<unknown>;\n  body?: Schema<unknown>;\n};\n\nexport type InlineMiddlewareOptions<\n  Ctx = unknown,\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (ctx: Ctx, next: NextFn) => Awaitable<R>;\n};\n\nexport function isHandlerUnit(\n  value: unknown,\n): value is HandlerUnit<readonly unknown[], ValidatorParts> {\n  return (\n    typeof value === \"object\" &&\n    value !== null &&\n    \"handler\" in value &&\n    \"middlewares\" in value &&\n    Array.isArray((value as HandlerUnit<readonly unknown[], ValidatorParts>).middlewares)\n  );\n}\n"],"mappings":";AA4LA,SAAgB,cACd,OAC0D;CAC1D,OACE,OAAO,UAAU,YACjB,UAAU,QACV,aAAa,SACb,iBAAiB,SACjB,MAAM,QAAS,MAA0D,WAAW;AAExF"}

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

@@ -1,6 +1,4 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { ReplyResult } from '@taserjs/router-utils';
-import { RouterRegister } from '../register.js';
 import { MergeMiddlewareField, MergePart, RequestShape, RuntimeContextFields, Simplify, UnwrapPart } from './type-utils.js';
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
@@ -8,9 +6,6 @@ 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 NativeContext = RouterRegister extends {
-    NativeContext: infer N;
-} ? N : unknown;
 export type ValidatorParts = {
     query?: unknown;
     params?: unknown;
@@ -20,7 +15,7 @@ export type ValidatorParts = {
     bodyIn?: unknown;
 };
 export declare const StateBrand: unique symbol;
-export type NextResult<TState = unknown> = ReplyResult & {
+export type NextResult<TState = unknown> = Response & {
     readonly [StateBrand]?: TState;
 };
 export type ExtractState<T> = [Extract<Awaited<T>, {
@@ -38,7 +33,7 @@ export type MiddlewareDefinition = {
     params?: unknown;
     body?: unknown;
     returns?: ReturnsMap;
-    handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<ReplyResult | Response | unknown>;
+    handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<Response | unknown>;
 };
 export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
     query: Simplify<UnwrapPart<TQuery>>;
@@ -52,7 +47,7 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn =
         body: RequestShape<TBodyIn, TBody>;
     };
 };
-type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, "var">;
+type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;
 export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext, TState = {}> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
@@ -87,7 +82,7 @@ export type HandlerUnit<_Acc extends readonly unknown[], _Validators extends Val
         Output: TOutput;
     };
     middlewares: readonly MiddlewareDefinition[];
-    handler: (ctx: unknown) => Awaitable<ReplyResult | Response>;
+    handler: (ctx: unknown) => Awaitable<Response>;
     returns?: ReturnsMap;
     query?: Schema<unknown>;
     params?: Schema<unknown>;

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

@@ -0,0 +1,11 @@
+import { RouteManifestShape, TaserRuntime } from '@taserjs/router-core';
+declare class TaserServeView {
+    protected readonly runtime: TaserRuntime;
+    readonly fetch: (request: Request, env?: unknown, executionCtx?: unknown) => Promise<Response> | Response;
+    constructor(runtime: TaserRuntime);
+}
+export declare class TaserApp<TManifest extends RouteManifestShape = RouteManifestShape> extends TaserServeView {
+    readonly __manifest?: TManifest;
+    constructor(runtime: TaserRuntime, manifest?: TManifest);
+}
+export {};

package/dist/esm/builder/app.js

@@ -0,0 +1,22 @@
+//#region src/builder/app.ts
+var TaserServeView = class {
+	runtime;
+	fetch;
+	constructor(runtime) {
+		this.runtime = runtime;
+		this.fetch = (request, env, executionCtx) => {
+			return this.runtime.fetch(request, env, executionCtx);
+		};
+	}
+};
+var TaserApp = class extends TaserServeView {
+	__manifest;
+	constructor(runtime, manifest) {
+		super(runtime);
+		if (manifest !== void 0) this.__manifest = manifest;
+	}
+};
+//#endregion
+export { TaserApp };
+
+//# sourceMappingURL=app.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"app.js","names":[],"sources":["../../../src/builder/app.ts"],"sourcesContent":["import type { RouteManifestShape, TaserRuntime } from \"@taserjs/router-core\";\n\nclass TaserServeView {\n  readonly fetch: (\n    request: Request,\n    env?: unknown,\n    executionCtx?: unknown,\n  ) => Promise<Response> | Response;\n\n  constructor(protected readonly runtime: TaserRuntime) {\n    this.fetch = (request: Request, env?: unknown, executionCtx?: unknown) => {\n      return this.runtime.fetch(request, env, executionCtx as never);\n    };\n  }\n}\n\nexport class TaserApp<\n  TManifest extends RouteManifestShape = RouteManifestShape,\n> extends TaserServeView {\n  readonly __manifest?: TManifest;\n\n  constructor(runtime: TaserRuntime, manifest?: TManifest) {\n    super(runtime);\n    if (manifest !== undefined) {\n      this.__manifest = manifest;\n    }\n  }\n}\n"],"mappings":";AAEA,IAAM,iBAAN,MAAqB;CAOY;CAN/B;CAMA,YAAY,SAA0C;EAAvB,KAAA,UAAA;EAC7B,KAAK,SAAS,SAAkB,KAAe,iBAA2B;GACxE,OAAO,KAAK,QAAQ,MAAM,SAAS,KAAK,YAAqB;EAC/D;CACF;AACF;AAEA,IAAa,WAAb,cAEU,eAAe;CACvB;CAEA,YAAY,SAAuB,UAAsB;EACvD,MAAM,OAAO;EACb,IAAI,aAAa,KAAA,GACf,KAAK,aAAa;CAEtB;AACF"}

package/dist/esm/{constants.js → builder/constants.js}

@@ -1,4 +1,4 @@
-//#region src/constants.ts
+//#region src/builder/constants.ts
 /** Input schema keys validated by middleware and route handlers. Headers/cookies are parsed only. */
 var SCHEMA_KEYS = [
 	"query",

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","names":[],"sources":["../../../src/builder/constants.ts"],"sourcesContent":["/** Input schema keys validated by middleware and route handlers. Headers/cookies are parsed only. */\nexport const SCHEMA_KEYS = [\"query\", \"params\", \"body\"] as const;\n\nexport type SchemaKey = (typeof SCHEMA_KEYS)[number];\n\nexport const HANDLER_SCHEMA_KEY_MAP = {\n  query: \"handlerQuery\",\n  params: \"handlerParams\",\n  body: \"handlerBody\",\n} as const satisfies Record<SchemaKey, string>;\n"],"mappings":";;AACA,IAAa,cAAc;CAAC;CAAS;CAAU;AAAM;AAIrD,IAAa,yBAAyB;CACpC,OAAO;CACP,QAAQ;CACR,MAAM;AACR"}

package/dist/esm/{factories.d.ts → builder/factories.d.ts}

@@ -1,5 +1,5 @@
-import { RouteBuilder, RoutePath, Schema } from './types/index.js';
-import { AppContext, HttpMethod } from './types/units.js';
+import { RouteBuilder, RoutePath, Schema } from '../types/index.js';
+import { AppContext, HttpMethod } from '../types/units.js';
 type WithoutBodyOptions<TQuery, TParams, TQueryIn = unknown, TParamsIn = unknown> = {
     query?: Schema<TQuery, TQueryIn>;
     params?: Schema<TParams, TParamsIn>;

package/dist/esm/{factories.js → builder/factories.js}

@@ -1,5 +1,5 @@
 import { createRouteBuilder } from "./route.js";
-//#region src/factories.ts
+//#region src/builder/factories.ts
 function createWithoutBodyRoute(method) {
 	return ((path, options) => createRouteBuilder(path, method, options));
 }

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

@@ -0,0 +1 @@
+{"version":3,"file":"factories.js","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { RouteBuilder, RoutePath, Schema } from \"../types/index.js\";\nimport type { AppContext, HttpMethod } from \"../types/units.js\";\n\ntype WithoutBodyOptions<TQuery, TParams, TQueryIn = unknown, TParamsIn = unknown> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n};\n\ntype WithBodyOptions<\n  TQuery,\n  TParams,\n  TBody,\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n> = WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn> & {\n  body?: Schema<TBody, TBodyIn>;\n};\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n  >(\n    path: Path,\n    options: WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn>,\n  ): RouteBuilder<\n    Path,\n    M,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    M,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = {\n  <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(\n    path: Path,\n    methods: Methods,\n  ): RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    const Methods extends readonly HttpMethod[],\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    methods: Methods,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    Methods[number],\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    HttpMethod,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string, options?: WithoutBodyOptions<unknown, unknown>) =>\n    createRouteBuilder(path, method, options)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string, options?: WithBodyOptions<unknown, unknown, unknown>) =>\n    createRouteBuilder(path, method, options)) 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 = ((\n  path: string,\n  methods: readonly HttpMethod[],\n  options?: WithBodyOptions<unknown, unknown, unknown>,\n) => createRouteBuilder(path, \"ANY\", options, methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((\n  path: string,\n  options?: WithBodyOptions<unknown, unknown, unknown>,\n) => createRouteBuilder(path, \"ALL\", options)) as unknown as CreateAllRoute;\n"],"mappings":";;AAyJA,SAAS,uBACP,QAC2B;CAC3B,SAAS,MAAc,YACrB,mBAAmB,MAAM,QAAQ,OAAO;AAC5C;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,MAAc,YACrB,mBAAmB,MAAM,QAAQ,OAAO;AAC5C;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,mBACX,MACA,SACA,YACG,mBAAmB,MAAM,OAAO,SAAS,OAAO;AAErD,IAAa,mBACX,MACA,YACG,mBAAmB,MAAM,OAAO,OAAO"}

package/dist/esm/{middleware.d.ts → builder/middleware.d.ts}

@@ -1,2 +1,2 @@
-import { LayoutId, MiddlewareBuilder } from './types/index.js';
+import { LayoutId, MiddlewareBuilder } from '../types/index.js';
 export declare function createMiddleware<const Layout extends LayoutId>(layout: Layout): MiddlewareBuilder<Layout, readonly []>;

package/dist/esm/{middleware.js → builder/middleware.js}

@@ -1,4 +1,4 @@
-//#region src/middleware.ts
+//#region src/builder/middleware.ts
 function createMiddleware(layout) {
 	const entries = [];
 	const chain = {

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

@@ -0,0 +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) {\n      entries.push(definition);\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,YAAkC;GACpC,QAAQ,KAAK,UAAU;GACvB,OAAO;EACT;CACF;CAEA,OAAO;AACT"}

package/dist/esm/{route.d.ts → builder/route.d.ts}

@@ -1,5 +1,5 @@
-import { Method, RouteBuilder, RoutePath, ValidatorParts } from './types/index.js';
-import { HttpMethod } from './types/units.js';
-import { SchemaValidators } from './define/validators.js';
+import { Method, RouteBuilder, RoutePath, ValidatorParts } from '../types/index.js';
+import { HttpMethod } from '../types/units.js';
+import { SchemaValidators } from '../define/validators.js';
 /** Shared internal builder — not part of the public `@taserjs/router` API. */
 export declare function createRouteBuilder(path: string, method: HttpMethod | "ANY" | "ALL", validators?: SchemaValidators, methods?: readonly HttpMethod[]): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;

package/dist/esm/{route.js → builder/route.js}

@@ -1,8 +1,8 @@
-import { isHandlerUnit } from "./types/units.js";
+import { isHandlerUnit } from "../types/units.js";
 import { HANDLER_SCHEMA_KEY_MAP } from "./constants.js";
-import { pickDefinedSchemas } from "./define/validators.js";
+import { pickDefinedSchemas } from "../define/validators.js";
 import { collectReturnsFromDefinitions, hasInputSchemas, mergeReturnsMaps, withAuto422 } from "@taserjs/router-utils";
-//#region src/route.ts
+//#region src/builder/route.ts
 function toUtilsMap(map) {
 	if (!map) return {};
 	const out = {};
@@ -42,46 +42,32 @@ function createRouteBuilder(path, method, validators = {}, methods) {
 		handler(fnOrUnit) {
 			const routeSchemas = pickDefinedSchemas(validators);
 			const base = buildRouteBase(path, method, methods, middlewares);
-			if (isHandlerUnit(fnOrUnit)) {
-				const handlerSchemas = pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP);
-				const returns = buildEffectiveReturns({
-					middlewareReturns: collectReturnsFromDefinitions(middlewares),
-					routeReturns,
-					handlerMiddlewareReturns: collectReturnsFromDefinitions(fnOrUnit.middlewares),
-					handlerReturns: fnOrUnit.returns,
-					schemas: {
-						...validators,
-						handlerQuery: fnOrUnit.query,
-						handlerParams: fnOrUnit.params,
-						handlerBody: fnOrUnit.body,
-						middlewares,
-						handlerMiddlewares: fnOrUnit.middlewares
-					}
-				});
-				return {
-					...base,
-					handlerMiddlewares: [...fnOrUnit.middlewares],
-					handler: fnOrUnit.handler,
-					...routeSchemas,
-					...handlerSchemas,
-					...returns ? { returns } : {}
-				};
-			}
+			const unit = isHandlerUnit(fnOrUnit) ? fnOrUnit : {
+				handler: fnOrUnit,
+				middlewares: [],
+				returns: void 0
+			};
+			const handlerSchemas = isHandlerUnit(fnOrUnit) ? pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP) : {};
 			const returns = buildEffectiveReturns({
 				middlewareReturns: collectReturnsFromDefinitions(middlewares),
 				routeReturns,
-				handlerMiddlewareReturns: {},
-				handlerReturns: void 0,
+				handlerMiddlewareReturns: collectReturnsFromDefinitions(unit.middlewares),
+				handlerReturns: unit.returns,
 				schemas: {
 					...validators,
-					middlewares
+					handlerQuery: unit.query,
+					handlerParams: unit.params,
+					handlerBody: unit.body,
+					middlewares,
+					handlerMiddlewares: unit.middlewares
 				}
 			});
 			return {
 				...base,
-				handlerMiddlewares: [],
-				handler: fnOrUnit,
+				handlerMiddlewares: [...unit.middlewares],
+				handler: unit.handler,
 				...routeSchemas,
+				...handlerSchemas,
 				...returns ? { returns } : {}
 			};
 		}