thesimplevalidation 1.0.0 → 1.0.2

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "thesimplevalidation",
   "description": "The simple validation",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "./dist/index.js",
   "scripts": {
     "build": "tsc",
-    "lint": "tslint index.ts",
-    "pretest": "npm run lint",
     "test": "jest"
   },
   "publishConfig": {
-    "registry": "http://registry.npmjs.org"
+    "registry": "https://registry.npmjs.org"
   },
   "author": "Alexey Ripenko <alexey@ripenko.ru>",
   "license": "MIT",
@@ -26,11 +24,20 @@
     "typescript",
     "promise"
   ],
+  "dependencies": {
+    "lodash.clonedeep": "4.5.0",
+    "lodash.get": "4.4.2",
+    "lodash.isequal": "4.5.0",
+    "lodash.keys": "4.2.0"
+  },
   "devDependencies": {
-    "@types/jest": "24.0.25",
-    "tslint": "5.20.1",
-    "typescript": "3.7.4",
-    "jest": "24.9.0",
-    "ts-jest": "24.2.0"
+    "@types/lodash.clonedeep": "4.5.7",
+    "@types/lodash.get": "4.4.7",
+    "@types/lodash.isequal": "4.5.6",
+    "@types/lodash.keys": "4.2.7",
+    "@types/jest": "29.5.1",
+    "typescript": "5.0.4",
+    "jest": "29.5.0",
+    "ts-jest": "29.1.0"
   }
 }

package/src/validation-scope.ts

@@ -14,8 +14,12 @@ export class ValidationScope<TModel extends {}> {
         }
     };
 
-    constructor(private getModel: () => TModel, private onValidationChanged: (result: IValidationResult<TModel>) => Promise<void>) {
-        this.originalModel = cloneDeep(getModel());
+    constructor(private setup: {
+        getModel: () => TModel;
+        onValidationChanged?: (result: IValidationResult<TModel>) => Promise<void>;
+
+    }) {
+        this.originalModel = cloneDeep(setup.getModel());
         this.modelInfo = {} as any;
     }
 
@@ -32,7 +36,7 @@ export class ValidationScope<TModel extends {}> {
     }
 
     public isPropertyDirty = (field: keyof TModel, key: string | null = null): boolean => {
-        const model: TModel = this.getModel();
+        const model: TModel = this.setup.getModel();
         const originalField = this.originalModel[field];
         const modelField = model[field];
         if (Array.isArray(originalField) && Array.isArray(modelField)) {
@@ -71,7 +75,7 @@ export class ValidationScope<TModel extends {}> {
             let isValid: boolean = true;
             let errors: string[] = [];
 
-            const model: TModel = this.getModel();
+            const model: TModel = this.setup.getModel();
             const value: TModel[K] = model[field];
 
             for (const validator of this.modelInfo[field].validators) {
@@ -92,7 +96,7 @@ export class ValidationScope<TModel extends {}> {
     }
 
     public isValid = async (): Promise<IValidationResult<TModel>> => {
-        const properties: Array<keyof TModel> = keys(this.getModel()) as Array<keyof TModel>;
+        const properties: Array<keyof TModel> = keys(this.setup.getModel()) as Array<keyof TModel>;
         const result: IValidationResult<TModel> = {
             isValid: true,
             errors: [],
@@ -108,7 +112,7 @@ export class ValidationScope<TModel extends {}> {
             if (!propertyValidationResult.isValid) result.errors = [...result.errors, ...propertyValidationResult.errors];
         }
 
-        await this.onValidationChanged(result);
+        if (this.setup.onValidationChanged != null) await this.setup.onValidationChanged(result);
 
         return result;
     }

package/src/validators/max/index.ts

@@ -15,15 +15,12 @@ export class MaxValidator<TModel, K extends keyof TModel> extends Validator<TMod
         let isValid: boolean = true;
         if (value != null) {
             const maxValue: number = this.setup.maxValue();
-            if (typeof maxValue === "number") {
-                // tslint:disable-next-line:prefer-conditional-expression
-                if (Array.isArray(value)) {
-                    isValid = value.length <= maxValue;
-                } else if (typeof value === "string") {
-                    isValid = value.length <= maxValue;
-                } else if (typeof value === "number") {
-                    isValid = value <= maxValue;
-                }
+            if (Array.isArray(value)) {
+                isValid = value.length <= maxValue;
+            } else if (typeof value === "string") {
+                isValid = value.length <= maxValue;
+            } else if (typeof value === "number") {
+                isValid = value <= maxValue;
             }
         }
 

package/src/validators/min/index.ts

@@ -16,14 +16,12 @@ export class MinValidator<TModel, K extends keyof TModel> extends Validator<TMod
         if (value != null) {
             const minValue: number = this.setup.minValue();
             // tslint:disable-next-line:prefer-conditional-expression
-            if (typeof minValue === "number") {
-                if (Array.isArray(value)) {
-                    isValid = value.length >= minValue;
-                } else if (typeof value === "string") {
-                    isValid = value.length >= minValue;
-                } else if (typeof value === "number") {
-                    isValid = value >= minValue;
-                }
+            if (Array.isArray(value)) {
+                isValid = value.length >= minValue;
+            } else if (typeof value === "string") {
+                isValid = value.length >= minValue;
+            } else if (typeof value === "number") {
+                isValid = value >= minValue;
             }
         }
 

package/src/validators/simple/index.ts

@@ -11,7 +11,7 @@ export class SimpleValidator<TModel, K extends keyof TModel> extends Validator<T
         super(setup);
     }
 
-    public async isValidInternal(value: TModel[K]): Promise<IValidationPropertyResult> {
+    public async isValidInternal(_value: TModel[K]): Promise<IValidationPropertyResult> {
         const isValid: boolean = this.setup.getValidation();
 
         return {