@autofleet/sadot 0.13.5-beta-1 → 0.13.5-beta-2

package/dist/hooks/hooks.js

@@ -31,6 +31,7 @@ const ajv_1 = __importDefault(require("ajv"));
 const joi_1 = __importDefault(require("joi"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const errors_1 = require("@autofleet/errors");
+const ajv_errors_1 = __importDefault(require("ajv-errors"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const ValidatorRepo = __importStar(require("../repository/validator"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
@@ -48,6 +49,7 @@ const ajv = new ajv_1.default({
     $data: true, // Enable $data references
 });
 (0, ajv_formats_1.default)(ajv);
+(0, ajv_errors_1.default)(ajv);
 /**
  * Helper function to manually copy object properties
  * This is more efficient for large objects and avoids excessive object creation
@@ -88,6 +90,18 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
+const formatAjvErrors = (errors) => errors.reduce((acc, err) => {
+    const basePath = (err.instancePath || '')
+        .split('/')
+        .filter(Boolean)
+        .join('.')
+        .replace(/^after\./, '');
+    const missingProp = err.keyword === 'required' ? `.${err.params?.missingProperty}` : '';
+    const key = (basePath + missingProp).replace(/^\./, '') || 'root';
+    const message = err.message || 'Invalid value';
+    acc[key] = message;
+    return acc;
+}, {});
 /**
  * Validates the model using custom validators
  */
@@ -176,7 +190,8 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
                 })));
                 if (!isValid) {
                     const errorDetails = validateSchema.errors?.map((err) => `${err.instancePath || ''} ${err.message || 'Invalid value'}`).join(', ');
-                    throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+                    const formattedErrors = formatAjvErrors(validateSchema.errors);
+                    throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)], undefined, formattedErrors);
                 }
             }
         }
@@ -205,7 +220,8 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
                 const errorDetails = validateSchema
                     .errors
                     ?.map((err) => `${err.instancePath || ''} ${err.message || 'Invalid value'}`).join(', ');
-                throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+                const formattedErrors = formatAjvErrors(validateSchema.errors);
+                throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)], undefined, formattedErrors);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.5-beta-1",
+  "version": "0.13.5-beta-2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -31,6 +31,7 @@
     "@autofleet/common-types": "^4.4.0",
     "@autofleet/events": "^4.0.0",
     "ajv": "^8.12.0",
+    "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "http-status-codes": "^2.3.0",
     "joi": "^17.7.0",

package/src/hooks/hooks.ts

@@ -3,6 +3,7 @@ import Ajv from 'ajv';
 import Joi from 'joi';
 import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
+import ajvErrors from 'ajv-errors';
 import logger from '../utils/logger';
 import * as ValidatorRepo from '../repository/validator';
 import * as DefinitionRepo from '../repository/definition';
@@ -25,6 +26,7 @@ const ajv = new Ajv({
 });
 
 addFormats(ajv);
+ajvErrors(ajv);
 
 /**
  * Helper function to manually copy object properties
@@ -76,6 +78,29 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
+const formatAjvErrors = (
+  errors: {
+  instancePath?: string;
+  keyword: string;
+  message?: string;
+  params?: Record<string, any>;
+}[],
+): Record<string, string> => errors.reduce((acc, err) => {
+  const basePath = (err.instancePath || '')
+    .split('/')
+    .filter(Boolean)
+    .join('.')
+    .replace(/^after\./, '');
+
+  const missingProp = err.keyword === 'required' ? `.${err.params?.missingProperty}` : '';
+  const key = (basePath + missingProp).replace(/^\./, '') || 'root';
+
+  const message = err.message || 'Invalid value';
+  acc[key] = message;
+
+  return acc;
+}, {} as Record<string, string>);
+
 /**
  * Validates the model using custom validators
  */
@@ -193,7 +218,12 @@ const validateModel = async (
           const errorDetails = validateSchema.errors?.map((err) =>
             `${(err as any).instancePath || ''} ${(err as any).message || 'Invalid value'}`).join(', ');
 
-          throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+          const formattedErrors = formatAjvErrors(validateSchema.errors);
+          throw new BadRequest(
+            [new Error(`Validation failed for ${modelType}: ${errorDetails}`)],
+            undefined,
+            formattedErrors,
+          );
         }
       }
     } else {
@@ -228,7 +258,12 @@ const validateModel = async (
           .errors
           ?.map((err) => `${(err as any).instancePath || ''} ${(err as any).message || 'Invalid value'}`).join(', ');
 
-        throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+        const formattedErrors = formatAjvErrors(validateSchema.errors);
+        throw new BadRequest(
+          [new Error(`Validation failed for ${modelType}: ${errorDetails}`)],
+          undefined,
+          formattedErrors,
+        );
       }
     }
   }