@coxy/react-validator 2.0.7 → 3.0.0

package/src/validator-wrapper.tsx

@@ -1,13 +1,13 @@
-import { Component, ReactNode, RefObject } from 'react'
+import { Component, type ReactNode, type RefObject } from 'react'
 
-import { Validity } from './types'
 import { Context } from './context'
-import { Field, Validator } from './validator'
+import type { Validity } from './types'
+import { type Field, Validator } from './validator'
 
 interface ComponentProps {
   children?: ReactNode
   stopAtFirstError?: boolean
-  ref?: RefObject<any>
+  ref?: RefObject<ValidatorWrapper>
 }
 
 export class ValidatorWrapper extends Component<ComponentProps> {
@@ -16,8 +16,8 @@ export class ValidatorWrapper extends Component<ComponentProps> {
     customErrors: [],
   }
 
-  constructor(props, ctx) {
-    super(props, ctx)
+  constructor(props) {
+    super(props)
     this.registerField = this.registerField.bind(this)
     this.unregisterField = this.unregisterField.bind(this)
   }
@@ -53,13 +53,13 @@ export class ValidatorWrapper extends Component<ComponentProps> {
 
   validate(): Validity {
     const validator = new Validator({ stopAtFirstError: this.props.stopAtFirstError })
-    this.fields.forEach((comp) => {
+    for (const comp of this.fields) {
       validator.addField(comp.props)
-    })
+    }
     return validator.validate()
   }
 
-  render() {
+  render(): ReactNode {
     return (
       <Context.Provider
         value={{

package/src/validator.ts

@@ -1,6 +1,6 @@
-import { Value } from './validator-field'
-import { ValidatorRules } from './rules'
-import { FieldParams, Validity } from './types'
+import type { ValidatorRules } from './rules'
+import type { FieldParams, Validity } from './types'
+import type { Value } from './validator-field'
 
 export class Field {
   private rules: ValidatorRules
@@ -20,12 +20,12 @@ export class Field {
     let message = ''
     const { rules, value, required, id } = this
 
-    const isEmptyValue = !value && parseFloat(value) !== 0
+    const isEmptyValue = !value && Number.parseFloat(value) !== 0
 
     if (!rules.length || (isEmptyValue && required === false)) {
       return { isValid, message, id }
     }
-    rules.forEach((instance) => {
+    for (const instance of rules) {
       if (isValid) {
         isValid = instance.rule(value)
         if (!isValid) {
@@ -36,7 +36,7 @@ export class Field {
           }
         }
       }
-    })
+    }
     return { isValid, message, id }
   }
 }
@@ -70,7 +70,7 @@ export class Validator {
   }
 
   validate(): Validity {
-    let prevResult
+    let prevResult: Validity | null
     const statuses = this.fields.map((field) => {
       if (this.params?.stopAtFirstError && prevResult && prevResult.isValid === false) {
         return null

package/tsconfig.json

@@ -6,21 +6,17 @@
     "removeComments": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es2017",
+    "target": "ESNext",
     "sourceMap": false,
-    "composite": true,
-    "incremental": true,
+    "composite": false,
+    "incremental": false,
     "noUnusedLocals": true,
     "noUnusedParameters": false,
     "resolveJsonModule": true,
     "outDir": "./dist",
     "rootDir": "src",
     "baseUrl": "./src",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -28,12 +24,6 @@
     "moduleResolution": "node",
     "jsx": "react-jsx"
   },
-  "include": [
-    "src",
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
+  "include": ["src", "src/**/*"],
+  "exclude": ["node_modules", "dist"]
 }

package/tsup.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  entry: ['src/index.ts'],
+  format: ['cjs', 'esm'],
+  target: 'esnext',
+  clean: true,
+  dts: true,
+  treeshake: true,
+  splitting: false,
+  minify: true,
+  sourcemap: true,
+  external: ['react'],
+})

package/.eslintignore

@@ -1,2 +0,0 @@
-dist
-node_modules

package/.eslintrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  extends: ['@coxy/eslint-config/react', 'plugin:prettier/recommended'],
-}

package/.prettierrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  singleQuote: true,
-  trailingComma: 'all',
-  arrowParens: 'always',
-  semi: false,
-  bracketSpacing: true,
-  tabWidth: 2,
-  printWidth: 120,
-  jsxSingleQuote: true,
-}

package/CHANGELOG.md

@@ -1,49 +0,0 @@
-2.0.1 / 2022-06-12
-==================
-* Typescript version
-* Update dependencies
-
-
-1.3.0 / 2020-11-10
-==================
-  * Update dependencies
-  * "message" can be a function
-
-  
-1.2.6 / 2020-08-23
-==================
-  * Update dependencies
-  
-1.2.5 / 2020-08-23
-==================
-  * Fix email validation
-  * Add test for sort rules
-
-1.2.4 / 2020-08-13
-==================
-  * Fix rules order validation
-  
-1.2.3 / 2020-08-13
-==================
-  * Update dependencies
-  * Fix rules order validation
-  
-1.2.1 / 2020-08-3
-==================
-  * Fix Readme
-  * Update eslint
-  * Small fixes
-  
-1.2.0 / 2020-07-28
-==================
-  * Add new inline Validator API
-  * Add more tests
-  * Add examples
-  
-1.1.7 / 2020-07-28
-==================
-  * Update tests
-  
-1.1.6 / 2020-07-24
-==================
-  * Update readme. Add more examples

package/dist/context.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="react" />
-import { Validity } from './types';
-export declare const Context: import("react").Context<{
-    registerField: (field: string | number) => void;
-    unregisterField: (field: string | number) => void;
-    customErrors: Array<Validity>;
-}>;

package/dist/context.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Context = void 0;
-const react_1 = require("react");
-exports.Context = (0, react_1.createContext)(null);

package/dist/rules.d.ts

@@ -1,32 +0,0 @@
-import { ValidatorRule } from './types';
-export declare type ValidatorRules = ValidatorRule[];
-export declare const rules: {
-    notEmpty: {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    bool: {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    password: {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    email: {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    min: (min: any) => {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    max: (max: any) => {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-    length: (min: any, max?: any) => {
-        rule: (value: any) => boolean;
-        message: string;
-    }[];
-};

package/dist/rules.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rules = void 0;
-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,}))$/;
-exports.rules = {
-    notEmpty: [
-        {
-            rule: (value) => value !== '' && value.length > 0,
-            message: 'Value is required',
-        },
-    ],
-    bool: [
-        {
-            rule: (value) => !!value,
-            message: 'Value is required',
-        },
-    ],
-    password: [
-        {
-            rule: (value) => value.length > 0,
-            message: 'Password field cannot be empty',
-        },
-        {
-            rule: (value) => value.length > 5,
-            message: 'Password field can not be less than 6 characters',
-        },
-    ],
-    email: [
-        {
-            rule: (value) => !!value && value !== '' && value.length !== 0,
-            message: 'Email is required',
-        },
-        {
-            rule: (value) => emailReg.test(String(value).toLowerCase()),
-            message: 'Email is invalid',
-        },
-    ],
-    min: (min) => [
-        {
-            rule: (value) => parseFloat(value) > min,
-            message: `The value must be greater than ${min}`,
-        },
-    ],
-    max: (max) => [
-        {
-            rule: (value) => parseFloat(value) < max,
-            message: `The value must be smaller ${max}`,
-        },
-    ],
-    length: (min, max) => [
-        {
-            rule: (value) => String(value).length >= min,
-            message: `No less than ${min} symbols`,
-        },
-        {
-            rule: (value) => (max !== undefined ? String(value).length <= max : true),
-            message: `No more than ${max} symbols`,
-        },
-    ],
-};

package/dist/types.d.ts

@@ -1,24 +0,0 @@
-import { ValidatorRules } from './rules';
-import { Value } from './validator-field';
-declare type Fn = (value: Value) => string;
-export interface ValidatorRule {
-    rule: (value: Value) => boolean;
-    message: string | Fn;
-}
-export interface ErrorMessage {
-    message: string;
-    isValid: boolean;
-}
-export interface Validity {
-    message: string;
-    isValid: boolean;
-    errors?: ErrorMessage[];
-    id?: string | number;
-}
-export interface FieldParams {
-    value: Value;
-    rules: ValidatorRules;
-    required?: boolean;
-    id?: string | number;
-}
-export {};

package/dist/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/use-validator.d.ts

@@ -1,4 +0,0 @@
-import { ValidatorRules } from './rules';
-import { Value } from './validator-field';
-import { Validity } from './types';
-export declare function useValidator(value: Value, rules: ValidatorRules): [boolean, Pick<Validity, 'message' | 'errors'>];

package/dist/use-validator.js

@@ -1,22 +0,0 @@
-"use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useValidator = void 0;
-const validator_1 = require("./validator");
-function useValidator(value, rules) {
-    const validator = new validator_1.Validator();
-    validator.addField({ value, rules });
-    const _a = validator.validate(), { isValid } = _a, validateObject = __rest(_a, ["isValid"]);
-    return [isValid, validateObject];
-}
-exports.useValidator = useValidator;

package/dist/validator-field.d.ts

@@ -1,17 +0,0 @@
-import { ReactNode } from 'react';
-import { Validity } from 'types';
-import { ValidatorRules } from './rules';
-export declare type Value = any;
-declare type Fn = (validity: Validity, value: Value) => ReactNode;
-interface Props {
-    rules?: ValidatorRules;
-    required?: boolean;
-    value?: Value;
-    id?: string | number;
-    children?: ReactNode | Fn;
-    unregisterField: (val: any) => void;
-    registerField: (val: any) => void;
-    customErrors: Array<Validity>;
-}
-export declare function ValidatorField(props: Omit<Props, 'registerField' | 'unregisterField' | 'customErrors'>): JSX.Element;
-export {};

package/dist/validator-field.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidatorField = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const context_1 = require("./context");
-const validator_1 = require("./validator");
-class ValidationFieldWrapper extends react_1.Component {
-    componentWillUnmount() {
-        this.props.unregisterField(this);
-    }
-    componentDidMount() {
-        this.props.registerField(this);
-    }
-    validate() {
-        const props = this.props;
-        const customError = (props.customErrors || []).find((item) => item.id === props.id);
-        if (customError) {
-            return customError;
-        }
-        const field = new validator_1.Field({
-            rules: props.rules,
-            required: props.required,
-            value: props.value,
-            id: props.id,
-        });
-        return field.validate();
-    }
-    render() {
-        const { children, value } = this.props;
-        const validity = this.validate();
-        return typeof children === 'function' ? children(validity, value) : children;
-    }
-}
-function ValidatorField(props) {
-    return ((0, jsx_runtime_1.jsx)(context_1.Context.Consumer, { children: (data) => ((0, jsx_runtime_1.jsx)(ValidationFieldWrapper, Object.assign({}, props, { customErrors: data === null || data === void 0 ? void 0 : data.customErrors, registerField: data === null || data === void 0 ? void 0 : data.registerField, unregisterField: data === null || data === void 0 ? void 0 : data.unregisterField }))) }));
-}
-exports.ValidatorField = ValidatorField;

package/dist/validator-wrapper.d.ts

@@ -1,24 +0,0 @@
-import { Component, ReactNode, RefObject } from 'react';
-import { Validity } from './types';
-import { Field } from './validator';
-interface ComponentProps {
-    children?: ReactNode;
-    stopAtFirstError?: boolean;
-    ref?: RefObject<any>;
-}
-export declare class ValidatorWrapper extends Component<ComponentProps> {
-    fields: any[];
-    state: {
-        customErrors: any[];
-    };
-    constructor(props: any, ctx: any);
-    componentWillUnmount(): void;
-    registerField(field: any): void;
-    unregisterField(field: any): void;
-    getField(id: any): Field | null;
-    setCustomError(customError: Validity): void;
-    clearCustomErrors(): void;
-    validate(): Validity;
-    render(): JSX.Element;
-}
-export {};

package/dist/validator-wrapper.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidatorWrapper = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const context_1 = require("./context");
-const validator_1 = require("./validator");
-class ValidatorWrapper extends react_1.Component {
-    constructor(props, ctx) {
-        super(props, ctx);
-        this.fields = [];
-        this.state = {
-            customErrors: [],
-        };
-        this.registerField = this.registerField.bind(this);
-        this.unregisterField = this.unregisterField.bind(this);
-    }
-    componentWillUnmount() {
-        this.fields = [];
-    }
-    registerField(field) {
-        if (field && !this.fields.includes(field)) {
-            this.fields.push(field);
-        }
-    }
-    unregisterField(field) {
-        const index = this.fields.indexOf(field);
-        if (index > -1)
-            this.fields.splice(index, 1);
-    }
-    getField(id) {
-        return this.fields.find((field) => field.props.id === id) || null;
-    }
-    setCustomError(customError) {
-        this.setState({
-            customErrors: [...this.state.customErrors, customError],
-        });
-    }
-    clearCustomErrors() {
-        this.setState({ customErrors: [] });
-    }
-    validate() {
-        const validator = new validator_1.Validator({ stopAtFirstError: this.props.stopAtFirstError });
-        this.fields.forEach((comp) => {
-            validator.addField(comp.props);
-        });
-        return validator.validate();
-    }
-    render() {
-        return ((0, jsx_runtime_1.jsx)(context_1.Context.Provider, Object.assign({ value: {
-                customErrors: this.state.customErrors,
-                registerField: this.registerField,
-                unregisterField: this.unregisterField,
-            } }, { children: this.props.children })));
-    }
-}
-exports.ValidatorWrapper = ValidatorWrapper;

package/dist/validator.d.ts

@@ -1,21 +0,0 @@
-import { FieldParams, Validity } from './types';
-export declare class Field {
-    private rules;
-    private required;
-    private value;
-    id: string | number;
-    constructor({ rules, required, value, id }: FieldParams);
-    validate(): Validity;
-}
-export interface ValidatorParams {
-    stopAtFirstError: boolean;
-}
-export declare class Validator {
-    private fields;
-    private params;
-    constructor(params?: ValidatorParams);
-    addField(params: FieldParams): Field;
-    removeField(field: Field): void;
-    getField(id: Field['id']): Field;
-    validate(): Validity;
-}

package/dist/validator.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validator = exports.Field = void 0;
-class Field {
-    constructor({ rules, required, value, id }) {
-        this.rules = rules;
-        this.required = required;
-        this.value = value;
-        this.id = id;
-    }
-    validate() {
-        let isValid = true;
-        let message = '';
-        const { rules, value, required, id } = this;
-        const isEmptyValue = !value && parseFloat(value) !== 0;
-        if (!rules.length || (isEmptyValue && required === false)) {
-            return { isValid, message, id };
-        }
-        rules.forEach((instance) => {
-            if (isValid) {
-                isValid = instance.rule(value);
-                if (!isValid) {
-                    if (typeof instance.message === 'function') {
-                        message = instance.message(value);
-                    }
-                    else {
-                        message = instance.message;
-                    }
-                }
-            }
-        });
-        return { isValid, message, id };
-    }
-}
-exports.Field = Field;
-class Validator {
-    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) => {
-            var _a;
-            if (((_a = this.params) === null || _a === void 0 ? void 0 : _a.stopAtFirstError) && prevResult && prevResult.isValid === false) {
-                return null;
-            }
-            prevResult = field.validate();
-            return prevResult;
-        });
-        const errors = statuses.filter((inst) => inst && inst.isValid === false);
-        if (errors.length) {
-            const { isValid, message } = errors[0];
-            return { isValid, message, errors };
-        }
-        return { isValid: true, message: '' };
-    }
-}
-exports.Validator = Validator;

package/tsconfig.build.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "src/**/*.test.tsx",
-    "src/**/*.test.ts"
-  ]
-}