@hookform/resolvers 2.0.0-beta.7 → 2.0.0

package/superstruct/src/__tests__/superstruct.ts

@@ -1,77 +1,18 @@
-import {
-  object,
-  number,
-  string,
-  optional,
-  pattern,
-  size,
-  union,
-  min,
-  max,
-  Infer,
-  define,
-  array,
-  boolean,
-} from 'superstruct';
 import { superstructResolver } from '..';
-
-const Password = define('Password', (value, ctx) =>
-  value === ctx.branch[0].password);
-
-const schema = object({
-  username: size(pattern(string(), /^\w+$/), 3, 30),
-  password: pattern(string(), /^[a-zA-Z0-9]{3,30}/),
-  repeatPassword: Password,
-  accessToken: optional(union([string(), number()])),
-  birthYear: optional(max(min(number(), 1900), 2013)),
-  email: optional(pattern(string(), /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/)),
-  tags: array(string()),
-  enabled: boolean(),
-});
+import { invalidData, schema, validData, fields } from './__fixtures__/data';
 
 describe('superstructResolver', () => {
   it('should return values from superstructResolver when validation pass', async () => {
-    const data: Infer<typeof schema> = {
-      username: 'Doe',
-      password: 'Password123',
-      repeatPassword: 'Password123',
-      birthYear: 2000,
-      email: 'john@doe.com',
-      tags: ['tag1', 'tag2'],
-      enabled: true,
-    };
-
-    const result = await superstructResolver(schema)(data, undefined, {
-      fields: {},
+    const result = await superstructResolver(schema)(validData, undefined, {
+      fields,
     });
 
-    expect(result).toEqual({ errors: {}, values: data });
+    expect(result).toEqual({ errors: {}, values: validData });
   });
 
   it('should return a single error from superstructResolver when validation fails', async () => {
-    const data = {
-      password: '___',
-      email: '',
-      birthYear: 'birthYear',
-    };
-
-    const result = await superstructResolver(schema)(data, undefined, {
-      fields: {},
-    });
-
-    expect(result).toMatchSnapshot();
-  });
-
-  it('should return all the errors from superstructResolver when validation fails with `validateAllFieldCriteria` set to true', async () => {
-    const data = {
-      password: '___',
-      email: '',
-      birthYear: 'birthYear',
-    };
-
-    const result = await superstructResolver(schema)(data, undefined, {
-      fields: {},
-      criteriaMode: 'all',
+    const result = await superstructResolver(schema)(invalidData, undefined, {
+      fields,
     });
 
     expect(result).toMatchSnapshot();

package/superstruct/src/superstruct.ts

@@ -1,63 +1,30 @@
-import { appendErrors, transformToNestObject } from 'react-hook-form';
+import { FieldError } from 'react-hook-form';
+import { toNestError } from '@hookform/resolvers';
+
 import { StructError, validate } from 'superstruct';
-// @ts-expect-error maybe fixed after the first publish ?
-import { convertArrayToPathName } from '@hookform/resolvers';
 import { Resolver } from './types';
 
-const parseErrorSchema = (
-  error: StructError,
-  validateAllFieldCriteria: boolean,
-) =>
-  error
-    .failures()
-    .reduce((previous: Record<string, any>, { path, message = '', type }) => {
-      const currentPath = convertArrayToPathName(path);
-      return {
-        ...previous,
-        ...(path
-          ? previous[currentPath] && validateAllFieldCriteria
-            ? {
-                [currentPath]: appendErrors(
-                  currentPath,
-                  validateAllFieldCriteria,
-                  previous,
-                  type || '',
-                  message,
-                ),
-              }
-            : {
-                [currentPath]: previous[currentPath] || {
-                  message,
-                  type,
-                  ...(validateAllFieldCriteria
-                    ? {
-                        types: { [type || '']: message || true },
-                      }
-                    : {}),
-                },
-              }
-          : {}),
-      };
-    }, {});
+const parseErrorSchema = (error: StructError) =>
+  error.failures().reduce<Record<string, FieldError>>(
+    (previous, error) =>
+      (previous[error.path.join('.')] = {
+        message: error.message,
+        type: error.type,
+      }) && previous,
+    {},
+  );
 
-export const superstructResolver: Resolver = (schema, options) => async (
+export const superstructResolver: Resolver = (schema, resolverOptions) => (
   values,
-  _context,
-  { criteriaMode },
+  _,
+  options,
 ) => {
-  const [errors, result] = validate(values, schema, options);
-
-  if (errors != null) {
-    return {
-      values: {},
-      errors: transformToNestObject(
-        parseErrorSchema(errors, criteriaMode === 'all'),
-      ),
-    };
-  }
+  const result = validate(values, schema, resolverOptions);
 
   return {
-    values: result,
-    errors: {},
+    values: result[1] || {},
+    errors: result[0]
+      ? toNestError(parseErrorSchema(result[0]), options.fields)
+      : {},
   };
 };

package/superstruct/src/types.ts

@@ -15,4 +15,4 @@ export type Resolver = <T extends Struct<any, any>>(
   values: UnpackNestedValue<TFieldValues>,
   context: TContext | undefined,
   options: ResolverOptions<TFieldValues>,
-) => Promise<ResolverResult<TFieldValues>>;
+) => ResolverResult<TFieldValues>;

package/vest/dist/vest.js

@@ -1,2 +1,2 @@
-var r=require("react-hook-form");function e(r){return r&&"object"==typeof r&&"default"in r?r:{default:r}}var t=e(require("vest/promisify"));function n(){return(n=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(r[n]=t[n])}return r}).apply(this,arguments)}exports.vestResolver=function(e,o,a){var s=(void 0===a?{mode:"async"}:a).mode;return function(o,a,u){var i=u.criteriaMode;try{var c,f=function(){var e,t,a=c.getErrors();return c.hasErrors()?{values:{},errors:r.transformToNestObject((e=a,t="all"===i,Object.entries(e).reduce(function(r,e){var o,a=e[1];return n({},r,((o={})[e[0]]=n({type:"",message:a[0]},t?{types:a.reduce(function(r,e,t){var o;return n({},r,((o={})[t]=e,o))},{})}:{}),o))},{})))}:{values:o,errors:{}}},v=function(){if("async"===s){var r=t.default(e);return Promise.resolve(r(o)).then(function(r){c=r})}c=e(o)}();return Promise.resolve(v&&v.then?v.then(f):f())}catch(r){return Promise.reject(r)}}};
+var r=require("@hookform/resolvers");function e(r){return r&&"object"==typeof r&&"default"in r?r:{default:r}}var t=e(require("vest/promisify")),o=function(r,e){var t={};for(var o in r)t[o]||(t[o]={message:r[o][0],type:""}),e&&(t[o].types=r[o].reduce(function(r,e,t){return(r[t]=e)&&r},{}));return t};exports.vestResolver=function(e,s,n){return void 0===n&&(n={}),function(s,u,i){try{var a=function(e){return e.hasErrors()?{values:{},errors:r.toNestError(o(e.getErrors(),"all"===i.criteriaMode),i.fields)}:{values:s,errors:{}}};return Promise.resolve("sync"===n.mode?a(e(s)):Promise.resolve(t.default(e)(s)).then(a))}catch(r){return Promise.reject(r)}}};
 //# sourceMappingURL=vest.js.map

package/vest/dist/vest.js.map

@@ -1 +1 @@
-{"version":3,"file":"vest.js","sources":["../src/vest.ts"],"sourcesContent":["import { transformToNestObject } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport { DraftResult, IVestResult } from 'vest/vestResult';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  return Object.entries(vestError).reduce((prev, [key, value]) => {\n    return {\n      ...prev,\n      [key]: {\n        type: '',\n        message: value[0],\n        ...(validateAllFieldCriteria\n          ? {\n              types: value.reduce((prev, message, index) => {\n                return {\n                  ...prev,\n                  [index]: message,\n                };\n              }, {}),\n            }\n          : {}),\n      },\n    };\n  }, {});\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  { mode } = { mode: 'async' },\n) => async (values, _context, { criteriaMode }) => {\n  let result: IVestResult | DraftResult;\n  if (mode === 'async') {\n    const validateSchema = promisify(schema);\n    result = await validateSchema(values);\n  } else {\n    result = schema(values);\n  }\n\n  const errors = result.getErrors();\n\n  if (!result.hasErrors()) {\n    return { values, errors: {} };\n  }\n\n  return {\n    values: {},\n    errors: transformToNestObject(\n      parseErrorSchema(errors, criteriaMode === 'all'),\n    ),\n  };\n};\n"],"names":["schema","_","mode","values","_context","criteriaMode","result","vestError","validateAllFieldCriteria","errors","getErrors","hasErrors","transformToNestObject","Object","entries","reduce","prev","value","type","message","types","index","validateSchema","promisify"],"mappings":"gXA8BsC,SACpCA,EACAC,SACEC,cAAS,CAAEA,KAAM,YAAjBA,qBACQC,EAAQC,SAAYC,IAAAA,qBAC1BC,eAQJ,IArCAC,EACAC,EAoCMC,EAASH,EAAOI,mBAEjBJ,EAAOK,YAIL,CACLR,OAAQ,GACRM,OAAQG,yBA7CVL,EA8CqBE,EA7CrBD,EA6C8C,QAAjBH,EA3CtBQ,OAAOC,QAAQP,GAAWQ,OAAO,SAACC,WAAYC,OACnD,YACKD,mBAEDE,KAAM,GACNC,QAASF,EAAM,IACXT,EACA,CACEY,MAAOH,EAAMF,OAAO,SAACC,EAAMG,EAASE,SAClC,YACKL,UACFK,GAAQF,OAEV,KAEL,SAGP,OAmBM,CAAEhB,OAAAA,EAAQM,OAAQ,qBAVd,UAATP,GACF,IAAMoB,EAAiBC,UAAUvB,0BAClBsB,EAAenB,qBAA9BG,MAEAA,EAASN,EAAOG,sDAVkB"}
+{"version":3,"file":"vest.js","sources":["../src/vest.ts"],"sourcesContent":["import { toNestError } from '@hookform/resolvers';\nimport { FieldError } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  const errors: Record<string, FieldError> = {};\n  for (const path in vestError) {\n    if (!errors[path]) {\n      errors[path] = { message: vestError[path][0], type: '' };\n    }\n\n    if (validateAllFieldCriteria) {\n      errors[path].types = vestError[path].reduce<Record<number, string>>(\n        (acc, message, index) => (acc[index] = message) && acc,\n        {},\n      );\n    }\n  }\n  return errors;\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  resolverOptions = {},\n) => async (values, _context, options) => {\n  const result =\n    resolverOptions.mode === 'sync'\n      ? schema(values)\n      : await promisify(schema)(values);\n\n  return result.hasErrors()\n    ? {\n        values: {},\n        errors: toNestError(\n          parseErrorSchema(result.getErrors(), options.criteriaMode === 'all'),\n          options.fields,\n        ),\n      }\n    : { values, errors: {} };\n};\n"],"names":["parseErrorSchema","vestError","validateAllFieldCriteria","errors","path","message","type","types","reduce","acc","index","schema","_","resolverOptions","values","_context","options","result","hasErrors","toNestError","getErrors","criteriaMode","fields","mode","promisify"],"mappings":"gJAKMA,EAAmB,SACvBC,EACAC,GAEA,IAAMC,EAAqC,GAC3C,IAAK,IAAMC,KAAQH,EACZE,EAAOC,KACVD,EAAOC,GAAQ,CAAEC,QAASJ,EAAUG,GAAM,GAAIE,KAAM,KAGlDJ,IACFC,EAAOC,GAAMG,MAAQN,EAAUG,GAAMI,OACnC,SAACC,EAAKJ,EAASK,UAAWD,EAAIC,GAASL,IAAYI,GACnD,KAIN,OAAON,wBAG6B,SACpCQ,EACAC,EACAC,mBAAAA,IAAAA,EAAkB,aACRC,EAAQC,EAAUC,sBACtBC,GAKN,OAAOA,EAAOC,YACV,CACEJ,OAAQ,GACRX,OAAQgB,cACNnB,EAAiBiB,EAAOG,YAAsC,QAAzBJ,EAAQK,cAC7CL,EAAQM,SAGZ,CAAER,OAAAA,EAAQX,OAAQ,4BAZK,SAAzBU,EAAgBU,OACZZ,EAAOG,oBACDU,UAAUb,EAAVa,CAAkBV,aARM"}

package/vest/dist/vest.mjs

@@ -1,2 +1,2 @@
-import{transformToNestObject as r}from"react-hook-form";import e from"vest/promisify";function t(){return(t=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(r[n]=t[n])}return r}).apply(this,arguments)}var n=function(n,o,a){var i=(void 0===a?{mode:"async"}:a).mode;return function(o,a,s){var c=s.criteriaMode;try{var u,v=function(){var e,n,a=u.getErrors();return u.hasErrors()?{values:{},errors:r((e=a,n="all"===c,Object.entries(e).reduce(function(r,e){var o,a=e[1];return t({},r,((o={})[e[0]]=t({type:"",message:a[0]},n?{types:a.reduce(function(r,e,n){var o;return t({},r,((o={})[n]=e,o))},{})}:{}),o))},{})))}:{values:o,errors:{}}},f=function(){if("async"===i){var r=e(n);return Promise.resolve(r(o)).then(function(r){u=r})}u=n(o)}();return Promise.resolve(f&&f.then?f.then(v):v())}catch(r){return Promise.reject(r)}}};export{n as vestResolver};
+import{toNestError as r}from"@hookform/resolvers";import e from"vest/promisify";var o=function(r,e){var o={};for(var t in r)o[t]||(o[t]={message:r[t][0],type:""}),e&&(o[t].types=r[t].reduce(function(r,e,o){return(r[o]=e)&&r},{}));return o},t=function(t,s,n){return void 0===n&&(n={}),function(s,i,u){try{var a=function(e){return e.hasErrors()?{values:{},errors:r(o(e.getErrors(),"all"===u.criteriaMode),u.fields)}:{values:s,errors:{}}};return Promise.resolve("sync"===n.mode?a(t(s)):Promise.resolve(e(t)(s)).then(a))}catch(r){return Promise.reject(r)}}};export{t as vestResolver};
 //# sourceMappingURL=vest.module.js.map

package/vest/dist/vest.modern.js

@@ -1,2 +1,2 @@
-import{transformToNestObject as r}from"react-hook-form";import e from"vest/promisify";function t(){return(t=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(r[o]=t[o])}return r}).apply(this,arguments)}const o=(o,s,{mode:a}={mode:"async"})=>async(s,n,{criteriaMode:c})=>{let i;if("async"===a){const r=e(o);i=await r(s)}else i=o(s);const p=i.getErrors();return i.hasErrors()?{values:{},errors:r((l=p,f="all"===c,Object.entries(l).reduce((r,[e,o])=>t({},r,{[e]:t({type:"",message:o[0]},f?{types:o.reduce((r,e,o)=>t({},r,{[o]:e}),{})}:{})}),{})))}:{values:s,errors:{}};var l,f};export{o as vestResolver};
+import{toNestError as r}from"@hookform/resolvers";import e from"vest/promisify";const o=(r,e)=>{const o={};for(const s in r)o[s]||(o[s]={message:r[s][0],type:""}),e&&(o[s].types=r[s].reduce((r,e,o)=>(r[o]=e)&&r,{}));return o},s=(s,t,a={})=>async(t,i,n)=>{const c="sync"===a.mode?s(t):await e(s)(t);return c.hasErrors()?{values:{},errors:r(o(c.getErrors(),"all"===n.criteriaMode),n.fields)}:{values:t,errors:{}}};export{s as vestResolver};
 //# sourceMappingURL=vest.modern.js.map

package/vest/dist/vest.modern.js.map

@@ -1 +1 @@
-{"version":3,"file":"vest.modern.js","sources":["../src/vest.ts"],"sourcesContent":["import { transformToNestObject } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport { DraftResult, IVestResult } from 'vest/vestResult';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  return Object.entries(vestError).reduce((prev, [key, value]) => {\n    return {\n      ...prev,\n      [key]: {\n        type: '',\n        message: value[0],\n        ...(validateAllFieldCriteria\n          ? {\n              types: value.reduce((prev, message, index) => {\n                return {\n                  ...prev,\n                  [index]: message,\n                };\n              }, {}),\n            }\n          : {}),\n      },\n    };\n  }, {});\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  { mode } = { mode: 'async' },\n) => async (values, _context, { criteriaMode }) => {\n  let result: IVestResult | DraftResult;\n  if (mode === 'async') {\n    const validateSchema = promisify(schema);\n    result = await validateSchema(values);\n  } else {\n    result = schema(values);\n  }\n\n  const errors = result.getErrors();\n\n  if (!result.hasErrors()) {\n    return { values, errors: {} };\n  }\n\n  return {\n    values: {},\n    errors: transformToNestObject(\n      parseErrorSchema(errors, criteriaMode === 'all'),\n    ),\n  };\n};\n"],"names":["vestResolver","schema","_","mode","async","values","_context","criteriaMode","result","validateSchema","promisify","errors","getErrors","hasErrors","transformToNestObject","vestError","validateAllFieldCriteria","Object","entries","reduce","prev","key","value","[object Object]","type","message","types","index"],"mappings":"qSAKA,MAyBaA,EAAyB,CACpCC,EACAC,GACEC,KAAAA,GAAS,CAAEA,KAAM,WAChBC,MAAOC,EAAQC,GAAYC,aAAAA,MAC9B,IAAIC,EACJ,GAAa,UAATL,EAAkB,CACpB,MAAMM,EAAiBC,EAAUT,GACjCO,QAAeC,EAAeJ,QAE9BG,EAASP,EAAOI,GAGlB,MAAMM,EAASH,EAAOI,YAEtB,OAAKJ,EAAOK,YAIL,CACLR,OAAQ,GACRM,OAAQG,GA7CVC,EA8CqBJ,EA7CrBK,EA6C8C,QAAjBT,EA3CtBU,OAAOC,QAAQH,GAAWI,OAAO,CAACC,GAAOC,EAAKC,UAE9CF,GACHG,CAACF,MACCG,KAAM,GACNC,QAASH,EAAM,IACXN,EACA,CACEU,MAAOJ,EAAMH,OAAO,CAACC,EAAMK,EAASE,SAE7BP,GACHG,CAACI,GAAQF,IAEV,KAEL,MAGP,OAmBM,CAAEpB,OAAAA,EAAQM,OAAQ,IAzCJ,IACvBI,EACAC"}
+{"version":3,"file":"vest.modern.js","sources":["../src/vest.ts"],"sourcesContent":["import { toNestError } from '@hookform/resolvers';\nimport { FieldError } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  const errors: Record<string, FieldError> = {};\n  for (const path in vestError) {\n    if (!errors[path]) {\n      errors[path] = { message: vestError[path][0], type: '' };\n    }\n\n    if (validateAllFieldCriteria) {\n      errors[path].types = vestError[path].reduce<Record<number, string>>(\n        (acc, message, index) => (acc[index] = message) && acc,\n        {},\n      );\n    }\n  }\n  return errors;\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  resolverOptions = {},\n) => async (values, _context, options) => {\n  const result =\n    resolverOptions.mode === 'sync'\n      ? schema(values)\n      : await promisify(schema)(values);\n\n  return result.hasErrors()\n    ? {\n        values: {},\n        errors: toNestError(\n          parseErrorSchema(result.getErrors(), options.criteriaMode === 'all'),\n          options.fields,\n        ),\n      }\n    : { values, errors: {} };\n};\n"],"names":["parseErrorSchema","vestError","validateAllFieldCriteria","errors","path","message","type","types","reduce","acc","index","vestResolver","schema","_","resolverOptions","async","values","_context","options","result","mode","promisify","hasErrors","toNestError","getErrors","criteriaMode","fields"],"mappings":"gFAKA,MAAMA,EAAmB,CACvBC,EACAC,KAEA,MAAMC,EAAqC,GAC3C,IAAK,MAAMC,KAAQH,EACZE,EAAOC,KACVD,EAAOC,GAAQ,CAAEC,QAASJ,EAAUG,GAAM,GAAIE,KAAM,KAGlDJ,IACFC,EAAOC,GAAMG,MAAQN,EAAUG,GAAMI,OACnC,CAACC,EAAKJ,EAASK,KAAWD,EAAIC,GAASL,IAAYI,EACnD,KAIN,OAAON,GAGIQ,EAAyB,CACpCC,EACAC,EACAC,EAAkB,KACfC,MAAOC,EAAQC,EAAUC,KAC5B,MAAMC,EACqB,SAAzBL,EAAgBM,KACZR,EAAOI,SACDK,EAAUT,EAAVS,CAAkBL,GAE9B,OAAOG,EAAOG,YACV,CACEN,OAAQ,GACRb,OAAQoB,EACNvB,EAAiBmB,EAAOK,YAAsC,QAAzBN,EAAQO,cAC7CP,EAAQQ,SAGZ,CAAEV,OAAAA,EAAQb,OAAQ"}

package/vest/dist/vest.module.js

@@ -1,2 +1,2 @@
-import{transformToNestObject as r}from"react-hook-form";import e from"vest/promisify";function t(){return(t=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(r[n]=t[n])}return r}).apply(this,arguments)}var n=function(n,o,a){var i=(void 0===a?{mode:"async"}:a).mode;return function(o,a,s){var c=s.criteriaMode;try{var u,v=function(){var e,n,a=u.getErrors();return u.hasErrors()?{values:{},errors:r((e=a,n="all"===c,Object.entries(e).reduce(function(r,e){var o,a=e[1];return t({},r,((o={})[e[0]]=t({type:"",message:a[0]},n?{types:a.reduce(function(r,e,n){var o;return t({},r,((o={})[n]=e,o))},{})}:{}),o))},{})))}:{values:o,errors:{}}},f=function(){if("async"===i){var r=e(n);return Promise.resolve(r(o)).then(function(r){u=r})}u=n(o)}();return Promise.resolve(f&&f.then?f.then(v):v())}catch(r){return Promise.reject(r)}}};export{n as vestResolver};
+import{toNestError as r}from"@hookform/resolvers";import e from"vest/promisify";var o=function(r,e){var o={};for(var t in r)o[t]||(o[t]={message:r[t][0],type:""}),e&&(o[t].types=r[t].reduce(function(r,e,o){return(r[o]=e)&&r},{}));return o},t=function(t,s,n){return void 0===n&&(n={}),function(s,i,u){try{var a=function(e){return e.hasErrors()?{values:{},errors:r(o(e.getErrors(),"all"===u.criteriaMode),u.fields)}:{values:s,errors:{}}};return Promise.resolve("sync"===n.mode?a(t(s)):Promise.resolve(e(t)(s)).then(a))}catch(r){return Promise.reject(r)}}};export{t as vestResolver};
 //# sourceMappingURL=vest.module.js.map

package/vest/dist/vest.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"vest.module.js","sources":["../src/vest.ts"],"sourcesContent":["import { transformToNestObject } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport { DraftResult, IVestResult } from 'vest/vestResult';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  return Object.entries(vestError).reduce((prev, [key, value]) => {\n    return {\n      ...prev,\n      [key]: {\n        type: '',\n        message: value[0],\n        ...(validateAllFieldCriteria\n          ? {\n              types: value.reduce((prev, message, index) => {\n                return {\n                  ...prev,\n                  [index]: message,\n                };\n              }, {}),\n            }\n          : {}),\n      },\n    };\n  }, {});\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  { mode } = { mode: 'async' },\n) => async (values, _context, { criteriaMode }) => {\n  let result: IVestResult | DraftResult;\n  if (mode === 'async') {\n    const validateSchema = promisify(schema);\n    result = await validateSchema(values);\n  } else {\n    result = schema(values);\n  }\n\n  const errors = result.getErrors();\n\n  if (!result.hasErrors()) {\n    return { values, errors: {} };\n  }\n\n  return {\n    values: {},\n    errors: transformToNestObject(\n      parseErrorSchema(errors, criteriaMode === 'all'),\n    ),\n  };\n};\n"],"names":["vestResolver","schema","_","mode","values","_context","criteriaMode","result","vestError","validateAllFieldCriteria","errors","getErrors","hasErrors","transformToNestObject","Object","entries","reduce","prev","value","type","message","types","index","validateSchema","promisify"],"mappings":"qSAKA,IAyBaA,EAAyB,SACpCC,EACAC,SACEC,cAAS,CAAEA,KAAM,YAAjBA,qBACQC,EAAQC,SAAYC,IAAAA,qBAC1BC,eAQJ,IArCAC,EACAC,EAoCMC,EAASH,EAAOI,mBAEjBJ,EAAOK,YAIL,CACLR,OAAQ,GACRM,OAAQG,GA7CVL,EA8CqBE,EA7CrBD,EA6C8C,QAAjBH,EA3CtBQ,OAAOC,QAAQP,GAAWQ,OAAO,SAACC,WAAYC,OACnD,YACKD,mBAEDE,KAAM,GACNC,QAASF,EAAM,IACXT,EACA,CACEY,MAAOH,EAAMF,OAAO,SAACC,EAAMG,EAASE,SAClC,YACKL,UACFK,GAAQF,OAEV,KAEL,SAGP,OAmBM,CAAEhB,OAAAA,EAAQM,OAAQ,qBAVd,UAATP,GACF,IAAMoB,EAAiBC,EAAUvB,0BAClBsB,EAAenB,qBAA9BG,MAEAA,EAASN,EAAOG,sDAVkB"}
+{"version":3,"file":"vest.module.js","sources":["../src/vest.ts"],"sourcesContent":["import { toNestError } from '@hookform/resolvers';\nimport { FieldError } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  const errors: Record<string, FieldError> = {};\n  for (const path in vestError) {\n    if (!errors[path]) {\n      errors[path] = { message: vestError[path][0], type: '' };\n    }\n\n    if (validateAllFieldCriteria) {\n      errors[path].types = vestError[path].reduce<Record<number, string>>(\n        (acc, message, index) => (acc[index] = message) && acc,\n        {},\n      );\n    }\n  }\n  return errors;\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  resolverOptions = {},\n) => async (values, _context, options) => {\n  const result =\n    resolverOptions.mode === 'sync'\n      ? schema(values)\n      : await promisify(schema)(values);\n\n  return result.hasErrors()\n    ? {\n        values: {},\n        errors: toNestError(\n          parseErrorSchema(result.getErrors(), options.criteriaMode === 'all'),\n          options.fields,\n        ),\n      }\n    : { values, errors: {} };\n};\n"],"names":["parseErrorSchema","vestError","validateAllFieldCriteria","errors","path","message","type","types","reduce","acc","index","vestResolver","schema","_","resolverOptions","values","_context","options","result","hasErrors","toNestError","getErrors","criteriaMode","fields","mode","promisify"],"mappings":"gFAKA,IAAMA,EAAmB,SACvBC,EACAC,GAEA,IAAMC,EAAqC,GAC3C,IAAK,IAAMC,KAAQH,EACZE,EAAOC,KACVD,EAAOC,GAAQ,CAAEC,QAASJ,EAAUG,GAAM,GAAIE,KAAM,KAGlDJ,IACFC,EAAOC,GAAMG,MAAQN,EAAUG,GAAMI,OACnC,SAACC,EAAKJ,EAASK,UAAWD,EAAIC,GAASL,IAAYI,GACnD,KAIN,OAAON,GAGIQ,EAAyB,SACpCC,EACAC,EACAC,mBAAAA,IAAAA,EAAkB,aACRC,EAAQC,EAAUC,sBACtBC,GAKN,OAAOA,EAAOC,YACV,CACEJ,OAAQ,GACRZ,OAAQiB,EACNpB,EAAiBkB,EAAOG,YAAsC,QAAzBJ,EAAQK,cAC7CL,EAAQM,SAGZ,CAAER,OAAAA,EAAQZ,OAAQ,4BAZK,SAAzBW,EAAgBU,OACZZ,EAAOG,oBACDU,EAAUb,EAAVa,CAAkBV,aARM"}

package/vest/dist/vest.umd.js

@@ -1,2 +1,2 @@
-!function(e,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("react-hook-form"),require("vest/promisify")):"function"==typeof define&&define.amd?define(["exports","react-hook-form","vest/promisify"],r):r((e||self).hookformResolversVest={},e.reactHookForm,e.promisify)}(this,function(e,r,t){function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=o(t);function i(){return(i=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e}).apply(this,arguments)}e.vestResolver=function(e,t,o){var s=(void 0===o?{mode:"async"}:o).mode;return function(t,o,f){var u=f.criteriaMode;try{var a,c=function(){var e,o,n=a.getErrors();return a.hasErrors()?{values:{},errors:r.transformToNestObject((e=n,o="all"===u,Object.entries(e).reduce(function(e,r){var t,n=r[1];return i({},e,((t={})[r[0]]=i({type:"",message:n[0]},o?{types:n.reduce(function(e,r,t){var o;return i({},e,((o={})[t]=r,o))},{})}:{}),t))},{})))}:{values:t,errors:{}}},l=function(){if("async"===s){var r=n.default(e);return Promise.resolve(r(t)).then(function(e){a=e})}a=e(t)}();return Promise.resolve(l&&l.then?l.then(c):c())}catch(e){return Promise.reject(e)}}}});
+!function(e,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("@hookform/resolvers"),require("vest/promisify")):"function"==typeof define&&define.amd?define(["exports","@hookform/resolvers","vest/promisify"],r):r((e||self).hookformResolversVest={},e.hookformResolvers,e.promisify)}(this,function(e,r,o){function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=t(o),n=function(e,r){var o={};for(var t in e)o[t]||(o[t]={message:e[t][0],type:""}),r&&(o[t].types=e[t].reduce(function(e,r,o){return(e[o]=r)&&e},{}));return o};e.vestResolver=function(e,o,t){return void 0===t&&(t={}),function(o,i,f){try{var u=function(e){return e.hasErrors()?{values:{},errors:r.toNestError(n(e.getErrors(),"all"===f.criteriaMode),f.fields)}:{values:o,errors:{}}};return Promise.resolve("sync"===t.mode?u(e(o)):Promise.resolve(s.default(e)(o)).then(u))}catch(e){return Promise.reject(e)}}}});
 //# sourceMappingURL=vest.umd.js.map

package/vest/dist/vest.umd.js.map

@@ -1 +1 @@
-{"version":3,"file":"vest.umd.js","sources":["../src/vest.ts"],"sourcesContent":["import { transformToNestObject } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport { DraftResult, IVestResult } from 'vest/vestResult';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  return Object.entries(vestError).reduce((prev, [key, value]) => {\n    return {\n      ...prev,\n      [key]: {\n        type: '',\n        message: value[0],\n        ...(validateAllFieldCriteria\n          ? {\n              types: value.reduce((prev, message, index) => {\n                return {\n                  ...prev,\n                  [index]: message,\n                };\n              }, {}),\n            }\n          : {}),\n      },\n    };\n  }, {});\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  { mode } = { mode: 'async' },\n) => async (values, _context, { criteriaMode }) => {\n  let result: IVestResult | DraftResult;\n  if (mode === 'async') {\n    const validateSchema = promisify(schema);\n    result = await validateSchema(values);\n  } else {\n    result = schema(values);\n  }\n\n  const errors = result.getErrors();\n\n  if (!result.hasErrors()) {\n    return { values, errors: {} };\n  }\n\n  return {\n    values: {},\n    errors: transformToNestObject(\n      parseErrorSchema(errors, criteriaMode === 'all'),\n    ),\n  };\n};\n"],"names":["schema","_","mode","values","_context","criteriaMode","result","vestError","validateAllFieldCriteria","errors","getErrors","hasErrors","transformToNestObject","Object","entries","reduce","prev","value","type","message","types","index","validateSchema","promisify"],"mappings":"wpBA8BsC,SACpCA,EACAC,SACEC,cAAS,CAAEA,KAAM,YAAjBA,qBACQC,EAAQC,SAAYC,IAAAA,qBAC1BC,eAQJ,IArCAC,EACAC,EAoCMC,EAASH,EAAOI,mBAEjBJ,EAAOK,YAIL,CACLR,OAAQ,GACRM,OAAQG,yBA7CVL,EA8CqBE,EA7CrBD,EA6C8C,QAAjBH,EA3CtBQ,OAAOC,QAAQP,GAAWQ,OAAO,SAACC,WAAYC,OACnD,YACKD,mBAEDE,KAAM,GACNC,QAASF,EAAM,IACXT,EACA,CACEY,MAAOH,EAAMF,OAAO,SAACC,EAAMG,EAASE,SAClC,YACKL,UACFK,GAAQF,OAEV,KAEL,SAGP,OAmBM,CAAEhB,OAAAA,EAAQM,OAAQ,qBAVd,UAATP,GACF,IAAMoB,EAAiBC,UAAUvB,0BAClBsB,EAAenB,qBAA9BG,MAEAA,EAASN,EAAOG,sDAVkB"}
+{"version":3,"file":"vest.umd.js","sources":["../src/vest.ts"],"sourcesContent":["import { toNestError } from '@hookform/resolvers';\nimport { FieldError } from 'react-hook-form';\nimport promisify from 'vest/promisify';\nimport type { VestErrors, Resolver } from './types';\n\nconst parseErrorSchema = (\n  vestError: VestErrors,\n  validateAllFieldCriteria: boolean,\n) => {\n  const errors: Record<string, FieldError> = {};\n  for (const path in vestError) {\n    if (!errors[path]) {\n      errors[path] = { message: vestError[path][0], type: '' };\n    }\n\n    if (validateAllFieldCriteria) {\n      errors[path].types = vestError[path].reduce<Record<number, string>>(\n        (acc, message, index) => (acc[index] = message) && acc,\n        {},\n      );\n    }\n  }\n  return errors;\n};\n\nexport const vestResolver: Resolver = (\n  schema,\n  _,\n  resolverOptions = {},\n) => async (values, _context, options) => {\n  const result =\n    resolverOptions.mode === 'sync'\n      ? schema(values)\n      : await promisify(schema)(values);\n\n  return result.hasErrors()\n    ? {\n        values: {},\n        errors: toNestError(\n          parseErrorSchema(result.getErrors(), options.criteriaMode === 'all'),\n          options.fields,\n        ),\n      }\n    : { values, errors: {} };\n};\n"],"names":["parseErrorSchema","vestError","validateAllFieldCriteria","errors","path","message","type","types","reduce","acc","index","schema","_","resolverOptions","values","_context","options","result","hasErrors","toNestError","getErrors","criteriaMode","fields","mode","promisify"],"mappings":"scAKMA,EAAmB,SACvBC,EACAC,GAEA,IAAMC,EAAqC,GAC3C,IAAK,IAAMC,KAAQH,EACZE,EAAOC,KACVD,EAAOC,GAAQ,CAAEC,QAASJ,EAAUG,GAAM,GAAIE,KAAM,KAGlDJ,IACFC,EAAOC,GAAMG,MAAQN,EAAUG,GAAMI,OACnC,SAACC,EAAKJ,EAASK,UAAWD,EAAIC,GAASL,IAAYI,GACnD,KAIN,OAAON,kBAG6B,SACpCQ,EACAC,EACAC,mBAAAA,IAAAA,EAAkB,aACRC,EAAQC,EAAUC,sBACtBC,GAKN,OAAOA,EAAOC,YACV,CACEJ,OAAQ,GACRX,OAAQgB,cACNnB,EAAiBiB,EAAOG,YAAsC,QAAzBJ,EAAQK,cAC7CL,EAAQM,SAGZ,CAAER,OAAAA,EAAQX,OAAQ,4BAZK,SAAzBU,EAAgBU,OACZZ,EAAOG,oBACDU,UAAUb,EAAVa,CAAkBV,aARM"}

package/vest/package.json

@@ -11,6 +11,8 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "peerDependencies": {
-    "react-hook-form": ">=6.6.0"
+    "react-hook-form": ">=6.6.0",
+    "@hookform/resolvers": ">=2.0.0",
+    "vest": ">=3.0.0"
   }
 }

package/vest/src/__tests__/__fixtures__/data.ts

@@ -0,0 +1,67 @@
+import { Field, InternalFieldName } from 'react-hook-form';
+import * as vest from 'vest';
+
+export const validationSuite = vest.create('form', (data: any = {}) => {
+  vest.test('username', 'Username is required', () => {
+    vest.enforce(data.username).isNotEmpty();
+  });
+
+  vest.test('username', 'Must be longer than 3 chars', () => {
+    vest.enforce(data.username).longerThan(3);
+  });
+
+  vest.test('deepObject.data', 'deepObject.data is required', () => {
+    vest.enforce(data.deepObject.data).isNotEmpty();
+  });
+
+  vest.test('password', 'Password is required', () => {
+    vest.enforce(data.password).isNotEmpty();
+  });
+
+  vest.test('password', 'Password must be at least 5 chars', () => {
+    vest.enforce(data.password).longerThanOrEquals(5);
+  });
+
+  vest.test('password', 'Password must contain a digit', () => {
+    vest.enforce(data.password).matches(/[0-9]/);
+  });
+
+  vest.test('password', 'Password must contain a symbol', () => {
+    vest.enforce(data.password).matches(/[^A-Za-z0-9]/);
+  });
+});
+
+export const validData = {
+  username: 'asdda',
+  password: 'asddfg123!',
+  deepObject: {
+    data: 'test',
+  },
+};
+
+export const invalidData = {
+  username: '',
+  password: 'a',
+  deepObject: {
+    data: '',
+  },
+};
+
+export const fields: Record<InternalFieldName, Field['_f']> = {
+  username: {
+    ref: { name: 'username' },
+    name: 'username',
+  },
+  password: {
+    ref: { name: 'password' },
+    name: 'password',
+  },
+  email: {
+    ref: { name: 'email' },
+    name: 'email',
+  },
+  birthday: {
+    ref: { name: 'birthday' },
+    name: 'birthday',
+  },
+};

package/vest/src/__tests__/__snapshots__/vest.ts.snap

@@ -6,6 +6,7 @@ Object {
     "deepObject": Object {
       "data": Object {
         "message": "deepObject.data is required",
+        "ref": undefined,
         "type": "",
         "types": Object {
           "0": "deepObject.data is required",
@@ -14,6 +15,9 @@ Object {
     },
     "password": Object {
       "message": "Password must be at least 5 chars",
+      "ref": Object {
+        "name": "password",
+      },
       "type": "",
       "types": Object {
         "0": "Password must be at least 5 chars",
@@ -23,6 +27,9 @@ Object {
     },
     "username": Object {
       "message": "Username is required",
+      "ref": Object {
+        "name": "username",
+      },
       "type": "",
       "types": Object {
         "0": "Username is required",
@@ -40,6 +47,7 @@ Object {
     "deepObject": Object {
       "data": Object {
         "message": "deepObject.data is required",
+        "ref": undefined,
         "type": "",
         "types": Object {
           "0": "deepObject.data is required",
@@ -48,6 +56,9 @@ Object {
     },
     "password": Object {
       "message": "Password must be at least 5 chars",
+      "ref": Object {
+        "name": "password",
+      },
       "type": "",
       "types": Object {
         "0": "Password must be at least 5 chars",
@@ -57,6 +68,9 @@ Object {
     },
     "username": Object {
       "message": "Username is required",
+      "ref": Object {
+        "name": "username",
+      },
       "type": "",
       "types": Object {
         "0": "Username is required",
@@ -74,15 +88,22 @@ Object {
     "deepObject": Object {
       "data": Object {
         "message": "deepObject.data is required",
+        "ref": undefined,
         "type": "",
       },
     },
     "password": Object {
       "message": "Password must be at least 5 chars",
+      "ref": Object {
+        "name": "password",
+      },
       "type": "",
     },
     "username": Object {
       "message": "Username is required",
+      "ref": Object {
+        "name": "username",
+      },
       "type": "",
     },
   },
@@ -96,15 +117,22 @@ Object {
     "deepObject": Object {
       "data": Object {
         "message": "deepObject.data is required",
+        "ref": undefined,
         "type": "",
       },
     },
     "password": Object {
       "message": "Password must be at least 5 chars",
+      "ref": Object {
+        "name": "password",
+      },
       "type": "",
     },
     "username": Object {
       "message": "Username is required",
+      "ref": Object {
+        "name": "username",
+      },
       "type": "",
     },
   },