vovk-ajv 0.0.0-draft.28 → 0.0.0-draft.30

package/index.d.ts

@@ -6,9 +6,9 @@ export type VovkAjvConfig = {
     options?: Options;
     localize?: Lang;
 };
-declare const validateOnClient: VovkValidateOnClient;
+declare const validateOnClientAjv: VovkValidateOnClient;
 declare const configure: ({ options: givenOptions, localize: givenLocalize }: VovkAjvConfig) => VovkValidateOnClient;
-declare const validateOnClientAjv: typeof validateOnClient & {
+export declare const validateOnClient: typeof validateOnClientAjv & {
     configure: typeof configure;
 };
-export default validateOnClientAjv;
+export {};

package/index.js

@@ -3,33 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOnClient = void 0;
 const ajv_1 = __importDefault(require("ajv"));
 const vovk_1 = require("vovk");
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const ajv_i18n_1 = __importDefault(require("ajv-i18n"));
-const validate = ({ input, validation, ajv, localize = 'en', }) => {
-    if (validation.body) {
-        const isValid = ajv.validate(validation.body, input.body);
-        if (!isValid) {
-            ajv_i18n_1.default[localize](ajv.errors);
-            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid request body on client for ${input.endpoint}. ${ajv.errorsText()}`, { body: input.body, endpoint: input.endpoint, errors: ajv.errors });
-        }
-    }
-    if (validation.query) {
-        const isValid = ajv.validate(validation.query, input.query);
-        if (!isValid) {
-            ajv_i18n_1.default[localize](ajv.errors);
-            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid request query on client for ${input.endpoint}. ${ajv.errorsText()}`, { query: input.query, endpoint: input.endpoint, errors: ajv.errors });
-        }
-    }
-    if (validation.params) {
-        const isValid = ajv.validate(validation.params, input.params);
+const ajv_errors_1 = __importDefault(require("ajv-errors"));
+const createAjv = (options) => {
+    const ajv = new ajv_1.default({ allErrors: true, ...options });
+    (0, ajv_formats_1.default)(ajv);
+    (0, ajv_errors_1.default)(ajv);
+    ajv.addKeyword('x-isDto');
+    return ajv;
+};
+const validate = ({ data, schema, ajv, localize = 'en', type, endpoint, }) => {
+    if (data && schema) {
+        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 request params on client for ${input.endpoint}. ${ajv.errorsText()}`, { params: input.params, endpoint: input.endpoint, errors: ajv.errors });
+            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${type} on client for ${endpoint}. ${ajv.errorsText()}`, { data, errors: ajv.errors });
         }
     }
 };
+const validateAll = ({ input, validation, ajv, localize = 'en', }) => {
+    validate({ data: input.body, schema: validation.body, ajv, localize, endpoint: input.endpoint, type: 'body' });
+    validate({ data: input.query, schema: validation.query, ajv, localize, endpoint: input.endpoint, type: 'query' });
+    validate({ data: input.params, schema: validation.params, ajv, localize, endpoint: input.endpoint, type: 'params' });
+};
 const getConfig = (fullSchema) => {
     const config = fullSchema.config.custom?.ajv;
     const options = config?.options || {};
@@ -37,21 +37,23 @@ const getConfig = (fullSchema) => {
     return { options, localize };
 };
 let ajvScope = null;
-const validateOnClient = (input, validation, fullSchema) => {
+const validateOnClientAjv = (input, validation, fullSchema) => {
     const { options, localize } = getConfig(fullSchema);
     if (!ajvScope) {
-        ajvScope = new ajv_1.default(options);
-        (0, ajv_formats_1.default)(ajvScope);
+        ajvScope = createAjv(options);
     }
-    return validate({ input, validation, ajv: ajvScope, localize });
+    return validateAll({ input, validation, ajv: ajvScope, localize });
 };
 const configure = ({ options: givenOptions, localize: givenLocalize }) => (input, validation, fullSchema) => {
     const { options, localize } = getConfig(fullSchema);
-    const ajv = new ajv_1.default({ ...options, ...givenOptions });
-    (0, ajv_formats_1.default)(ajv);
-    return validate({ input, validation, ajv, localize: givenLocalize || localize });
+    const ajv = createAjv({ ...options, ...givenOptions });
+    validateAll({
+        input,
+        validation,
+        ajv,
+        localize: givenLocalize || localize,
+    });
 };
-const validateOnClientAjv = Object.assign(validateOnClient, {
+exports.validateOnClient = Object.assign(validateOnClientAjv, {
     configure,
 });
-exports.default = validateOnClientAjv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.28",
+  "version": "0.0.0-draft.30",
   "description": "Local validation for JSON schemas for vovk-zod and other validation libraries for Vovk.ts",
   "main": "index.js",
   "scripts": {
@@ -28,10 +28,11 @@
   "homepage": "https://github.com/finom/vovk#readme",
   "dependencies": {
     "ajv": "^8.17.1",
+    "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "ajv-i18n": "^4.2.0"
   },
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.92"
+    "vovk": "^3.0.0-draft.95"
   }
 }