refactor: refacotr validationAsyncData

Author: foxhound87

src/Field.ts

@@ -166,7 +166,7 @@ export default class Field extends Base implements FieldInterface {
 
   validationErrorStack: string[] = [];
   validationFunctionsData: any[] = [];
-  validationAsyncData: any;
+  validationAsyncData = { valid: true, message: null };
   debouncedValidation: any;
 
   disposeValidationOnBlur: any;
@@ -288,8 +288,7 @@ export default class Field extends Base implements FieldInterface {
 
   get checkValidationErrors(): boolean {
     return (
-      ((this.validationAsyncData as any)?.valid === false &&
-        !_.isEmpty(this.validationAsyncData)) ||
+      !this.validationAsyncData.valid ||
         !_.isEmpty(this.validationErrorStack) ||
         _.isString(this.errorAsync) ||
         _.isString(this.errorSync)
@@ -743,15 +742,15 @@ export default class Field extends Base implements FieldInterface {
     this.showErrors(true, deep);
   }
 
-  setValidationAsyncData(valid: boolean = false, message: string = ""): void {
+  setValidationAsyncData(valid: boolean = false, message: string|null = null): void {
     this.validationAsyncData = { valid, message };
   }
 
   resetValidation(deep: boolean = false): void {
     this.showError = false;
     this.errorSync = null;
     this.errorAsync = null;
-    this.validationAsyncData = undefined;
+    this.validationAsyncData = { valid: true, message: null };
     this.validationFunctionsData = [];
     this.validationErrorStack = [];
     Promise.resolve().then(action(() => {
@@ -825,7 +824,7 @@ export default class Field extends Base implements FieldInterface {
   showErrors(show: boolean = true, deep: boolean = true): void {
     this.showError = show;
     this.errorSync = _.head(this.validationErrorStack) as string || null;
-    this.errorAsync = (this.validationAsyncData?.valid === false) ? this.validationAsyncData?.message as string : null
+    this.errorAsync = !this.validationAsyncData.valid ? this.validationAsyncData.message : null
     deep && this.each((field: FieldInterface) => field.showErrors(show, deep));
   }
 

src/models/FieldInterface.ts

@@ -16,7 +16,7 @@ export interface FieldInterface extends BaseInterface {
   errorAsync: string | null;
   validationErrorStack: string[];
   validationFunctionsData: any[];
-  validationAsyncData: { valid?: boolean, message?: string | null;};
+  validationAsyncData: { valid: boolean, message: string | null };
   debouncedValidation: any;
   autoFocus: boolean;
   inputMode: string;
@@ -70,7 +70,7 @@ export interface FieldInterface extends BaseInterface {
   // checkValidationPlugins(): void;
   initNestedFields(field: any, update: boolean): void;
   invalidate(message?: string, deep?: boolean, async?: boolean): void;
-  setValidationAsyncData(valid?: boolean, message?: string): void;
+  setValidationAsyncData(valid: boolean, message?: string|null): void;
   resetValidation(deep: boolean): void;
   clear(deep?: boolean): void;
   reset(deep?: boolean): void;

src/validators/DVR.ts

@@ -1,12 +1,13 @@
 import _ from "lodash";
 import FieldInterface from "src/models/FieldInterface";
 import FormInterface from "src/models/FormInterface";
+import StateInterface from "src/models/StateInterface";
 import { ValidationPlugin, ValidationPluginConfig, ValidationPluginConstructor, ValidationPluginInterface } from "src/models/ValidatorInterface";
 
 export class DVR<TValidator = any> implements ValidationPluginInterface<TValidator> {
   promises: Promise<any>[];
   config: any;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: TValidator;
   schema?: any;

src/validators/JOI.ts

@@ -1,6 +1,7 @@
 import _ from "lodash";
 import FieldInterface from "src/models/FieldInterface";
 import FormInterface from "src/models/FormInterface";
+import StateInterface from "src/models/StateInterface";
 import {
   ValidationPlugin,
   ValidationPluginConfig,
@@ -11,7 +12,7 @@ import {
 class JOI<TValidator = any> implements ValidationPluginInterface<TValidator> {
   promises: Promise<any>[];
   config: ValidationPluginConfig<TValidator>;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: TValidator;
   schema: any;

src/validators/SVK.ts

@@ -1,6 +1,7 @@
 import _ from "lodash";
 import FieldInterface from "src/models/FieldInterface";
 import FormInterface from "src/models/FormInterface";
+import StateInterface from "src/models/StateInterface";
 import {
   ValidationPlugin,
   ValidationPluginConfig,
@@ -19,7 +20,7 @@ function isPromise(obj: any): obj is Promise<any> {
 class SVK<TValidator = any> implements ValidationPluginInterface<TValidator> {
   promises: Promise<any>[];
   config: ValidationPluginConfig<TValidator>;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: any;
   schema: any;
@@ -104,9 +105,8 @@ class SVK<TValidator = any> implements ValidationPluginInterface<TValidator> {
   }
 
   executeAsyncValidation(field: FieldInterface): void {
-    const asyncData = field.validationAsyncData;
-    if (asyncData.valid === false) {
-      field.invalidate(asyncData.message, false, true);
+    if (field.validationAsyncData.valid === false) {
+      field.invalidate(field.validationAsyncData.message, false, true);
     }
   }
 }

src/validators/VJF.ts

@@ -1,6 +1,7 @@
 import _ from "lodash";
 import FieldInterface from "src/models/FieldInterface";
 import FormInterface from "src/models/FormInterface";
+import StateInterface from "src/models/StateInterface";
 import {
   ValidationPlugin,
   ValidationPluginConfig,
@@ -19,7 +20,7 @@ function isPromise(obj: any): obj is Promise<any> {
 export class VJF<TValidator = any> implements ValidationPluginInterface<TValidator> {
   promises: Promise<any>[];
   config: ValidationPluginConfig<TValidator>;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: TValidator;
 
@@ -82,9 +83,8 @@ export class VJF<TValidator = any> implements ValidationPluginInterface<TValidat
   }
 
   executeAsyncValidation(field: FieldInterface): void {
-    const data = field.validationAsyncData;
-    if (data.valid === false) {
-      field.invalidate(data.message, false, true);
+    if (field.validationAsyncData.valid === false) {
+      field.invalidate(field.validationAsyncData.message, false, true);
     }
   }
 

src/validators/YUP.ts

@@ -4,13 +4,13 @@ import {
   ValidationPluginConstructor,
   ValidationPluginInterface,
 } from "../models/ValidatorInterface";
-import _ from "lodash";
 import FormInterface from "src/models/FormInterface";
+import StateInterface from "src/models/StateInterface";
 
 class YUP<TValidator = any> implements ValidationPluginInterface {
   promises: Promise<any>[] = [];
   config: ValidationPluginConfig<TValidator>;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: TValidator;
   schema: any;

src/validators/ZOD.ts

@@ -1,7 +1,8 @@
 import _ from "lodash";
 import FieldInterface from "src/models/FieldInterface";
 import FormInterface from "src/models/FormInterface";
-import { ZodSchema, ZodError } from "zod";
+import StateInterface from "src/models/StateInterface";
+import { ZodSchema } from "zod";
 import {
   ValidationPlugin,
   ValidationPluginConfig,
@@ -12,7 +13,7 @@ import {
 export class ZOD<TValidator = any> implements ValidationPluginInterface {
   promises: Promise<any>[];
   config: ValidationPluginConfig;
-  state: any;
+  state: StateInterface;
   extend?: (args: { validator: TValidator; form: FormInterface }) => void;
   validator: any;
   schema: ZodSchema<any>;