@fishka/express 0.9.16 → 0.9.18

package/README.md

@@ -12,22 +12,19 @@ npm install @fishka/express
 
 ```typescript
 import express from 'express';
-import { createRouteTable, param, toInt } from '@fishka/express';
+import { RouteTable, transform, toInt } from '@fishka/express';
 import { assertString } from '@fishka/assertions';
 
 const app = express();
 app.use(express.json());
 
-const routes = createRouteTable(app);
+const routes = new RouteTable(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,38 +46,37 @@ 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):**
+
 - `toInt()` - parse to integer
 - `toNumber()` - parse to number
 - `toBool()` - parse 'true'/'false' to boolean
 - `oneOf('a', 'b')` - enum values
 
 **String validators:**
+
 - `minLength(n)` - minimum length
 - `maxLength(n)` - maximum length
 - `matches(/regex/)` - regex match
@@ -88,28 +84,30 @@ routes.get('users/:id', {
 - `lowercase` / `uppercase` - case transform
 
 **Number validators:**
+
 - `min(n)` - minimum value
 - `max(n)` - maximum value
 - `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 +161,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 { RouteTable, createTlsMiddleware, catchAllMiddleware, transform, toInt } from '@fishka/express';
 
 const app = express();
 
@@ -171,17 +169,18 @@ const app = express();
 app.use(express.json());
 
 // 2. Initialize TLS context (Request IDs, etc.)
+// Note: Request ID functionality is disabled by default.
+// To enable it, call configureExpressApi({ requestIdHeader: 'x-request-id' }) first.
 app.use(createTlsMiddleware());
 
 // 3. Define routes with typed parameters
-const routes = createRouteTable(app);
+const routes = new RouteTable(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);
@@ -189,6 +188,26 @@ app.use(catchAllMiddleware);
 app.listen(3000);
 ```
 
+## Configuration
+
+You can configure global settings using `configureExpressApi`:
+
+```typescript
+import { configureExpressApi } from '@fishka/express';
+
+// Request ID configuration (disabled by default)
+configureExpressApi({
+  // Enable request ID with custom header name
+  requestIdHeader: 'x-request-id', // or 'x-correlation-id', 'trace-id', etc.
+
+  // Whether to trust request ID from client headers
+  trustRequestIdHeader: true, // default: true
+});
+
+// By default, request ID functionality is disabled.
+// To enable it, you must set requestIdHeader.
+```
+
 ## Process Handlers
 
 Handle uncaught errors and graceful shutdown in one place:

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

@@ -1,11 +1,5 @@
-/** Validator function that validates and returns typed value */
-export type TypeValidator<T> = (value: unknown) => T;
-/** Map of param name to type validator */
-export type TypedValidatorMap = Record<string, TypeValidator<unknown>>;
-/** Infer validated types from validator map */
-export type InferValidated<T extends TypedValidatorMap | undefined> = T extends TypedValidatorMap ? {
-    [K in keyof T]: ReturnType<T[K]>;
-} : Record<string, string>;
+/** Validator function that validates and returns a typed value */
+export type ParamValidator<T> = (value: unknown) => T;
 export declare class HttpError extends Error {
     readonly status: number;
     readonly details?: Record<string, unknown> | undefined;
@@ -46,12 +40,6 @@ export declare function assertHttp(value: unknown, status: number, message: stri
 export interface ApiResponse<ResponseEntity = unknown> {
     /** Result of the call. A single entity for non-paginated ${by-id} requests or an array for list queries. */
     result: ResponseEntity;
-    /**
-     * Unique ID of the request.
-     * Automatically added to every API response.
-     * May be passed via 'x-request-id' header from client.
-     */
-    requestId?: string;
     /**
      * Response status code. Same as HTTP response status.
      * Default: 200 for successful responses or 500 for internal server errors.

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":";;;AAgDA,gCAEC;AAqBD,4BAEC;AAzED,mDAAkD;AAKlD,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;AAoBD,gFAAgF;AAChF,SAAgB,QAAQ,CAAc,MAAS;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC"}

package/dist/cjs/config.d.ts

@@ -1,8 +1,15 @@
 export interface GlobalExpressApiConfig {
+    /**
+     * Header name for request ID. If not set, request ID functionality is disabled.
+     * When set, enables request ID generation and propagation.
+     * Default: undefined (disabled)
+     */
+    requestIdHeader?: string;
     /**
      * Whether to trust and use the request ID from the request header.
-     * If true, the middleware will look for 'x-request-id' and use it.
+     * If true, the middleware will look for the request ID header and use it.
      * If false, a new UUID will always be generated.
+     * Only applies when requestIdHeader is set.
      * Default: true
      */
     trustRequestIdHeader: boolean;

package/dist/cjs/config.js

@@ -4,6 +4,7 @@ exports.configureExpressApi = configureExpressApi;
 exports.getExpressApiConfig = getExpressApiConfig;
 exports.resetExpressApiConfig = resetExpressApiConfig;
 const defaultConfig = {
+    requestIdHeader: undefined,
     trustRequestIdHeader: true,
 };
 let currentConfig = { ...defaultConfig };

package/dist/cjs/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;AAoBA,kDAEC;AAKD,kDAEC;AAMD,sDAEC;AA3BD,MAAM,aAAa,GAA2B;IAC5C,oBAAoB,EAAE,IAAI;CAC3B,CAAC;AAEF,IAAI,aAAa,GAA2B,EAAE,GAAG,aAAa,EAAE,CAAC;AAEjE;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,MAAuC;IACzE,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,EAA4B,CAAC;AAC5E,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB;IACjC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;AACvC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;AA6BA,kDAEC;AAKD,kDAEC;AAMD,sDAEC;AA5BD,MAAM,aAAa,GAA2B;IAC5C,eAAe,EAAE,SAAS;IAC1B,oBAAoB,EAAE,IAAI;CAC3B,CAAC;AAEF,IAAI,aAAa,GAA2B,EAAE,GAAG,aAAa,EAAE,CAAC;AAEjE;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,MAAuC;IACzE,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,EAA4B,CAAC;AAC5E,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB;IACjC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;AACvC,CAAC"}

package/dist/cjs/error-handling.d.ts

@@ -3,7 +3,7 @@ import { ExpressFunction, ExpressRequest, ExpressResponse } from './utils/expres
 /**
  * @Internal
  * Wraps a route handler to catch and convert errors to API responses.
- * Applied automatically to all routes registered via createRouteTable().
+ * Applied automatically to all routes registered via RouteTable.
  *
  * Catches:
  * - Errors thrown in validators ($path, $query, $body)

package/dist/cjs/error-handling.js

@@ -5,22 +5,18 @@ exports.catchAllMiddleware = catchAllMiddleware;
 exports.installProcessHandlers = installProcessHandlers;
 const assertions_1 = require("@fishka/assertions");
 const api_types_1 = require("./api.types");
+const config_1 = require("./config");
 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");
 /**
  * Converts any error into a standardized API response format.
  * - HttpError: Uses the error's status code and message
  * - Other errors: Returns 500 with the error message or 'Internal error'
- * Attaches requestId from thread-local storage if available.
  */
 function buildApiResponse(error) {
-    const tls = (0, thread_local_storage_1.getRequestLocalStorage)();
-    const requestId = tls?.requestId;
     let response;
     if (error instanceof api_types_1.HttpError) {
         response = {
-            ...(0, conversion_utils_1.wrapAsApiResponse)(undefined),
             error: error.message,
             status: error.status,
             details: error.details,
@@ -29,20 +25,16 @@ function buildApiResponse(error) {
     else {
         const errorMessage = (0, assertions_1.getMessageFromError)(error, '');
         response = {
-            ...(0, conversion_utils_1.wrapAsApiResponse)(undefined),
             error: errorMessage && errorMessage.length > 0 ? errorMessage : 'Internal error',
             status: http_status_codes_1.HTTP_INTERNAL_SERVER_ERROR,
         };
     }
-    if (requestId) {
-        response.requestId = requestId;
-    }
     return response;
 }
 /**
  * @Internal
  * Wraps a route handler to catch and convert errors to API responses.
- * Applied automatically to all routes registered via createRouteTable().
+ * Applied automatically to all routes registered via RouteTable.
  *
  * Catches:
  * - Errors thrown in validators ($path, $query, $body)
@@ -61,6 +53,12 @@ function catchRouteErrors(fn) {
             if (apiResponse.status >= http_status_codes_1.HTTP_INTERNAL_SERVER_ERROR) {
                 console.error(`catchRouteErrors: ${req.path}`, error);
             }
+            // Добавляем requestId в заголовки, если он есть и функция включена
+            const tls = (0, thread_local_storage_1.getRequestLocalStorage)();
+            const headerName = (0, config_1.getExpressApiConfig)().requestIdHeader;
+            if (tls?.requestId && headerName) {
+                res.setHeader(headerName, tls.requestId);
+            }
             res.status(apiResponse.status);
             res.send(apiResponse);
         }

package/dist/cjs/error-handling.js.map

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

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

@@ -1,5 +1,4 @@
-import { TypedValidatorMap } from './api.types';
-import { DeleteEndpoint, GetEndpoint, PatchEndpoint, PostEndpoint, PutEndpoint, RequestContext, ResponseOrValue } from './router';
+import { DeleteEndpoint, GetEndpoint, PatchEndpoint, PostEndpoint, PutEndpoint, RequestContext } from './router';
 import { ExpressRouter } from './utils/express.utils';
 /**
  * Helper utility for organizing and mounting routes.
@@ -8,24 +7,24 @@ 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. */
-    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 GET endpoint. */
+    get<Result>(path: string, endpoint: GetEndpoint<Result>): this;
+    /** Register a GET endpoint with function shorthand. */
+    get<Result>(path: string, run: (ctx: RequestContext) => Result | Promise<Result>): this;
+    /** 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) => Result | Promise<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) => Result | Promise<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) => Result | Promise<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;
 }
-/**
- * Factory function to create a new route table.
- * @param app Express application instance
- * @returns RouteTable instance with fluent API
- */
-export declare function createRouteTable(app: ExpressRouter): RouteTable;

package/dist/cjs/route-table.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouteTable = void 0;
-exports.createRouteTable = createRouteTable;
 const router_1 = require("./router");
 /**
  * Helper utility for organizing and mounting routes.
@@ -13,37 +12,29 @@ class RouteTable {
     }
     get(path, endpointOrRun) {
         const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
-        (0, router_1.mountGet)(this.app, path, endpoint);
+        (0, router_1.mount)(this.app, { method: 'get', endpoint: endpoint, path });
         return this;
     }
-    /** Register POST endpoint with full type inference for path/query params. */
-    post(path, endpoint) {
-        (0, router_1.mountPost)(this.app, path, endpoint);
+    post(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
+        (0, router_1.mount)(this.app, { method: 'post', endpoint: endpoint, path });
         return this;
     }
-    /** Register PATCH endpoint with full type inference for path/query params. */
-    patch(path, endpoint) {
-        (0, router_1.mountPatch)(this.app, path, endpoint);
+    patch(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
+        (0, router_1.mount)(this.app, { method: 'patch', endpoint: endpoint, path });
         return this;
     }
-    /** Register PUT endpoint with full type inference for path/query params. */
-    put(path, endpoint) {
-        (0, router_1.mountPut)(this.app, path, endpoint);
+    put(path, endpointOrRun) {
+        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
+        (0, router_1.mount)(this.app, { method: 'put', endpoint: endpoint, path });
         return this;
     }
     delete(path, endpointOrRun) {
         const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
-        (0, router_1.mountDelete)(this.app, path, endpoint);
+        (0, router_1.mount)(this.app, { method: 'delete', endpoint: endpoint, path });
         return this;
     }
 }
 exports.RouteTable = RouteTable;
-/**
- * Factory function to create a new route table.
- * @param app Express application instance
- * @returns RouteTable instance with fluent API
- */
-function createRouteTable(app) {
-    return new RouteTable(app);
-}
 //# sourceMappingURL=route-table.js.map

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":";;;AAAA,qCAAwH;AAGxH;;;GAGG;AACH,MAAa,UAAU;IACrB,YAA6B,GAAkB;QAAlB,QAAG,GAAH,GAAG,CAAe;IAAG,CAAC;IAQnD,GAAG,CACD,IAAY,EACZ,aAAwF;QAExF,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAgC,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,IAAI,CACF,IAAY,EACZ,aAAyF;QAEzF,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAiC,EAAE,IAAI,EAAE,CAAC,CAAC;QACvF,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,KAAK,CACH,IAAY,EACZ,aAA0F;QAE1F,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAkC,EAAE,IAAI,EAAE,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,GAAG,CACD,IAAY,EACZ,aAAwF;QAExF,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAgC,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,MAAM,CAAC,IAAY,EAAE,aAA+E;QAClG,MAAM,QAAQ,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9F,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1ED,gCA0EC"}

package/dist/cjs/router.d.ts

@@ -1,28 +1,43 @@
-import { Assertion, ObjectAssertion } from '@fishka/assertions';
-import { ApiResponse, InferValidated, TypedValidatorMap } from './api.types';
+import { Assertion } from '@fishka/assertions';
+import { 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. */
-export type ResponseOrValue<ResponseEntity> = ApiResponse<ResponseEntity> | ResponseEntity;
 /**
  * Generic middleware hook for endpoint execution.
  * Allows custom logic like transaction management, authorization checks, etc.
  */
 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 +45,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) => Result | Promise<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';
@@ -74,15 +82,5 @@ export type RouteRegistrationInfo = ({
 }) & {
     path: string;
 };
-/** 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;
-/** Registers a PATCH route. */
-export declare const mountPatch: <Body, Result>(app: ExpressRouter, path: string, endpoint: PatchEndpoint<Body, Result>) => void;
-/** Registers a PUT route. */
-export declare const mountPut: <Body, Result>(app: ExpressRouter, path: string, endpoint: PutEndpoint<Body, 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. */
 export declare function mount(app: ExpressRouter, { method, endpoint, path }: RouteRegistrationInfo): void;