@fishka/express 0.9.15 → 0.9.17

package/README.md

@@ -12,7 +12,7 @@ npm install @fishka/express
 
 ```typescript
 import express from 'express';
-import { createRouteTable, param, toInt } from '@fishka/express';
+import { createRouteTable, transform, toInt } from '@fishka/express';
 import { assertString } from '@fishka/assertions';
 
 const app = express();
@@ -21,13 +21,10 @@ app.use(express.json());
 const routes = createRouteTable(app);
 
 // GET /users/:id - with typed path params
-routes.get('users/:id', {
-  $path: { id: param(toInt()) },
-  run: async ctx => ({
-    id: ctx.path.id,  // number - typed from $path
-    name: 'John',
-  }),
-});
+routes.get('users/:id', async ctx => ({
+  id: ctx.path('id', transform(toInt())),  // number - validated inline
+  name: 'John',
+}));
 
 // GET /users - list all users
 routes.get('users', async () => [
@@ -36,10 +33,10 @@ routes.get('users', async () => [
 ]);
 
 // POST /users - with body validation
-routes.post<{ name: string }, { id: number }>('users', {
-  $body: { name: v => assertString(v, 'name required') },
-  run: async ctx => ({ id: 1 }),
-});
+routes.post('users', async ctx => ({ 
+  id: 1,
+  name: ctx.body({ name: v => assertString(v, 'name required') }).name
+}));
 
 // DELETE /users/:id
 routes.delete('users/:id', async () => {});
@@ -49,29 +46,26 @@ app.listen(3000);
 
 ## URL Parameter Validation
 
-Use `param()` to validate and transform path/query parameters. All operators are composable:
+Use `transform()` to validate and transform path/query parameters. All operators are composable:
 
 ```typescript
-import { param, toInt, minLength, matches, min, range, oneOf } from '@fishka/express';
-
-routes.get('users/:id', {
-  $path: {
-    id: param(toInt()),                      // string → number
-  },
-  $query: {
-    page: param(toInt(), min(1)),            // number >= 1
-    limit: param(toInt(), range(1, 100)),    // number 1-100
-    sort: param(oneOf('asc', 'desc')),       // enum
-    search: param(minLength(3)),             // string min 3 chars
-  },
-  run: async ctx => ({
-    id: ctx.path.id,       // number
-    page: ctx.query.page,  // number
-    sort: ctx.query.sort,  // 'asc' | 'desc'
-  }),
-});
+import { transform, toInt, minLength, matches, min, range, oneOf } from '@fishka/express';
+
+routes.get('users/:id', async ctx => ({
+  id: ctx.path('id', transform(toInt())),                      // string → number (required)
+  page: ctx.query('page', transform(toInt(), min(1))),         // number >= 1, optional
+  limit: ctx.query('limit', transform(toInt(), range(1, 100))), // number 1-100, optional
+  sort: ctx.query('sort', transform(oneOf('asc', 'desc'))),    // enum, optional
+  search: ctx.query('search', transform(minLength(3))),        // string min 3 chars, optional
+}));
 ```
 
+### Without Validators
+
+- `ctx.path('name')` - returns string (throws 400 if missing)
+- `ctx.query('name')` - returns string | undefined (returns undefined if missing/empty)
+- Validators receive raw values (including undefined/null/empty) and can enforce requiredness
+
 ### Available Operators
 
 **Transformations (string → T):**
@@ -93,23 +87,23 @@ routes.get('users/:id', {
 - `range(min, max)` - value range
 
 **Generic:**
-- `check(fn, msg)` - custom validation
+- `transform(...ops)` - chain of validators/transformers
+- `assert(predicate, msg)` - custom validation with predicate
+- `validator(fn)` - custom validator returning string|undefined
 - `map(fn)` - transform value
 
 ### Optional Parameters
 
-Use `optional()` to make parameters optional:
+Query parameters are optional by default. Use `ctx.query()` without a validator to get optional string values:
 
 ```typescript
-import { optional, param, toInt } from '@fishka/express';
+import { transform, toInt } from '@fishka/express';
 
-routes.get('users', {
-  $query: {
-    page: optional(param(toInt())),  // number | undefined
-  },
-  run: async ctx => {
-    const page = ctx.query.page ?? 1;
-  },
+routes.get('users', async ctx => {
+  const page = ctx.query('page', transform(toInt())) ?? 1;  // number | undefined
+  const search = ctx.query('search');  // string | undefined
+  
+  return { page, search };
 });
 ```
 
@@ -163,7 +157,7 @@ Full initialization with TLS context, validation, and error handling:
 
 ```typescript
 import express from 'express';
-import { createRouteTable, createTlsMiddleware, catchAllMiddleware, param, toInt } from '@fishka/express';
+import { createRouteTable, createTlsMiddleware, catchAllMiddleware, transform, toInt } from '@fishka/express';
 
 const app = express();
 
@@ -178,10 +172,9 @@ const routes = createRouteTable(app);
 
 routes.get('health', async () => ({ status: 'UP' }));
 
-routes.get('users/:id', {
-  $path: { id: param(toInt()) },
-  run: async ctx => ({ id: ctx.path.id }),
-});
+routes.get('users/:id', async ctx => ({ 
+  id: ctx.path('id', transform(toInt())) 
+}));
 
 // 4. Error handler - catches middleware/parsing errors
 app.use(catchAllMiddleware);

package/dist/cjs/api.types.d.ts

@@ -1,9 +1,9 @@
-/** Validator function that validates and returns typed value */
-export type TypeValidator<T> = (value: unknown) => T;
+/** Validator function that validates and returns a typed value */
+export type ParamValidator<T> = (value: unknown) => T;
 /** Map of param name to type validator */
-export type TypedValidatorMap = Record<string, TypeValidator<unknown>>;
+export type ParamValidatorMap = Record<string, ParamValidator<unknown>>;
 /** Infer validated types from validator map */
-export type InferValidated<T extends TypedValidatorMap | undefined> = T extends TypedValidatorMap ? {
+export type ValidatedParams<T extends ParamValidatorMap | undefined> = T extends ParamValidatorMap ? {
     [K in keyof T]: ReturnType<T[K]>;
 } : Record<string, never>;
 export declare class HttpError extends Error {

package/dist/cjs/api.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.types.js","sourceRoot":"","sources":["../../src/api.types.ts"],"names":[],"mappings":";;;AAyDA,gCAEC;AA2BD,4BAEC;AAxFD,mDAAkD;AAclD,MAAa,SAAU,SAAQ,KAAK;IAClC,YACkB,MAAc,EAC9B,OAAe,EACC,OAAiC;QAEjD,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,WAAM,GAAN,MAAM,CAAQ;QAEd,YAAO,GAAP,OAAO,CAA0B;QAGjD,qDAAqD;QACrD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACF;AAVD,8BAUC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,UAAU,CAAC,KAAc,EAAE,MAAc,EAAE,OAAe;IACxE,IAAA,yBAAY,EAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AA0BD,gFAAgF;AAChF,SAAgB,QAAQ,CAAc,MAAS;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC"}
+{"version":3,"file":"api.types.js","sourceRoot":"","sources":["../../src/api.types.ts"],"names":[],"mappings":";;;AAwDA,gCAEC;AA2BD,4BAEC;AAvFD,mDAAkD;AAalD,MAAa,SAAU,SAAQ,KAAK;IAClC,YACkB,MAAc,EAC9B,OAAe,EACC,OAAiC;QAEjD,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,WAAM,GAAN,MAAM,CAAQ;QAEd,YAAO,GAAP,OAAO,CAA0B;QAGjD,qDAAqD;QACrD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACF;AAVD,8BAUC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,UAAU,CAAC,KAAc,EAAE,MAAc,EAAE,OAAe;IACxE,IAAA,yBAAY,EAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AA0BD,gFAAgF;AAChF,SAAgB,QAAQ,CAAc,MAAS;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC"}

package/dist/cjs/route-table.d.ts

@@ -1,4 +1,3 @@
-import { TypedValidatorMap } from './api.types';
 import { DeleteEndpoint, GetEndpoint, PatchEndpoint, PostEndpoint, PutEndpoint, RequestContext, ResponseOrValue } from './router';
 import { ExpressRouter } from './utils/express.utils';
 /**
@@ -8,19 +7,25 @@ import { ExpressRouter } from './utils/express.utils';
 export declare class RouteTable {
     private readonly app;
     constructor(app: ExpressRouter);
-    /** Register GET endpoint with full type inference for path/query params. */
-    get<Result, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap>(path: string, endpoint: GetEndpoint<Result, PathParams, QueryParams>): this;
-    /** Register GET endpoint with function shorthand. */
+    /** Register a GET endpoint. */
+    get<Result>(path: string, endpoint: GetEndpoint<Result>): this;
+    /** Register a GET endpoint with function shorthand. */
     get<Result>(path: string, run: (ctx: RequestContext) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>): this;
-    /** Register POST endpoint with full type inference for path/query params. */
-    post<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap>(path: string, endpoint: PostEndpoint<Body, Result, PathParams, QueryParams>): this;
-    /** Register PATCH endpoint with full type inference for path/query params. */
-    patch<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap>(path: string, endpoint: PatchEndpoint<Body, Result, PathParams, QueryParams>): this;
-    /** Register PUT endpoint with full type inference for path/query params. */
-    put<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap>(path: string, endpoint: PutEndpoint<Body, Result, PathParams, QueryParams>): this;
-    /** Register DELETE endpoint with full endpoint object. */
-    delete<PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap>(path: string, endpoint: DeleteEndpoint<PathParams, QueryParams>): this;
-    /** Register DELETE endpoint with function shorthand. */
+    /** Register a POST endpoint. */
+    post<Result = void>(path: string, endpoint: PostEndpoint<Result>): this;
+    /** Register a POST endpoint with function shorthand. */
+    post<Result = void>(path: string, run: (ctx: RequestContext) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>): this;
+    /** Register a PATCH endpoint. */
+    patch<Result = void>(path: string, endpoint: PatchEndpoint<Result>): this;
+    /** Register a PATCH endpoint with function shorthand. */
+    patch<Result = void>(path: string, run: (ctx: RequestContext) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>): this;
+    /** Register a PUT endpoint. */
+    put<Result = void>(path: string, endpoint: PutEndpoint<Result>): this;
+    /** Register a PUT endpoint with function shorthand. */
+    put<Result = void>(path: string, run: (ctx: RequestContext) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>): this;
+    /** Register a DELETE endpoint with a full endpoint object. */
+    delete(path: string, endpoint: DeleteEndpoint): this;
+    /** Register a DELETE endpoint with function shorthand. */
     delete(path: string, run: (ctx: RequestContext) => void | Promise<void>): this;
 }
 /**

package/dist/cjs/route-table.js

@@ -16,18 +16,18 @@ class RouteTable {
         (0, router_1.mountGet)(this.app, path, endpoint);
         return this;
     }
-    /** Register POST endpoint with full type inference for path/query params. */
-    post(path, endpoint) {
+    post(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
         (0, router_1.mountPost)(this.app, path, endpoint);
         return this;
     }
-    /** Register PATCH endpoint with full type inference for path/query params. */
-    patch(path, endpoint) {
+    patch(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
         (0, router_1.mountPatch)(this.app, path, endpoint);
         return this;
     }
-    /** Register PUT endpoint with full type inference for path/query params. */
-    put(path, endpoint) {
+    put(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
         (0, router_1.mountPut)(this.app, path, endpoint);
         return this;
     }

package/dist/cjs/route-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-table.js","sourceRoot":"","sources":["../../src/route-table.ts"],"names":[],"mappings":";;;AA6GA,4CAEC;AA9GD,qCAakB;AAGlB;;;GAGG;AACH,MAAa,UAAU;IACrB,YAA6B,GAAkB;QAAlB,QAAG,GAAH,GAAG,CAAe;IAAG,CAAC;IAYnD,GAAG,CAKD,IAAY,EACZ,aAEyF;QAEzF,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAgC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6EAA6E;IAC7E,IAAI,CAKF,IAAY,EAAE,QAA6D;QAC3E,IAAA,kBAAS,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAA4C,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8EAA8E;IAC9E,KAAK,CAKH,IAAY,EAAE,QAA8D;QAC5E,IAAA,mBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAA6C,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4EAA4E;IAC5E,GAAG,CAKD,IAAY,EAAE,QAA4D;QAC1E,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAA2C,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAWD,MAAM,CAIJ,IAAY,EACZ,aAAwG;QAExG,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,oBAAW,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAA0B,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjFD,gCAiFC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,GAAkB;IACjD,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"route-table.js","sourceRoot":"","sources":["../../src/route-table.ts"],"names":[],"mappings":";;;AAwGA,4CAEC;AA1GD,qCAakB;AAGlB;;;GAGG;AACH,MAAa,UAAU;IACrB,YAA6B,GAAkB;QAAlB,QAAG,GAAH,GAAG,CAAe;IAAG,CAAC;IAQnD,GAAG,CACD,IAAY,EACZ,aAA0H;QAE1H,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAgC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,IAAI,CACF,IAAY,EACZ,aAA2H;QAE3H,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,kBAAS,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAiC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,KAAK,CACH,IAAY,EACZ,aAA4H;QAE5H,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,mBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAkC,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,GAAG,CACD,IAAY,EACZ,aAA0H;QAE1H,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAgC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,MAAM,CACJ,IAAY,EACZ,aAA+E;QAE/E,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,oBAAW,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAA0B,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7ED,gCA6EC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,GAAkB;IACjD,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}

package/dist/cjs/router.d.ts

@@ -1,5 +1,5 @@
-import { Assertion, ObjectAssertion } from '@fishka/assertions';
-import { ApiResponse, InferValidated, TypedValidatorMap } from './api.types';
+import { Assertion } from '@fishka/assertions';
+import { ApiResponse, ParamValidator } from './api.types';
 import { AuthUser } from './auth/auth.types';
 import { ExpressRequest, ExpressResponse, ExpressRouter } from './utils/express.utils';
 /** Express API allows handlers to return a response in the raw form. */
@@ -10,19 +10,36 @@ export type ResponseOrValue<ResponseEntity> = ApiResponse<ResponseEntity> | Resp
  */
 export type EndpointMiddleware<Context = RequestContext> = (run: () => Promise<unknown>, context: Context) => Promise<unknown>;
 /** Generic request context passed to all handlers. Database-agnostic and extensible. */
-export interface RequestContext<Body = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> {
-    /** Parsed and validated request body (for POST/PATCH/PUT handlers). */
-    body: Body;
+export interface RequestContext {
     /** Express Request object. */
     req: ExpressRequest;
     /** Express Response object. */
     res: ExpressResponse;
     /** Authenticated user (if any). Populated by auth middleware. */
     authUser?: AuthUser;
-    /** Validated path parameters (typed from $path validators). */
-    path: InferValidated<PathParams>;
-    /** Validated query parameters (typed from $query validators). */
-    query: InferValidated<QueryParams>;
+    /**
+     * Get and validate a path parameter.
+     * @param name - Name of the path parameter
+     * @param validator - Optional validator. If not provided, returns the raw string value.
+     * @returns Validated value of type T (or string if no validator)
+     * @throws {HttpError} 400 Bad Request if validation fails
+     */
+    path<T = string>(name: string, validator?: ParamValidator<T>): T;
+    /**
+     * Get and validate a query parameter.
+     * @param name - Name of the query parameter
+     * @param validator - Optional validator. If not provided, returns the raw string value or undefined.
+     * @returns Validated value of type T, or undefined if parameter is not present
+     * @throws {HttpError} 400 Bad Request if validation fails
+     */
+    query<T = string>(name: string, validator?: ParamValidator<T>): T | undefined;
+    /**
+     * Get and validate the request body.
+     * @param validator - Validator function or object assertion
+     * @returns Validated body of type T
+     * @throws {HttpError} 400 Bad Request if validation fails
+     */
+    body<T>(validator: Assertion<T>): T;
     /**
      * Generic state storage for middleware to attach data.
      * Allows middleware to pass information to handlers and other middleware.
@@ -30,31 +47,24 @@ export interface RequestContext<Body = void, PathParams extends TypedValidatorMa
     state: Map<string, unknown>;
 }
 /** Base interface with common endpoint properties. */
-export interface EndpointBase<PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap, Body = void, Result = unknown> {
-    /** Path parameter validators (typed). */
-    $path?: PathParams;
-    /** Query parameter validators (typed). */
-    $query?: QueryParams;
+export interface EndpointBase<Result = unknown> {
     /** Optional middleware to execute before the handler. */
     middlewares?: Array<EndpointMiddleware>;
     /** Handler function. Can be sync or async. */
-    run: (ctx: RequestContext<Body, PathParams, QueryParams>) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>;
+    run: (ctx: RequestContext) => ResponseOrValue<Result> | Promise<ResponseOrValue<Result>>;
 }
 /** Descriptor for GET list routes. */
-export type GetListEndpoint<ResultElementType, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> = EndpointBase<PathParams, QueryParams, void, Array<ResultElementType>>;
+export type GetListEndpoint<ResultElementType> = EndpointBase<Array<ResultElementType>>;
 /** Descriptor for GET routes. */
-export type GetEndpoint<Result, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> = EndpointBase<PathParams, QueryParams, void, Result>;
+export type GetEndpoint<Result> = EndpointBase<Result>;
 /** Descriptor for POST routes. */
-export interface PostEndpoint<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> extends EndpointBase<PathParams, QueryParams, Body, Result> {
-    /** Request body validator. */
-    $body: Body extends object ? ObjectAssertion<Body> : Assertion<Body>;
-}
+export type PostEndpoint<Result = void> = EndpointBase<Result>;
 /** Same as POST. Used for full object updates. */
-export type PutEndpoint<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> = PostEndpoint<Body, Result, PathParams, QueryParams>;
+export type PutEndpoint<Result = void> = EndpointBase<Result>;
 /** Same as PUT. While PUT is used for the whole object update, PATCH is used for a partial update. */
-export type PatchEndpoint<Body, Result = void, PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> = PutEndpoint<Body, Result, PathParams, QueryParams>;
+export type PatchEndpoint<Result = void> = EndpointBase<Result>;
 /** Descriptor for DELETE routes. */
-export type DeleteEndpoint<PathParams extends TypedValidatorMap = TypedValidatorMap, QueryParams extends TypedValidatorMap = TypedValidatorMap> = EndpointBase<PathParams, QueryParams, void, void>;
+export type DeleteEndpoint = EndpointBase<void>;
 /** Union type for all route registration info objects. */
 export type RouteRegistrationInfo = ({
     method: 'get';
@@ -77,11 +87,11 @@ export type RouteRegistrationInfo = ({
 /** Registers a GET route. */
 export declare const mountGet: (app: ExpressRouter, path: string, endpoint: GetEndpoint<unknown> | GetListEndpoint<unknown>) => void;
 /** Registers a POST route. */
-export declare const mountPost: <Body, Result>(app: ExpressRouter, path: string, endpoint: PostEndpoint<Body, Result>) => void;
+export declare const mountPost: <Result>(app: ExpressRouter, path: string, endpoint: PostEndpoint<Result>) => void;
 /** Registers a PATCH route. */
-export declare const mountPatch: <Body, Result>(app: ExpressRouter, path: string, endpoint: PatchEndpoint<Body, Result>) => void;
+export declare const mountPatch: <Result>(app: ExpressRouter, path: string, endpoint: PatchEndpoint<Result>) => void;
 /** Registers a PUT route. */
-export declare const mountPut: <Body, Result>(app: ExpressRouter, path: string, endpoint: PutEndpoint<Body, Result>) => void;
+export declare const mountPut: <Result>(app: ExpressRouter, path: string, endpoint: PutEndpoint<Result>) => void;
 /** Registers a DELETE route. */
 export declare const mountDelete: (app: ExpressRouter, path: string, endpoint: DeleteEndpoint) => void;
 /** Mounts a route with the given method, endpoint, and path. */

package/dist/cjs/router.js

@@ -42,9 +42,94 @@ const error_handling_1 = require("./error-handling");
 const http_status_codes_1 = require("./http-status-codes");
 const thread_local_storage_1 = require("./thread-local/thread-local-storage");
 const conversion_utils_1 = require("./utils/conversion.utils");
-// ============================================================================
-// Internal implementation details
-// ============================================================================
+/** Implementation of RequestContext with caching for validated parameters. */
+class RequestContextImpl {
+    constructor(
+    /** Express request object. */
+    req, 
+    /** Express response object. */
+    res, 
+    /** Authenticated user (if any). */
+    authUser, 
+    /** Request-scoped state storage. */
+    state = new Map()) {
+        this.req = req;
+        this.res = res;
+        this.authUser = authUser;
+        this.state = state;
+    }
+    /**
+     * Validates a parameter with optional validator and caching.
+     * @param name Parameter name.
+     * @param rawValue Raw parameter value from request.
+     * @param validator Optional validator function.
+     * @param cache Cache map for this parameter type.
+     * @param isRequired Whether parameter is required (path=true, query=false).
+     * @returns Validated value or undefined for optional missing parameters.
+     */
+    validateParam(name, rawValue, validator, isRequired) {
+        try {
+            let result;
+            if (validator) {
+                // Pass value to validator even if it's undefined/null/empty
+                result = validator(rawValue);
+            }
+            else {
+                // Without validator
+                if (rawValue === undefined || rawValue === null || rawValue === '') {
+                    if (isRequired) {
+                        (0, api_types_1.assertHttp)(false, http_status_codes_1.HTTP_BAD_REQUEST, `Missing required parameter: ${name}`);
+                    }
+                    return undefined;
+                }
+                result = rawValue;
+            }
+            return result;
+        }
+        catch (error) {
+            if (error instanceof api_types_1.HttpError)
+                throw error;
+            throw new api_types_1.HttpError(http_status_codes_1.HTTP_BAD_REQUEST, (0, assertions_1.getMessageFromError)(error));
+        }
+    }
+    path(name, validator) {
+        const rawValue = this.req.params[name];
+        const result = this.validateParam(name, rawValue, validator, true);
+        (0, api_types_1.assertHttp)(result !== undefined, http_status_codes_1.HTTP_BAD_REQUEST, `Missing required path parameter: ${name}`);
+        return result;
+    }
+    query(name, validator) {
+        const parsedUrl = url.parse(this.req.url, true);
+        const rawValue = parsedUrl.query[name];
+        const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
+        return this.validateParam(name, value, validator, false);
+    }
+    body(validator) {
+        const apiRequest = this.req.body;
+        try {
+            // Handle validation based on whether the validator is an object or function
+            if (typeof validator === 'function') {
+                // It's a ValueAssertion (function) - call it directly
+                validator(apiRequest);
+            }
+            else {
+                // It's an ObjectAssertion - use validateObject
+                const objectValidator = validator;
+                const isEmptyValidator = Object.keys(objectValidator).length === 0;
+                const errorMessage = (0, assertions_1.validateObject)(apiRequest, objectValidator, `${http_status_codes_1.HTTP_BAD_REQUEST}: request body`, {
+                    failOnUnknownFields: !isEmptyValidator,
+                });
+                (0, api_types_1.assertHttp)(!errorMessage, http_status_codes_1.HTTP_BAD_REQUEST, errorMessage || 'Request body validation failed');
+            }
+            return apiRequest;
+        }
+        catch (error) {
+            if (error instanceof api_types_1.HttpError)
+                throw error;
+            throw new api_types_1.HttpError(http_status_codes_1.HTTP_BAD_REQUEST, (0, assertions_1.getMessageFromError)(error));
+        }
+    }
+}
 /** Registers a GET route. */
 const mountGet = (app, path, endpoint) => mount(app, { method: 'get', endpoint, path });
 exports.mountGet = mountGet;
@@ -96,48 +181,12 @@ function createRouteHandler(method, endpoint) {
         res.send(response);
     };
 }
-/**
- * @Internal
- * Validates and builds typed path/query parameters using $path and $query validators.
- */
-function buildValidatedParams(req, $path, $query) {
-    const pathResult = {};
-    const queryResult = {};
-    try {
-        // Validate path params
-        if ($path) {
-            for (const [key, validator] of Object.entries($path)) {
-                const value = req.params[key];
-                pathResult[key] = validator(value);
-            }
-        }
-        // Validate query params
-        if ($query) {
-            const parsedUrl = url.parse(req.url, true);
-            for (const [key, validator] of Object.entries($query)) {
-                const rawValue = parsedUrl.query[key];
-                const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
-                queryResult[key] = validator(value);
-            }
-        }
-    }
-    catch (error) {
-        if (error instanceof api_types_1.HttpError)
-            throw error;
-        throw new api_types_1.HttpError(http_status_codes_1.HTTP_BAD_REQUEST, (0, assertions_1.getMessageFromError)(error));
-    }
-    return {
-        path: pathResult,
-        query: queryResult,
-    };
-}
 /**
  * @Internal
  * Runs GET handler with optional middleware.
  */
 async function executeGetEndpoint(route, req, res) {
-    const validated = buildValidatedParams(req, route.$path, route.$query);
-    const requestContext = newRequestContext(undefined, req, res, validated.path, validated.query);
+    const requestContext = new RequestContextImpl(req, res);
     return await executeWithMiddleware(() => route.run(requestContext), route.middlewares || [], requestContext);
 }
 /**
@@ -145,8 +194,7 @@ async function executeGetEndpoint(route, req, res) {
  * Runs DELETE handler with optional middleware.
  */
 async function executeDeleteEndpoint(route, req, res) {
-    const validated = buildValidatedParams(req, route.$path, route.$query);
-    const requestContext = newRequestContext(undefined, req, res, validated.path, validated.query);
+    const requestContext = new RequestContextImpl(req, res);
     await executeWithMiddleware(() => route.run(requestContext), route.middlewares || [], requestContext);
     return undefined;
 }
@@ -155,32 +203,8 @@ async function executeDeleteEndpoint(route, req, res) {
  * Runs POST/PUT/PATCH handler with optional middleware.
  */
 async function executeBodyEndpoint(route, req, res) {
-    const validator = route.$body;
-    const apiRequest = req.body;
-    try {
-        // Handle validation based on whether the validator is an object or function
-        if (typeof validator === 'function') {
-            // It's a ValueAssertion (function) - call it directly
-            validator(apiRequest);
-        }
-        else {
-            // It's an ObjectAssertion - use validateObject
-            const objectValidator = validator;
-            const isEmptyValidator = Object.keys(objectValidator).length === 0;
-            const errorMessage = (0, assertions_1.validateObject)(apiRequest, objectValidator, `${http_status_codes_1.HTTP_BAD_REQUEST}: request body`, {
-                failOnUnknownFields: !isEmptyValidator,
-            });
-            (0, api_types_1.assertHttp)(!errorMessage, http_status_codes_1.HTTP_BAD_REQUEST, errorMessage || 'Request body validation failed');
-        }
-    }
-    catch (error) {
-        if (error instanceof api_types_1.HttpError)
-            throw error;
-        throw new api_types_1.HttpError(http_status_codes_1.HTTP_BAD_REQUEST, (0, assertions_1.getMessageFromError)(error));
-    }
-    const validated = buildValidatedParams(req, route.$path, route.$query);
-    const requestContext = newRequestContext(apiRequest, req, res, validated.path, validated.query);
-    return await executeWithMiddleware(() => route.run(requestContext), (route.middlewares || []), requestContext);
+    const requestContext = new RequestContextImpl(req, res);
+    return await executeWithMiddleware(() => route.run(requestContext), route.middlewares || [], requestContext);
 }
 /**
  * @Internal
@@ -197,18 +221,4 @@ async function executeWithMiddleware(run, middlewares, context) {
     };
     return await current(0);
 }
-/**
- * @Internal
- * Creates a new RequestContext instance.
- */
-function newRequestContext(requestBody, req, res, validatedPath, validatedQuery) {
-    return {
-        body: requestBody,
-        req,
-        res,
-        path: validatedPath,
-        query: validatedQuery,
-        state: new Map(),
-    };
-}
 //# sourceMappingURL=router.js.map

package/dist/cjs/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}