vovk-ajv 0.0.0-draft.84 → 0.0.0-draft.87

package/index.d.ts

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

package/index.js

@@ -24,49 +24,20 @@ const createAjv = (options, target) => {
     });
     return ajv;
 };
-const validate = ({ data, schema, localize = 'en', type, endpoint, options, target, }) => {
-    if (data && schema) {
-        const schemaTarget = schema.$schema.includes('://json-schema.org/draft-07/schema') ? 'draft-07' : 'draft-2020-12';
+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);
-        if (data instanceof FormData) {
-            data = Object.fromEntries(data.entries());
+        if (input instanceof FormData) {
+            input = Object.fromEntries(input.entries());
         }
-        const isValid = ajv.validate(schema, data);
+        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 ${data instanceof FormData ? 'form' : type} on client: ${ajv.errorsText()}`, { data, errors: ajv.errors, endpoint });
+            throw new vovk_1.HttpException(vovk_1.HttpStatus.NULL, `Ajv validation failed. Invalid ${input instanceof FormData ? 'form' : type} on client: ${ajv.errorsText()}`, { input, errors: ajv.errors, endpoint });
         }
     }
 };
-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 ?? {};
@@ -74,20 +45,34 @@ const getConfig = (schema) => {
     const target = config?.target;
     return { options, localize, target };
 };
-const validateOnClientAjv = (input, validation, schema) => {
-    const { options, localize, target } = getConfig(schema);
-    return validateAll({ input, validation, target, localize, options });
-};
-const configure = ({ options: givenOptions, localize: givenLocalize, target: givenTarget }) => (input, validation, schema) => {
-    const { options, localize, target } = getConfig(schema);
-    validateAll({
-        input,
-        validation,
-        target: givenTarget ?? target,
-        localize: givenLocalize ?? localize,
-        options: givenOptions ?? options,
-    });
-};
+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,
+        });
+    },
+});
+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,
+        });
+    },
+});
 exports.validateOnClient = Object.assign(validateOnClientAjv, {
     configure,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-ajv",
-  "version": "0.0.0-draft.84",
+  "version": "0.0.0-draft.87",
   "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.340"
+    "vovk": "^3.0.0-draft.352"
   }
 }