vovk-ajv 0.0.0-draft.55 → 0.0.0-draft.56

package/index.d.ts

@@ -5,9 +5,10 @@ type Lang = keyof typeof ajvLocalize;
 export type VovkAjvConfig = {
     options?: Options;
     localize?: Lang;
+    target: 'draft-2020-12' | 'draft-07';
 };
 declare const validateOnClientAjv: VovkValidateOnClient;
-declare const configure: ({ options: givenOptions, localize: givenLocalize }: VovkAjvConfig) => VovkValidateOnClient;
+declare const configure: ({ options: givenOptions, localize: givenLocalize, target: givenTarget }: VovkAjvConfig) => VovkValidateOnClient;
 export declare const validateOnClient: typeof validateOnClientAjv & {
     configure: typeof configure;
 };

package/index.js

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (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 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 createAjv = (options) => {
-    const ajv = new ajv_1.Ajv({ allErrors: true, ...options });
+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');
@@ -32,26 +34,27 @@ const validateAll = ({ input, validation, ajv, localize = 'en', }) => {
 };
 const getConfig = (schema) => {
     const config = schema.config.libs?.ajv;
-    const options = config?.options || {};
-    const localize = config?.localize || 'en';
-    return { options, localize };
+    const options = config?.options ?? {};
+    const localize = config?.localize ?? 'en';
+    const target = config?.target ?? 'draft-2020-12';
+    return { options, localize, target };
 };
 let ajvScope = null;
 const validateOnClientAjv = (input, validation, schema) => {
-    const { options, localize } = getConfig(schema);
+    const { options, localize, target } = getConfig(schema);
     if (!ajvScope) {
-        ajvScope = createAjv(options);
+        ajvScope = createAjv(options, target);
     }
     return validateAll({ input, validation, ajv: ajvScope, localize });
 };
-const configure = ({ options: givenOptions, localize: givenLocalize }) => (input, validation, schema) => {
-    const { options, localize } = getConfig(schema);
-    const ajv = createAjv({ ...options, ...givenOptions });
+const configure = ({ options: givenOptions, localize: givenLocalize, target: givenTarget }) => (input, validation, schema) => {
+    const { options, localize, target } = getConfig(schema);
+    const ajv = createAjv({ ...options, ...givenOptions }, givenTarget ?? target);
     validateAll({
         input,
         validation,
         ajv,
-        localize: givenLocalize || localize,
+        localize: givenLocalize ?? localize,
     });
 };
 exports.validateOnClient = Object.assign(validateOnClientAjv, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.55",
+  "version": "0.0.0-draft.56",
   "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.138"
+    "vovk": "^3.0.0-draft.140"
   }
 }