@sn1006/common 1.0.18 → 1.0.19

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

@@ -5,5 +5,5 @@ export declare abstract class NormalizedError extends Error {
 }
 export interface SerializedError {
     message: string;
-    field?: string;
+    path?: (string | number)[];
 }

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

@@ -1,7 +1,7 @@
 import { NormalizedError } from './normalized-error';
 interface NonSerializedValidationError {
-    msg: string;
-    path: string;
+    message: string;
+    path: (string | number)[];
 }
 declare class CustomValidationError extends NormalizedError {
     errors: NonSerializedValidationError[];
@@ -9,7 +9,7 @@ declare class CustomValidationError extends NormalizedError {
     constructor(errors: NonSerializedValidationError[]);
     serializeErrors(): {
         message: string;
-        field: string;
+        path: (string | number)[];
     }[];
 }
 export default CustomValidationError;

package/build/errors/validation-error.js

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

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

@@ -10,7 +10,12 @@ function joiValidateRequest(schema, options) {
         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(".") })));
+            // const errors = error.details.map((err) => ({
+            //   ...err,
+            //   msg: err.message,
+            //   path: err.path.join("."),
+            // }));
+            const errors = error.details;
             return next(new validation_error_1.default(errors));
         }
         return next();

package/build/middlewares/validate-request.js

@@ -10,7 +10,11 @@ const validateRequest = (req, res, next) => {
     const error = (0, express_validator_1.validationResult)(req);
     if (!error.isEmpty()) {
         const errors = error.array();
-        return next(new validation_error_1.default(errors));
+        const cleanedErrors = errors.map((err) => ({
+            path: err.path.split("."),
+            message: err.msg
+        }));
+        return next(new validation_error_1.default(cleanedErrors));
     }
     next();
 };

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 zodValidateRequest(schema) {
+    return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+        const result = schema.safeParse(req.body);
+        if (!result.success) {
+            const errors = result.error.issues;
+            return next(new validation_error_1.default(errors));
+        }
+        return next();
+    });
+}

package/build/schemas/filter.d.ts

@@ -0,0 +1,18 @@
+import { z } from "zod";
+declare const filterSchema: z.ZodObject<{
+    name: z.ZodString;
+    description: z.ZodString;
+    keyword: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    active: z.ZodBoolean;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    description: string;
+    active: boolean;
+    keyword?: string[] | undefined;
+}, {
+    name: string;
+    description: string;
+    active: boolean;
+    keyword?: string[] | undefined;
+}>;
+export { filterSchema };

package/build/schemas/filter.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterSchema = void 0;
+const zod_1 = require("zod");
+const filterSchema = zod_1.z.object({
+    name: zod_1.z.string().min(3).max(30),
+    description: zod_1.z.string().min(10).max(320),
+    keyword: zod_1.z.string().array().optional(),
+    active: zod_1.z.boolean()
+});
+exports.filterSchema = filterSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sn1006/common",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -27,6 +27,7 @@
     "express": "^4.18.2",
     "express-validator": "^7.0.1",
     "joi": "^17.12.1",
-    "jsonwebtoken": "^9.0.1"
+    "jsonwebtoken": "^9.0.1",
+    "zod": "^3.22.4"
   }
 }