@taserjs/router 0.0.5 → 0.1.0

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

@@ -1,26 +1,16 @@
-import { RouteManifestShape } from '@taserjs/router-core';
+import { CookieRuntimeConfig, RouteManifestShape } from '@taserjs/router-core';
 import { ResponseValidationFailureHandler } from '@taserjs/router-utils';
 import { TaserApp } from '../builder/app.js';
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
 export type CreateTaserAppOptions = {
-    basePath?: string;
     response?: {
         /** Validate handler replies against returns maps. Default true. */
         validate?: boolean;
         onValidationFailure?: ResponseValidationFailureHandler;
     };
     /** Global cookie defaults and signing secret. Per-call `ctx.cookies.set` options override defaults. */
-    cookies?: {
-        secret?: string | BufferSource;
-        path?: string;
-        httpOnly?: boolean;
-        sameSite?: "Strict" | "Lax" | "None" | "strict" | "lax" | "none";
-        secure?: boolean;
-        domain?: string;
-        maxAge?: number;
-        expires?: Date;
-    };
+    cookies?: CookieRuntimeConfig;
 };
 export type ContextDefinition<TBoot extends Record<string, unknown> = Record<string, never>, TReq extends Record<string, unknown> = Record<string, never>> = {
     boot?: () => TBoot | Promise<TBoot>;
@@ -31,17 +21,9 @@ 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 : TApp extends {
+export type InferAppManifest<TApp> = TApp extends TaserApp<infer TManifest, any> ? TManifest : TApp extends {
     manifest: infer TManifest;
 } ? TManifest : TApp extends RouteManifestShape ? TApp : never;
-export type TaserHandler<TFrameworkApp> = {
-    /**
-     * Mount the Taser handler on a framework app.
-     * Use universal wildcard patterns (`/*`, `/prefix/*`) for Hono/Fastify.
-     * Use framework-native splat patterns for Express (e.g. `/{*splat}`, `/*splat`).
-     */
-    mount(pattern: string, frameworkApp: TFrameworkApp): void;
-};
 export type { RouteManifestShape } from '@taserjs/router-core';
 export type { Schema };
 export type { TaserApp } from '../builder/app.js';

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

@@ -1,13 +1,13 @@
 import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
 import { RouterRegister } from '../register.js';
-import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, RuntimeContextFields, Simplify, UnionToIntersection } from './type-utils.js';
+import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnionToIntersection, UnitRuntimeContext } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
 import { AppContext, ExtractState, 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 { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnitRuntimeContext, UnwrapPart, } from './type-utils.js';
 export type { EmptyReturns, EnforceHandlerReply, HandlerReply, HasReturns, MergeReturns, ReplyFor, ReturnsMap, StatusCode, ValidHandlerReply, } from './returns.js';
 export type { AppContext, ExtractState, HandlerContext, HandlerUnit, HttpMethod, InlineMiddlewareOptions, IsUnknown, Method, MiddlewareDefinition, MiddlewareNext, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
 export type RoutePath = RouterRegister extends {
@@ -57,9 +57,11 @@ 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"> = MergeMiddlewareField<ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>, Field> & MergeMiddlewareField<Acc, Field>;
+export type RouteLayoutMiddlewares<Path extends RoutePath, TMethod extends Method> = ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>;
+export type RouteLayoutField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
+export type RouteLayoutInputField<Path extends RoutePath, TMethod extends Method, Field extends "query" | "params" | "body"> = MergeMiddlewareInputField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
+type RouteResolvedField<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = RouteLayoutField<Path, TMethod, Field> & MergeMiddlewareField<Acc, Field>;
 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, "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<ResolveParams<PathParams<Path>, MergePart<TParams, RouteChainField<Path, TMethod, Acc, "params">>>>;
@@ -105,7 +107,7 @@ export type RouteHandleContextWithoutBody<Path extends RoutePath, TMethod extend
     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"> = RouteLayoutInputField<Path, TMethod, Field> & MergeMiddlewareInputField<Acc, Field>;
 type IsNever<T> = [T] extends [never] ? true : false;
 type IsEmptyObject<T> = [keyof T] extends [never] ? true : false;
 export type IsLayoutAllowed<TRequiredLayouts, TChain extends readonly LayoutId[]> = [
@@ -139,7 +141,8 @@ export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Meth
         Input: infer I;
     };
 } ? I : never : never;
-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 MiddlewareLayoutField<Layout extends LayoutId, Field extends "query" | "params" | "body" | "state"> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
+type MiddlewareChainField<Layout extends LayoutId, Acc extends readonly unknown[], Field extends "query" | "params" | "body" | "state"> = MiddlewareLayoutField<Layout, Field> & MergeMiddlewareField<Acc, Field>;
 export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly unknown[], TQuery, TParams, TBody, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
     params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
@@ -178,6 +181,7 @@ export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc exte
     readonly middlewares: readonly MiddlewareDefinition[];
     readonly handlerMiddlewares: readonly MiddlewareDefinition[];
     readonly returns?: TReturns;
+    readonly bodyMode?: "json" | "form" | "urlencoded";
     handler: (ctx: unknown) => Awaitable<Response>;
     readonly $Infer: {
         Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, {}> : RouteHandleContext<Path, TMethod, Acc, {}>;
@@ -198,7 +202,7 @@ type RouteHandleResult<Path extends RoutePath, TMethod extends Method, Acc exten
         Output: TOutput;
     };
 };
-export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = {
+export type RouteBuilderBase<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = {
     readonly path: Path;
     readonly method: TMethod;
     readonly $Infer: {
@@ -206,6 +210,14 @@ export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc ext
         Input: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleInputWithoutBody<Path, TMethod, Acc, Validators> : RouteHandleInput<Path, TMethod, Acc, Validators>;
         Output: TReturns;
     };
+    query<TQuery, TQueryIn = unknown>(schema: Schema<TQuery, TQueryIn>): RouteBuilder<Path, TMethod, Acc, Omit<Validators, "query" | "queryIn"> & {
+        query: TQuery;
+        queryIn: TQueryIn;
+    }, TReturns, TAppContext>;
+    params<TParams, TParamsIn = unknown>(schema: Schema<TParams, TParamsIn>): RouteBuilder<Path, TMethod, Acc, Omit<Validators, "params" | "paramsIn"> & {
+        params: TParams;
+        paramsIn: TParamsIn;
+    }, TReturns, TAppContext>;
     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: [
         IsLayoutAllowed<TRequiredLayouts, RouteLayoutChain<Path, TMethod>>,
@@ -231,6 +243,16 @@ export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc ext
     ]): RouteHandleResult<Path, TMethod, Acc, Validators, TReturns, R, TAppContext>;
     handler<HandlerAcc extends readonly unknown[] = readonly [], HandlerValidators extends ValidatorParts = ValidatorParts, HReturns extends ReturnsMap = {}, HOutput = Response>(unit: HandlerUnit<HandlerAcc, HandlerValidators, HReturns, HOutput>): RouteHandleResult<Path, TMethod, readonly [...Acc, ...HandlerAcc], Validators, Omit<TReturns, keyof HReturns> & HReturns, HOutput, TAppContext>;
 };
+export type RouteBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = RouteBuilderBase<Path, TMethod, Acc, Validators, TReturns, TAppContext> & (TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? {} : {
+    body<TBody, TBodyIn = unknown>(schema: Schema<TBody, TBodyIn>): RouteBuilder<Path, TMethod, Acc, Omit<Validators, "body" | "bodyIn"> & {
+        body: TBody;
+        bodyIn: TBodyIn;
+    }, TReturns, TAppContext>;
+    body<Mode extends "json" | "form" | "urlencoded", TBody, TBodyIn = unknown>(mode: Mode, schema: Schema<TBody, TBodyIn>): RouteBuilder<Path, TMethod, Acc, Omit<Validators, "body" | "bodyIn"> & {
+        body: TBody;
+        bodyIn: TBodyIn;
+    }, TReturns, TAppContext>;
+});
 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 = {}, TRequiredLayouts = unknown, TRequiredState = unknown>(unit: MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequiredState>, ..._assert: [IsStateSatisfied<MergeMiddlewareField<Acc, "state">, TRequiredState>] extends [

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

@@ -1,21 +1,18 @@
-import { ReplyOf } from '@taserjs/router-utils';
+import { ReplyOf } from '@taserjs/router-utils/reply';
+import { StatusCode } from '@taserjs/router-utils';
 import { Simplify } from './type-utils.js';
 import { Schema, InferOutput } from './schema.js';
-/**
- * Known HTTP status codes. `number & {}` allows custom codes while keeping
- * literal autocomplete / inference for well-known values.
- */
-export type StatusCode = 100 | 101 | 102 | 103 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511 | (number & {});
+export type { StatusCode };
 /** Status-code → Standard Schema map for route/middleware/handler outputs. */
 export type ReturnsMap = {
-    readonly [K in StatusCode]?: Schema<unknown>;
+    readonly [status: number]: Schema<unknown> | undefined;
 };
 /** 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 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];
+    [S in keyof M & number]: M[S] extends Schema<unknown> ? ReplyOf<S, Simplify<InferOutput<M[S]>>> : never;
+}[keyof M & number];
 export type EmptyReturns = {};
 /** True when no status schemas have been declared yet. */
 export type HasReturns<M extends ReturnsMap> = [keyof M] extends [never] ? false : true;

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

@@ -1,5 +1,7 @@
-export type Method = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD";
-export type HttpMethod = Method;
+import { TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
+import { HttpMethod, HttpVerb } from '@taserjs/router-utils/http';
+export type Method = HttpMethod;
+export type { HttpMethod, HttpVerb };
 export type MiddlewareFieldName = "query" | "params" | "body" | "state";
 export type MiddlewareInputFieldName = "query" | "params" | "body";
 export type UnwrapPart<T> = unknown extends T ? {} : T;
@@ -41,8 +43,8 @@ export type RuntimeContextFields = {
     request: Request;
     method: Method;
     url: URL;
-    headers: import('@taserjs/router-core').TaserHeaders;
-    cookies: import('@taserjs/router-core').TaserCookieJar;
+    headers: TaserHeaders;
+    cookies: TaserCookieJar;
     var: Record<string, unknown>;
 };
-export {};
+export type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;

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\";\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"}
+{"version":3,"file":"units.cjs","names":[],"sources":["../../../src/types/units.ts"],"sourcesContent":["import type {\n  Awaitable,\n  MiddlewareDefinition as CoreMiddlewareDefinition,\n  TaserCookieJar,\n  TaserHeaders,\n} from \"@taserjs/router-core\";\n\nimport type {\n  MergeMiddlewareField,\n  MergePart,\n  RequestShape,\n  Simplify,\n  UnitRuntimeContext,\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 = CoreMiddlewareDefinition<ReturnsMap>;\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\nexport type DefineMiddlewareResult<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  R,\n  TQueryIn = TQuery,\n  TParamsIn = TParams,\n  TBodyIn = TBody,\n  TReturns extends ReturnsMap = {},\n  TLayout = null,\n  TRequires = {},\n> = MiddlewareUnit<\n  MiddlewareReturnFromParts<\n    TQuery,\n    TParams,\n    TBody,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn\n  >,\n  TReturns,\n  TLayout,\n  TRequires\n>;\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":";AAoNA,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,5 +1,5 @@
-import { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
-import { MergeMiddlewareField, MergePart, RequestShape, RuntimeContextFields, Simplify, UnwrapPart } from './type-utils.js';
+import { Awaitable, MiddlewareDefinition as CoreMiddlewareDefinition, TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
+import { MergeMiddlewareField, MergePart, RequestShape, Simplify, UnitRuntimeContext, UnwrapPart } from './type-utils.js';
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
 export type { HttpMethod, Method } from './type-utils.js';
@@ -28,13 +28,7 @@ export type ExtractState<T> = [Extract<Awaited<T>, {
 export type IsUnknown<T> = [unknown] extends [T] ? true : false;
 export type NextFn<TExpectedState = unknown> = IsUnknown<TExpectedState> extends true ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>> : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;
 export type MiddlewareNext = NextFn;
-export type MiddlewareDefinition = {
-    query?: unknown;
-    params?: unknown;
-    body?: unknown;
-    returns?: ReturnsMap;
-    handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<Response | unknown>;
-};
+export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
@@ -47,7 +41,7 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn =
         body: RequestShape<TBodyIn, TBody>;
     };
 };
-type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;
+export type DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody, TReturns extends ReturnsMap = {}, TLayout = null, TRequires = {}> = MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, TLayout, TRequires>;
 export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext, TState = {}> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;

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

@@ -1,11 +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 TaserServeView<THasNotFound extends boolean = boolean> {
+    protected readonly runtime: TaserRuntime<THasNotFound>;
+    readonly fetch: (request: Request, env?: unknown, executionCtx?: unknown) => THasNotFound extends true ? Promise<Response> | Response : Promise<Response | undefined> | Response | undefined;
+    readonly request: (path: string, init?: RequestInit) => THasNotFound extends true ? Promise<Response> : Promise<Response | undefined>;
+    constructor(runtime: TaserRuntime<THasNotFound>);
 }
-export declare class TaserApp<TManifest extends RouteManifestShape = RouteManifestShape> extends TaserServeView {
+export declare class TaserApp<TManifest extends RouteManifestShape = RouteManifestShape, THasNotFound extends boolean = boolean> extends TaserServeView<THasNotFound> {
     readonly __manifest?: TManifest;
-    constructor(runtime: TaserRuntime, manifest?: TManifest);
+    constructor(runtime: TaserRuntime<THasNotFound>, manifest?: TManifest);
 }
-export {};

package/dist/esm/builder/app.js

@@ -2,11 +2,15 @@
 var TaserServeView = class {
 	runtime;
 	fetch;
+	request;
 	constructor(runtime) {
 		this.runtime = runtime;
 		this.fetch = (request, env, executionCtx) => {
 			return this.runtime.fetch(request, env, executionCtx);
 		};
+		this.request = (path, init) => {
+			return this.runtime.request(path, init);
+		};
 	}
 };
 var TaserApp = class extends TaserServeView {
@@ -17,6 +21,6 @@ var TaserApp = class extends TaserServeView {
 	}
 };
 //#endregion
-export { TaserApp };
+export { TaserApp, TaserServeView };
 
 //# sourceMappingURL=app.js.map

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

@@ -1 +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"}
+{"version":3,"file":"app.js","names":[],"sources":["../../../src/builder/app.ts"],"sourcesContent":["import type { RouteManifestShape, TaserRuntime } from \"@taserjs/router-core\";\n\nexport class TaserServeView<THasNotFound extends boolean = boolean> {\n  readonly fetch: (\n    request: Request,\n    env?: unknown,\n    executionCtx?: unknown,\n  ) => THasNotFound extends true\n    ? Promise<Response> | Response\n    : Promise<Response | undefined> | Response | undefined;\n\n  readonly request: (\n    path: string,\n    init?: RequestInit,\n  ) => THasNotFound extends true ? Promise<Response> : Promise<Response | undefined>;\n\n  constructor(protected readonly runtime: TaserRuntime<THasNotFound>) {\n    this.fetch = (request: Request, env?: unknown, executionCtx?: unknown) => {\n      return this.runtime.fetch(request, env, executionCtx as never);\n    };\n    this.request = (path: string, init?: RequestInit) => {\n      return this.runtime.request(path, init);\n    };\n  }\n}\n\nexport class TaserApp<\n  TManifest extends RouteManifestShape = RouteManifestShape,\n  THasNotFound extends boolean = boolean,\n> extends TaserServeView<THasNotFound> {\n  readonly __manifest?: TManifest;\n\n  constructor(runtime: TaserRuntime<THasNotFound>, manifest?: TManifest) {\n    super(runtime);\n    if (manifest !== undefined) {\n      this.__manifest = manifest;\n    }\n  }\n}\n"],"mappings":";AAEA,IAAa,iBAAb,MAAoE;CAcnC;CAb/B;CAQA;CAKA,YAAY,SAAwD;EAArC,KAAA,UAAA;EAC7B,KAAK,SAAS,SAAkB,KAAe,iBAA2B;GACxE,OAAO,KAAK,QAAQ,MAAM,SAAS,KAAK,YAAqB;EAC/D;EACA,KAAK,WAAW,MAAc,SAAuB;GACnD,OAAO,KAAK,QAAQ,QAAQ,MAAM,IAAI;EACxC;CACF;AACF;AAEA,IAAa,WAAb,cAGU,eAA6B;CACrC;CAEA,YAAY,SAAqC,UAAsB;EACrE,MAAM,OAAO;EACb,IAAI,aAAa,KAAA,GACf,KAAK,aAAa;CAEtB;AACF"}

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

@@ -1,54 +1,9 @@
-import { RouteBuilder, RoutePath, Schema } from '../types/index.js';
+import { RouteBuilder, RoutePath } 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>;
-};
-type WithBodyOptions<TQuery, TParams, TBody, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown> = WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn> & {
-    body?: Schema<TBody, TBodyIn>;
-};
-export type CreateWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD", TAppContext extends Record<string, unknown> = AppContext> = {
-    <const Path extends RoutePath>(path: Path): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-    <const Path extends RoutePath, TQuery = unknown, TParams = unknown, TQueryIn = unknown, TParamsIn = unknown>(path: Path, options: WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn>): RouteBuilder<Path, M, readonly [], {
-        query: TQuery;
-        params: TParams;
-        queryIn: TQueryIn;
-        paramsIn: TParamsIn;
-    }, {}, TAppContext>;
-};
-export type CreateWithBodyRoute<M extends "POST" | "PUT" | "PATCH", TAppContext extends Record<string, unknown> = AppContext> = {
-    <const Path extends RoutePath>(path: Path): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-    <const Path extends RoutePath, TQuery = unknown, TParams = unknown, TBody = unknown, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(path: Path, options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, M, readonly [], {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-        queryIn: TQueryIn;
-        paramsIn: TParamsIn;
-        bodyIn: TBodyIn;
-    }, {}, TAppContext>;
-};
-export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = {
-    <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(path: Path, methods: Methods): RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
-    <const Path extends RoutePath, const Methods extends readonly HttpMethod[], TQuery = unknown, TParams = unknown, TBody = unknown, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(path: Path, methods: Methods, options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, Methods[number], readonly [], {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-        queryIn: TQueryIn;
-        paramsIn: TParamsIn;
-        bodyIn: TBodyIn;
-    }, {}, TAppContext>;
-};
-export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = {
-    <const Path extends RoutePath>(path: Path): RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
-    <const Path extends RoutePath, TQuery = unknown, TParams = unknown, TBody = unknown, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown>(path: Path, options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>): RouteBuilder<Path, HttpMethod, readonly [], {
-        query: TQuery;
-        params: TParams;
-        body: TBody;
-        queryIn: TQueryIn;
-        paramsIn: TParamsIn;
-        bodyIn: TBodyIn;
-    }, {}, TAppContext>;
-};
+export type CreateWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
+export type CreateWithBodyRoute<M extends "POST" | "PUT" | "PATCH", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
+export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(path: Path, methods: Methods) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
+export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
 export declare const createGetRoute: CreateWithoutBodyRoute<"GET", AppContext>;
 export declare const createDeleteRoute: CreateWithoutBodyRoute<"DELETE", AppContext>;
 export declare const createOptionsRoute: CreateWithoutBodyRoute<"OPTIONS", AppContext>;
@@ -58,4 +13,3 @@ export declare const createPutRoute: CreateWithBodyRoute<"PUT", AppContext>;
 export declare const createPatchRoute: CreateWithBodyRoute<"PATCH", AppContext>;
 export declare const createAnyRoute: CreateAnyRoute;
 export declare const createAllRoute: CreateAllRoute;
-export {};

package/dist/esm/builder/factories.js

@@ -1,10 +1,10 @@
 import { createRouteBuilder } from "./route.js";
 //#region src/builder/factories.ts
 function createWithoutBodyRoute(method) {
-	return ((path, options) => createRouteBuilder(path, method, options));
+	return ((path) => createRouteBuilder(path, method));
 }
 function createWithBodyRoute(method) {
-	return ((path, options) => createRouteBuilder(path, method, options));
+	return ((path) => createRouteBuilder(path, method));
 }
 var createGetRoute = createWithoutBodyRoute("GET");
 var createDeleteRoute = createWithoutBodyRoute("DELETE");
@@ -13,8 +13,8 @@ var createHeadRoute = createWithoutBodyRoute("HEAD");
 var createPostRoute = createWithBodyRoute("POST");
 var createPutRoute = createWithBodyRoute("PUT");
 var createPatchRoute = createWithBodyRoute("PATCH");
-var createAnyRoute = ((path, methods, options) => createRouteBuilder(path, "ANY", options, methods));
-var createAllRoute = ((path, options) => createRouteBuilder(path, "ALL", options));
+var createAnyRoute = ((path, methods) => createRouteBuilder(path, "ANY", methods));
+var createAllRoute = ((path) => createRouteBuilder(path, "ALL"));
 //#endregion
 export { createAllRoute, createAnyRoute, createDeleteRoute, createGetRoute, createHeadRoute, createOptionsRoute, createPatchRoute, createPostRoute, createPutRoute };
 

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

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

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

@@ -1,5 +1,4 @@
 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>;
+export declare function createRouteBuilder(path: string, method: HttpMethod | "ANY" | "ALL", methods?: readonly HttpMethod[]): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;

package/dist/esm/builder/route.js

@@ -22,12 +22,32 @@ function buildRouteBase(path, method, methods, middlewares) {
 	};
 }
 /** Shared internal builder — not part of the public `@taserjs/router` API. */
-function createRouteBuilder(path, method, validators = {}, methods) {
+function createRouteBuilder(path, method, methods) {
 	const middlewares = [];
 	let routeReturns = {};
+	const validators = {};
+	let bodyMode;
 	const builder = {
 		path,
 		method,
+		query(schema) {
+			validators.query = schema;
+			return builder;
+		},
+		params(schema) {
+			validators.params = schema;
+			return builder;
+		},
+		body(modeOrSchema, schema) {
+			if (typeof modeOrSchema === "string") {
+				bodyMode = modeOrSchema;
+				if (schema !== void 0) validators.body = schema;
+			} else {
+				bodyMode = "json";
+				validators.body = modeOrSchema;
+			}
+			return builder;
+		},
 		returns(map) {
 			routeReturns = {
 				...routeReturns,
@@ -68,6 +88,7 @@ function createRouteBuilder(path, method, validators = {}, methods) {
 				handler: unit.handler,
 				...routeSchemas,
 				...handlerSchemas,
+				...bodyMode ? { bodyMode } : {},
 				...returns ? { returns } : {}
 			};
 		}

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

@@ -1 +1 @@
-{"version":3,"file":"route.js","names":[],"sources":["../../../src/builder/route.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport {\n  collectReturnsFromDefinitions,\n  hasInputSchemas,\n  mergeReturnsMaps,\n  withAuto422,\n} from \"@taserjs/router-utils\";\n\nimport type {\n  Method,\n  RouteBuilder,\n  RoutePath,\n  ReturnsMap,\n  ValidatorParts,\n} from \"../types/index.js\";\nimport type { HttpMethod, MiddlewareDefinition } from \"../types/units.js\";\nimport { isHandlerUnit } from \"../types/units.js\";\nimport { HANDLER_SCHEMA_KEY_MAP } from \"./constants.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nfunction toUtilsMap(map: ReturnsMap | undefined): Record<number, StandardSchemaV1> {\n  if (!map) {\n    return {};\n  }\n  const out: Record<number, StandardSchemaV1> = {};\n  for (const [key, schema] of Object.entries(map)) {\n    if (schema !== undefined) {\n      out[Number(key)] = schema;\n    }\n  }\n  return out;\n}\n\nfunction buildEffectiveReturns(args: {\n  middlewareReturns: ReturnsMap;\n  routeReturns: ReturnsMap;\n  handlerMiddlewareReturns: ReturnsMap;\n  handlerReturns: ReturnsMap | undefined;\n  schemas: {\n    query?: unknown;\n    params?: unknown;\n    body?: unknown;\n    handlerQuery?: unknown;\n    handlerParams?: unknown;\n    handlerBody?: unknown;\n    middlewares?: readonly MiddlewareDefinition[];\n    handlerMiddlewares?: readonly MiddlewareDefinition[];\n  };\n}): Record<number, StandardSchemaV1> | undefined {\n  const merged = mergeReturnsMaps(\n    toUtilsMap(args.middlewareReturns),\n    toUtilsMap(args.routeReturns),\n    toUtilsMap(args.handlerMiddlewareReturns),\n    toUtilsMap(args.handlerReturns),\n  );\n  const with422 = withAuto422(merged, hasInputSchemas(args.schemas));\n  return Object.keys(with422).length > 0 ? with422 : undefined;\n}\n\nfunction buildRouteBase(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods: readonly HttpMethod[] | undefined,\n  middlewares: MiddlewareDefinition[],\n) {\n  return {\n    path,\n    method,\n    ...(methods ? { methods: [...methods] } : {}),\n    middlewares: [...middlewares],\n  };\n}\n\n/** Shared internal builder — not part of the public `@taserjs/router` API. */\nexport function createRouteBuilder(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  validators: SchemaValidators = {},\n  methods?: readonly HttpMethod[],\n): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {\n  const middlewares: MiddlewareDefinition[] = [];\n  let routeReturns: Record<number, StandardSchemaV1> = {};\n\n  const builder = {\n    path,\n    method,\n    returns(map: ReturnsMap) {\n      routeReturns = { ...routeReturns, ...toUtilsMap(map) };\n      return builder;\n    },\n    use(definition: MiddlewareDefinition) {\n      middlewares.push(definition);\n      return builder;\n    },\n    handler(fnOrUnit: ((ctx: unknown) => unknown) | unknown) {\n      const routeSchemas = pickDefinedSchemas(validators);\n      const base = buildRouteBase(path, method, methods, middlewares);\n\n      const unit = isHandlerUnit(fnOrUnit)\n        ? fnOrUnit\n        : {\n            handler: fnOrUnit as (ctx: unknown) => Response | Promise<Response>,\n            middlewares: [] as MiddlewareDefinition[],\n            returns: undefined as ReturnsMap | undefined,\n          };\n\n      const handlerSchemas = isHandlerUnit(fnOrUnit)\n        ? pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP)\n        : {};\n\n      const returns = buildEffectiveReturns({\n        middlewareReturns: collectReturnsFromDefinitions(middlewares),\n        routeReturns,\n        handlerMiddlewareReturns: collectReturnsFromDefinitions(unit.middlewares),\n        handlerReturns: unit.returns,\n        schemas: {\n          ...validators,\n          handlerQuery: (unit as any).query,\n          handlerParams: (unit as any).params,\n          handlerBody: (unit as any).body,\n          middlewares,\n          handlerMiddlewares: unit.middlewares,\n        },\n      });\n\n      return {\n        ...base,\n        handlerMiddlewares: [...unit.middlewares],\n        handler: unit.handler,\n        ...routeSchemas,\n        ...handlerSchemas,\n        ...(returns ? { returns } : {}),\n      };\n    },\n  };\n\n  return builder as unknown as RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;\n}\n"],"mappings":";;;;;AAoBA,SAAS,WAAW,KAA+D;CACjF,IAAI,CAAC,KACH,OAAO,CAAC;CAEV,MAAM,MAAwC,CAAC;CAC/C,KAAK,MAAM,CAAC,KAAK,WAAW,OAAO,QAAQ,GAAG,GAC5C,IAAI,WAAW,KAAA,GACb,IAAI,OAAO,GAAG,KAAK;CAGvB,OAAO;AACT;AAEA,SAAS,sBAAsB,MAekB;CAO/C,MAAM,UAAU,YAND,iBACb,WAAW,KAAK,iBAAiB,GACjC,WAAW,KAAK,YAAY,GAC5B,WAAW,KAAK,wBAAwB,GACxC,WAAW,KAAK,cAAc,CAEJ,GAAQ,gBAAgB,KAAK,OAAO,CAAC;CACjE,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,KAAA;AACrD;AAEA,SAAS,eACP,MACA,QACA,SACA,aACA;CACA,OAAO;EACL;EACA;EACA,GAAI,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC;EAC3C,aAAa,CAAC,GAAG,WAAW;CAC9B;AACF;;AAGA,SAAgB,mBACd,MACA,QACA,aAA+B,CAAC,GAChC,SAC8D;CAC9D,MAAM,cAAsC,CAAC;CAC7C,IAAI,eAAiD,CAAC;CAEtD,MAAM,UAAU;EACd;EACA;EACA,QAAQ,KAAiB;GACvB,eAAe;IAAE,GAAG;IAAc,GAAG,WAAW,GAAG;GAAE;GACrD,OAAO;EACT;EACA,IAAI,YAAkC;GACpC,YAAY,KAAK,UAAU;GAC3B,OAAO;EACT;EACA,QAAQ,UAAiD;GACvD,MAAM,eAAe,mBAAmB,UAAU;GAClD,MAAM,OAAO,eAAe,MAAM,QAAQ,SAAS,WAAW;GAE9D,MAAM,OAAO,cAAc,QAAQ,IAC/B,WACA;IACE,SAAS;IACT,aAAa,CAAC;IACd,SAAS,KAAA;GACX;GAEJ,MAAM,iBAAiB,cAAc,QAAQ,IACzC,mBAAmB,UAAU,sBAAsB,IACnD,CAAC;GAEL,MAAM,UAAU,sBAAsB;IACpC,mBAAmB,8BAA8B,WAAW;IAC5D;IACA,0BAA0B,8BAA8B,KAAK,WAAW;IACxE,gBAAgB,KAAK;IACrB,SAAS;KACP,GAAG;KACH,cAAe,KAAa;KAC5B,eAAgB,KAAa;KAC7B,aAAc,KAAa;KAC3B;KACA,oBAAoB,KAAK;IAC3B;GACF,CAAC;GAED,OAAO;IACL,GAAG;IACH,oBAAoB,CAAC,GAAG,KAAK,WAAW;IACxC,SAAS,KAAK;IACd,GAAG;IACH,GAAG;IACH,GAAI,UAAU,EAAE,QAAQ,IAAI,CAAC;GAC/B;EACF;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"route.js","names":[],"sources":["../../../src/builder/route.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport {\n  collectReturnsFromDefinitions,\n  hasInputSchemas,\n  mergeReturnsMaps,\n  withAuto422,\n} from \"@taserjs/router-utils\";\nimport type { BodyMode } from \"@taserjs/router-core\";\n\nimport type {\n  Method,\n  RouteBuilder,\n  RoutePath,\n  ReturnsMap,\n  ValidatorParts,\n  Schema,\n} from \"../types/index.js\";\nimport type { HttpMethod, MiddlewareDefinition } from \"../types/units.js\";\nimport { isHandlerUnit } from \"../types/units.js\";\nimport { HANDLER_SCHEMA_KEY_MAP } from \"./constants.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nfunction toUtilsMap(map: ReturnsMap | undefined): Record<number, StandardSchemaV1> {\n  if (!map) {\n    return {};\n  }\n  const out: Record<number, StandardSchemaV1> = {};\n  for (const [key, schema] of Object.entries(map)) {\n    if (schema !== undefined) {\n      out[Number(key)] = schema;\n    }\n  }\n  return out;\n}\n\nfunction buildEffectiveReturns(args: {\n  middlewareReturns: ReturnsMap;\n  routeReturns: ReturnsMap;\n  handlerMiddlewareReturns: ReturnsMap;\n  handlerReturns: ReturnsMap | undefined;\n  schemas: {\n    query?: unknown;\n    params?: unknown;\n    body?: unknown;\n    handlerQuery?: unknown;\n    handlerParams?: unknown;\n    handlerBody?: unknown;\n    middlewares?: readonly MiddlewareDefinition[];\n    handlerMiddlewares?: readonly MiddlewareDefinition[];\n  };\n}): Record<number, StandardSchemaV1> | undefined {\n  const merged = mergeReturnsMaps(\n    toUtilsMap(args.middlewareReturns),\n    toUtilsMap(args.routeReturns),\n    toUtilsMap(args.handlerMiddlewareReturns),\n    toUtilsMap(args.handlerReturns),\n  );\n  const with422 = withAuto422(merged, hasInputSchemas(args.schemas));\n  return Object.keys(with422).length > 0 ? with422 : undefined;\n}\n\nfunction buildRouteBase(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods: readonly HttpMethod[] | undefined,\n  middlewares: MiddlewareDefinition[],\n) {\n  return {\n    path,\n    method,\n    ...(methods ? { methods: [...methods] } : {}),\n    middlewares: [...middlewares],\n  };\n}\n\n/** Shared internal builder — not part of the public `@taserjs/router` API. */\nexport function createRouteBuilder(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods?: readonly HttpMethod[],\n): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {\n  const middlewares: MiddlewareDefinition[] = [];\n  let routeReturns: Record<number, StandardSchemaV1> = {};\n  const validators: SchemaValidators = {};\n  let bodyMode: BodyMode | undefined;\n\n  const builder = {\n    path,\n    method,\n    query(schema: Schema<unknown>) {\n      validators.query = schema;\n      return builder;\n    },\n    params(schema: Schema<unknown>) {\n      validators.params = schema;\n      return builder;\n    },\n    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {\n      if (typeof modeOrSchema === \"string\") {\n        bodyMode = modeOrSchema as BodyMode;\n        if (schema !== undefined) {\n          validators.body = schema;\n        }\n      } else {\n        bodyMode = \"json\";\n        validators.body = modeOrSchema;\n      }\n      return builder;\n    },\n    returns(map: ReturnsMap) {\n      routeReturns = { ...routeReturns, ...toUtilsMap(map) };\n      return builder;\n    },\n    use(definition: MiddlewareDefinition) {\n      middlewares.push(definition);\n      return builder;\n    },\n    handler(fnOrUnit: ((ctx: unknown) => unknown) | unknown) {\n      const routeSchemas = pickDefinedSchemas(validators);\n      const base = buildRouteBase(path, method, methods, middlewares);\n\n      const unit = isHandlerUnit(fnOrUnit)\n        ? fnOrUnit\n        : {\n            handler: fnOrUnit as (ctx: unknown) => Response | Promise<Response>,\n            middlewares: [] as MiddlewareDefinition[],\n            returns: undefined as ReturnsMap | undefined,\n          };\n\n      const handlerSchemas = isHandlerUnit(fnOrUnit)\n        ? pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP)\n        : {};\n\n      const returns = buildEffectiveReturns({\n        middlewareReturns: collectReturnsFromDefinitions(middlewares),\n        routeReturns,\n        handlerMiddlewareReturns: collectReturnsFromDefinitions(unit.middlewares),\n        handlerReturns: unit.returns,\n        schemas: {\n          ...validators,\n          handlerQuery: (unit as any).query,\n          handlerParams: (unit as any).params,\n          handlerBody: (unit as any).body,\n          middlewares,\n          handlerMiddlewares: unit.middlewares,\n        },\n      });\n\n      return {\n        ...base,\n        handlerMiddlewares: [...unit.middlewares],\n        handler: unit.handler,\n        ...routeSchemas,\n        ...handlerSchemas,\n        ...(bodyMode ? { bodyMode } : {}),\n        ...(returns ? { returns } : {}),\n      };\n    },\n  };\n\n  return builder as unknown as RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;\n}\n"],"mappings":";;;;;AAsBA,SAAS,WAAW,KAA+D;CACjF,IAAI,CAAC,KACH,OAAO,CAAC;CAEV,MAAM,MAAwC,CAAC;CAC/C,KAAK,MAAM,CAAC,KAAK,WAAW,OAAO,QAAQ,GAAG,GAC5C,IAAI,WAAW,KAAA,GACb,IAAI,OAAO,GAAG,KAAK;CAGvB,OAAO;AACT;AAEA,SAAS,sBAAsB,MAekB;CAO/C,MAAM,UAAU,YAND,iBACb,WAAW,KAAK,iBAAiB,GACjC,WAAW,KAAK,YAAY,GAC5B,WAAW,KAAK,wBAAwB,GACxC,WAAW,KAAK,cAAc,CAEJ,GAAQ,gBAAgB,KAAK,OAAO,CAAC;CACjE,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,KAAA;AACrD;AAEA,SAAS,eACP,MACA,QACA,SACA,aACA;CACA,OAAO;EACL;EACA;EACA,GAAI,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC;EAC3C,aAAa,CAAC,GAAG,WAAW;CAC9B;AACF;;AAGA,SAAgB,mBACd,MACA,QACA,SAC8D;CAC9D,MAAM,cAAsC,CAAC;CAC7C,IAAI,eAAiD,CAAC;CACtD,MAAM,aAA+B,CAAC;CACtC,IAAI;CAEJ,MAAM,UAAU;EACd;EACA;EACA,MAAM,QAAyB;GAC7B,WAAW,QAAQ;GACnB,OAAO;EACT;EACA,OAAO,QAAyB;GAC9B,WAAW,SAAS;GACpB,OAAO;EACT;EACA,KAAK,cAA0C,QAA0B;GACvE,IAAI,OAAO,iBAAiB,UAAU;IACpC,WAAW;IACX,IAAI,WAAW,KAAA,GACb,WAAW,OAAO;GAEtB,OAAO;IACL,WAAW;IACX,WAAW,OAAO;GACpB;GACA,OAAO;EACT;EACA,QAAQ,KAAiB;GACvB,eAAe;IAAE,GAAG;IAAc,GAAG,WAAW,GAAG;GAAE;GACrD,OAAO;EACT;EACA,IAAI,YAAkC;GACpC,YAAY,KAAK,UAAU;GAC3B,OAAO;EACT;EACA,QAAQ,UAAiD;GACvD,MAAM,eAAe,mBAAmB,UAAU;GAClD,MAAM,OAAO,eAAe,MAAM,QAAQ,SAAS,WAAW;GAE9D,MAAM,OAAO,cAAc,QAAQ,IAC/B,WACA;IACE,SAAS;IACT,aAAa,CAAC;IACd,SAAS,KAAA;GACX;GAEJ,MAAM,iBAAiB,cAAc,QAAQ,IACzC,mBAAmB,UAAU,sBAAsB,IACnD,CAAC;GAEL,MAAM,UAAU,sBAAsB;IACpC,mBAAmB,8BAA8B,WAAW;IAC5D;IACA,0BAA0B,8BAA8B,KAAK,WAAW;IACxE,gBAAgB,KAAK;IACrB,SAAS;KACP,GAAG;KACH,cAAe,KAAa;KAC5B,eAAgB,KAAa;KAC7B,aAAc,KAAa;KAC3B;KACA,oBAAoB,KAAK;IAC3B;GACF,CAAC;GAED,OAAO;IACL,GAAG;IACH,oBAAoB,CAAC,GAAG,KAAK,WAAW;IACxC,SAAS,KAAK;IACd,GAAG;IACH,GAAG;IACH,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;IAC/B,GAAI,UAAU,EAAE,QAAQ,IAAI,CAAC;GAC/B;EACF;CACF;CAEA,OAAO;AACT"}

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

@@ -1,8 +1,8 @@
-import { createTaserCompatHandler, NotFoundHandler, OnErrorHandler, RouteManifestShape } from '@taserjs/router-core';
-import { DefineMiddlewareOptions, MultiScopedMiddlewareOptions, ScopedMiddlewareOptions } from '../define/middleware.js';
+import { NotFoundHandler, OnErrorHandler, RouteManifestShape } from '@taserjs/router-core';
+import { DefineMiddlewareFn } from '../define/middleware.js';
 import { TaserApp } from './app.js';
 import { ContextDefinition, CreateTaserAppOptions, OnErrorOptions } from '../types/app.js';
-import { AppContext, ExtractState, IsUnknown, MiddlewareReturnFromParts, MiddlewareUnit } from '../types/units.js';
+import { AppContext } from '../types/units.js';
 import { HandlerBuilder, LayoutId, MiddlewareBuilder } from '../types/index.js';
 import { ReturnsMap } from '../types/returns.js';
 import { Schema } from '../types/schema.js';
@@ -13,12 +13,12 @@ type RouterState = {
     onError?: OnErrorHandler;
     notFound?: NotFoundHandler;
 };
-export declare class TaserRouter<TAppContext extends Record<string, unknown> = AppContext> {
+export declare class TaserRouter<TAppContext extends Record<string, unknown> = AppContext, THasNotFound extends boolean = false> {
     private readonly state;
     constructor(options?: CreateTaserAppOptions, state?: Partial<Omit<RouterState, "options">>);
-    context<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>(definition: ContextDefinition<TBoot, TReq>): TaserRouter<TBoot & TReq>;
+    context<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>(definition: ContextDefinition<TBoot, TReq>): TaserRouter<TBoot & TReq, THasNotFound>;
     onError<TResponses extends ReturnsMap = ReturnsMap>(options: OnErrorOptions<TResponses> | OnErrorOptions<TResponses>["handle"]): this;
-    notFound(handler: (ctx: unknown) => Response | Promise<Response> | unknown): this;
+    notFound(handler: (ctx: unknown) => Response | Promise<Response> | unknown): TaserRouter<TAppContext, true>;
     get: CreateWithoutBodyRoute<"GET", TAppContext>;
     post: CreateWithBodyRoute<"POST", TAppContext>;
     put: CreateWithBodyRoute<"PUT", TAppContext>;
@@ -38,11 +38,10 @@ export declare class TaserRouter<TAppContext extends Record<string, unknown> = A
         params: TParams;
         body: TBody;
     }, {}, TAppContext>;
-    defineMiddleware(middleware: Parameters<typeof createTaserCompatHandler>[0]): MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>, {}, null, {}>;
-    defineMiddleware<const Layout extends LayoutId, TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(layout: Layout, options: ScopedMiddlewareOptions<Layout, TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layout, TRequires>;
-    defineMiddleware<const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(layouts: Layouts, options: MultiScopedMiddlewareOptions<Layouts, TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layouts, TRequires>;
-    defineMiddleware<TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: DefineMiddlewareOptions<TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, null, TRequires>;
-    create<const TManifest extends RouteManifestShape>(manifest: TManifest): TaserApp<TManifest>;
+    defineMiddleware: DefineMiddlewareFn<TAppContext>;
+    create<const TManifest extends RouteManifestShape>(manifest: TManifest, runtimeOptions?: {
+        basePath?: string;
+    }): TaserApp<TManifest, THasNotFound>;
 }
-export declare function createTaserApp(options?: CreateTaserAppOptions): TaserRouter;
+export declare function createTaserApp(options?: CreateTaserAppOptions): TaserRouter<AppContext, false>;
 export {};

package/dist/esm/builder/router.js

@@ -47,14 +47,12 @@ var TaserRouter = class {
 	defineHandler(options) {
 		return options === void 0 ? defineHandler() : defineHandler(options);
 	}
-	defineMiddleware(first, second) {
-		return defineMiddleware(first, second);
-	}
-	create(manifest) {
+	defineMiddleware = defineMiddleware;
+	create(manifest, runtimeOptions) {
 		const definition = this.state.contextDef;
 		const validateResponse = this.state.options.response?.validate ?? true;
 		const onValidationFailure = this.state.options.response?.onValidationFailure;
-		const basePath = this.state.options.basePath;
+		const basePath = runtimeOptions?.basePath;
 		const hasCustomContext = definition.boot !== void 0 || definition.request !== void 0;
 		let bootContextResolved;
 		let bootPromise;