@naturalcycles/backend-lib 8.0.1 → 8.0.3

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/validateMiddleware.js

@@ -31,7 +31,7 @@ function validateObject(prop, schema, opt = {}) {
     });
     const reportPredicate = typeof opt.report === 'function' ? opt.report : () => opt.report;
     return (req, _res, next) => {
-        const error = ajvSchema.getValidationError(req[prop]);
+        const error = ajvSchema.getValidationError(req[prop] || {});
         if (error) {
             const report = reportPredicate(error);
             if (opt.redactPaths) {

package/dist/server/validation/validateRequest.js

@@ -42,7 +42,7 @@ class ValidateRequest {
         return this.validate(req, 'headers', schema, options);
     }
     validate(req, reqProperty, schema, opt = {}) {
-        const { value, error } = (0, nodejs_lib_1.getValidationResult)(req[reqProperty], schema, `request ${reqProperty}`);
+        const { value, error } = (0, nodejs_lib_1.getValidationResult)(req[reqProperty] || {}, schema, `request ${reqProperty}`);
         if (error) {
             let report;
             if (typeof opt.report === 'boolean') {

package/dist/server/validation/zodValidateMiddleware.js

@@ -12,7 +12,7 @@ const REDACTED = 'REDACTED';
 function zodReqValidate(prop, schema, opt = {}) {
     const reportPredicate = typeof opt.report === 'function' ? opt.report : () => opt.report;
     return (req, _res, next) => {
-        const { error } = (0, js_lib_1.zSafeValidate)(req[prop], schema);
+        const { error } = (0, js_lib_1.zSafeValidate)(req[prop] || {}, schema);
         if (!error) {
             return next();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "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/validateMiddleware.ts

@@ -52,7 +52,7 @@ function validateObject(
     typeof opt.report === 'function' ? opt.report : () => opt.report as boolean | undefined
 
   return (req, _res, next) => {
-    const error = ajvSchema.getValidationError(req[prop])
+    const error = ajvSchema.getValidationError(req[prop] || {})
     if (error) {
       const report = reportPredicate(error)
 

package/src/server/validation/validateRequest.ts

@@ -89,7 +89,11 @@ class ValidateRequest {
     schema: AnySchema<T>,
     opt: ReqValidationOptions<JoiValidationError> = {},
   ): T {
-    const { value, error } = getValidationResult(req[reqProperty], schema, `request ${reqProperty}`)
+    const { value, error } = getValidationResult(
+      req[reqProperty] || {},
+      schema,
+      `request ${reqProperty}`,
+    )
     if (error) {
       let report: boolean | undefined
       if (typeof opt.report === 'boolean') {

package/src/server/validation/zodValidateMiddleware.ts

@@ -19,7 +19,7 @@ export function zodReqValidate(
     typeof opt.report === 'function' ? opt.report : () => opt.report as boolean | undefined
 
   return (req, _res, next) => {
-    const { error } = zSafeValidate(req[prop], schema)
+    const { error } = zSafeValidate(req[prop] || {}, schema)
     if (!error) {
       return next()
     }

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)
-    }
-  }