@naturalcycles/backend-lib 8.0.0 → 8.0.2

package/dist/index.d.ts

@@ -8,7 +8,6 @@ export * from './sentry/sentry.shared.service';
 export * from './server/asyncLocalStorageMiddleware';
 export * from './server/basicAuthMiddleware';
 export * from './server/bodyParserTimeoutMiddleware';
-export * from './server/catchWrapper';
 export * from './server/createDefaultApp';
 export * from './server/createDefaultApp.model';
 export * from './server/deployInfo.util';

package/dist/index.js

@@ -13,7 +13,6 @@ tslib_1.__exportStar(require("./sentry/sentry.shared.service"), exports);
 tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
 tslib_1.__exportStar(require("./server/basicAuthMiddleware"), exports);
 tslib_1.__exportStar(require("./server/bodyParserTimeoutMiddleware"), exports);
-tslib_1.__exportStar(require("./server/catchWrapper"), exports);
 tslib_1.__exportStar(require("./server/createDefaultApp"), exports);
 tslib_1.__exportStar(require("./server/createDefaultApp.model"), exports);
 tslib_1.__exportStar(require("./server/deployInfo.util"), exports);

package/dist/server/validation/validateRequest.js

@@ -63,7 +63,8 @@ class ValidateRequest {
             });
         }
         // mutate req to replace the property with the value, converted by Joi
-        if (!opt.keepOriginal) {
+        if (!opt.keepOriginal && reqProperty !== 'query') {
+            // query is read-only in Express 5
             req[reqProperty] = value;
         }
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -8,7 +8,7 @@
     "lint": "dev-lib lint",
     "bt": "dev-lib bt",
     "lbt": "dev-lib lbt",
-    "dev": "APP_ENV=dev node -r ts-node/register --watch ./src/test/server/server.ts",
+    "dev": "APP_ENV=dev tsx watch src/test/server/server.ts",
     "docs-serve": "NODE_OPTIONS=--openssl-legacy-provider vuepress dev docs",
     "docs-build": "NODE_OPTIONS=--openssl-legacy-provider vuepress build docs",
     "deploy-gae": "yarn tsx ./src/bin/deploy-gae.ts",

package/src/index.ts

@@ -8,7 +8,6 @@ export * from './sentry/sentry.shared.service'
 export * from './server/asyncLocalStorageMiddleware'
 export * from './server/basicAuthMiddleware'
 export * from './server/bodyParserTimeoutMiddleware'
-export * from './server/catchWrapper'
 export * from './server/createDefaultApp'
 export * from './server/createDefaultApp.model'
 export * from './server/deployInfo.util'

package/src/server/validation/validateRequest.ts

@@ -112,7 +112,8 @@ class ValidateRequest {
     }
 
     // mutate req to replace the property with the value, converted by Joi
-    if (!opt.keepOriginal) {
+    if (!opt.keepOriginal && reqProperty !== 'query') {
+      // query is read-only in Express 5
       req[reqProperty] = value
     }
 

package/dist/server/catchWrapper.d.ts

@@ -1,2 +0,0 @@
-import { BackendRequestHandler } from './server.model';
-export declare const catchWrapper: (fn: BackendRequestHandler) => BackendRequestHandler;

package/dist/server/catchWrapper.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.catchWrapper = void 0;
-// https://strongloop.com/strongblog/async-error-handling-expressjs-es7-promises-generators/
-// https://stackoverflow.com/a/43564267/4919972
-const catchWrapper = (fn) => async (req, res, next) => {
-    try {
-        await fn(req, res, next);
-    }
-    catch (err) {
-        next(err);
-    }
-};
-exports.catchWrapper = catchWrapper;

package/src/server/catchWrapper.ts

@@ -1,13 +0,0 @@
-import { BackendRequestHandler } from './server.model'
-
-// https://strongloop.com/strongblog/async-error-handling-expressjs-es7-promises-generators/
-// https://stackoverflow.com/a/43564267/4919972
-export const catchWrapper =
-  (fn: BackendRequestHandler): BackendRequestHandler =>
-  async (req, res, next) => {
-    try {
-      await fn(req, res, next)
-    } catch (err) {
-      next(err)
-    }
-  }