@taserjs/router 0.1.8 → 0.1.10

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

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

package/dist/esm/index.d.ts

@@ -4,14 +4,14 @@ export interface RouterMiddlewaresRegister {
 }
 export interface RouterRoutesRegister {
 }
-export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutMiddlewaresMap, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
+export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteInputFromPath, InferRouteOutput, LayoutBuilder, LayoutId, LayoutMiddlewaresMap, LayoutParams, LayoutTree, Method, MiddlewareBuilder, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteByPathMethod, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
 export type { ContextDefinition, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, } from './types/app.js';
 export { ValidationError, validationErrorSchema } from '@taserjs/router-utils';
 export type { ResponseValidationFailureHandler, SuccessStatusCode } from '@taserjs/router-utils';
-export { all, any, del, get, head, layout, middleware, options, patch, post, put, query, t, type TaserNamespace, } from './builder/standalone.js';
+export { middleware, t, type TaserNamespace } from './builder/standalone.js';
 export { createTaserApp, TaserRouter } from './builder/router.js';
 export { TaserApp } from './builder/app.js';
 export { createContext } from './context/create-context.js';
 export { honoMw } from './middleware/hono-mw.js';
 export type { MiddlewareFn } from './define/middleware.js';
-export type { TaserCookieJar, TaserHeaders } from '@taserjs/router-core';
+export type { TaserCookieJar, TaserCookieOptions, TaserHeaders } from '@taserjs/router-core';

package/dist/esm/index.js

@@ -1,7 +1,7 @@
-import { all, any, del, get, head, layout, middleware, options, patch, post, put, query, t } from "./builder/standalone.js";
+import { middleware, t } from "./builder/standalone.js";
 import { TaserApp } from "./builder/app.js";
 import { TaserRouter, createTaserApp } from "./builder/router.js";
 import { createContext } from "./context/create-context.js";
 import { honoMw } from "./middleware/hono-mw.js";
 import { ValidationError, validationErrorSchema } from "@taserjs/router-utils";
-export { TaserApp, TaserRouter, ValidationError, all, any, createContext, createTaserApp, del, get, head, honoMw, layout, middleware, options, patch, post, put, query, t, validationErrorSchema };
+export { TaserApp, TaserRouter, ValidationError, createContext, createTaserApp, honoMw, middleware, t, validationErrorSchema };

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

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

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

@@ -38,7 +38,8 @@ type ParseParam<Segment extends string> = Segment extends "*" ? {
     [K in Name]: string;
 } : {};
 type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${infer Rest}` ? ParseParam<Segment> & ParseParamsFromSegments<Rest> : ParseParam<S>;
-export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : {};
+export type PathParams<Path extends string> = Path extends `/${infer Rest}` ? ParseParamsFromSegments<Rest> : ParseParamsFromSegments<Path>;
+export type LayoutParams<Layout extends string> = PathParams<Layout>;
 export type ResolveParams<TPathParams, TSchemaParams> = TSchemaParams extends Record<string, unknown> ? [keyof TSchemaParams] extends [never] ? TPathParams : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams> : TPathParams;
 type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutTree ? LayoutTree[Layout] extends {
     parent: infer P extends LayoutId;
@@ -177,7 +178,7 @@ export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly
     readonly headers: TaserHeaders;
     readonly cookies: TaserCookieJar;
     query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
-    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
+    params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>>>;
     body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
     state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
 }>;
@@ -201,7 +202,7 @@ export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unkn
         readonly headers: TaserHeaders;
         readonly cookies: TaserCookieJar;
         query: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "query">>>;
-        params: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>;
+        params: Simplify<ResolveParams<LayoutParams<Layout>, Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>>>;
         body: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "body">>>;
         state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
     }>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;

package/package.json

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

package/src/builder/middleware-unit.ts

@@ -4,63 +4,68 @@ import type { ReturnsMap } from "../types/returns.js";
 import type { Schema } from "../types/schema.js";
 import { pickDefinedSchemas, type SchemaValidators } from "../define/validators.js";
 
-export function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]) {
-  const validators: SchemaValidators = {};
-  let bodyMode: BodyMode | undefined;
-  let returnsMap: ReturnsMap | undefined;
+class MiddlewareUnitBuilderImpl {
+  private readonly validators: SchemaValidators = {};
+  private bodyMode: BodyMode | undefined;
+  private returnsMap: ReturnsMap | undefined;
+  readonly __requiredLayouts: string | readonly string[] | undefined;
+  readonly __middlewareAcc: unknown = undefined;
+
+  constructor(requiredLayouts?: string | readonly string[]) {
+    this.__requiredLayouts = requiredLayouts;
+  }
+
+  query(schema: Schema<unknown>): this {
+    this.validators.query = schema;
+    return this;
+  }
+
+  params(schema: Schema<unknown>): this {
+    this.validators.params = schema;
+    return this;
+  }
+
+  body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>): this {
+    if (typeof modeOrSchema === "string") {
+      this.bodyMode = modeOrSchema as BodyMode;
+      if (schema !== undefined) {
+        this.validators.body = schema;
+      }
+    } else {
+      this.bodyMode = "json";
+      this.validators.body = modeOrSchema;
+    }
+    return this;
+  }
+
+  returns(map: ReturnsMap): this {
+    this.returnsMap = this.returnsMap ? { ...this.returnsMap, ...map } : { ...map };
+    return this;
+  }
+
+  requires(): this {
+    return this;
+  }
 
-  function toUnit(fn?: (ctx: any, next: any) => any) {
-    const schemas = pickDefinedSchemas(validators);
+  handler(fn: (ctx: any, next: any) => any) {
+    return this.toUnit(fn);
+  }
+
+  toUnit(fn?: (ctx: any, next: any) => any) {
+    const schemas = pickDefinedSchemas(this.validators);
     return {
       ...(fn ? { handler: fn } : {}),
       ...schemas,
-      ...(bodyMode ? { bodyMode } : {}),
-      ...(returnsMap ? { returns: returnsMap, __returns: returnsMap } : {}),
-      ...(requiredLayouts !== undefined ? { __requiredLayouts: requiredLayouts } : {}),
+      ...(this.bodyMode ? { bodyMode: this.bodyMode } : {}),
+      ...(this.returnsMap ? { returns: this.returnsMap, __returns: this.returnsMap } : {}),
+      ...(this.__requiredLayouts !== undefined
+        ? { __requiredLayouts: this.__requiredLayouts }
+        : {}),
       __middlewareAcc: undefined as unknown,
     };
   }
+}
 
-  const builder: any = {
-    query(schema: Schema<unknown>) {
-      validators.query = schema;
-      return builder;
-    },
-    params(schema: Schema<unknown>) {
-      validators.params = schema;
-      return builder;
-    },
-    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {
-      if (typeof modeOrSchema === "string") {
-        bodyMode = modeOrSchema as BodyMode;
-        if (schema !== undefined) {
-          validators.body = schema;
-        }
-      } else {
-        bodyMode = "json";
-        validators.body = modeOrSchema;
-      }
-      return builder;
-    },
-    returns(map: ReturnsMap) {
-      returnsMap = { ...returnsMap, ...map };
-      return builder;
-    },
-    requires() {
-      return builder;
-    },
-    handler(fn: (ctx: any, next: any) => any) {
-      return toUnit(fn);
-    },
-    toUnit() {
-      return toUnit();
-    },
-    __middlewareAcc: undefined as unknown,
-  };
-
-  if (requiredLayouts !== undefined) {
-    builder.__requiredLayouts = requiredLayouts;
-  }
-
-  return builder;
+export function createMiddlewareUnitBuilder(requiredLayouts?: string | readonly string[]) {
+  return new MiddlewareUnitBuilderImpl(requiredLayouts);
 }

package/src/builder/middleware.ts

@@ -1,25 +1,23 @@
 import type { LayoutId, MiddlewareBuilder } from "../types/index.js";
 import type { MiddlewareDefinition } from "../types/units.js";
+import { normalizeMiddlewareDefinition } from "./normalize.js";
+
+class MiddlewareBuilderImpl<Layout extends LayoutId> {
+  readonly layout: Layout;
+  readonly middlewares: MiddlewareDefinition[] = [];
+
+  constructor(layout: Layout) {
+    this.layout = layout;
+  }
+
+  use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)): this {
+    this.middlewares.push(normalizeMiddlewareDefinition(definition));
+    return this;
+  }
+}
 
 export function createMiddleware<const Layout extends LayoutId>(
   layout: Layout,
 ): MiddlewareBuilder<Layout, readonly []> {
-  const entries: MiddlewareDefinition[] = [];
-
-  const chain = {
-    layout,
-    middlewares: entries,
-    use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)) {
-      if (typeof definition === "function") {
-        entries.push({ handler: definition as any });
-      } else if (typeof (definition as any)?.toUnit === "function") {
-        entries.push((definition as any).toUnit());
-      } else {
-        entries.push(definition);
-      }
-      return chain;
-    },
-  };
-
-  return chain as unknown as MiddlewareBuilder<Layout, readonly []>;
+  return new MiddlewareBuilderImpl(layout) as unknown as MiddlewareBuilder<Layout, readonly []>;
 }

package/src/builder/normalize.ts

@@ -0,0 +1,13 @@
+import type { MiddlewareDefinition } from "../types/units.js";
+
+export function normalizeMiddlewareDefinition(
+  definition: MiddlewareDefinition | ((ctx: any, next: any) => any),
+): MiddlewareDefinition {
+  if (typeof definition === "function") {
+    return { handler: definition as any };
+  }
+  if (typeof (definition as any)?.toUnit === "function") {
+    return (definition as any).toUnit();
+  }
+  return definition;
+}

package/src/builder/route.ts

@@ -17,21 +17,9 @@ import type {
 } from "../types/index.js";
 import type { HttpMethod, MiddlewareDefinition } from "../types/units.js";
 import { pickDefinedSchemas, type SchemaValidators } from "../define/validators.js";
+import { normalizeMiddlewareDefinition } from "./normalize.js";
 
-function toUtilsMap(map: ReturnsMap | undefined): Record<number, StandardSchemaV1> {
-  if (!map) {
-    return {};
-  }
-  const out: Record<number, StandardSchemaV1> = {};
-  for (const [key, schema] of Object.entries(map)) {
-    if (schema !== undefined) {
-      out[Number(key)] = schema;
-    }
-  }
-  return out;
-}
-
-function buildEffectiveReturns(args: {
+function buildRouteReturnsWith422(args: {
   middlewareReturns: ReturnsMap;
   routeReturns: ReturnsMap;
   schemas: {
@@ -42,8 +30,8 @@ function buildEffectiveReturns(args: {
   };
 }): Record<number, StandardSchemaV1> | undefined {
   const merged = mergeReturnsMaps(
-    toUtilsMap(args.middlewareReturns),
-    toUtilsMap(args.routeReturns),
+    args.middlewareReturns as Record<number, StandardSchemaV1>,
+    args.routeReturns as Record<number, StandardSchemaV1>,
   );
   const with422 = withAuto422(merged, hasInputSchemas(args.schemas));
   return Object.keys(with422).length > 0 ? with422 : undefined;
@@ -63,76 +51,87 @@ function buildRouteBase(
   };
 }
 
+class RouteBuilderImpl {
+  readonly path: string;
+  readonly method: HttpMethod | "ANY" | "ALL";
+  readonly methods: readonly HttpMethod[] | undefined;
+  private readonly middlewares: MiddlewareDefinition[] = [];
+  private readonly routeReturns: Record<number, StandardSchemaV1> = {};
+  private readonly validators: SchemaValidators = {};
+  private bodyMode: BodyMode | undefined;
+
+  constructor(path: string, method: HttpMethod | "ANY" | "ALL", methods?: readonly HttpMethod[]) {
+    this.path = path;
+    this.method = method;
+    this.methods = methods;
+  }
+
+  query(schema: Schema<unknown>): this {
+    this.validators.query = schema;
+    return this;
+  }
+
+  params(schema: Schema<unknown>): this {
+    this.validators.params = schema;
+    return this;
+  }
+
+  body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>): this {
+    if (typeof modeOrSchema === "string") {
+      this.bodyMode = modeOrSchema as BodyMode;
+      if (schema !== undefined) {
+        this.validators.body = schema;
+      }
+    } else {
+      this.bodyMode = "json";
+      this.validators.body = modeOrSchema;
+    }
+    return this;
+  }
+
+  returns(map: ReturnsMap): this {
+    Object.assign(this.routeReturns, map);
+    return this;
+  }
+
+  use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)): this {
+    this.middlewares.push(normalizeMiddlewareDefinition(definition));
+    return this;
+  }
+
+  handler(fn: (ctx: unknown) => Response | Promise<Response>) {
+    const routeSchemas = pickDefinedSchemas(this.validators);
+    const base = buildRouteBase(this.path, this.method, this.methods, this.middlewares);
+
+    const returns = buildRouteReturnsWith422({
+      middlewareReturns: collectReturnsFromDefinitions(this.middlewares),
+      routeReturns: this.routeReturns,
+      schemas: {
+        ...this.validators,
+        middlewares: this.middlewares,
+      },
+    });
+
+    return {
+      ...base,
+      handler: fn,
+      ...routeSchemas,
+      ...(this.bodyMode ? { bodyMode: this.bodyMode } : {}),
+      ...(returns ? { returns } : {}),
+    };
+  }
+}
+
 /** Shared internal builder — not part of the public `@taserjs/router` API. */
 export function createRouteBuilder(
   path: string,
   method: HttpMethod | "ANY" | "ALL",
   methods?: readonly HttpMethod[],
 ): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {
-  const middlewares: MiddlewareDefinition[] = [];
-  let routeReturns: Record<number, StandardSchemaV1> = {};
-  const validators: SchemaValidators = {};
-  let bodyMode: BodyMode | undefined;
-
-  const builder = {
-    path,
-    method,
-    query(schema: Schema<unknown>) {
-      validators.query = schema;
-      return builder;
-    },
-    params(schema: Schema<unknown>) {
-      validators.params = schema;
-      return builder;
-    },
-    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {
-      if (typeof modeOrSchema === "string") {
-        bodyMode = modeOrSchema as BodyMode;
-        if (schema !== undefined) {
-          validators.body = schema;
-        }
-      } else {
-        bodyMode = "json";
-        validators.body = modeOrSchema;
-      }
-      return builder;
-    },
-    returns(map: ReturnsMap) {
-      routeReturns = { ...routeReturns, ...toUtilsMap(map) };
-      return builder;
-    },
-    use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)) {
-      if (typeof definition === "function") {
-        middlewares.push({ handler: definition as any });
-      } else if (typeof (definition as any)?.toUnit === "function") {
-        middlewares.push((definition as any).toUnit());
-      } else {
-        middlewares.push(definition);
-      }
-      return builder;
-    },
-    handler(fn: (ctx: unknown) => Response | Promise<Response>) {
-      const routeSchemas = pickDefinedSchemas(validators);
-      const base = buildRouteBase(path, method, methods, middlewares);
-
-      const returns = buildEffectiveReturns({
-        middlewareReturns: collectReturnsFromDefinitions(middlewares),
-        routeReturns,
-        schemas: {
-          ...validators,
-          middlewares,
-        },
-      });
-
-      return {
-        ...base,
-        handler: fn,
-        ...routeSchemas,
-        ...(bodyMode ? { bodyMode } : {}),
-        ...(returns ? { returns } : {}),
-      };
-    },
-  };
-
-  return builder as unknown as RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;
+  return new RouteBuilderImpl(path, method, methods) as unknown as RouteBuilder<
+    RoutePath,
+    Method,
+    readonly [],
+    ValidatorParts
+  >;
 }

package/src/builder/standalone.ts

@@ -1,48 +1,49 @@
-import type { AppContext, LayoutBuilder } from "../types/index.js";
-import {
-  createAllRoute,
-  createAnyRoute,
-  createDeleteRoute,
-  createGetRoute,
-  createHeadRoute,
-  createOptionsRoute,
-  createPatchRoute,
-  createPostRoute,
-  createPutRoute,
-  createQueryRoute,
-  type CreateAllRoute,
-  type CreateAnyRoute,
-  type CreateWithBodyRoute,
-  type CreateWithoutBodyRoute,
-} from "./factories.js";
+import type { AppContext, LayoutBuilder, RouteBuilder, RoutePath } from "../types/index.js";
+import type { HttpMethod } from "../types/units.js";
+import { createRouteBuilder } from "./route.js";
 import { createMiddleware } from "./middleware.js";
 import { middleware as createMiddlewareFn, type MiddlewareFn } from "../define/middleware.js";
 
-export const get: CreateWithoutBodyRoute<"GET", AppContext> =
-  createGetRoute as CreateWithoutBodyRoute<"GET", AppContext>;
-export const post: CreateWithBodyRoute<"POST", AppContext> = createPostRoute as CreateWithBodyRoute<
-  "POST",
-  AppContext
->;
-export const put: CreateWithBodyRoute<"PUT", AppContext> = createPutRoute as CreateWithBodyRoute<
-  "PUT",
-  AppContext
->;
-export const patch: CreateWithBodyRoute<"PATCH", AppContext> =
-  createPatchRoute as CreateWithBodyRoute<"PATCH", AppContext>;
-export const del: CreateWithoutBodyRoute<"DELETE", AppContext> =
-  createDeleteRoute as CreateWithoutBodyRoute<"DELETE", AppContext>;
-export const options: CreateWithoutBodyRoute<"OPTIONS", AppContext> =
-  createOptionsRoute as CreateWithoutBodyRoute<"OPTIONS", AppContext>;
-export const head: CreateWithoutBodyRoute<"HEAD", AppContext> =
-  createHeadRoute as CreateWithoutBodyRoute<"HEAD", AppContext>;
-export const query: CreateWithBodyRoute<"QUERY", AppContext> =
-  createQueryRoute as CreateWithBodyRoute<"QUERY", AppContext>;
-export const any: CreateAnyRoute<AppContext> = createAnyRoute as CreateAnyRoute<AppContext>;
-export const all: CreateAllRoute<AppContext> = createAllRoute as CreateAllRoute<AppContext>;
+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 const layout: LayoutBuilder<AppContext> = createMiddleware as LayoutBuilder<AppContext>;
-export const middleware: MiddlewareFn<AppContext> = createMiddlewareFn as MiddlewareFn<AppContext>;
+export type CreateWithBodyRoute<
+  M extends "POST" | "PUT" | "PATCH" | "QUERY",
+  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>;
+
+function createWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD">(
+  method: M,
+): CreateWithoutBodyRoute<M> {
+  return ((path: string) =>
+    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;
+}
+
+function createWithBodyRoute<M extends "POST" | "PUT" | "PATCH" | "QUERY">(
+  method: M,
+): CreateWithBodyRoute<M> {
+  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;
+}
 
 export type TaserNamespace<TAppContext extends Record<string, unknown> = AppContext> = {
   readonly get: CreateWithoutBodyRoute<"GET", TAppContext>;
@@ -59,17 +60,20 @@ export type TaserNamespace<TAppContext extends Record<string, unknown> = AppCont
   readonly middleware: MiddlewareFn<TAppContext>;
 };
 
+export const middleware: MiddlewareFn<AppContext> = createMiddlewareFn as MiddlewareFn<AppContext>;
+
 export const t: TaserNamespace<AppContext> = {
-  get,
-  post,
-  put,
-  patch,
-  delete: del,
-  options,
-  head,
-  query,
-  any,
-  all,
-  layout,
+  get: createWithoutBodyRoute("GET"),
+  post: createWithBodyRoute("POST"),
+  put: createWithBodyRoute("PUT"),
+  patch: createWithBodyRoute("PATCH"),
+  delete: createWithoutBodyRoute("DELETE"),
+  options: createWithoutBodyRoute("OPTIONS"),
+  head: createWithoutBodyRoute("HEAD"),
+  query: createWithBodyRoute("QUERY"),
+  any: ((path: string, methods: readonly HttpMethod[]) =>
+    createRouteBuilder(path, "ANY", methods)) as unknown as CreateAnyRoute<AppContext>,
+  all: ((path: string) => createRouteBuilder(path, "ALL")) as unknown as CreateAllRoute<AppContext>,
+  layout: createMiddleware as LayoutBuilder<AppContext>,
   middleware,
 };

package/src/define/middleware.ts

@@ -11,6 +11,7 @@ import type {
 import type {
   AppContext,
   LayoutId,
+  LayoutParams,
   ResolveLayoutMiddlewaresState,
   ResolveLayoutsState,
 } from "../types/index.js";
@@ -85,7 +86,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     fn: (
       ctx: StandaloneMiddlewareContext<
         unknown,
-        unknown,
+        LayoutParams<Layout>,
         unknown,
         TAppContext,
         ResolveLayoutMiddlewaresState<Layout>,
@@ -120,7 +121,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     fn: (
       ctx: StandaloneMiddlewareContext<
         unknown,
-        unknown,
+        LayoutParams<Layouts[number]>,
         unknown,
         TAppContext,
         ResolveLayoutsState<Layouts>,
@@ -149,7 +150,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     layout: Layout,
   ): MiddlewareUnitBuilder<
     unknown,
-    unknown,
+    LayoutParams<Layout>,
     unknown,
     {},
     Layout,
@@ -169,7 +170,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     layouts: Layouts,
   ): MiddlewareUnitBuilder<
     unknown,
-    unknown,
+    LayoutParams<Layouts[number]>,
     unknown,
     {},
     Layouts,