@sn1006/common 1.0.12 → 1.0.15

package/build/errors/validation-error.d.ts

@@ -1,11 +1,14 @@
 import { NormalizedError } from './normalized-error';
-import { ValidationError } from 'express-validator';
+interface NonSerializedValidationError {
+    msg: string;
+    path: string;
+}
 declare class CustomValidationError extends NormalizedError {
-    errors: ValidationError[];
+    errors: NonSerializedValidationError[];
     status: number;
-    constructor(errors: ValidationError[]);
+    constructor(errors: NonSerializedValidationError[]);
     serializeErrors(): {
-        message: any;
+        message: string;
         field: string;
     }[];
 }

package/build/errors/validation-error.js

@@ -10,8 +10,7 @@ class CustomValidationError extends normalized_error_1.NormalizedError {
     }
     serializeErrors() {
         return this.errors.map(err => {
-            const ferr = err;
-            return { message: ferr.msg, field: ferr.path };
+            return { message: err.msg, field: err.path };
         });
     }
 }

package/build/index.d.ts

@@ -8,3 +8,4 @@ export * from './middlewares/current-user';
 export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
 export * from './middlewares/validate-request';
+export * from './middlewares/joi-validate-request';

package/build/index.js

@@ -24,3 +24,4 @@ __exportStar(require("./middlewares/current-user"), exports);
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/require-auth"), exports);
 __exportStar(require("./middlewares/validate-request"), exports);
+__exportStar(require("./middlewares/joi-validate-request"), exports);

package/build/middlewares/joi-validate-request.d.ts

@@ -0,0 +1,3 @@
+import { NextFunction, Request, Response } from "express";
+import Joi from "joi";
+export default function joiValidateRequest(schema: Joi.AnySchema, options?: Joi.ValidationOptions): (req: Request, res: Response, next: NextFunction) => any;

package/build/middlewares/joi-validate-request.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_error_1 = __importDefault(require("../errors/validation-error"));
+function joiValidateRequest(schema, options) {
+    return (req, res, next) => {
+        const { error } = schema.validate(req, options);
+        if (error) {
+            // normalized the error to be similar to express-validator error
+            const errors = error.details.map((err) => (Object.assign(Object.assign({}, err), { msg: err.message, path: err.path.join(".") })));
+            return next(new validation_error_1.default(errors));
+        }
+        return next();
+    };
+}
+exports.default = joiValidateRequest;

package/build/middlewares/validate-request.js

@@ -7,9 +7,10 @@ exports.validateRequest = void 0;
 const express_validator_1 = require("express-validator");
 const validation_error_1 = __importDefault(require("../errors/validation-error"));
 const validateRequest = (req, res, next) => {
-    const errors = (0, express_validator_1.validationResult)(req);
-    if (!errors.isEmpty()) {
-        return next(new validation_error_1.default(errors.array()));
+    const error = (0, express_validator_1.validationResult)(req);
+    if (!error.isEmpty()) {
+        const errors = error.array();
+        return next(new validation_error_1.default(errors));
     }
     next();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sn1006/common",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -26,6 +26,7 @@
     "cookie-session": "^2.0.0",
     "express": "^4.18.2",
     "express-validator": "^7.0.1",
+    "joi": "^17.12.1",
     "jsonwebtoken": "^9.0.1"
   }
 }