@fishka/express 0.9.23 → 0.9.25

package/dist/esm/error-handling.js

@@ -3,6 +3,8 @@ import { HttpError } from './api.types';
 import { getExpressApiConfig } from './config';
 import { HTTP_BAD_REQUEST, HTTP_INTERNAL_SERVER_ERROR } from './http-status-codes';
 import { getRequestLocalStorage } from './thread-local/thread-local-storage';
+// Track if async errors patch is already applied
+let asyncErrorsPatchApplied = false;
 /**
  * Converts any error into a standardized API response format.
  * - HttpError: Uses the error's status code and message
@@ -95,6 +97,67 @@ export async function catchAllMiddleware(error, _, res, next) {
     res.status(apiResponse.status);
     res.send(apiResponse);
 }
+/**
+ * Patches Express to automatically catch errors from async route handlers.
+ * Call this once at application startup, before defining routes.
+ *
+ * After patching, you can use async handlers without try/catch:
+ * @example
+ * patchExpressAsyncErrors();
+ *
+ * const app = express();
+ *
+ * app.get('/users', async (req, res) => {
+ *   const user = await getUser(); // если упадёт - catchAllMiddleware поймает
+ *   res.json(user);
+ * });
+ *
+ * app.use(catchAllMiddleware);
+ *
+ * Note: This patches Express internal API. Works with Express 4.x and 5.x.
+ * Safe to call multiple times - patch applies only once.
+ */
+export function patchExpressAsyncErrors() {
+    if (asyncErrorsPatchApplied) {
+        return;
+    }
+    asyncErrorsPatchApplied = true;
+    // We use require here to access Express internals
+    // This is the only way to patch the Layer prototype
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const express = require('express');
+    // Get the Layer constructor from Express internals
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const Layer = express.Router?.constructor || getLayerFromExpress();
+    if (!Layer || !Layer.prototype) {
+        console.warn('patchExpressAsyncErrors: Could not find Express Layer prototype');
+        return;
+    }
+    const originalHandle = Layer.prototype.handle_request;
+    Layer.prototype.handle_request = function handle_request(req, res, next) {
+        const result = originalHandle.call(this, req, res, next);
+        // If result is a Promise, catch errors and pass to next()
+        if (result !== null && typeof result === 'object' && typeof result.catch === 'function') {
+            result.catch(next);
+        }
+        return result;
+    };
+}
+/**
+ * Helper function to get Layer from Express internals.
+ * This is needed because Express doesn't export Layer directly.
+ */
+function getLayerFromExpress() {
+    try {
+        // Try to require the layer module directly
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const layerModule = require('express/lib/router/layer');
+        return layerModule.default || layerModule;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Installs process-level handlers for errors and graceful shutdown.
  * Call once at application startup, before app.listen().

package/dist/esm/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/esm/index.d.ts

@@ -8,8 +8,7 @@ export * from './error-handling';
 export * from './http-status-codes';
 export * from './rate-limit/in-memory-rate-limiter';
 export * from './rate-limit/rate-limit.types';
-export * from './route-table';
-export * from './router';
+export * from './request-utils';
 export * from './thread-local/thread-local-storage';
 export * from './thread-local/thread-local-storage-middleware';
 export * from './utils/express.utils';

package/dist/esm/index.js

@@ -8,8 +8,7 @@ export * from './error-handling';
 export * from './http-status-codes';
 export * from './rate-limit/in-memory-rate-limiter';
 export * from './rate-limit/rate-limit.types';
-export * from './route-table';
-export * from './router';
+export * from './request-utils';
 export * from './thread-local/thread-local-storage';
 export * from './thread-local/thread-local-storage-middleware';
 export * from './utils/express.utils';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,qCAAqC,CAAC;AACpD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,qCAAqC,CAAC;AACpD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC"}

package/dist/esm/request-utils.d.ts

@@ -0,0 +1,29 @@
+import { Assertion } from '@fishka/assertions';
+import { ParamValidator } from './api.types';
+import { ExpressRequest } from './utils/express.utils';
+/**
+ * Get and validate a path parameter from Express request.
+ * @param req - Express Request object
+ * @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
+ */
+export declare function pathParam<T = string>(req: ExpressRequest, name: string, validator?: ParamValidator<T>): T;
+/**
+ * Get and validate a query parameter from Express request.
+ * @param req - Express Request object
+ * @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.
+ * @throws {HttpError} 400 Bad Request if validation fails
+ */
+export declare function queryParam<T = string>(req: ExpressRequest, name: string, validator?: ParamValidator<T>): T;
+/**
+ * Get and validate the request body.
+ * @param req - Express Request object
+ * @param validator - Validator function or object assertion
+ * @returns Validated body of type T
+ * @throws {HttpError} 400 Bad Request if validation fails
+ */
+export declare function body<T>(req: ExpressRequest, validator: Assertion<T>): T;

package/dist/esm/request-utils.js

@@ -0,0 +1,77 @@
+import { getMessageFromError, truthy, validateObject } from '@fishka/assertions';
+import * as url from 'url';
+import { assertHttp, HttpError } from './api.types';
+import { HTTP_BAD_REQUEST } from './http-status-codes';
+/**
+ * Validates a parameter with optional validator.
+ */
+function validateParam(name, value, validator) {
+    try {
+        const result = validator ? validator(value) : truthy(value, `Missing required parameter: ${name}`);
+        return result;
+    }
+    catch (error) {
+        if (error instanceof HttpError)
+            throw error;
+        throw new HttpError(HTTP_BAD_REQUEST, `Parameter validation failed: ${name}. ${getMessageFromError(error)}`);
+    }
+}
+/**
+ * Get and validate a path parameter from Express request.
+ * @param req - Express Request object
+ * @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
+ */
+export function pathParam(req, name, validator) {
+    const rawValue = req.params[name];
+    return validateParam(name, rawValue, validator);
+}
+/**
+ * Get and validate a query parameter from Express request.
+ * @param req - Express Request object
+ * @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.
+ * @throws {HttpError} 400 Bad Request if validation fails
+ */
+export function queryParam(req, name, validator) {
+    const parsedUrl = url.parse(req.originalUrl, true);
+    const rawValue = parsedUrl.query[name];
+    const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
+    return validateParam(name, value, validator);
+}
+/**
+ * Get and validate the request body.
+ * @param req - Express Request object
+ * @param validator - Validator function or object assertion
+ * @returns Validated body of type T
+ * @throws {HttpError} 400 Bad Request if validation fails
+ */
+export function body(req, validator) {
+    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 = validateObject(apiRequest, objectValidator, `${HTTP_BAD_REQUEST}: request body`, {
+                failOnUnknownFields: !isEmptyValidator,
+            });
+            assertHttp(!errorMessage, HTTP_BAD_REQUEST, errorMessage || 'Request body validation failed');
+        }
+        return apiRequest;
+    }
+    catch (error) {
+        if (error instanceof HttpError)
+            throw error;
+        throw new HttpError(HTTP_BAD_REQUEST, getMessageFromError(error));
+    }
+}
+//# sourceMappingURL=request-utils.js.map

package/dist/esm/request-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-utils.js","sourceRoot":"","sources":["../../src/request-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,mBAAmB,EAAmB,MAAM,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7G,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAkB,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD;;GAEG;AACH,SAAS,aAAa,CAAI,IAAY,EAAE,KAAc,EAAE,SAAwC;IAC9F,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,+BAA+B,IAAI,EAAE,CAAC,CAAC;QACnG,OAAO,MAAW,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,SAAS;YAAE,MAAM,KAAK,CAAC;QAC5C,MAAM,IAAI,SAAS,CAAC,gBAAgB,EAAE,gCAAgC,IAAI,KAAK,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/G,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CAAa,GAAmB,EAAE,IAAY,EAAE,SAA6B;IACpG,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAA8B,CAAC;IAC/D,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAa,GAAmB,EAAE,IAAY,EAAE,SAA6B;IACrG,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,OAAO,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,IAAI,CAAI,GAAmB,EAAE,SAAuB;IAClE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAE5B,IAAI,CAAC;QACH,4EAA4E;QAC5E,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;YACpC,sDAAsD;YACrD,SAAkC,CAAC,UAAU,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,+CAA+C;YAC/C,MAAM,eAAe,GAAG,SAA+B,CAAC;YACxD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;YACnE,MAAM,YAAY,GAAG,cAAc,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,gBAAgB,gBAAgB,EAAE;gBACpG,mBAAmB,EAAE,CAAC,gBAAgB;aACvC,CAAC,CAAC;YACH,UAAU,CAAC,CAAC,YAAY,EAAE,gBAAgB,EAAE,YAAY,IAAI,gCAAgC,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,UAAe,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,SAAS;YAAE,MAAM,KAAK,CAAC;QAC5C,MAAM,IAAI,SAAS,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}

package/dist/esm/thread-local/thread-local-storage-middleware.d.ts

@@ -2,7 +2,7 @@ import { ExpressFunction } from '../utils/express.utils';
 /**
  * Creates middleware that initializes thread-local storage for each request.
  * Automatically generates a unique request ID and makes it available throughout
- * the request lifecycle.
+ * the request lifecycle. Also adds the request ID to response headers.
  *
  * @returns Express middleware function
  */

package/dist/esm/thread-local/thread-local-storage-middleware.js

@@ -1,15 +1,15 @@
 import { randomUUID } from 'crypto';
 import { getExpressApiConfig } from '../config';
-import { runWithRequestTlsData } from './thread-local-storage';
+import { getRequestLocalStorage, runWithRequestTlsData } from './thread-local-storage';
 /**
  * Creates middleware that initializes thread-local storage for each request.
  * Automatically generates a unique request ID and makes it available throughout
- * the request lifecycle.
+ * the request lifecycle. Also adds the request ID to response headers.
  *
  * @returns Express middleware function
  */
 export function createTlsMiddleware() {
-    return async (req, _res, next) => {
+    return async (req, res, next) => {
         const config = getExpressApiConfig();
         const headerName = config.requestIdHeader;
         // If requestIdHeader is not set, skip request ID generation entirely
@@ -20,6 +20,18 @@ export function createTlsMiddleware() {
         const headerId = config.trustRequestIdHeader ? req.headers[headerName] : undefined;
         const existingId = req.requestId || headerId;
         const requestId = typeof existingId === 'string' ? existingId : randomUUID();
+        // Add response hook to set request ID header before response is sent
+        const originalSend = res.send.bind(res);
+        res.send = function (body) {
+            // Only set header if not already set
+            if (!res.getHeader(headerName)) {
+                const tls = getRequestLocalStorage();
+                if (tls?.requestId) {
+                    res.setHeader(headerName, tls.requestId);
+                }
+            }
+            return originalSend(body);
+        };
         // Run the next handler within the TLS context
         await runWithRequestTlsData({
             requestId,

package/dist/esm/thread-local/thread-local-storage-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"thread-local-storage-middleware.js","sourceRoot":"","sources":["../../../src/thread-local/thread-local-storage-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IACjC,OAAO,KAAK,EAAE,GAAmB,EAAE,IAAqB,EAAE,IAAkB,EAAiB,EAAE;QAC7F,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC;QAE1C,qEAAqE;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,UAAU,GAAI,GAA+B,CAAC,SAAS,IAAI,QAAQ,CAAC;QAC1E,MAAM,SAAS,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAE7E,8CAA8C;QAC9C,MAAM,qBAAqB,CACzB;YACE,SAAS;SACV,EACD,KAAK,IAAI,EAAE;YACT,IAAI,EAAE,CAAC;QACT,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"thread-local-storage-middleware.js","sourceRoot":"","sources":["../../../src/thread-local/thread-local-storage-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEvF;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB;IACjC,OAAO,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAiB,EAAE;QAC5F,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC;QAE1C,qEAAqE;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,UAAU,GAAI,GAA+B,CAAC,SAAS,IAAI,QAAQ,CAAC;QAC1E,MAAM,SAAS,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAE7E,qEAAqE;QACrE,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,GAAG,CAAC,IAAI,GAAG,UAAU,IAAa;YAChC,qCAAqC;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,sBAAsB,EAAE,CAAC;gBACrC,IAAI,GAAG,EAAE,SAAS,EAAE,CAAC;oBACnB,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;YACD,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,8CAA8C;QAC9C,MAAM,qBAAqB,CACzB;YACE,SAAS;SACV,EACD,KAAK,IAAI,EAAE;YACT,IAAI,EAAE,CAAC;QACT,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}

package/dist/esm/utils/type-validators.d.ts

@@ -4,7 +4,7 @@
  */
 import { ParamValidator } from '../api.types';
 /** Makes validator optional - returns undefined if value missing */
-export declare function optional<T>(validator: ParamValidator<T>): ParamValidator<T | undefined>;
+export declare function optional<T>(validator?: ParamValidator<T>): ParamValidator<T | undefined>;
 /** Operator that transforms string to T */
 export type ParamOperator<T> = (value: string) => T;
 /** Operator that transforms T to R */

package/dist/esm/utils/type-validators.js

@@ -9,7 +9,7 @@ export function optional(validator) {
         if (value === undefined || value === null || value === '') {
             return undefined;
         }
-        return validator(value);
+        return validator ? validator(value) : value;
     };
 }
 export function transform(...operators) {

package/dist/esm/utils/type-validators.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishka/express",
-  "version": "0.9.23",
+  "version": "0.9.25",
   "description": "Express.js extension with built-in validation, and type safety",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

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

@@ -1,30 +0,0 @@
-import { DeleteEndpoint, GetEndpoint, PatchEndpoint, PostEndpoint, PutEndpoint, RequestContext } from './router';
-import { ExpressRouter } from './utils/express.utils';
-/**
- * Helper utility for organizing and mounting routes.
- * Provides a fluent interface for registering multiple handlers.
- */
-export declare class RouteTable {
-    private readonly app;
-    constructor(app: ExpressRouter);
-    /** 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;
-}

package/dist/cjs/route-table.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteTable = void 0;
-const router_1 = require("./router");
-/**
- * Helper utility for organizing and mounting routes.
- * Provides a fluent interface for registering multiple handlers.
- */
-class RouteTable {
-    constructor(app) {
-        this.app = app;
-    }
-    get(path, endpointOrRun) {
-        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
-        (0, router_1.mount)(this.app, { method: 'get', endpoint: endpoint, path });
-        return this;
-    }
-    post(path, endpointOrRun) {
-        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
-        (0, router_1.mount)(this.app, { method: 'post', endpoint: endpoint, path });
-        return this;
-    }
-    patch(path, endpointOrRun) {
-        const endpoint = typeof endpointOrRun === 'function' ? { run: endpointOrRun } : endpointOrRun;
-        (0, router_1.mount)(this.app, { method: 'patch', endpoint: endpoint, path });
-        return this;
-    }
-    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.mount)(this.app, { method: 'delete', endpoint: endpoint, path });
-        return this;
-    }
-}
-exports.RouteTable = RouteTable;
-//# sourceMappingURL=route-table.js.map

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

@@ -1 +0,0 @@
-{"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,86 +0,0 @@
-import { Assertion } from '@fishka/assertions';
-import { ParamValidator } from './api.types';
-import { AuthUser } from './auth/auth.types';
-import { ExpressRequest, ExpressResponse, ExpressRouter } from './utils/express.utils';
-/**
- * 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 {
-    /** Express Request object. */
-    req: ExpressRequest;
-    /** Express Response object. */
-    res: ExpressResponse;
-    /** Authenticated user (if any). Populated by auth middleware. */
-    authUser?: AuthUser;
-    /**
-     * 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.
-     * @throws {HttpError} 400 Bad Request if validation fails
-     */
-    query<T = string>(name: string, validator?: ParamValidator<T>): T;
-    /**
-     * 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.
-     */
-    state: Map<string, unknown>;
-}
-/** Base interface with common endpoint properties. */
-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) => Result | Promise<Result>;
-}
-/** Descriptor for GET list routes. */
-export type GetListEndpoint<ResultElementType> = EndpointBase<Array<ResultElementType>>;
-/** Descriptor for GET routes. */
-export type GetEndpoint<Result> = EndpointBase<Result>;
-/** Descriptor for POST routes. */
-export type PostEndpoint<Result = void> = EndpointBase<Result>;
-/** Same as POST. Used for full object updates. */
-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<Result = void> = EndpointBase<Result>;
-/** Descriptor for DELETE routes. */
-export type DeleteEndpoint = EndpointBase<void>;
-/** Union type for all route registration info objects. */
-export type RouteRegistrationInfo = ({
-    method: 'get';
-    endpoint: GetEndpoint<unknown> | GetListEndpoint<unknown>;
-} | {
-    method: 'post';
-    endpoint: PostEndpoint<unknown>;
-} | {
-    method: 'patch';
-    endpoint: PatchEndpoint<unknown>;
-} | {
-    method: 'put';
-    endpoint: PutEndpoint<unknown>;
-} | {
-    method: 'delete';
-    endpoint: DeleteEndpoint;
-}) & {
-    path: string;
-};
-/** Mounts a route with the given method, endpoint, and path. */
-export declare function mount(app: ExpressRouter, { method, endpoint, path }: RouteRegistrationInfo): void;