@taserjs/router 0.1.5 → 0.1.7

package/dist/esm/define/middleware.d.ts

@@ -1,4 +1,4 @@
-import { DefineMiddlewareResult, ExtractState, IsUnknown, MiddlewareUnitBuilder, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
+import { DefineMiddlewareResult, ExtractState, IsUnknown, MiddlewareRequirements, MiddlewareUnitBuilder, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
 import { AppContext, LayoutId, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
 export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
     /**
@@ -25,11 +25,11 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
     /**
      * Defines a standalone middleware scoped to a single layout branch using a short function signature.
      */
-    <const Layout extends LayoutId, TState = unknown, TRequires = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout> & TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
+    <const Layout extends LayoutId, TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
     /**
      * Defines a standalone middleware scoped to multiple layout branches using a short function signature.
      */
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutsState<Layouts> & TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutsState<Layouts>, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
     /**
      * Defines a standalone, unscoped middleware using a short function signature.
      *
@@ -40,6 +40,6 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
      * });
      * ```
      */
-    <TState = unknown, TRequires = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
+    <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>, next: NextFn<NoInfer<TState>>) => R): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
 }
 export declare const middleware: MiddlewareFn<AppContext>;

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  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   * 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   * 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  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <const Layout extends LayoutId, TState = unknown, TRequires = {}, R = unknown>(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout> & 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 = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts> & 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   * 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 = {}, 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\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":";;AAiLA,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  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\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   * 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  /**\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   * 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\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"}

package/dist/esm/index.d.ts

@@ -4,7 +4,7 @@ export type { AppContext, EmptyAppContext, HttpMethod, InferInput, InferOutput,
 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, t, type TaserNamespace, } from './builder/standalone.js';
+export { all, any, del, get, head, layout, middleware, options, patch, post, put, query, 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';

package/dist/esm/index.js

@@ -1,7 +1,7 @@
-import { all, any, del, get, head, layout, middleware, options, patch, post, put, t } from "./builder/standalone.js";
+import { all, any, del, get, head, layout, middleware, options, patch, post, put, query, 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, t, validationErrorSchema };
+export { TaserApp, TaserRouter, ValidationError, all, any, createContext, createTaserApp, del, get, head, honoMw, layout, middleware, options, patch, post, put, query, t, validationErrorSchema };

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

@@ -3,12 +3,12 @@ import { RouterRegister } from '../index.js';
 import { MergeMiddlewareField, MergeMiddlewareInputField, MergePart, RequestShape, Simplify, UnionToIntersection, UnitRuntimeContext } from './type-utils.js';
 import { ReturnsMap, ValidHandlerReply } from './returns.js';
 import { Schema } from './schema.js';
-import { EmptyAppContext, ExtractState, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, ValidatorParts } from './units.js';
+import { EmptyAppContext, ExtractState, Method, MiddlewareDefinition, MiddlewareRequirements, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, ValidatorParts } from './units.js';
 export type { Awaitable } from '@taserjs/router-core';
 export type { SchemaRequestShape, InferInput, InferOutput, Schema, StandardSchemaV1, } from './schema.js';
 export type { 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 { EmptyAppContext, ExtractState, HttpMethod, IsUnknown, Method, MiddlewareDefinition, MiddlewareReturnFromParts, MiddlewareUnit, MiddlewareUnitBuilder, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
+export type { EmptyAppContext, ExtractState, HttpMethod, IsUnknown, Method, MiddlewareDefinition, MiddlewareRequirements, MiddlewareReturnFromParts, MiddlewareUnit, MiddlewareUnitBuilder, NextFn, NextResult, StandaloneMiddlewareContext, StateBrand, ValidatorParts, } from './units.js';
 export type AppContext = RouterRegister extends {
     AppContext: infer C;
 } ? C : EmptyAppContext;
@@ -39,9 +39,12 @@ type LayoutParentsMap = RouterRegister extends {
 type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutParentsMap ? LayoutParentsMap[Layout] extends LayoutId ? LayoutParentsMap[Layout] : null : LayoutTree[Layout] extends {
     parent: infer Parent extends LayoutId | null;
 } ? Parent : null;
+type LayoutMiddlewares<Layout extends LayoutId> = LayoutTree[Layout]["middlewares"] extends {
+    readonly __acc?: infer Acc extends readonly unknown[];
+} ? Acc : LayoutTree[Layout]["middlewares"] extends infer Acc extends readonly unknown[] ? Acc : readonly [];
 type ResolveLayoutMiddlewares<Layout extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : Layout extends LayoutId ? readonly [
     ...ResolveLayoutMiddlewares<LayoutParent<Layout>, [...Depth, unknown]>,
-    ...LayoutTree[Layout]["middlewares"]
+    ...LayoutMiddlewares<Layout>
 ] : readonly [];
 export type ResolveLayoutIdChain<L extends LayoutId | null, Depth extends readonly unknown[] = []> = Depth["length"] extends 10 ? readonly [] : L extends LayoutId ? readonly [...ResolveLayoutIdChain<LayoutParent<L>, [...Depth, unknown]>, L] : readonly [];
 export type ResolveLayoutMiddlewaresState<Layout extends LayoutId | null> = Layout extends LayoutId ? MergeMiddlewareField<ResolveLayoutMiddlewares<Layout>, "state"> : {};
@@ -51,7 +54,7 @@ type ResolveLayoutChainMiddlewares<Chain extends readonly LayoutId[]> = Chain ex
     infer Head extends LayoutId,
     ...infer Rest
 ] ? readonly [
-    ...LayoutTree[Head]["middlewares"],
+    ...LayoutMiddlewares<Head>,
     ...ResolveLayoutChainMiddlewares<Rest extends readonly LayoutId[] ? Rest : readonly []>
 ] : readonly [];
 type RouteEntry<Path extends RoutePath, TMethod extends Method> = RouteByPathMethod[Path] extends {
@@ -118,7 +121,25 @@ type IsEmptyObject<T> = [keyof T] extends [never] ? true : false;
 export type IsLayoutAllowed<TRequiredLayouts, TChain extends readonly LayoutId[]> = [
     TRequiredLayouts
 ] extends [never] ? true : [unknown] extends [TRequiredLayouts] ? true : [null] extends [TRequiredLayouts] ? true : [undefined] extends [TRequiredLayouts] ? true : TRequiredLayouts extends LayoutId ? TRequiredLayouts extends TChain[number] ? true : false : TRequiredLayouts extends readonly LayoutId[] ? [TRequiredLayouts[number] & TChain[number]] extends [never] ? false : true : true;
-export type IsStateSatisfied<TActualState, TRequiredState> = [TRequiredState] extends [never] ? true : [unknown] extends [TRequiredState] ? true : [null] extends [TRequiredState] ? true : [undefined] extends [TRequiredState] ? true : [IsEmptyObject<TRequiredState>] extends [true] ? true : [TActualState] extends [TRequiredState] ? true : false;
+export type IsRequirementsSatisfied<TActual extends {
+    query?: unknown;
+    params?: unknown;
+    body?: unknown;
+    state?: unknown;
+}, TRequires extends MiddlewareRequirements> = [TRequires] extends [never] ? true : [unknown] extends [TRequires] ? true : [null] extends [TRequires] ? true : [undefined] extends [TRequires] ? true : [IsEmptyObject<TRequires>] extends [true] ? true : (TRequires extends {
+    state: infer S extends Record<string, unknown>;
+} ? [TActual["state"]] extends [S] ? true : false : true) extends false ? false : (TRequires extends {
+    query: infer Q extends Record<string, unknown>;
+} ? [TActual["query"]] extends [Q] ? true : false : true) extends false ? false : (TRequires extends {
+    params: infer P extends Record<string, unknown>;
+} ? [TActual["params"]] extends [P] ? true : false : true) extends false ? false : (TRequires extends {
+    body: infer B;
+} ? unknown extends B ? true : [TRequires["body"]] extends [undefined] ? true : [TActual["body"]] extends [B] ? true : false : true) extends false ? false : true;
+export type IsStateSatisfied<TActualState, TRequiredState> = IsRequirementsSatisfied<{
+    state: TActualState;
+}, {
+    state: TRequiredState extends Record<string, unknown> ? TRequiredState : {};
+}>;
 type InputFacet<T, K extends string> = IsNever<T> extends true ? {} : IsEmptyObject<T> extends true ? {} : {
     [Key in K]: T;
 };
@@ -156,31 +177,41 @@ export type MiddlewareChainContext<Layout extends LayoutId, Acc extends readonly
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = Acc & {
+export type MiddlewareBuilder<Layout extends LayoutId, Acc extends readonly unknown[] = readonly [], TAppContext extends Record<string, unknown> = AppContext> = {
     readonly layout: Layout;
     readonly middlewares: readonly MiddlewareDefinition[];
+    readonly __acc?: Acc;
     readonly $Infer: {
         Context: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>;
     };
-    use<TAcc, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = unknown>(unit: MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequiredState>, ..._assert: [
+    use<TAcc, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}>(unit: [
         IsLayoutAllowed<TRequiredLayouts, ResolveLayoutIdChain<Layout>>,
-        IsStateSatisfied<MiddlewareChainField<Layout, Acc, "state">, TRequiredState>
-    ] extends [true, true] ? [] : [
-        {
-            error: "Middleware cannot be attached to this layout";
-            requiredLayouts: TRequiredLayouts;
-            layoutChain: ResolveLayoutIdChain<Layout>;
-            requiredState: TRequiredState;
-            actualState: MiddlewareChainField<Layout, Acc, "state">;
-        }
-    ]): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
+        IsRequirementsSatisfied<{
+            query: MiddlewareChainField<Layout, Acc, "query">;
+            params: MiddlewareChainField<Layout, Acc, "params">;
+            body: MiddlewareChainField<Layout, Acc, "body">;
+            state: MiddlewareChainField<Layout, Acc, "state">;
+        }, TRequires>
+    ] extends [true, true] ? MiddlewareUnit<TAcc, TReturns, TRequiredLayouts, TRequires> : {
+        error: "Middleware cannot be attached to this layout";
+        requiredLayouts: TRequiredLayouts;
+        layoutChain: ResolveLayoutIdChain<Layout>;
+        requirements: TRequires;
+        actual: {
+            query: MiddlewareChainField<Layout, Acc, "query">;
+            params: MiddlewareChainField<Layout, Acc, "params">;
+            body: MiddlewareChainField<Layout, Acc, "body">;
+            state: MiddlewareChainField<Layout, Acc, "state">;
+        };
+    }): MiddlewareBuilder<Layout, readonly [...Acc, TAcc], TAppContext>;
     use<R = unknown>(fn: (ctx: MiddlewareChainContext<Layout, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): MiddlewareBuilder<Layout, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], TAppContext>;
 };
-export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = Acc & {
+export type RouteExport<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[], TReturns extends ReturnsMap = {}, TOutput = Response> = {
     readonly path: Path;
     readonly method: TMethod | "ANY" | "ALL";
     readonly methods?: readonly Method[];
     readonly middlewares: readonly MiddlewareDefinition[];
+    readonly __acc?: Acc;
     readonly returns?: TReturns;
     readonly bodyMode?: "json" | "form" | "urlencoded";
     handler: (ctx: unknown) => Awaitable<Response>;
@@ -200,7 +231,7 @@ type RouteHandleResult<Path extends RoutePath, TMethod extends Method, Acc exten
         Output: TOutput;
     };
 };
-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> = {
+export type RouteContractBuilderBase<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: {
@@ -208,28 +239,15 @@ export type RouteBuilderBase<Path extends RoutePath, TMethod extends Method, Acc
         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, TQueryIn = unknown>(schema: Schema<TQuery, TQueryIn>): RouteContractBuilder<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, TParamsIn = unknown>(schema: Schema<TParams, TParamsIn>): RouteContractBuilder<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>>,
-        IsStateSatisfied<RouteResolvedField<Path, TMethod, Acc, "state">, TRequiredState>
-    ] extends [true, true] ? [] : [
-        {
-            error: "Middleware cannot be attached to this route";
-            requiredLayouts: TRequiredLayouts;
-            routeLayoutChain: RouteLayoutChain<Path, TMethod>;
-            requiredState: TRequiredState;
-            actualState: RouteResolvedField<Path, TMethod, Acc, "state">;
-        }
-    ]): RouteBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
-    use<R = unknown>(fn: (ctx: RouteChainContext<Path, TMethod, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): RouteBuilder<Path, TMethod, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], Validators, TReturns, TAppContext>;
+    returns<const M extends ReturnsMap>(map: M): RouteContractBuilder<Path, TMethod, Acc, Validators, Omit<TReturns, keyof M> & M, TAppContext>;
     handler<R extends Response = Response>(fn: (ctx: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? RouteHandleContextWithoutBody<Path, TMethod, Acc, Validators, TAppContext> : RouteHandleContext<Path, TMethod, Acc, Validators, TAppContext>) => Awaitable<R>, ..._assert: [R] extends [ValidHandlerReply<R, TReturns>] ? [] : [
         {
             expected: ValidHandlerReply<R, TReturns>;
@@ -237,16 +255,40 @@ export type RouteBuilderBase<Path extends RoutePath, TMethod extends Method, Acc
         }
     ]): RouteHandleResult<Path, TMethod, Acc, Validators, TReturns, R, 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"> & {
+export type RouteContractBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = RouteContractBuilderBase<Path, TMethod, Acc, Validators, TReturns, TAppContext> & (TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS" ? {} : {
+    body<TBody, TBodyIn = unknown>(schema: Schema<TBody, TBodyIn>): RouteContractBuilder<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<Mode extends "json" | "form" | "urlencoded", TBody, TBodyIn = unknown>(mode: Mode, schema: Schema<TBody, TBodyIn>): RouteContractBuilder<Path, TMethod, Acc, Omit<Validators, "body" | "bodyIn"> & {
         body: TBody;
         bodyIn: TBodyIn;
     }, TReturns, TAppContext>;
 });
+export type RouteMiddlewareBuilder<Path extends RoutePath, TMethod extends Method, Acc extends readonly unknown[] = readonly [], Validators extends ValidatorParts = {}, TReturns extends ReturnsMap = {}, TAppContext extends Record<string, unknown> = AppContext> = RouteContractBuilder<Path, TMethod, Acc, Validators, TReturns, TAppContext> & {
+    use<TAcc, UReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}>(unit: [
+        IsLayoutAllowed<TRequiredLayouts, RouteLayoutChain<Path, TMethod>>,
+        IsRequirementsSatisfied<{
+            query: RouteResolvedField<Path, TMethod, Acc, "query">;
+            params: ResolveParams<PathParams<Path>, RouteResolvedField<Path, TMethod, Acc, "params">>;
+            body: RouteResolvedField<Path, TMethod, Acc, "body">;
+            state: RouteResolvedField<Path, TMethod, Acc, "state">;
+        }, TRequires>
+    ] extends [true, true] ? MiddlewareUnit<TAcc, UReturns, TRequiredLayouts, TRequires> : {
+        error: "Middleware cannot be attached to this route";
+        requiredLayouts: TRequiredLayouts;
+        routeLayoutChain: RouteLayoutChain<Path, TMethod>;
+        requirements: TRequires;
+        actual: {
+            query: RouteResolvedField<Path, TMethod, Acc, "query">;
+            params: ResolveParams<PathParams<Path>, RouteResolvedField<Path, TMethod, Acc, "params">>;
+            body: RouteResolvedField<Path, TMethod, Acc, "body">;
+            state: RouteResolvedField<Path, TMethod, Acc, "state">;
+        };
+    }): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, TAcc], Validators, Omit<TReturns, keyof UReturns> & UReturns, TAppContext>;
+    use<R = unknown>(fn: (ctx: RouteChainContext<Path, TMethod, Acc, unknown, unknown, unknown, TAppContext>, next: NextFn) => Awaitable<R>): RouteMiddlewareBuilder<Path, TMethod, readonly [...Acc, MiddlewareReturnFromParts<unknown, unknown, unknown, ExtractState<R>>], Validators, TReturns, 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> = RouteMiddlewareBuilder<Path, TMethod, Acc, Validators, TReturns, TAppContext>;
 export type RouteDefinition<Path extends RoutePath = RoutePath, TMethod extends Method = Method, Acc extends readonly unknown[] = readonly unknown[], Validators extends ValidatorParts = ValidatorParts, TReturns extends ReturnsMap = ReturnsMap, TOutput = Response, TAppContext extends Record<string, unknown> = AppContext> = RouteHandleResult<Path, TMethod, Acc, Validators, TReturns, TOutput, TAppContext>;
 export type InferRouteContext<R> = R extends {
     $Infer: {

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

@@ -37,29 +37,35 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn =
         body: RequestShape<TBodyIn, TBody>;
     };
 };
-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> = EmptyAppContext, TState = {}> = Simplify<TAppContext & UnitRuntimeContext & {
-    query: Simplify<UnwrapPart<TQuery>>;
-    params: Simplify<UnwrapPart<TParams>>;
-    body: Simplify<UnwrapPart<TBody>>;
-    state: Simplify<UnwrapPart<TState>>;
+export type MiddlewareRequirements = {
+    query?: Record<string, unknown>;
+    params?: Record<string, unknown>;
+    body?: unknown;
+    state?: Record<string, unknown>;
+};
+export type DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody, TReturns extends ReturnsMap = {}, TLayout = null, TRequires extends MiddlewareRequirements = {}> = 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> = EmptyAppContext, TState = {}, TRequires extends MiddlewareRequirements = {}> = Simplify<TAppContext & UnitRuntimeContext & {
+    query: Simplify<UnwrapPart<TQuery> & (TRequires["query"] extends Record<string, unknown> ? TRequires["query"] : {})>;
+    params: Simplify<UnwrapPart<TParams> & (TRequires["params"] extends Record<string, unknown> ? TRequires["params"] : {})>;
+    body: Simplify<UnwrapPart<TBody> & (unknown extends TRequires["body"] ? {} : [TRequires["body"]] extends [undefined] ? {} : TRequires["body"])>;
+    state: Simplify<UnwrapPart<TState> & (TRequires["state"] extends Record<string, unknown> ? TRequires["state"] : {})>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
 export declare const MiddlewareUnitBrand: unique symbol;
-export type MiddlewareUnit<TAcc = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = unknown> = MiddlewareDefinition & {
+export type MiddlewareUnit<TAcc = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}> = MiddlewareDefinition & {
     readonly [MiddlewareUnitBrand]: true;
     readonly __middlewareAcc: TAcc;
     readonly __returns?: TReturns;
     readonly __requiredLayouts?: TRequiredLayouts;
-    readonly __requiredState?: TRequiredState;
+    readonly __requirements?: TRequires;
 };
-export type MiddlewareUnitBuilder<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequiredState = {}, TAppContext extends Record<string, unknown> = EmptyAppContext, TInheritedState = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TExpectedState = unknown> = MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? {} : TExpectedState, TQueryIn, TParamsIn, TBodyIn>, TReturns, TRequiredLayouts, TRequiredState> & {
-    query<Q, QIn = unknown>(schema: Schema<Q, QIn>): MiddlewareUnitBuilder<Q, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, QIn, TParamsIn, TBodyIn, TExpectedState>;
-    params<P, PIn = unknown>(schema: Schema<P, PIn>): MiddlewareUnitBuilder<TQuery, P, TBody, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, PIn, TBodyIn, TExpectedState>;
-    body<B, BIn = unknown>(schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
-    body<Mode extends "json" | "form" | "urlencoded", B, BIn = unknown>(mode: Mode, schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
-    returns<const M extends ReturnsMap>(map: M): MiddlewareUnitBuilder<TQuery, TParams, TBody, Omit<TReturns, keyof M> & M, TRequiredLayouts, TRequiredState, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
-    requires<Requires extends Record<string, unknown>>(): MiddlewareUnitBuilder<TQuery, TParams, TBody, TReturns, TRequiredLayouts, TRequiredState & Requires, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
-    handler<R>(fn: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TInheritedState & TRequiredState>, next: NextFn<TExpectedState>) => R): DefineMiddlewareResult<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? ExtractState<R> : TExpectedState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, TRequiredLayouts, TRequiredState>;
+export type MiddlewareUnitBuilder<TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TRequiredLayouts = unknown, TRequires extends MiddlewareRequirements = {}, TAppContext extends Record<string, unknown> = EmptyAppContext, TInheritedState = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TExpectedState = unknown> = MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? {} : TExpectedState, TQueryIn, TParamsIn, TBodyIn>, TReturns, TRequiredLayouts, TRequires> & {
+    query<Q, QIn = unknown>(schema: Schema<Q, QIn>): MiddlewareUnitBuilder<Q, TParams, TBody, TReturns, TRequiredLayouts, TRequires, TAppContext, TInheritedState, QIn, TParamsIn, TBodyIn, TExpectedState>;
+    params<P, PIn = unknown>(schema: Schema<P, PIn>): MiddlewareUnitBuilder<TQuery, P, TBody, TReturns, TRequiredLayouts, TRequires, TAppContext, TInheritedState, TQueryIn, PIn, TBodyIn, TExpectedState>;
+    body<B, BIn = unknown>(schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequires, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
+    body<Mode extends "json" | "form" | "urlencoded", B, BIn = unknown>(mode: Mode, schema: Schema<B, BIn>): MiddlewareUnitBuilder<TQuery, TParams, B, TReturns, TRequiredLayouts, TRequires, TAppContext, TInheritedState, TQueryIn, TParamsIn, BIn, TExpectedState>;
+    returns<const M extends ReturnsMap>(map: M): MiddlewareUnitBuilder<TQuery, TParams, TBody, Omit<TReturns, keyof M> & M, TRequiredLayouts, TRequires, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
+    requires<Requires extends MiddlewareRequirements>(): MiddlewareUnitBuilder<TQuery, TParams, TBody, TReturns, TRequiredLayouts, TRequires & Requires, TAppContext, TInheritedState, TQueryIn, TParamsIn, TBodyIn, TExpectedState>;
+    handler<R>(fn: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TInheritedState, TRequires>, next: NextFn<TExpectedState>) => R): DefineMiddlewareResult<TQuery, TParams, TBody, IsUnknown<TExpectedState> extends true ? ExtractState<R> : TExpectedState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, TRequiredLayouts, TRequires>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taserjs/router",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "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-utils": "0.1.5",
-    "@taserjs/router-core": "0.1.5"
+    "@taserjs/router-core": "0.1.7",
+    "@taserjs/router-utils": "0.1.7"
   },
   "devDependencies": {
     "@tanstack/vite-config": "^0.6.0",

package/src/builder/factories.ts

@@ -10,7 +10,7 @@ export type CreateWithoutBodyRoute<
 ) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
 
 export type CreateWithBodyRoute<
-  M extends "POST" | "PUT" | "PATCH",
+  M extends "POST" | "PUT" | "PATCH" | "QUERY",
   TAppContext extends Record<string, unknown> = AppContext,
 > = <const Path extends RoutePath>(
   path: Path,
@@ -37,7 +37,7 @@ function createWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD">
     createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;
 }
 
-function createWithBodyRoute<M extends "POST" | "PUT" | "PATCH">(
+function createWithBodyRoute<M extends "POST" | "PUT" | "PATCH" | "QUERY">(
   method: M,
 ): CreateWithBodyRoute<M> {
   return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;
@@ -50,6 +50,7 @@ export const createHeadRoute = createWithoutBodyRoute("HEAD");
 export const createPostRoute = createWithBodyRoute("POST");
 export const createPutRoute = createWithBodyRoute("PUT");
 export const createPatchRoute = createWithBodyRoute("PATCH");
+export const createQueryRoute = createWithBodyRoute("QUERY");
 
 export const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>
   createRouteBuilder(path, "ANY", methods)) as unknown as CreateAnyRoute;

package/src/builder/standalone.ts

@@ -9,6 +9,7 @@ import {
   createPatchRoute,
   createPostRoute,
   createPutRoute,
+  createQueryRoute,
   type CreateAllRoute,
   type CreateAnyRoute,
   type CreateWithBodyRoute,
@@ -35,6 +36,8 @@ 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>;
 
@@ -49,6 +52,7 @@ export type TaserNamespace<TAppContext extends Record<string, unknown> = AppCont
   readonly delete: CreateWithoutBodyRoute<"DELETE", TAppContext>;
   readonly options: CreateWithoutBodyRoute<"OPTIONS", TAppContext>;
   readonly head: CreateWithoutBodyRoute<"HEAD", TAppContext>;
+  readonly query: CreateWithBodyRoute<"QUERY", TAppContext>;
   readonly any: CreateAnyRoute<TAppContext>;
   readonly all: CreateAllRoute<TAppContext>;
   readonly layout: LayoutBuilder<TAppContext>;
@@ -63,6 +67,7 @@ export const t: TaserNamespace<AppContext> = {
   delete: del,
   options,
   head,
+  query,
   any,
   all,
   layout,

package/src/define/middleware.ts

@@ -3,6 +3,7 @@ import type {
   DefineMiddlewareResult,
   ExtractState,
   IsUnknown,
+  MiddlewareRequirements,
   MiddlewareUnitBuilder,
   NextFn,
   StandaloneMiddlewareContext,
@@ -85,7 +86,12 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
   /**
    * Defines a standalone middleware scoped to a single layout branch using a short function signature.
    */
-  <const Layout extends LayoutId, TState = unknown, TRequires = {}, R = unknown>(
+  <
+    const Layout extends LayoutId,
+    TState = unknown,
+    TRequires extends MiddlewareRequirements = {},
+    R = unknown,
+  >(
     layout: Layout,
     fn: (
       ctx: StandaloneMiddlewareContext<
@@ -93,7 +99,8 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
         unknown,
         unknown,
         TAppContext,
-        ResolveLayoutMiddlewaresState<Layout> & TRequires
+        ResolveLayoutMiddlewaresState<Layout>,
+        TRequires
       >,
       next: NextFn<NoInfer<TState>>,
     ) => R,
@@ -117,7 +124,7 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
   <
     const Layouts extends readonly [LayoutId, ...LayoutId[]],
     TState = unknown,
-    TRequires = {},
+    TRequires extends MiddlewareRequirements = {},
     R = unknown,
   >(
     layouts: Layouts,
@@ -127,7 +134,8 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
         unknown,
         unknown,
         TAppContext,
-        ResolveLayoutsState<Layouts> & TRequires
+        ResolveLayoutsState<Layouts>,
+        TRequires
       >,
       next: NextFn<NoInfer<TState>>,
     ) => R,
@@ -155,9 +163,9 @@ export interface MiddlewareFn<TAppContext extends Record<string, unknown> = AppC
    * });
    * ```
    */
-  <TState = unknown, TRequires = {}, R = unknown>(
+  <TState = unknown, TRequires extends MiddlewareRequirements = {}, R = unknown>(
     fn: (
-      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, TRequires>,
+      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, {}, TRequires>,
       next: NextFn<NoInfer<TState>>,
     ) => R,
   ): DefineMiddlewareResult<

package/src/index.ts

@@ -51,6 +51,7 @@ export {
   patch,
   post,
   put,
+  query,
   t,
   type TaserNamespace,
 } from "./builder/standalone.js";