@darksheep/express 2.0.1 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.1.1](https://github.com/DarkSheepSoftware/node-packages/compare/express-v2.1.0...express-v2.1.1) (2025-12-04)
+
+
+### 📚 Documentation
+
+* fix issue in example ([#797](https://github.com/DarkSheepSoftware/node-packages/issues/797)) ([c889a98](https://github.com/DarkSheepSoftware/node-packages/commit/c889a980ea4b6cbe970eac7627d8229becddbe83))
+
+## [2.1.0](https://github.com/DarkSheepSoftware/node-packages/compare/express-v2.0.1...express-v2.1.0) (2025-10-09)
+
+
+### 🌟 Features
+
+* Support node 24 ([#761](https://github.com/DarkSheepSoftware/node-packages/issues/761)) ([f13caae](https://github.com/DarkSheepSoftware/node-packages/commit/f13caaef978c7a657e4599f775e0a62d1738f475))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @darksheep/errors bumped from 1.1.1 to 1.2.0
+    * @darksheep/prune bumped from 1.0.4 to 1.1.0
+  * devDependencies
+    * @darksheep/json-schema bumped to 0.1.1
+    * @darksheep/logger bumped from 1.2.0 to 1.3.0
+  * peerDependencies
+    * @darksheep/json-schema bumped to 0.1.1
+    * @darksheep/logger bumped from >=1.0.10 to >=1.3.0
+
 ## [2.0.1](https://github.com/DarkSheepSoftware/node-packages/compare/express-v2.0.0...express-v2.0.1) (2025-09-17)
 
 

package/express.d.ts

@@ -1,11 +1,11 @@
 /* eslint @typescript-eslint/consistent-type-definitions: 0 */
 import { type Logger } from '@darksheep/logger';
 
-export type ApiError = {
+export interface ApiError {
   message?: string;
   name: string;
   path?: (number | string)[] | string;
-};
+}
 
 export type ErrorHandler<E extends Error = Error> = {
   format(error: E): ApiError[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksheep/express",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "express utilites and other bits",
   "license": "UNLICENCED",
   "type": "module",
@@ -22,16 +22,16 @@
     "test:watch": "node --watch --test src/**/*.test.js"
   },
   "dependencies": {
-    "@darksheep/errors": "1.1.1",
-    "@darksheep/prune": "1.0.4",
+    "@darksheep/errors": "1.2.0",
+    "@darksheep/prune": "1.1.0",
     "on-finished": "2.4.1"
   },
   "devDependencies": {
     "@darksheep/json-schema": "",
-    "@darksheep/logger": "1.2.0",
+    "@darksheep/logger": "1.3.0",
     "@types/express": "~5.0.0",
     "@types/on-finished": "^2",
-    "express": "~5.1.0"
+    "express": "~5.2.0"
   },
   "peerDependencies": {
     "@darksheep/json-schema": "",
@@ -47,6 +47,6 @@
     }
   },
   "engines": {
-    "node": "^20.13.1 || ^22.2.0"
+    "node": "^20.13.1 || >=22.2.0"
   }
 }

package/src/content-type/middleware.js

@@ -22,14 +22,15 @@ export function createContentTypeMiddleware(targetContentTypes, shouldThrow = tr
       provided != null &&
       contentTypes.has(provided)
     ) {
-      return next();
+      next();
+      return;
     }
 
     if (shouldThrow === true) {
       return unsupportedMediaType(request, response, next);
     }
 
-    return next('route');
+    next('route');
   };
 }
 

package/src/error-handler/http.handler.js

@@ -8,7 +8,9 @@
  * @property {Record<string, string> | undefined} headers - Additional headers to send.
  * @property {number} statusCode - The response status code.
  */
-/** @typedef {Error & HttpErrorExtra} HttpError */
+/**
+ * @typedef {Error & HttpErrorExtra} HttpError
+ */
 
 /** @type {ErrorHandler<HttpError>} */
 export const HttpErrorHandler = {

package/src/error-handler/json-schema.handler.js

@@ -1,10 +1,11 @@
 /**
+ * @import * as JsonSchema from '@darksheep/json-schema';
  * @import { ErrorHandler } from '../../express.js';
  * @import { RequestSchemaError, ResponseSchemaError } from '@darksheep/json-schema';
  */
 
 /**
- * @type {import('@darksheep/json-schema')}
+ * @type {JsonSchema}
  */
 let schema;
 try {
@@ -33,8 +34,9 @@ export const SchemaErrorHandler = {
   format(error) {
     const base = HttpErrorHandler.format(error);
 
-    // @ts-ignore
-    base.push(...error.errors);
+    for (const child of error.errors) {
+      base.push(Object.assign(child, { name: child.keyword }));
+    }
 
     return base;
   },

package/src/error-handler/zod.handler.js

@@ -8,7 +8,9 @@
  * @property {string} code - The zod error code text.
  * @property {string} path - The path to the error in zod.
  */
-/** @typedef {Error & { errors: ZodIssue[] }} ZodError */
+/**
+ * @typedef {Error & { errors: ZodIssue[] }} ZodError
+ */
 
 /** @type {ErrorHandler<ZodError>} */
 export const ZodErrorHandler = {

package/src/logger/filter.js

@@ -5,7 +5,9 @@ const fallbackFilters = [
   /^\/live(?:ness)?z?$/u,
 ];
 
-/** @typedef {string|RegExp} Filter */
+/**
+ * @typedef {string|RegExp} Filter
+ */
 
 /**
  * @param {string} requestPath - The path to test.

package/src/logger/middleware.js

@@ -34,7 +34,8 @@ export function createRequestLoggerMiddleware(
         requestPath == null ||
         shouldFilterOutRequest(requestPath, filters)
       ) {
-        return next();
+        next();
+        return;
       }
 
       const startBytesRead = sockets.get(request.socket) ?? 0;
@@ -61,14 +62,16 @@ export function createRequestLoggerMiddleware(
         });
 
         if (response.statusCode < 400) {
-          return request.logger.info(message, context);
+          request.logger.info(message, context);
+          return;
         }
 
         if (response.statusCode < 500) {
-          return request.logger.warning(message, context);
+          request.logger.warning(message, context);
+          return;
         }
 
-        return request.logger.error(message, context);
+        request.logger.error(message, context);
       });
 
       next();

package/src/not-found/middleware.js

@@ -1,11 +1,17 @@
 /**
- * @import { Handler } from '../../express.js'
+ * @import { NextFunction } from 'express'
+ * @import { Request, Response } from '../../express.js'
  */
 import { NotFound } from '@darksheep/errors';
 
-/** @type {Handler} */
+/**
+ * @param {Request} request - The express request.
+ * @param {Response} _response - The express response.
+ * @param {NextFunction} next - The next handler.
+ * @returns {void}
+ */
 export function notFoundMiddleware(request, _response, next) {
-  return next(
+  next(
     new NotFound(`${request.method} ${request.originalUrl}`),
   );
 }

package/src/request-id/middleware.js

@@ -29,6 +29,6 @@ export function createRequestIdMiddleware(headerName) {
   return (request, response, next) => {
     request.trail ??= getTrail(request, headerName);
     response.trail = request.trail;
-    return next();
+    next();
   };
 }

package/types/content-type/middleware.d.ts

@@ -4,5 +4,5 @@
  * @returns {Handler}
  */
 export function createContentTypeMiddleware(targetContentTypes: string | string[], shouldThrow?: boolean): Handler;
-export function unsupportedMediaType(req: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Request<import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").ParamsDictionary, any, any, import(".store/@types-qs-npm-6.14.0-e27d9ca044/package").ParsedQs, Record<string, any>>, res: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Response<any, Record<string, any>, number>, next: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").NextFunction): unknown;
+export function unsupportedMediaType(req: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").Request<import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").ParamsDictionary, any, any, import(".store/@types-qs-npm-6.14.0-e27d9ca044/package").ParsedQs, Record<string, any>>, res: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").Response<any, Record<string, any>, number>, next: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").NextFunction): unknown;
 import type { Handler } from '../../express.js';

package/types/error-handler/http.handler.d.ts

@@ -7,7 +7,9 @@
  * @property {Record<string, string> | undefined} headers - Additional headers to send.
  * @property {number} statusCode - The response status code.
  */
-/** @typedef {Error & HttpErrorExtra} HttpError */
+/**
+ * @typedef {Error & HttpErrorExtra} HttpError
+ */
 /** @type {ErrorHandler<HttpError>} */
 export const HttpErrorHandler: ErrorHandler<HttpError>;
 export type HttpErrorExtra = {

package/types/error-handler/json-schema.handler.d.ts

@@ -1,5 +1,4 @@
 /** @type {ErrorHandler<RequestSchemaError | ResponseSchemaError>} */
-export const SchemaErrorHandler: ErrorHandler<RequestSchemaError | ResponseSchemaError>;
-import type { RequestSchemaError } from '@darksheep/json-schema';
-import type { ResponseSchemaError } from '@darksheep/json-schema';
+export const SchemaErrorHandler: ErrorHandler<JsonSchema.RequestSchemaError | JsonSchema.ResponseSchemaError>;
+import type * as JsonSchema from '@darksheep/json-schema';
 import type { ErrorHandler } from '../../express.js';

package/types/error-handler/middleware.d.ts

@@ -1 +1 @@
-export function errorHandlerMiddleware(err: any, req: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Request<import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").ParamsDictionary, any, any, import(".store/@types-qs-npm-6.14.0-e27d9ca044/package").ParsedQs, Record<string, any>>, res: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Response<any, Record<string, any>, number>, next: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").NextFunction): unknown;
+export function errorHandlerMiddleware(err: any, req: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").Request<import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").ParamsDictionary, any, any, import(".store/@types-qs-npm-6.14.0-e27d9ca044/package").ParsedQs, Record<string, any>>, res: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").Response<any, Record<string, any>, number>, next: import(".store/@types-express-serve-static-core-npm-5.1.0-227fccbb7d/package").NextFunction): unknown;

package/types/error-handler/zod.handler.d.ts

@@ -7,7 +7,9 @@
  * @property {string} code - The zod error code text.
  * @property {string} path - The path to the error in zod.
  */
-/** @typedef {Error & { errors: ZodIssue[] }} ZodError */
+/**
+ * @typedef {Error & { errors: ZodIssue[] }} ZodError
+ */
 /** @type {ErrorHandler<ZodError>} */
 export const ZodErrorHandler: ErrorHandler<ZodError>;
 export type ZodIssue = {

package/types/logger/filter.d.ts

@@ -1,4 +1,6 @@
-/** @typedef {string|RegExp} Filter */
+/**
+ * @typedef {string|RegExp} Filter
+ */
 /**
  * @param {string} requestPath - The path to test.
  * @param {Filter[]} [filters] - A list of paths to filter out.

package/types/not-found/middleware.d.ts

@@ -1 +1,10 @@
-export function notFoundMiddleware(req: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Request<import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").ParamsDictionary, any, any, import(".store/@types-qs-npm-6.14.0-e27d9ca044/package").ParsedQs, Record<string, any>>, res: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").Response<any, Record<string, any>, number>, next: import(".store/@types-express-serve-static-core-npm-5.0.7-4a816a369e/package").NextFunction): unknown;
+/**
+ * @param {Request} request - The express request.
+ * @param {Response} _response - The express response.
+ * @param {NextFunction} next - The next handler.
+ * @returns {void}
+ */
+export function notFoundMiddleware(request: Request, _response: Response, next: NextFunction): void;
+import type { Request } from '../../express.js';
+import type { Response } from '../../express.js';
+import type { NextFunction } from 'express';