@taserjs/router 0.0.1 → 0.0.3

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

@@ -1,16 +1,15 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { ReplyResult } from '@taserjs/router-utils';
 import { RouterRegister } from '../register.js';
 import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, RuntimeContextFields, Simplify } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
-import { AppContext, HandlerContext, HandlerUnit, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NativeContext, ValidatorParts } from './units.js';
+import { AppContext, ExtractState, HandlerContext, HandlerUnit, InlineMiddlewareOptions, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NativeContext, 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, HandlerContext, HandlerUnit, HttpMethod, InlineMiddlewareOptions, Method, MiddlewareDefinition, MiddlewareNext, MiddlewareReturnFromParts, MiddlewareUnit, NativeContext, StandaloneMiddlewareContext, ValidatorParts, } from './units.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 RoutePath = RouterRegister extends {
     RoutePath: infer P;
 } ? P : never;
@@ -23,9 +22,9 @@ export type LayoutTree = RouterRegister extends {
 export type RouteByPathMethod = RouterRegister extends {
     RouteByPathMethod: infer R;
 } ? R : Record<never, never>;
-type ParseParam<Segment extends string> = Segment extends '*' ? {
+type ParseParam<Segment extends string> = Segment extends "*" ? {
     _splat: string;
-} : Segment extends `:${infer Name extends string}` ? Name extends '' ? {} : {
+} : Segment extends `:${infer Name extends string}` ? Name extends "" ? {} : {
     [K in Name]: string;
 } : {};
 type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${infer Rest}` ? ParseParam<Segment> & ParseParamsFromSegments<Rest> : ParseParam<S>;
@@ -35,11 +34,14 @@ type LayoutParent<Layout extends LayoutId> = LayoutTree[Layout] extends {
 } ? Parent : null;
 type ResolveLayoutMiddlewares<Layout extends LayoutId | null> = Layout extends null ? readonly [] : Layout extends LayoutId ? readonly [
     ...ResolveLayoutMiddlewares<LayoutParent<Layout>>,
-    ...LayoutTree[Layout]['middlewares']
+    ...LayoutTree[Layout]["middlewares"]
 ] : readonly [];
 /** Fold layout middleware Acc from a route's layoutChain (shallow → deep). */
-type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain extends readonly [infer Head extends LayoutId, ...infer Rest] ? readonly [
-    ...LayoutTree[Head]['middlewares'],
+type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain extends readonly [
+    infer Head extends LayoutId,
+    ...infer Rest
+] ? readonly [
+    ...LayoutTree[Head]["middlewares"],
     ...ResolveLayoutChainMiddlewares<Rest extends readonly LayoutId[] ? Rest : readonly []>
 ] : readonly [];
 type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMethod[Path] extends {
@@ -51,15 +53,14 @@ type RouteParent<Path extends RoutePath, TMethod extends Method> = RouteEntry<Pa
 type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> = RouteEntry<Path, TMethod> extends {
     layoutChain: infer Chain extends readonly LayoutId[];
 } ? Chain : RouteParent<Path, TMethod> extends LayoutId ? readonly [RouteParent<Path, TMethod>] : readonly [];
-type RouteResolvedField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends 'query' | 'params' | 'body' | 'state' | 'ctx'> = MergeMiddlewareField<ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>, Field> & MergeMiddlewareField<Acc, Field>;
-type MiddlewareCtxField<Layout extends LayoutId, Field extends 'query' | 'params' | 'body' | 'state' | 'ctx'> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
-type RouteChainField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends 'query' | 'params' | 'body' | 'state' | 'ctx'> = RouteResolvedField<Path, TMethod, Acc, Field>;
-type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, '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 & RouteChainField<Path, TMethod, Acc, 'ctx'> & {
-    query: Simplify<MergePart<TQuery, RouteChainField<Path, TMethod, Acc, 'query'>>>;
-    params: Simplify<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'>>;
+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">;
+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">>>;
+    body: Simplify<MergePart<TBody, RouteChainField<Path, TMethod, Acc, "body">>>;
+    state: Simplify<RouteChainField<Path, TMethod, Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -67,40 +68,40 @@ export type RouteHandleContext<Path extends RoutePath, TMethod extends Method, A
     query?: unknown;
     params?: unknown;
     body?: unknown;
-}, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & RouteResolvedField<Path, TMethod, Acc, 'ctx'> & {
+}, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     path: Path;
     method: TMethod;
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
-    } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, 'query'>>>;
+    } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, "query">>>;
     params: Simplify<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'>>>;
-    state: Simplify<RouteResolvedField<Path, TMethod, Acc, 'state'>>;
+    } ? B : unknown, RouteResolvedField<Path, TMethod, Acc, "body">>>;
+    state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
 export type RouteHandleContextWithoutBody<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends {
     query?: unknown;
     params?: unknown;
-}, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & RouteResolvedField<Path, TMethod, Acc, 'ctx'> & {
+}, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     path: Path;
     method: TMethod;
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
-    } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, 'query'>>>;
+    } ? Q : unknown, RouteResolvedField<Path, TMethod, Acc, "query">>>;
     params: Simplify<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'>>;
+    state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-type RouteResolvedInputField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends 'query' | 'params' | 'body'> = MergeMiddlewareInputField<ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>, Field> & MergeMiddlewareInputField<Acc, Field>;
+type RouteResolvedInputField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body"> = MergeMiddlewareInputField<ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>, Field> & MergeMiddlewareInputField<Acc, Field>;
 type IsNever<T> = [T] extends [never] ? true : false;
 type IsEmptyObject<T> = [keyof T] extends [never] ? true : false;
 type InputFacet<T, K extends string> = IsNever<T> extends true ? {} : IsEmptyObject<T> extends true ? {} : {
@@ -110,19 +111,19 @@ type RouteQueryInput<Path extends RoutePath, TMethod extends Method, Acc extends
     queryIn?: infer QI;
 } ? QI : unknown, Validators extends {
     query?: infer Q;
-} ? Q : unknown>, RouteResolvedInputField<Path, TMethod, Acc, 'query'>>>;
+} ? 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 {
     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 {
     body?: infer B;
-} ? 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'>>;
+} ? 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 {
     route: infer Route;
 } ? Route extends {
@@ -130,54 +131,15 @@ export type InferRouteInput<Path extends RoutePath, TMethod extends Method> = Ro
         Input: infer I;
     };
 } ? I : never : never;
-type MiddlewareChainField<Layout extends LayoutId, Acc extends readonly unknown[], Field extends 'query' | 'params' | 'body' | 'state' | 'ctx'> = MiddlewareCtxField<Layout, Field> & MergeMiddlewareField<Acc, Field>;
-export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & MiddlewareChainField<Layout, Acc, 'ctx'> & {
-    query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, 'query'>>>;
-    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, 'params'>>>;
-    body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, 'body'>>>;
-    state: Simplify<MiddlewareChainField<Layout, Acc, 'state'>>;
+type MiddlewareChainField<Layout extends LayoutId, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field> & MergeMiddlewareField<Acc, Field>;
+export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
+    query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
+    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
+    body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
+    state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-type StatefulUseOptions<Ctx, TState, TQuery, TParams, TBody, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = {
-    state: Schema<TState>;
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: Ctx, next: (args: {
-        state: TState;
-    }) => Promise<ReplyResult>) => Awaitable<ReplyResult | Response | unknown>;
-};
-type CtxUseOptions<Ctx, TCtx, TQuery, TParams, TBody, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = {
-    ctx: Schema<TCtx>;
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: Ctx, next: (args: {
-        ctx: TCtx;
-    }) => Promise<ReplyResult>) => Awaitable<ReplyResult | Response | unknown>;
-};
-type StateAndCtxUseOptions<Ctx, TState, TCtx, TQuery, TParams, TBody, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = {
-    state: Schema<TState>;
-    ctx: Schema<TCtx>;
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: Ctx, next: (args: {
-        state: TState;
-        ctx: TCtx;
-    }) => Promise<ReplyResult>) => Awaitable<ReplyResult | Response | unknown>;
-};
-type StatelessUseOptions<Ctx, TQuery, TParams, TBody, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = {
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: Ctx, next: () => Promise<ReplyResult>) => Awaitable<ReplyResult | Response | unknown>;
-};
 export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = Acc & {
     readonly layout: Layout;
     readonly middlewares: readonly MiddlewareDefinition[];
@@ -185,33 +147,21 @@ export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unkn
         Context: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>;
     };
     use<TAcc, TReturns extends ReturnsMap = {}>(unit: MiddlewareUnit<TAcc, TReturns>): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
-    use<TState, TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StateAndCtxUseOptions<MiddlewareChainContext<Layout, Acc, TQuery, TParams, TBody, TAppContext>, TState, TCtx, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn>): MiddlewareBuilder<Layout, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], TAppContext>;
-    use<TState, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatefulUseOptions<MiddlewareChainContext<Layout, Acc, TQuery, TParams, TBody, TAppContext>, TState, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn>): MiddlewareBuilder<Layout, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, unknown, TQueryIn, TParamsIn, TBodyIn>
-    ], TAppContext>;
-    use<TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: CtxUseOptions<MiddlewareChainContext<Layout, Acc, TQuery, TParams, TBody, TAppContext>, TCtx, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn>): MiddlewareBuilder<Layout, readonly [
+    use<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: InlineMiddlewareOptions<MiddlewareChainContext<Layout, Acc, TQuery, TParams, TBody, TAppContext>, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, R>): MiddlewareBuilder<Layout, readonly [
         ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], TAppContext>;
-    use<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatelessUseOptions<MiddlewareChainContext<Layout, Acc, TQuery, TParams, TBody, TAppContext>, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn>): MiddlewareBuilder<Layout, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, unknown, TQueryIn, TParamsIn, TBodyIn>
+        MiddlewareReturnFromParts<TQuery, TParams, TBody, ExtractState<R>, TQueryIn, TParamsIn, TBodyIn>
     ], TAppContext>;
 };
 export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = Acc & {
     readonly path: Path;
-    readonly method: TMethod | 'ANY' | 'ALL';
+    readonly method: TMethod | "ANY" | "ALL";
     readonly methods?: readonly Method[];
     readonly middlewares: readonly MiddlewareDefinition[];
     readonly handlerMiddlewares: readonly MiddlewareDefinition[];
     readonly returns?: TReturns;
     handler: (ctx: unknown) => Awaitable<Response>;
     readonly $Infer: {
-        Context: TMethod extends 'GET' | 'DELETE' | 'HEAD' | 'OPTIONS' ? RouteHandleContextWithoutBody<Path, TMethod, Acc, {}> : RouteHandleContext<Path, TMethod, Acc, {}>;
+        Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, {}> : RouteHandleContext<Path, TMethod, Acc, {}>;
         /** Concrete handler reply (`ReplyOf` union) for client inference. */
         Output: TOutput;
     };
@@ -222,10 +172,10 @@ export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc exte
     handlerParams?: Schema<unknown>;
     handlerBody?: Schema<unknown>;
 };
-type RouteHandleResult<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts, TReturns extends ReturnsMap = {}, TOutput = Response, TAppContext extends Record<string, unknown> = AppContext> = Omit<RouteExport<Path, TMethod, Acc, TReturns, TOutput>, '$Infer'> & {
+type RouteHandleResult<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Validators extends ValidatorParts, TReturns extends ReturnsMap = {}, TOutput = Response, TAppContext extends Record<string, unknown> = AppContext> = Omit<RouteExport<Path, TMethod, Acc, TReturns, TOutput>, "$Infer"> & {
     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>;
+        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: TOutput;
     };
 };
@@ -233,27 +183,15 @@ export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc ext
     readonly path: Path;
     readonly method: TMethod;
     readonly $Infer: {
-        Context: TMethod extends 'GET' | 'DELETE' | 'HEAD' | 'OPTIONS' ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>;
+        Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>;
     };
     returns<const M extends ReturnsMap>(map: M): RouteBuilder<Path, TMethod, Acc, Validators, Omit<TReturns, keyof M> & M, TAppContext>;
     use<TAcc, UReturns extends ReturnsMap = {}>(unit: MiddlewareUnit<TAcc, UReturns>): RouteBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TState, TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StateAndCtxUseOptions<RouteChainContext<Path, TMethod, Acc, TQuery, TParams, TBody, TAppContext>, TState, TCtx, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, TMethod, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TState, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatefulUseOptions<RouteChainContext<Path, TMethod, Acc, TQuery, TParams, TBody, TAppContext>, TState, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, TMethod, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, unknown, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: CtxUseOptions<RouteChainContext<Path, TMethod, Acc, TQuery, TParams, TBody, TAppContext>, TCtx, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, TMethod, readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatelessUseOptions<RouteChainContext<Path, TMethod, Acc, TQuery, TParams, TBody, TAppContext>, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, TMethod, readonly [
+    use<TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: InlineMiddlewareOptions<RouteChainContext<Path, TMethod, Acc, TQuery, TParams, TBody, TAppContext>, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn, R>): RouteBuilder<Path, TMethod, readonly [
         ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, unknown, TQueryIn, TParamsIn, TBodyIn>
+        MiddlewareReturnFromParts<TQuery, TParams, TBody, ExtractState<R>, TQueryIn, TParamsIn, TBodyIn>
     ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    handler<R extends Response = Response>(fn: (ctx: TMethod extends 'GET' | 'DELETE' | 'HEAD' | 'OPTIONS' ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>) => Awaitable<R>, ..._assert: [R] extends [ValidHandlerReply<R, TReturns>] ? [] : [
+    handler<R extends Response = Response>(fn: (ctx: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>) => Awaitable<R>, ..._assert: [R] extends [ValidHandlerReply<R, TReturns>] ? [] : [
         {
             expected: ValidHandlerReply<R, TReturns>;
             actual: R;
@@ -264,37 +202,13 @@ export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc ext
 export type HandlerBuilder<Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = {
     returns<const M extends ReturnsMap>(map: M): HandlerBuilder<Acc, Validators, Omit<TReturns, keyof M> & M, TAppContext>;
     use<TAcc, UReturns extends ReturnsMap = {}>(unit: MiddlewareUnit<TAcc, UReturns>): HandlerBuilder<readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TState, TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StateAndCtxUseOptions<HandlerContext<Acc, {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-    }, TAppContext>, TState, TCtx, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): HandlerBuilder<readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TState, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatefulUseOptions<HandlerContext<Acc, {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-    }, TAppContext>, TState, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): HandlerBuilder<readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, unknown, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TCtx, TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: CtxUseOptions<HandlerContext<Acc, {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-    }, TAppContext>, TCtx, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): HandlerBuilder<readonly [
-        ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, TCtx, TQueryIn, TParamsIn, TBodyIn>
-    ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(options: StatelessUseOptions<HandlerContext<Acc, {
+    use<TQuery = unknown, TParams = unknown, TBody = unknown, UReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: InlineMiddlewareOptions<HandlerContext<Acc, {
         query: TQuery;
         params: TParams;
         body: TBody;
-    }, TAppContext>, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn>): HandlerBuilder<readonly [
+    }, TAppContext>, TQuery, TParams, TBody, UReturns, TQueryIn, TParamsIn, TBodyIn, R>): HandlerBuilder<readonly [
         ...Acc,
-        MiddlewareReturnFromParts<TQuery, TParams, TBody, {}, unknown, TQueryIn, TParamsIn, TBodyIn>
+        MiddlewareReturnFromParts<TQuery, TParams, TBody, ExtractState<R>, TQueryIn, TParamsIn, TBodyIn>
     ], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
     handler<R extends Response = Response>(fn: (ctx: HandlerContext<Acc, Validators, TAppContext>) => Awaitable<R>, ..._assert: [R] extends [ValidHandlerReply<R, TReturns>] ? [] : [
         {

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

@@ -1,7 +1,7 @@
-export type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'HEAD';
+export type Method = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD";
 export type HttpMethod = Method;
-export type MiddlewareFieldName = 'query' | 'params' | 'body' | 'state' | 'ctx';
-export type MiddlewareInputFieldName = 'query' | 'params' | 'body';
+export type MiddlewareFieldName = "query" | "params" | "body" | "state";
+export type MiddlewareInputFieldName = "query" | "params" | "body";
 export type UnwrapPart<T> = unknown extends T ? {} : T;
 export type MergePart<T, Base> = unknown extends T ? Base : Base & T;
 /** Collapse intersections so `Omit`/`keyof` treat the result as one object type. */
@@ -21,17 +21,15 @@ export type RequestShape<TIn, TOut> = unknown extends TIn ? UnwrapPart<TOut> : S
     [K in keyof TIn]: K extends keyof TOut ? RequestPropType<TIn[K], TOut[K]> : TIn[K];
 }>;
 export type UnionToIntersection<U> = (U extends unknown ? (value: U) => void : never) extends (value: infer Value) => void ? Value : never;
-export type MiddlewareField<Middleware, Field extends MiddlewareFieldName> = Field extends 'query' ? Middleware extends {
+export type MiddlewareField<Middleware, Field extends MiddlewareFieldName> = Field extends "query" ? Middleware extends {
     query: infer Query;
-} ? Query : {} : Field extends 'params' ? Middleware extends {
+} ? Query : {} : Field extends "params" ? Middleware extends {
     params: infer Params;
-} ? Params : {} : Field extends 'body' ? Middleware extends {
+} ? Params : {} : Field extends "body" ? Middleware extends {
     body: infer Body;
-} ? Body : {} : Field extends 'state' ? Middleware extends {
+} ? Body : {} : Field extends "state" ? Middleware extends {
     state: infer State;
-} ? State : {} : Field extends 'ctx' ? Middleware extends {
-    ctx: infer Ctx;
-} ? Ctx : {} : {};
+} ? State : {} : {};
 export type MiddlewareInputField<Middleware, Field extends MiddlewareInputFieldName> = Middleware extends {
     input: {
         [K in Field]: infer V;
@@ -45,7 +43,6 @@ export type RuntimeContextFields<TNative = unknown> = {
     url: URL;
     headers: import('@taserjs/router-core').TaserHeaders;
     cookies: import('@taserjs/router-core').TaserCookieJar;
-    reply: typeof import('@taserjs/router-utils').reply;
     var: Record<string, unknown>;
     native?: TNative;
 };

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 { EmptyReturns, MergeReturns, ReturnsMap, HandlerReply, HasReturns, StatusCode, ValidHandlerReply, EnforceHandlerReply } 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 type MiddlewareNext = {\n  (args?: { state?: unknown, ctx?: unknown }): Promise<ReplyResult>\n}\n\nexport type MiddlewareDefinition = {\n  state?: unknown\n  ctx?: unknown\n  query?: unknown\n  params?: unknown\n  body?: unknown\n  returns?: ReturnsMap\n  handler: (\n    ctx: unknown,\n    next: MiddlewareNext,\n  ) => Awaitable<ReplyResult | Response | unknown>\n}\n\nexport type MiddlewareReturnFromParts<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  TCtx = unknown,\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  ctx: Simplify<UnwrapPart<TCtx>>\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> = Simplify<\n  TAppContext & UnitRuntimeContext & {\n    query: Simplify<UnwrapPart<TQuery>>\n    params: Simplify<UnwrapPart<TParams>>\n    body: Simplify<UnwrapPart<TBody>>\n    state: {}\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  & MergeMiddlewareField<Acc, 'ctx'>\n  & {\n    query: Simplify<MergePart<\n      Validators extends { query?: infer Q } ? Q : unknown,\n      MergeMiddlewareField<Acc, 'query'>\n    >>\n    params: Simplify<MergePart<\n      Validators extends { params?: infer P } ? P : unknown,\n      MergeMiddlewareField<Acc, 'params'>\n    >>\n    body: Simplify<MergePart<\n      Validators extends { body?: infer B } ? B : unknown,\n      MergeMiddlewareField<Acc, 'body'>\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> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc\n  readonly __returns?: TReturns\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  state?: Schema<unknown>\n  ctx?: Schema<unknown>\n  query?: Schema<unknown>\n  params?: Schema<unknown>\n  body?: Schema<unknown>\n  returns?: ReturnsMap\n  handler: (\n    ctx: unknown,\n    next: MiddlewareNext,\n  ) => Awaitable<unknown>\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":";AA4JA,SAAgB,cACd,OAC0D;CAC1D,OACE,OAAO,UAAU,YACd,UAAU,QACV,aAAa,SACb,iBAAiB,SACjB,MAAM,QAAS,MAA0D,WAAW;AAE3F"}
+{"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> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<UnwrapPart<TQuery>>;\n      params: Simplify<UnwrapPart<TParams>>;\n      body: Simplify<UnwrapPart<TBody>>;\n      state: {};\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> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc;\n  readonly __returns?: TReturns;\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":";AA2LA,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

@@ -5,7 +5,7 @@ import { MergeMiddlewareField, MergePart, RequestShape, RuntimeContextFields, Si
 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';
+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 {
@@ -19,27 +19,32 @@ export type ValidatorParts = {
     paramsIn?: unknown;
     bodyIn?: unknown;
 };
-export type MiddlewareNext = {
-    (args?: {
-        state?: unknown;
-        ctx?: unknown;
-    }): Promise<ReplyResult>;
+export declare const StateBrand: unique symbol;
+export type NextResult<TState = unknown> = ReplyResult & {
+    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 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 = {
-    state?: unknown;
-    ctx?: unknown;
     query?: unknown;
     params?: unknown;
     body?: unknown;
     returns?: ReturnsMap;
     handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<ReplyResult | Response | unknown>;
 };
-export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx = unknown, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
+export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
     body: Simplify<UnwrapPart<TBody>>;
     state: Simplify<UnwrapPart<TState>>;
-    ctx: Simplify<UnwrapPart<TCtx>>;
     /** Pre-parse shapes merged into route `$Infer.Input`. */
     input: {
         query: RequestShape<TQueryIn, TQuery>;
@@ -47,7 +52,7 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx = unk
         body: RequestShape<TBodyIn, TBody>;
     };
 };
-type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, 'var'>;
+type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, "var">;
 export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
@@ -56,17 +61,17 @@ export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBo
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-export type HandlerContext<Acc extends readonly unknown[], Validators extends ValidatorParts, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & MergeMiddlewareField<Acc, 'ctx'> & {
+export type HandlerContext<Acc extends readonly unknown[], Validators extends ValidatorParts, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
-    } ? Q : unknown, MergeMiddlewareField<Acc, 'query'>>>;
+    } ? Q : unknown, MergeMiddlewareField<Acc, "query">>>;
     params: Simplify<MergePart<Validators extends {
         params?: infer P;
-    } ? P : unknown, MergeMiddlewareField<Acc, 'params'>>>;
+    } ? P : unknown, MergeMiddlewareField<Acc, "params">>>;
     body: Simplify<MergePart<Validators extends {
         body?: infer B;
-    } ? B : unknown, MergeMiddlewareField<Acc, 'body'>>>;
-    state: Simplify<MergeMiddlewareField<Acc, 'state'>>;
+    } ? B : unknown, MergeMiddlewareField<Acc, "body">>>;
+    state: Simplify<MergeMiddlewareField<Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -86,13 +91,11 @@ export type HandlerUnit<_Acc extends readonly unknown[], _Validators extends Val
     params?: Schema<unknown>;
     body?: Schema<unknown>;
 };
-export type InlineMiddlewareOptions = {
-    state?: Schema<unknown>;
-    ctx?: Schema<unknown>;
-    query?: Schema<unknown>;
-    params?: Schema<unknown>;
-    body?: Schema<unknown>;
-    returns?: ReturnsMap;
-    handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<unknown>;
+export type InlineMiddlewareOptions<Ctx = unknown, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown> = {
+    query?: Schema<TQuery, TQueryIn>;
+    params?: Schema<TParams, TParamsIn>;
+    body?: Schema<TBody, TBodyIn>;
+    returns?: TReturns;
+    handler: (ctx: Ctx, next: NextFn) => Awaitable<R>;
 };
 export declare function isHandlerUnit(value: unknown): value is HandlerUnit<readonly unknown[], ValidatorParts>;

package/dist/esm/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","names":[],"sources":["../../src/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"}
+{"version":3,"file":"constants.js","names":[],"sources":["../../src/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/create-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-context.js","names":[],"sources":["../../src/create-context.ts"],"sourcesContent":["import type { ReservedContextKey } from '@taserjs/router-core'\n\nimport type { ContextDefinition } from './types/app.js'\n\ntype NoReservedKeysConstraint<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>\n  = Extract<keyof TBoot | keyof TReq, ReservedContextKey> extends never\n    ? unknown\n    : never\n\nexport function createContext<\n  TBoot extends Record<string, unknown> = Record<string, never>,\n  TReq extends Record<string, unknown> = Record<string, never>,\n>(\n  definition: ContextDefinition<TBoot, TReq> & NoReservedKeysConstraint<TBoot, TReq>,\n): ContextDefinition<TBoot, TReq> {\n  return definition\n}\n\nexport type { ContextDefinition, InferAppContext } from './types/app.js'\n"],"mappings":";AASA,SAAgB,cAId,YACgC;CAChC,OAAO;AACT"}
+{"version":3,"file":"create-context.js","names":[],"sources":["../../src/create-context.ts"],"sourcesContent":["import type { ReservedContextKey } from \"@taserjs/router-core\";\n\nimport type { ContextDefinition } from \"./types/app.js\";\n\ntype NoReservedKeysConstraint<\n  TBoot extends Record<string, unknown>,\n  TReq extends Record<string, unknown>,\n> = Extract<keyof TBoot | keyof TReq, ReservedContextKey> extends never ? unknown : never;\n\nexport function createContext<\n  TBoot extends Record<string, unknown> = Record<string, never>,\n  TReq extends Record<string, unknown> = Record<string, never>,\n>(\n  definition: ContextDefinition<TBoot, TReq> & NoReservedKeysConstraint<TBoot, TReq>,\n): ContextDefinition<TBoot, TReq> {\n  return definition;\n}\n\nexport type { ContextDefinition, InferAppContext } from \"./types/app.js\";\n"],"mappings":";AASA,SAAgB,cAId,YACgC;CAChC,OAAO;AACT"}

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

@@ -1 +1 @@
-{"version":3,"file":"handler.js","names":[],"sources":["../../../src/define/handler.ts"],"sourcesContent":["import type { HandlerBuilder } from '../types/index.js'\nimport type {\n  AppContext,\n  HandlerUnit,\n  MiddlewareDefinition,\n  ReturnsMap,\n  ValidatorParts,\n} from '../types/units.js'\nimport type { Schema } from '../types/schema.js'\nimport { pickDefinedSchemas, type SchemaValidators } from './validators.js'\nimport { collectReturnsFromDefinitions } from '@taserjs/router-utils'\n\nfunction createHandlerBuilder<TAppContext extends Record<string, unknown> = AppContext>(\n  validators: SchemaValidators,\n  middlewares: MiddlewareDefinition[],\n  returnsMap: ReturnsMap,\n): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {\n  const builder = {\n    returns(map: ReturnsMap) {\n      return createHandlerBuilder<TAppContext>(validators, middlewares, { ...returnsMap, ...map })\n    },\n    use(unitOrOptions: MiddlewareDefinition) {\n      middlewares.push(unitOrOptions)\n      return builder\n    },\n    handler(fn: (ctx: unknown) => unknown) {\n      const mwReturns = collectReturnsFromDefinitions(middlewares)\n      const mergedReturns = { ...mwReturns, ...returnsMap }\n      const unit = {\n        $Infer: { Output: undefined as unknown as Response },\n        middlewares: [...middlewares],\n        handler: fn as HandlerUnit<readonly [], ValidatorParts>['handler'],\n        ...pickDefinedSchemas(validators),\n        ...(Object.keys(mergedReturns).length > 0 ? { returns: mergedReturns } : {}),\n      } as HandlerUnit<readonly [], ValidatorParts>\n      return unit\n    },\n  }\n\n  return builder as unknown as HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext>\n}\n\nexport function defineHandler<TAppContext extends Record<string, unknown> = AppContext>(): HandlerBuilder<\n  readonly [],\n  {},\n  {},\n  TAppContext\n>\n\nexport function defineHandler<\n  TAppContext extends Record<string, unknown> = AppContext,\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n>(\n  options: {\n    query?: Schema<TQuery>\n    params?: Schema<TParams>\n    body?: Schema<TBody>\n  },\n): HandlerBuilder<\n  readonly [],\n  { query: TQuery, params: TParams, body: TBody },\n  {},\n  TAppContext\n>\n\nexport function defineHandler<TAppContext extends Record<string, unknown> = AppContext>(\n  options?: SchemaValidators,\n): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {\n  return createHandlerBuilder<TAppContext>(options ?? {}, [], {})\n}\n"],"mappings":";;;AAYA,SAAS,qBACP,YACA,aACA,YAC8D;CAC9D,MAAM,UAAU;EACd,QAAQ,KAAiB;GACvB,OAAO,qBAAkC,YAAY,aAAa;IAAE,GAAG;IAAY,GAAG;GAAI,CAAC;EAC7F;EACA,IAAI,eAAqC;GACvC,YAAY,KAAK,aAAa;GAC9B,OAAO;EACT;EACA,QAAQ,IAA+B;GAErC,MAAM,gBAAgB;IAAE,GADN,8BAA8B,WACrB;IAAW,GAAG;GAAW;GAQpD,OAAO;IANL,QAAQ,EAAE,QAAQ,KAAA,EAAiC;IACnD,aAAa,CAAC,GAAG,WAAW;IAC5B,SAAS;IACT,GAAG,mBAAmB,UAAU;IAChC,GAAI,OAAO,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,EAAE,SAAS,cAAc,IAAI,CAAC;GAErE;EACT;CACF;CAEA,OAAO;AACT;AA2BA,SAAgB,cACd,SAC8D;CAC9D,OAAO,qBAAkC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChE"}
+{"version":3,"file":"handler.js","names":[],"sources":["../../../src/define/handler.ts"],"sourcesContent":["import type { HandlerBuilder } from \"../types/index.js\";\nimport type {\n  AppContext,\n  HandlerUnit,\n  MiddlewareDefinition,\n  ReturnsMap,\n  ValidatorParts,\n} from \"../types/units.js\";\nimport type { Schema } from \"../types/schema.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"./validators.js\";\nimport { collectReturnsFromDefinitions } from \"@taserjs/router-utils\";\n\nfunction createHandlerBuilder<TAppContext extends Record<string, unknown> = AppContext>(\n  validators: SchemaValidators,\n  middlewares: MiddlewareDefinition[],\n  returnsMap: ReturnsMap,\n): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {\n  const builder = {\n    returns(map: ReturnsMap) {\n      return createHandlerBuilder<TAppContext>(validators, middlewares, { ...returnsMap, ...map });\n    },\n    use(unitOrOptions: MiddlewareDefinition) {\n      middlewares.push(unitOrOptions);\n      return builder;\n    },\n    handler(fn: (ctx: unknown) => unknown) {\n      const mwReturns = collectReturnsFromDefinitions(middlewares);\n      const mergedReturns = { ...mwReturns, ...returnsMap };\n      const unit = {\n        $Infer: { Output: undefined as unknown as Response },\n        middlewares: [...middlewares],\n        handler: fn as HandlerUnit<readonly [], ValidatorParts>[\"handler\"],\n        ...pickDefinedSchemas(validators),\n        ...(Object.keys(mergedReturns).length > 0 ? { returns: mergedReturns } : {}),\n      } as HandlerUnit<readonly [], ValidatorParts>;\n      return unit;\n    },\n  };\n\n  return builder as unknown as HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext>;\n}\n\nexport function defineHandler<\n  TAppContext extends Record<string, unknown> = AppContext,\n>(): HandlerBuilder<readonly [], {}, {}, TAppContext>;\n\nexport function defineHandler<\n  TAppContext extends Record<string, unknown> = AppContext,\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n>(options: {\n  query?: Schema<TQuery>;\n  params?: Schema<TParams>;\n  body?: Schema<TBody>;\n}): HandlerBuilder<readonly [], { query: TQuery; params: TParams; body: TBody }, {}, TAppContext>;\n\nexport function defineHandler<TAppContext extends Record<string, unknown> = AppContext>(\n  options?: SchemaValidators,\n): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {\n  return createHandlerBuilder<TAppContext>(options ?? {}, [], {});\n}\n"],"mappings":";;;AAYA,SAAS,qBACP,YACA,aACA,YAC8D;CAC9D,MAAM,UAAU;EACd,QAAQ,KAAiB;GACvB,OAAO,qBAAkC,YAAY,aAAa;IAAE,GAAG;IAAY,GAAG;GAAI,CAAC;EAC7F;EACA,IAAI,eAAqC;GACvC,YAAY,KAAK,aAAa;GAC9B,OAAO;EACT;EACA,QAAQ,IAA+B;GAErC,MAAM,gBAAgB;IAAE,GADN,8BAA8B,WACrB;IAAW,GAAG;GAAW;GAQpD,OAAO;IANL,QAAQ,EAAE,QAAQ,KAAA,EAAiC;IACnD,aAAa,CAAC,GAAG,WAAW;IAC5B,SAAS;IACT,GAAG,mBAAmB,UAAU;IAChC,GAAI,OAAO,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,EAAE,SAAS,cAAc,IAAI,CAAC;GAErE;EACT;CACF;CAEA,OAAO;AACT;AAiBA,SAAgB,cACd,SAC8D;CAC9D,OAAO,qBAAkC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChE"}