vovk-ajv 0.0.0-draft.63 → 0.0.0-draft.65

package/index.d.ts

@@ -1,6 +1,6 @@
 import { Options } from 'ajv';
-import { type VovkValidateOnClient } from 'vovk';
 import ajvLocalize from 'ajv-i18n';
+import { type VovkValidateOnClient } from 'vovk';
 type Lang = keyof typeof ajvLocalize;
 export type VovkAjvConfig = {
     options?: Options;

package/index.js

@@ -6,24 +6,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOnClient = void 0;
 const ajv_1 = require("ajv");
 const _2020_1 = __importDefault(require("ajv/dist/2020"));
-const vovk_1 = require("vovk");
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const ajv_i18n_1 = __importDefault(require("ajv-i18n"));
 const ajv_errors_1 = __importDefault(require("ajv-errors"));
+const vovk_1 = require("vovk");
 const createAjv = (options, target) => {
     const AjvClass = target === 'draft-2020-12' ? _2020_1.default : ajv_1.Ajv;
     const ajv = new AjvClass({ allErrors: true, ...options });
     (0, ajv_formats_1.default)(ajv);
     (0, ajv_errors_1.default)(ajv);
     ajv.addKeyword('x-isDto');
+    ajv.addKeyword('x-formData');
     return ajv;
 };
 const validate = ({ data, schema, ajv, localize = 'en', type, endpoint, }) => {
     if (data && schema) {
+        const isForm = data instanceof FormData && schema['x-formData'];
+        if (isForm) {
+            data = Object.fromEntries(data.entries().map(([key, value]) => {
+                if (value instanceof File) {
+                    return [key, 'File<' + value.name + '>'];
+                }
+                return [key, value];
+            }));
+        }
         const isValid = ajv.validate(schema, data);
         if (!isValid) {
             ajv_i18n_1.default[localize](ajv.errors);
-            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${type} on client: ${ajv.errorsText()}`, { data, errors: ajv.errors, endpoint });
+            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${isForm ? 'form' : type} on client: ${ajv.errorsText()}`, { data, errors: ajv.errors, endpoint });
         }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.63",
+  "version": "0.0.0-draft.65",
   "description": "Local validation for JSON schemas for vovk-zod and other validation libraries for Vovk.ts",
   "main": "index.js",
   "scripts": {
@@ -33,6 +33,6 @@
     "ajv-i18n": "^4.2.0"
   },
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.193"
+    "vovk": "^3.0.0-draft.240"
   }
 }