vovk-ajv 0.0.0-draft.93 → 0.0.0-draft.95

package/index.js

@@ -1,106 +1,109 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+'use strict';
+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 = require("ajv");
-const _2020_1 = __importDefault(require("ajv/dist/2020"));
-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 ajv_1 = require('ajv');
+const _2020_1 = __importDefault(require('ajv/dist/2020'));
+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-isForm');
-    ajv.addKeyword('x-tsType');
-    return ajv;
+  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-isForm');
+  ajv.addKeyword('x-tsType');
+  return ajv;
 };
-const validate = ({ input, schema, localize = 'en', type, endpoint, options, target, }) => {
-    if (input && schema) {
-        const schemaTarget = schema.$schema?.includes('://json-schema.org/draft-07/schema') ? 'draft-07' : 'draft-2020-12';
-        const ajv = createAjv(options ?? {}, target ?? schemaTarget);
-        const isFormData = input instanceof FormData;
-        if (input instanceof FormData) {
-            const formDataEntries = Array.from(input.entries());
-            const result = {};
-            formDataEntries.forEach(([key, value]) => {
-                // Process the value (handle Blobs/Files)
-                let processedValue;
-                if (value instanceof Blob) {
-                    processedValue = '<binary>';
-                }
-                else if (Array.isArray(value)) {
-                    processedValue = value.map((item) => (item instanceof Blob ? '<binary>' : item));
-                }
-                else {
-                    processedValue = value;
-                }
-                // Handle duplicate keys
-                if (key in result) {
-                    // If the key already exists
-                    if (Array.isArray(result[key])) {
-                        // If it's already an array, push to it
-                        result[key].push(processedValue);
-                    }
-                    else {
-                        // If it's not an array yet, convert it to an array with both values
-                        result[key] = [result[key], processedValue];
-                    }
-                }
-                else {
-                    // First occurrence of this key
-                    result[key] = processedValue;
-                }
-            });
-            input = result;
+const validate = ({ input, schema, localize = 'en', type, endpoint, options, target }) => {
+  if (input && schema) {
+    const schemaTarget = schema.$schema?.includes('://json-schema.org/draft-07/schema') ? 'draft-07' : 'draft-2020-12';
+    const ajv = createAjv(options ?? {}, target ?? schemaTarget);
+    const isFormData = input instanceof FormData;
+    if (input instanceof FormData) {
+      const formDataEntries = Array.from(input.entries());
+      const result = {};
+      formDataEntries.forEach(([key, value]) => {
+        // Process the value (handle Blobs/Files)
+        let processedValue;
+        if (value instanceof Blob) {
+          processedValue = '<binary>';
+        } else if (Array.isArray(value)) {
+          processedValue = value.map((item) => (item instanceof Blob ? '<binary>' : item));
+        } else {
+          processedValue = value;
         }
-        const isValid = ajv.validate(schema, input);
-        if (!isValid) {
-            ajv_i18n_1.default[localize](ajv.errors);
-            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${isFormData ? 'form' : type} on client: ${ajv.errorsText()}`, { input, errors: ajv.errors, endpoint });
+        // Handle duplicate keys
+        if (key in result) {
+          // If the key already exists
+          if (Array.isArray(result[key])) {
+            // If it's already an array, push to it
+            result[key].push(processedValue);
+          } else {
+            // If it's not an array yet, convert it to an array with both values
+            result[key] = [result[key], processedValue];
+          }
+        } else {
+          // First occurrence of this key
+          result[key] = processedValue;
         }
+      });
+      input = result;
+    }
+    const isValid = ajv.validate(schema, input);
+    if (!isValid) {
+      ajv_i18n_1.default[localize](ajv.errors);
+      throw new vovk_1.HttpException(
+        vovk_1.HttpStatus.NULL,
+        `Ajv validation failed. Invalid ${isFormData ? 'form' : type} on client: ${ajv.errorsText()}`,
+        { input, errors: ajv.errors, endpoint }
+      );
     }
+  }
 };
 const getConfig = (schema) => {
-    const config = schema.meta?.config?.libs?.ajv;
-    const options = config?.options ?? {};
-    const localize = config?.localize ?? 'en';
-    const target = config?.target;
-    return { options, localize, target };
+  const config = schema.meta?.config?.libs?.ajv;
+  const options = config?.options ?? {};
+  const localize = config?.localize ?? 'en';
+  const target = config?.target;
+  return { options, localize, target };
 };
 const validateOnClientAjv = (0, vovk_1.createValidateOnClient)({
-    validate: (input, schema, { endpoint, type, fullSchema }) => {
-        const { options, localize, target } = getConfig(fullSchema);
-        validate({
-            input,
-            schema,
-            target,
-            localize,
-            endpoint,
-            options,
-            type,
-        });
-    },
+  validate: (input, schema, { endpoint, type, fullSchema }) => {
+    const { options, localize, target } = getConfig(fullSchema);
+    validate({
+      input,
+      schema,
+      target,
+      localize,
+      endpoint,
+      options,
+      type,
+    });
+  },
 });
-const configure = ({ options: givenOptions, localize: givenLocalize, target: givenTarget, }) => (0, vovk_1.createValidateOnClient)({
+const configure = ({ options: givenOptions, localize: givenLocalize, target: givenTarget }) =>
+  (0, vovk_1.createValidateOnClient)({
     validate: (input, schema, { endpoint, type, fullSchema }) => {
-        const { options, localize, target } = getConfig(fullSchema);
-        validate({
-            input,
-            schema,
-            target: givenTarget ?? target,
-            localize: givenLocalize ?? localize,
-            endpoint,
-            options: givenOptions ?? options,
-            type,
-        });
+      const { options, localize, target } = getConfig(fullSchema);
+      validate({
+        input,
+        schema,
+        target: givenTarget ?? target,
+        localize: givenLocalize ?? localize,
+        endpoint,
+        options: givenOptions ?? options,
+        type,
+      });
     },
-});
+  });
 exports.validateOnClient = Object.assign(validateOnClientAjv, {
-    configure,
+  configure,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.93",
+  "version": "0.0.0-draft.95",
   "description": "Local validation for JSON schemas for vovk-zod and other validation libraries for Vovk.ts",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/finom/vovk#readme",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.396",
+    "vovk": "^3.0.0-draft.398",
     "ajv": "^8.17.1"
   },
   "dependencies": {