@coxy/react-validator 4.0.0 → 5.0.1

package/README.md

@@ -71,41 +71,17 @@ Create your own rules easily, or use the built-in ones:
 
 ```javascript
 const rules = {
-  email: [
-    { rule: value => value.trim() !== '', message: 'Value is required' },
-    { rule: value => value.includes('@'), message: '@ is required' },
-  ],
-  password: [
-    { rule: value => value.length >= 6, message: 'Password must be at least 6 characters' },
-  ],
-  notEmpty: [
-    { rule: value => !!value && value.trim() !== '', message: 'Field cannot be empty' },
-  ],
-  boolean: [
-    { rule: value => typeof value === 'boolean', message: 'Must be a boolean value' },
-  ],
-  min: (min) => ([
-    { rule: value => Number(value) >= min, message: `Must be at least ${min}` },
-  ]),
-  max: (max) => ([
-    { rule: value => Number(value) <= max, message: `Must be at most ${max}` },
-  ]),
-  length: (min, max) => ([
-    { rule: value => value.length >= min, message: `Must be at least ${min} characters` },
-    ...(max ? [{ rule: value => value.length <= max, message: `Must be at most ${max} characters` }] : [])
-  ]),
-};
+  notEmpty: [z.string().min(1, { error: 'Field is required' })],
+  isTrue: [z.boolean({ error: 'Value is required' }).and(z.literal(true))],
+  email: [z.string().min(1, { error: 'Email is required' }), z.email({ message: 'Email is invalid' })],
+}
 ```
 
-| Name        | Type     | Description                                               |
-|-------------|----------|-----------------------------------------------------------|
-| email       | Array    | Validate non-empty email with regex check.                |
-| password    | Array    | Validate non-empty password with min length.              |
-| notEmpty    | Array    | Check if a string is not empty.                           |
-| boolean     | Array    | Ensure a boolean value is present.                        |
-| min(n)      | Function | Validate number is >= `n`.                                |
-| max(n)      | Function | Validate number is <= `n`.                                |
-| length(a,b) | Function | Validate string length is between `a` and `b` (optional). |
+| Name     | Type  | Description                                |
+|----------|-------|--------------------------------------------|
+| email    | Array | Validate non-empty email with regex check. |
+| notEmpty | Array | Check if a string is not empty.            |
+| isTrue   | Array | Ensure a boolean value is present.         |
 
 ---
 
@@ -160,7 +136,7 @@ Use it server-side or in custom flows.
 const validator = new Validator({ stopAtFirstError: true });
 
 const field = validator.addField({
-  rules: rules.password,
+  rules: rules.email,
   value: '12345',
 });
 ```
@@ -200,8 +176,8 @@ validator.addField({
 
 validator.addField({
   id: 'password',
-  rules: rules.password,
-  value: '1234567',
+  rules: rules.isTrue,
+  value: true,
 });
 
 const result = validator.validate();

package/dist/index.js

@@ -1,2 +1,206 @@
-'use strict';var react=require('react'),jsxRuntime=require('react/jsx-runtime');var h=/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,x={notEmpty:[{rule:r=>r!==""&&r.length>0,message:"Value is required"}],bool:[{rule:r=>!!r,message:"Value is required"}],password:[{rule:r=>r.length>0,message:"Password field cannot be empty"},{rule:r=>r.length>5,message:"Password field can not be less than 6 characters"}],email:[{rule:r=>!!r&&r!==""&&r.length!==0,message:"Email is required"},{rule:r=>h.test(String(r).toLowerCase()),message:"Email is invalid"}],min:r=>[{rule:e=>Number.parseFloat(e)>r,message:`The value must be greater than ${r}`}],max:r=>[{rule:e=>Number.parseFloat(e)<r,message:`The value must be smaller ${r}`}],length:(r,e)=>[{rule:t=>String(t).length>=r,message:`No less than ${r} symbols`},{rule:t=>e!==void 0?String(t).length<=e:true,message:`No more than ${e} symbols`}]};var V=class{rules;required;value;id;constructor({rules:e,required:t,value:s,id:i}){this.rules=e,this.required=t,this.value=s,this.id=i;}validate(){let e=true,t="",{rules:s,value:i,required:d,id:u}=this,n=!i&&Number.parseFloat(i)!==0;if(!s.length||n&&d===false)return {isValid:e,message:t,id:u};for(let a of s)e&&(e=a.rule(i),e||(typeof a.message=="function"?t=a.message(i):t=a.message));return {isValid:e,message:t,id:u}}},c=class{fields;params;constructor(e){this.params=e||null,this.fields=[];}addField(e){let t=new V(e);return this.fields.push(t),t}removeField(e){let t=this.fields.indexOf(e);t>-1&&this.fields.splice(t,1);}getField(e){return this.fields.find(t=>t.id===e)||null}validate(){let e,s=this.fields.map(i=>this.params?.stopAtFirstError&&e&&e.isValid===false?null:(e=i.validate(),e)).filter(i=>i&&i.isValid===false);if(s.length){let{isValid:i,message:d}=s[0];return {isValid:i,message:d,errors:s}}return {isValid:true,message:""}}};function b(r,e){let t=new c;t.addField({value:r,rules:e});let{isValid:s,...i}=t.validate();return [s,i]}var v=react.createContext(null);var w=react.forwardRef(function(e,t){let{children:s,value:i}=e,{customErrors:d,registerField:u,unregisterField:n}=react.useContext(v),a=react.useRef(e);a.current=e;let g=react.useRef(d);g.current=d;let p=react.useRef(null);p.current||(p.current={get props(){return a.current},validate:()=>{let m=a.current,y=g.current.find(o=>o.id===m.id);return y||new V({rules:m.rules,required:m.required,value:m.value,id:m.id}).validate()}}),react.useEffect(()=>(u(p.current),()=>{n(p.current);}),[u,n]);let F=p.current.validate();return typeof s=="function"?s(F,i):s});var S=react.forwardRef(function({children:e,stopAtFirstError:t},s){let i=react.useRef([]),[d,u]=react.useState([]),n=react.useCallback(l=>{l&&!i.current.includes(l)&&i.current.push(l);},[]),a=react.useCallback(l=>{let o=i.current.indexOf(l);o>-1&&i.current.splice(o,1);},[]),g=react.useCallback(l=>i.current.find(o=>o?.props?.id===l)||null,[]),p=react.useCallback(l=>{u(o=>[...o,l]);},[]),F=react.useCallback(()=>{u([]);},[]),m=react.useCallback(()=>{let l=new c({stopAtFirstError:t});for(let o of i.current)l.addField(o.props);return l.validate()},[t]);react.useImperativeHandle(s,()=>({validate:m,getField:g,registerField:n,unregisterField:a,setCustomError:p,clearCustomErrors:F}),[m,g,n,a,p,F]);let y=react.useMemo(()=>({customErrors:d,registerField:n,unregisterField:a}),[d,n,a]);return jsxRuntime.jsx(v.Provider,{value:y,children:e})});exports.Validator=c;exports.ValidatorField=w;exports.ValidatorWrapper=S;exports.rules=x;exports.useValidator=b;//# sourceMappingURL=index.js.map
-//# sourceMappingURL=index.js.map
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var index_exports = {};
+__export(index_exports, {
+  Validator: () => Validator,
+  ValidatorField: () => ValidatorField,
+  ValidatorWrapper: () => ValidatorWrapper,
+  rules: () => rules,
+  useValidator: () => useValidator
+});
+module.exports = __toCommonJS(index_exports);
+
+// src/rules.ts
+var import_zod = require("zod");
+var rules = {
+  notEmpty: [import_zod.z.string().min(1, { error: "Field is required" })],
+  isTrue: [import_zod.z.boolean({ error: "Value is required" }).and(import_zod.z.literal(true))],
+  email: [import_zod.z.string().min(1, { error: "Email is required" }), import_zod.z.email({ message: "Email is invalid" })]
+};
+
+// src/validator.ts
+var Field = class {
+  rules;
+  required;
+  value;
+  id;
+  constructor({ rules: rules2, required, value, id }) {
+    this.rules = rules2;
+    this.required = required;
+    this.value = value;
+    this.id = id;
+  }
+  validate() {
+    let isValid = true;
+    let message = "";
+    const { value, required, id } = this;
+    let result = { success: true, data: value };
+    const isEmptyValue = !value && Number.parseFloat(value) !== 0;
+    const rules2 = Array.isArray(this.rules) ? this.rules : [this.rules];
+    if (!rules2.length || isEmptyValue && required === false) {
+      return {
+        isValid,
+        message,
+        id,
+        result: { success: true, data: value }
+      };
+    }
+    for (const ruleItem of rules2) {
+      if (isValid && ruleItem && "safeParse" in ruleItem) {
+        result = ruleItem.safeParse(value);
+        isValid = result.success;
+        if (!isValid && result.error) {
+          message = result.error.issues[0]?.message || "Validation error";
+        }
+      }
+    }
+    return { isValid, message, id, result };
+  }
+};
+var Validator = class {
+  fields;
+  params;
+  constructor(params) {
+    this.params = params || null;
+    this.fields = [];
+  }
+  addField(params) {
+    const field = new Field(params);
+    this.fields.push(field);
+    return field;
+  }
+  removeField(field) {
+    const index = this.fields.indexOf(field);
+    if (index > -1) this.fields.splice(index, 1);
+  }
+  getField(id) {
+    return this.fields.find((field) => field.id === id) || null;
+  }
+  validate() {
+    let prevResult;
+    const statuses = this.fields.map((field) => {
+      if (this.params?.stopAtFirstError && prevResult && prevResult.isValid === false) {
+        return null;
+      }
+      prevResult = field.validate();
+      return prevResult;
+    });
+    const results = statuses.filter((inst) => inst && inst.isValid === false);
+    if (results.length) {
+      return results[0];
+    }
+    return { isValid: true, message: "", result: results[0]?.result };
+  }
+};
+
+// src/use-validator.ts
+function useValidator(value, rules2) {
+  const validator = new Validator();
+  validator.addField({ value, rules: rules2 });
+  const { isValid, ...validateObject } = validator.validate();
+  return [isValid, validateObject];
+}
+
+// src/validator-field.tsx
+var import_react2 = require("react");
+
+// src/context.ts
+var import_react = require("react");
+var Context = (0, import_react.createContext)(null);
+
+// src/validator-field.tsx
+var ValidatorField = (0, import_react2.forwardRef)(function ValidatorField2(props, _ref) {
+  const { children, value } = props;
+  const { registerField, unregisterField } = (0, import_react2.useContext)(Context);
+  const propsRef = (0, import_react2.useRef)(props);
+  propsRef.current = props;
+  const handleRef = (0, import_react2.useRef)(null);
+  if (!handleRef.current) {
+    handleRef.current = {
+      get props() {
+        return propsRef.current;
+      },
+      validate: () => {
+        const curr = propsRef.current;
+        const field = new Field({
+          rules: curr.rules,
+          required: curr.required,
+          value: curr.value,
+          id: curr.id
+        });
+        return field.validate();
+      }
+    };
+  }
+  (0, import_react2.useEffect)(() => {
+    registerField(handleRef.current);
+    return () => {
+      unregisterField(handleRef.current);
+    };
+  }, [registerField, unregisterField]);
+  const validity = handleRef.current.validate();
+  return typeof children === "function" ? children(validity, value) : children;
+});
+
+// src/validator-wrapper.tsx
+var import_react3 = require("react");
+var import_jsx_runtime = require("react/jsx-runtime");
+var ValidatorWrapper = (0, import_react3.forwardRef)(function ValidatorWrapper2({ children, stopAtFirstError }, ref) {
+  const fieldsRef = (0, import_react3.useRef)([]);
+  const registerField = (0, import_react3.useCallback)((field) => {
+    if (field && !fieldsRef.current.includes(field)) {
+      fieldsRef.current.push(field);
+    }
+  }, []);
+  const unregisterField = (0, import_react3.useCallback)((field) => {
+    const index = fieldsRef.current.indexOf(field);
+    if (index > -1) fieldsRef.current.splice(index, 1);
+  }, []);
+  const getField = (0, import_react3.useCallback)((id) => {
+    return fieldsRef.current.find((field) => field?.props?.id === id) || null;
+  }, []);
+  const validate = (0, import_react3.useCallback)(() => {
+    const validator = new Validator({ stopAtFirstError });
+    for (const comp of fieldsRef.current) {
+      validator.addField(comp.props);
+    }
+    return validator.validate();
+  }, [stopAtFirstError]);
+  (0, import_react3.useImperativeHandle)(
+    ref,
+    () => ({
+      validate,
+      getField,
+      registerField,
+      unregisterField
+    }),
+    [validate, getField, registerField, unregisterField]
+  );
+  const contextValue = (0, import_react3.useMemo)(() => ({ registerField, unregisterField }), [registerField, unregisterField]);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Context.Provider, { value: contextValue, children });
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Validator,
+  ValidatorField,
+  ValidatorWrapper,
+  rules,
+  useValidator
+});

package/example/example.tsx

@@ -1,6 +1,7 @@
+// biome-ignore lint/correctness/noUnusedImports: <need>
 import React, { createRef, useState } from 'react'
 import ReactDOM from 'react-dom/client'
-import { rules, Validator, ValidatorField, ValidatorWrapper } from '../dist/index'
+import { rules, ValidatorField, ValidatorWrapper } from '../dist/index'
 
 function App() {
   const [email, setEmail] = useState('')
@@ -15,32 +16,6 @@ function App() {
     console.log('success')
   }
 
-  function handleValidateCustomFields() {
-    const validator = new Validator({ stopAtFirstError: true })
-    const fieldPassword = validator.addField({
-      rules: rules.password,
-      value: '',
-      id: 'for-remove',
-    })
-
-    const fieldSearchPassword = validator.getField('for-remove')
-    console.log(fieldPassword === fieldSearchPassword)
-
-    validator.removeField(fieldPassword)
-
-    validator.addField({
-      rules: rules.password,
-      value: 'testpassword',
-    })
-
-    const { isValid, message, errors } = validator.validate()
-    if (!isValid) {
-      console.log(isValid, message, errors)
-      return
-    }
-    console.log('success')
-  }
-
   return (
     <ValidatorWrapper ref={jsxValidator}>
       <ValidatorField rules={rules.email} value={email}>
@@ -55,9 +30,6 @@ function App() {
           </>
         )}
       </ValidatorField>
-      <button onClick={handleValidateCustomFields} type="button">
-        Validate custom fields
-      </button>
     </ValidatorWrapper>
   )
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coxy/react-validator",
-  "version": "4.0.0",
-  "description": "🚀 Simple validation form for React or NodeJS apps. useValidator are included ;)",
+  "version": "5.0.1",
+  "description": "🚀 Simple validation form for React or NodeJS apps with zod. useValidator are included ;)",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -22,8 +22,8 @@
   "author": "dsshard",
   "scripts": {
     "start": "tsup ./src/index.ts --watch",
-    "build": "tsup",
-    "lint": "biome lint --fix",
+    "build": "tsup ./src/index.ts",
+    "lint": "npx biome lint --fix",
     "example": "NODE_ENV=production npx esbuild example/example.tsx --bundle --outfile=example/dist/example.js --minify --format=esm --target=es2020",
     "coverage": "npx codecov",
     "coveralls": "npx coveralls .",
@@ -33,11 +33,10 @@
   "peerDependencies": {
     "react": ">=18.x.x"
   },
-  "dependencies": {},
+  "dependencies": {
+    "zod": "^3.25.0 || ^4.0.0"
+  },
   "devDependencies": {
-    "react": ">=18.x.x",
-    "react-dom": ">=18.x.x",
-    "@biomejs/biome": "2.2.2",
     "@testing-library/dom": "10.4.1",
     "@testing-library/react": "16.3.0",
     "@types/jest": "30.0.0",
@@ -46,10 +45,12 @@
     "@types/react-dom": "19.1.7",
     "jest": "30.0.5",
     "jest-environment-jsdom": "30.0.5",
-    "tsup": "8.5.0",
+    "react": ">=18.x.x",
+    "react-dom": ">=18.x.x",
     "react-test-renderer": "19.1.1",
     "ts-jest": "29.4.0",
     "ts-node": "10.9.2",
+    "tsup": "8.5.0",
     "typescript": "5.8.3"
   }
 }

package/src/context.ts

@@ -10,5 +10,4 @@ export interface RegisteredFieldHandle {
 export const Context = createContext<{
   registerField: (field: RegisteredFieldHandle) => void
   unregisterField: (field: RegisteredFieldHandle) => void
-  customErrors: Array<Validity>
 }>(null)

package/src/index.ts

@@ -1,6 +1,6 @@
 export { rules } from './rules'
 
-export type { ErrorMessage, FieldParams, ValidatorRule, Validity } from './types'
+export type { ErrorMessage, FieldParams, Validity } from './types'
 export { useValidator } from './use-validator'
 export { Validator } from './validator'
 export { ValidatorField } from './validator-field'

package/src/rules.test.ts

@@ -1,132 +1,37 @@
+import type { ZodSafeParseResult } from 'zod'
 import { rules } from './rules'
 
 it('check rule email', () => {
   expect(rules.email.length).toBe(2)
 
-  let result: boolean
+  let result: ZodSafeParseResult<string>
   // email.length > 0
-  result = rules.email[0].rule('test')
-  expect(result).toBe(true)
+  result = rules.email[0].safeParse('test')
+  expect(result.success).toBe(true)
 
   // email check regexp
-  result = rules.email[1].rule('test')
-  expect(result).toBe(false)
+  result = rules.email[1].safeParse('test')
+  expect(result.success).toBe(false)
 
   // email check regexp
-  result = rules.email[1].rule('test@gmail.com')
-  expect(result).toBe(true)
-})
-
-it('check rule password', () => {
-  expect(rules.password.length).toBe(2)
-
-  let result: boolean
-  // password.length > 0
-  result = rules.password[0].rule('test')
-  expect(result).toBe(true)
-
-  // password.length > 5
-  result = rules.password[1].rule('test')
-  expect(result).toBe(false)
+  result = rules.email[1].safeParse('test@gmail.com')
+  expect(result.success).toBe(true)
 })
 
 it('check rule bool', () => {
-  expect(rules.bool.length).toBe(1)
+  expect(rules.isTrue.length).toBe(1)
 
-  // @ts-expect-error
-  const result = rules.bool[0].rule(true)
-  expect(result).toBe(true)
+  const result = rules.isTrue[0].safeParse(true)
+  expect(result.success).toBe(true)
 })
 
 it('check rule notEmpty', () => {
   expect(rules.notEmpty.length).toBe(1)
 
-  let result: boolean
-  result = rules.notEmpty[0].rule('')
-  expect(result).toBe(false)
-
-  result = rules.notEmpty[0].rule('test')
-  expect(result).toBe(true)
-})
-
-it('check rule min', () => {
-  expect(rules.min(1).length).toBe(1)
-  expect(typeof rules.min).toBe('function')
-
-  let result: boolean
-  result = rules.min(10)[0].rule('')
-  expect(result).toBe(false)
-
-  result = rules.min(9)[0].rule('test-test-test')
-  expect(result).toBe(false)
-
-  result = rules.min(9)[0].rule('11')
-  expect(result).toBe(true)
-
-  // @ts-expect-error
-  result = rules.min(9)[0].rule(10)
-  expect(result).toBe(true)
-
-  result = rules.min(9)[0].rule('8')
-  expect(result).toBe(false)
-
-  // @ts-expect-error
-  result = rules.min(9)[0].rule(7)
-  expect(result).toBe(false)
-
-  result = rules.min(-1)[0].rule('')
-  expect(result).toBe(false)
-})
-
-it('check rule max', () => {
-  let result: boolean
-  result = rules.max(10)[0].rule('')
-  expect(result).toBe(false)
-
-  result = rules.max(9)[0].rule('test-test-test')
-  expect(result).toBe(false)
-
-  result = rules.max(9)[0].rule('11')
-  expect(result).toBe(false)
-
-  // @ts-expect-error
-  result = rules.max(9)[0].rule(10)
-  expect(result).toBe(false)
-
-  result = rules.max(9)[0].rule('5')
-  expect(result).toBe(true)
-
-  // @ts-expect-error
-  result = rules.max(9)[0].rule(5)
-  expect(result).toBe(true)
-
-  result = rules.max(-1)[0].rule('')
-  expect(result).toBe(false)
-})
-
-it('check rule length', () => {
-  let result: boolean
-  result = rules.length(1)[0].rule('')
-  expect(result).toBe(false)
-
-  result = rules.length(1)[0].rule('1')
-  expect(result).toBe(true)
-
-  result = rules.length(1, 10)[0].rule('test-test-test')
-  expect(result).toBe(true)
-
-  result = rules.length(1, 10)[1].rule('test-test-test')
-  expect(result).toBe(false)
-
-  result = rules.length(1, 10)[0].rule('lol')
-  expect(result).toBe(true)
-
-  result = rules.length(1, 10)[1].rule('lol')
-  expect(result).toBe(true)
-
-  result = rules.length(1)[1].rule('test undefined 2 param')
-  expect(result).toBe(true)
+  let result: ZodSafeParseResult<string>
+  result = rules.notEmpty[0].safeParse('')
+  expect(result.success).toBe(false)
 
-  result = rules.length(10)[0].rule('tes')
-  expect(result).toBe(false)
+  result = rules.notEmpty[0].safeParse('test')
+  expect(result.success).toBe(true)
 })

package/src/rules.ts

@@ -1,70 +1,9 @@
-import type { ValidatorRule } from './types'
+import { z } from 'zod'
 
-// eslint-disable-next-line
-const emailReg =
-  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-
-export type ValidatorRules = ValidatorRule[]
+export type ValidatorRules = z.ZodType[] | z.ZodType
 
 export const rules = {
-  notEmpty: [
-    {
-      rule: (value: string) => value !== '' && value.length > 0,
-      message: 'Value is required',
-    },
-  ],
-
-  bool: [
-    {
-      rule: (value: string) => !!value,
-      message: 'Value is required',
-    },
-  ],
-
-  password: [
-    {
-      rule: (value: string) => value.length > 0,
-      message: 'Password field cannot be empty',
-    },
-    {
-      rule: (value: string) => value.length > 5,
-      message: 'Password field can not be less than 6 characters',
-    },
-  ],
-
-  email: [
-    {
-      rule: (value: string) => !!value && value !== '' && value.length !== 0,
-      message: 'Email is required',
-    },
-    {
-      rule: (value: string) => emailReg.test(String(value).toLowerCase()),
-      message: 'Email is invalid',
-    },
-  ],
-
-  min: (min: number) => [
-    {
-      rule: (value: string) => Number.parseFloat(value) > min,
-      message: `The value must be greater than ${min}`,
-    },
-  ],
-
-  max: (max: number) => [
-    {
-      rule: (value: string) => Number.parseFloat(value) < max,
-      message: `The value must be smaller ${max}`,
-    },
-  ],
-
-  length: (min: number, max?: number) => [
-    {
-      rule: (value: string) => String(value).length >= min,
-      message: `No less than ${min} symbols`,
-    },
-    {
-      rule: (value: string) => (max !== undefined ? String(value).length <= max : true),
-      message: `No more than ${max} symbols`,
-    },
-  ],
+  notEmpty: [z.string().min(1, { error: 'Field is required' })],
+  isTrue: [z.boolean({ error: 'Value is required' }).and(z.literal(true))],
+  email: [z.string().min(1, { error: 'Email is required' }), z.email({ message: 'Email is invalid' })],
 }

package/src/types.ts

@@ -1,13 +1,7 @@
+import type { ZodSafeParseResult } from 'zod/index'
 import type { ValidatorRules } from './rules'
 import type { Value } from './validator-field'
 
-type Fn = (value: Value) => string
-
-export interface ValidatorRule {
-  rule: (value: Value) => boolean
-  message: string | Fn
-}
-
 export interface ErrorMessage {
   message: string
   isValid: boolean
@@ -16,7 +10,7 @@ export interface ErrorMessage {
 export interface Validity {
   message: string
   isValid: boolean
-  errors?: ErrorMessage[]
+  result: ZodSafeParseResult<unknown>
   id?: string | number
 }
 

package/src/use-validator.test.tsx

@@ -24,14 +24,14 @@ jest.useFakeTimers()
 it('check state change and hide field', () => {
   function Comp() {
     const [value, setValue] = useState(false)
-    const [isValid, validateObject] = useValidator(value, rules.bool)
+    const [isValid, validateObject] = useValidator(value, rules.isTrue)
 
     useEffect(() => {
       setTimeout(() => {
         act(() => {
           setValue(true)
         })
-      }, 100)
+      }, 200)
     }, [])
 
     return (
@@ -46,7 +46,7 @@ it('check state change and hide field', () => {
   })
 
   expect(screen.getByTestId('test1').textContent).toContain('false')
-  expect(screen.getByTestId('test2').textContent).toContain('Value is required')
+  expect(screen.getByTestId('test2').textContent).toContain('Invalid input: expected true')
 
   jest.runAllTimers()