vovk-ajv 0.0.0-draft.72 → 0.0.0-draft.75

package/index.js

@@ -11,7 +11,6 @@ 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) => {
-    // TODO auto-detect by https://json-schema.org/draft-07/schema, https://json-schema.org/draft/2020-12/schema
     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);
@@ -19,49 +18,74 @@ const createAjv = (options, target) => {
     ajv.addKeyword('x-isDto');
     ajv.addKeyword('x-formData');
     ajv.addKeyword('x-tsType');
+    ajv.addFormat('binary', {
+        type: 'string',
+        validate: (data) => data instanceof File || data instanceof Blob,
+    });
     return ajv;
 };
-const validate = ({ data, schema, ajv, localize = 'en', type, endpoint, }) => {
+const validate = ({ data, schema, localize = 'en', type, endpoint, options, target, }) => {
     if (data && schema) {
-        const isForm = data instanceof FormData;
-        if (isForm) {
+        const schemaTarget = schema.$schema === 'https://json-schema.org/draft-07/schema#' ? 'draft-07' : 'draft-2020-12';
+        const ajv = createAjv(options ?? {}, target ?? schemaTarget);
+        if (data instanceof FormData) {
             data = Object.fromEntries(data.entries());
         }
         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 ${isForm ? 'form' : type} on client: ${ajv.errorsText()}`, { data, errors: ajv.errors, endpoint });
+            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${data instanceof FormData ? 'form' : type} on client: ${ajv.errorsText()}`, { data, errors: ajv.errors, endpoint });
         }
     }
 };
-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 validateAll = ({ input, validation, localize = 'en', target, options, }) => {
+    validate({
+        data: input.body,
+        schema: validation.body,
+        target,
+        localize,
+        endpoint: input.endpoint,
+        options,
+        type: 'body',
+    });
+    validate({
+        data: input.query,
+        schema: validation.query,
+        target,
+        localize,
+        endpoint: input.endpoint,
+        options,
+        type: 'query',
+    });
+    validate({
+        data: input.params,
+        schema: validation.params,
+        target,
+        localize,
+        endpoint: input.endpoint,
+        options,
+        type: 'params',
+    });
 };
 const getConfig = (schema) => {
     const config = schema.meta?.config?.libs?.ajv;
     const options = config?.options ?? {};
     const localize = config?.localize ?? 'en';
-    const target = config?.target ?? 'draft-2020-12';
+    const target = config?.target;
     return { options, localize, target };
 };
-let ajvScope = null;
 const validateOnClientAjv = (input, validation, schema) => {
     const { options, localize, target } = getConfig(schema);
-    if (!ajvScope) {
-        ajvScope = createAjv(options, target);
-    }
-    return validateAll({ input, validation, ajv: ajvScope, localize });
+    return validateAll({ input, validation, target, localize, options });
 };
 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,
+        target: givenTarget ?? target,
         localize: givenLocalize ?? localize,
+        options: givenOptions ?? options,
     });
 };
 exports.validateOnClient = Object.assign(validateOnClientAjv, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.72",
+  "version": "0.0.0-draft.75",
   "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.297"
+    "vovk": "^3.0.0-draft.303"
   }
 }