Improve ts validator

.eslintrc

@@ -196,6 +196,7 @@
         "@typescript-eslint/no-explicit-any": "error",
         // https://github.com/typescript-eslint/typescript-eslint/issues/2421- closed, but not resolved
         "@typescript-eslint/no-unnecessary-condition": "off",
+        "@typescript-eslint/consistent-type-imports": "error",
         "no-unused-vars": "off",
         "no-undef": "off"
       }

src/common.ts

@@ -34,6 +34,7 @@ import GridXhrModel from './grid/models/GridXhrModel';
 import PureGridComponent from './grid/PureGridComponent';
 import AbstractListModel from './list/AbstractListModel';
 import ListXhrModel from './list/ListXhrModel';
+import DeprecatedValidator from './validation/DeprecatedValidator';
 import booleanValidationRule from './validation/rules/boolean';
 import dateValidationRule from './validation/rules/date';
 import enumValidationRule from './validation/rules/enum';
@@ -44,16 +45,19 @@ import notNullValidationRule from './validation/rules/notNull';
 import regExpValidationRule from './validation/rules/regExp';
 import setValidationRule from './validation/rules/set';
 import ValidationErrors from './validation/ValidationErrors';
-import Validator from './validation/Validator';
+import ValidatorBuilder from './validation/ValidatorBuilder';
 
 const UIKernel = {
   applyGridFilters,
   Grid: Component,
   PureGrid: PureGridComponent,
   Form: FormService,
   connectForm,
-  createValidator: Validator.create,
-  Validator,
+  /**
+   * @deprecated use ValidatorBuilder instead
+   */
+  createValidator: DeprecatedValidator.create,
+  ValidatorBuilder,
   ValidationErrors,
   Models: {
     Grid: {
@@ -96,7 +100,7 @@ const UIKernel = {
     regExp: regExpValidationRule,
     notNull: notNullValidationRule,
     /**
-     * @deprecated use integer insted
+     * @deprecated use integer instead
      */
     number: integerValidationRule,
     integer: integerValidationRule,

src/common/EventsModel.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {EventListener, IObservable} from './types';
+import type {EventListener, IObservable} from './types';
 
 type Subscribers<TListenerArgsByEventName extends Record<string, unknown[]>> = {
   [K in keyof TListenerArgsByEventName & string]?: EventListener<TListenerArgsByEventName[K]>[];

src/common/assert.ts

@@ -1,4 +1,4 @@
-import {IsNever} from 'ts-essentials';
+import type {IsNever} from 'ts-essentials';
 import ArgumentsError from './error/ArgumentsError';
 
 type Assert = (value: unknown, message?: string) => asserts value;

src/common/asyncServerRouteHandler.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Request, RequestHandler, Response} from 'express';
+import type {Request, RequestHandler, Response} from 'express';
 
 function asyncServerRouteHandler(handler: (req: Request, res: Response) => Promise<void>): RequestHandler {
   return (req, res, next) => {

src/common/defaultXhr.ts

@@ -6,8 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {StrictOmit} from 'ts-essentials';
-import xhr, {XhrResponse, XhrUriConfig, XhrUrlConfig} from 'xhr';
+import type {StrictOmit} from 'ts-essentials';
+import type {XhrResponse, XhrUriConfig, XhrUrlConfig} from 'xhr';
+import xhr from 'xhr';
 import RequestError from './error/RequestError';
 import variables from './variables';
 

src/common/mock-utils/createMockInstance.ts

@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Newable} from 'ts-essentials';
+import type {Newable} from 'ts-essentials';
 import createMockedMethod from './createMockedMethod';
 
 function createMockInstance<TClass>(Schema: Newable<TClass>): jest.Mocked<TClass> {

src/common/utils.ts

@@ -8,7 +8,7 @@
 
 import omitBy from 'lodash/omitBy';
 import pick from 'lodash/pick';
-import EqualMap from './EqualMap';
+import type EqualMap from './EqualMap';
 
 /**
  * Check if two arrays intersection exists

src/common/variables.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {DefaultXhr} from './defaultXhr';
+import type {DefaultXhr} from './defaultXhr';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const collection: Record<string, unknown> = {};

src/editors/Number.tsx

@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import {StrictOmit} from 'ts-essentials';
+import type {StrictOmit} from 'ts-essentials';
 import {assertNonNullish} from '../common/assert';
 import {isEqual} from '../common/utils';
 import floatValidator from '../validation/rules/float';

src/editors/Select.tsx

@@ -8,7 +8,7 @@
 
 import omit from 'lodash/omit';
 import React from 'react';
-import {StrictOmit} from 'ts-essentials';
+import type {StrictOmit} from 'ts-essentials';
 import {isEqual} from '../common/utils';
 
 type AdvancedOptions<TValue> = [

src/editors/SuggestBox.tsx

@@ -11,12 +11,12 @@
 import omit from 'lodash/omit';
 import React from 'react';
 import {findDOMNode} from 'react-dom';
-import {StrictOmit} from 'ts-essentials';
+import type {StrictOmit} from 'ts-essentials';
 import {assertNonNullish} from '../common/assert';
 import ThrottleError from '../common/error/ThrottleError';
 import throttle from '../common/throttle';
 import {isEqual, parents} from '../common/utils';
-import {IListModel, ListModelReadResult} from '../list/types/IListModel';
+import type {IListModel, ListModelReadResult} from '../list/types/IListModel';
 import Portal from '../portal/Portal';
 
 const PRODUCT_ID = '__suggestBoxPopUp';

src/form/AbstractFormModel.ts

@@ -7,9 +7,9 @@
  */
 
 import EventsModel from '../common/EventsModel';
-import {IObservable, EventListener} from '../common/types';
+import type {IObservable, EventListener} from '../common/types';
 import ValidationErrors from '../validation/ValidationErrors';
-import {IFormModel} from './types/IFormModel';
+import type {IFormModel} from './types/IFormModel';
 
 abstract class AbstractFormModel<
   TRecord extends Record<string, unknown>,

src/form/FormExpressApi.ts

@@ -6,14 +6,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Request, RequestHandler, Response, Router} from 'express';
+import type {Request, RequestHandler, Response} from 'express';
+import {Router} from 'express';
 import multer from 'multer';
 import {assertNonNullish} from '../common/assert';
 import asyncServerRouteHandler from '../common/asyncServerRouteHandler';
 import parseJson from '../common/parseJson';
 import ValidationErrors from '../validation/ValidationErrors';
-import {IFormModel} from './types/IFormModel';
-import {JsonFormApiResult} from './types/JsonFormApiResult';
+import type {IFormModel} from './types/IFormModel';
+import type {JsonFormApiResult} from './types/JsonFormApiResult';
 
 const DEFAULT_MAX_FILE_SIZE = 104857600; // 100 MB
 

src/form/FormModel.ts

@@ -6,12 +6,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {IObservable} from '../common/types';
-import ValidationErrors from '../validation/ValidationErrors';
-import Validator from '../validation/Validator';
+import type {IObservable} from '../common/types';
+import type {IValidator} from '../validation/types/IValidator';
+import type ValidationErrors from '../validation/ValidationErrors';
+import ValidatorBuilder from '../validation/ValidatorBuilder';
 import AbstractFormModel from './AbstractFormModel';
-import {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
-import {IFormModel} from './types/IFormModel';
+import type {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
+import type {IFormModel} from './types/IFormModel';
 
 /**
  * Simple form model
@@ -22,12 +23,12 @@ class FormModel<TRecord extends Record<string, unknown>>
 {
   static create<TRecord extends Record<string, unknown>>(
     defaultValues?: Partial<TRecord>,
-    validator?: Validator<TRecord>
+    validator?: IValidator<TRecord>
   ): FormModel<TRecord> {
-    return new FormModel(validator ?? new Validator(), defaultValues ?? {});
+    return new FormModel(validator ?? ValidatorBuilder.createEmptyValidator(), defaultValues ?? {});
   }
 
-  constructor(private validator: Validator<TRecord>, private data: Partial<TRecord>) {
+  constructor(private validator: IValidator<TRecord>, private data: Partial<TRecord>) {
     super();
   }
 

src/form/FormService.ts

@@ -9,26 +9,28 @@
 import ThrottleError from '../common/error/ThrottleError';
 import EventEmitter from '../common/EventsModel';
 import throttle from '../common/throttle';
-import {EventListener, IObservable} from '../common/types';
+import type {EventListener, IObservable} from '../common/types';
 import {getRecordChanges, keys, parseValueFromEvent, isEmpty, isEqual, warn} from '../common/utils';
+import type {IValidator} from '../validation/types/IValidator';
 import ValidationErrors from '../validation/ValidationErrors';
-import Validator from '../validation/Validator';
-import {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
-import {IFormModel} from './types/IFormModel';
-import IFormService, {
+import ValidatorBuilder from '../validation/ValidatorBuilder';
+import type {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
+import type {IFormModel} from './types/IFormModel';
+import type {
   FormServiceEmptyState,
   FormServiceParams,
   FormServiceState,
   FormServiceStateFields,
   FormServiceListenerArgsByEventName
 } from './types/IFormService';
+import type IFormService from './types/IFormService';
 
 type InitalizedState<TRecord extends Record<string, unknown>> =
   | {
       data: Partial<TRecord>;
       initialized: true;
       model: IFormModel<TRecord> & IObservable<FormModelListenerArgsByEventName<TRecord>>;
-      warningsValidator: Validator<TRecord>;
+      warningsValidator: IValidator<TRecord>;
     }
   | {
       data: undefined;
@@ -74,7 +76,7 @@ class FormService<TRecord extends Record<string, unknown>, TAvailableField exten
     model,
     data,
     changes = {},
-    warningsValidator = new Validator(),
+    warningsValidator = ValidatorBuilder.createEmptyValidator(),
     partialErrorChecking = false,
     submitAll = false
   }: FormServiceParams<TRecord, TAvailableField, FormModelListenerArgsByEventName<TRecord>>): Promise<void> {

src/form/FormXhrModel.ts

@@ -8,15 +8,17 @@
 
 import url from 'url';
 import {assertNonNullish} from '../common/assert';
-import defaultXhr, {DefaultXhr} from '../common/defaultXhr';
+import type {DefaultXhr} from '../common/defaultXhr';
+import defaultXhr from '../common/defaultXhr';
 import EventsModel from '../common/EventsModel';
 import parseJson from '../common/parseJson';
-import {EventListener, IObservable} from '../common/types';
+import type {EventListener, IObservable} from '../common/types';
+import type {IValidator} from '../validation/types/IValidator';
 import ValidationErrors from '../validation/ValidationErrors';
-import Validator from '../validation/Validator';
-import {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
-import {IFormModel} from './types/IFormModel';
-import {JsonFormApiResult} from './types/JsonFormApiResult';
+import ValidatorBuilder from '../validation/ValidatorBuilder';
+import type {FormModelListenerArgsByEventName} from './types/FormModelListenerArgsByEventName';
+import type {IFormModel} from './types/IFormModel';
+import type {JsonFormApiResult} from './types/JsonFormApiResult';
 
 const MAX_URI_LENGTH = 2048;
 
@@ -25,23 +27,23 @@ type FormXhrModelParams<TRecord extends Record<string, unknown>> = {
   eventsModel?: EventsModel<FormModelListenerArgsByEventName<TRecord>>;
   multipartFormData?: boolean;
   validateOnClient?: boolean;
-  validator?: Validator<TRecord>;
+  validator?: IValidator<TRecord>;
   xhr?: DefaultXhr;
 };
 
 class FormXhrModel<TRecord extends Record<string, unknown>>
   implements IFormModel<TRecord>, IObservable<FormModelListenerArgsByEventName<TRecord>>
 {
   private multipartFormDataEncoded: boolean;
-  private validator: Validator<TRecord>;
+  private validator: IValidator<TRecord>;
   private validateOnClient: boolean;
   private xhr: DefaultXhr;
   private apiURL: string;
   private eventsModel: EventsModel<FormModelListenerArgsByEventName<TRecord>>;
 
   constructor(settings: FormXhrModelParams<TRecord>) {
     this.multipartFormDataEncoded = settings.multipartFormData ?? false;
-    this.validator = settings.validator ?? new Validator();
+    this.validator = settings.validator ?? ValidatorBuilder.createEmptyValidator();
     this.validateOnClient = settings.validateOnClient ?? false;
     this.xhr = settings.xhr ?? defaultXhr;
     this.eventsModel = settings.eventsModel ?? new EventsModel();

src/form/adapters/GridToFormCreate.ts

@@ -7,10 +7,10 @@
  */
 
 import pick from 'lodash/pick';
-import {IObservable} from '../../common/types';
-import {IGridModel} from '../../grid/models/types/IGridModel';
-import ValidationErrors from '../../validation/ValidationErrors';
-import {IFormModel} from '../types/IFormModel';
+import type {IObservable} from '../../common/types';
+import type {IGridModel} from '../../grid/models/types/IGridModel';
+import type ValidationErrors from '../../validation/ValidationErrors';
+import type {IFormModel} from '../types/IFormModel';
 
 /**
  * Adapter allows to use Grid model as a model for new form record creation

src/form/adapters/GridToFormUpdate.ts

@@ -7,13 +7,13 @@
  */
 
 import {assertNonNullish} from '../../common/assert';
-import {EventListener, IObservable} from '../../common/types';
+import type {EventListener, IObservable} from '../../common/types';
 import {isEqual} from '../../common/utils';
-import {GridModelListenerArgsByEventName} from '../../grid/models/types/GridModelListenerArgsByEventName';
-import {IGridModel} from '../../grid/models/types/IGridModel';
+import type {GridModelListenerArgsByEventName} from '../../grid/models/types/GridModelListenerArgsByEventName';
+import type {IGridModel} from '../../grid/models/types/IGridModel';
 import ValidationErrors from '../../validation/ValidationErrors';
-import {FormModelListenerArgsByEventName} from '../types/FormModelListenerArgsByEventName';
-import {IFormModel} from '../types/IFormModel';
+import type {FormModelListenerArgsByEventName} from '../types/FormModelListenerArgsByEventName';
+import type {IFormModel} from '../types/IFormModel';
 
 /**
  * Adapter that allows us to use Grid model record as a form model

src/form/mixin.js

@@ -15,7 +15,7 @@ import throttle from '../common/throttle';
 import toPromise from '../common/toPromise';
 import {parseValueFromEvent, getRecordChanges, forEach, isEmpty, isEqual} from '../common/utils';
 import ValidationErrors from '../validation/ValidationErrors';
-import Validator from '../validation/Validator';
+import ValidatorBuilder from '../validation/ValidatorBuilder';
 
 /**
  * Grid form mixin
@@ -546,7 +546,7 @@ const FormMixin = {
       pendingClearErrors: [],
       submitting: false,
       showDependentFields: settings.showDependentFields || false,
-      warningsValidator: settings.warningsValidator || new Validator(),
+      warningsValidator: settings.warningsValidator || ValidatorBuilder.createEmptyValidator(),
 
       partialErrorChecking: settings.partialErrorChecking, // Current mode
       partialErrorCheckingDefault: settings.partialErrorChecking, // Default mode

src/form/types/IFormModel.ts

@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ValidationErrors from '../../validation/ValidationErrors';
+import type ValidationErrors from '../../validation/ValidationErrors';
 
 export interface IFormModel<TRecord extends Record<string, unknown>> {
   /**