thesimplevalidation 1.1.2 → 1.2.0

package/dist/src/validators/simple/index.d.ts

@@ -1,10 +1,10 @@
-import { IValidationPropertyResult } from "../../validation-property-result";
-import { IValidatorSetup } from "../../validator-setup";
-import { Validator } from "../../validator";
-export interface ISimpleValidatorSetup<TModel, K extends keyof TModel> extends IValidatorSetup<TModel, K> {
-    getValidation: () => boolean;
-}
-export declare class SimpleValidator<TModel, K extends keyof TModel> extends Validator<TModel, K, ISimpleValidatorSetup<TModel, K>> {
-    constructor(setup: ISimpleValidatorSetup<TModel, K>);
-    isValidInternal(_value: TModel[K]): Promise<IValidationPropertyResult>;
-}
+import { IValidationPropertyResult } from "../../validation-property-result";
+import { IValidatorSetup } from "../../validator-setup";
+import { Validator } from "../../validator";
+export interface ISimpleValidatorSetup<TModel, K extends keyof TModel> extends IValidatorSetup<TModel, K> {
+    getValidation: () => boolean;
+}
+export declare class SimpleValidator<TModel, K extends keyof TModel> extends Validator<TModel, K, ISimpleValidatorSetup<TModel, K>> {
+    constructor(setup: ISimpleValidatorSetup<TModel, K>);
+    isValidInternal(_value: TModel[K]): Promise<IValidationPropertyResult>;
+}

package/dist/src/validators/simple/index.js

@@ -1,73 +1,76 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var validator_1 = require("../../validator");
-var SimpleValidator = /** @class */ (function (_super) {
-    __extends(SimpleValidator, _super);
-    function SimpleValidator(setup) {
-        return _super.call(this, setup) || this;
-    }
-    SimpleValidator.prototype.isValidInternal = function (_value) {
-        return __awaiter(this, void 0, void 0, function () {
-            var isValid;
-            return __generator(this, function (_a) {
-                isValid = this.setup.getValidation();
-                return [2 /*return*/, {
-                        isValid: isValid,
-                        errors: []
-                    }];
-            });
-        });
-    };
-    return SimpleValidator;
-}(validator_1.Validator));
-exports.SimpleValidator = SimpleValidator;
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleValidator = void 0;
+var validator_1 = require("../../validator");
+var SimpleValidator = /** @class */ (function (_super) {
+    __extends(SimpleValidator, _super);
+    function SimpleValidator(setup) {
+        return _super.call(this, setup) || this;
+    }
+    SimpleValidator.prototype.isValidInternal = function (_value) {
+        return __awaiter(this, void 0, void 0, function () {
+            var isValid;
+            return __generator(this, function (_a) {
+                isValid = this.setup.getValidation();
+                return [2 /*return*/, {
+                        isValid: isValid,
+                        errors: []
+                    }];
+            });
+        });
+    };
+    return SimpleValidator;
+}(validator_1.Validator));
+exports.SimpleValidator = SimpleValidator;
 //# sourceMappingURL=index.js.map

package/dist/src/validators/simple/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/validators/simple/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA4C;AAM5C;IAAqE,mCAAsD;IACvH,yBAAY,KAAuC;eAC/C,kBAAM,KAAK,CAAC;IAChB,CAAC;IAEY,yCAAe,GAA5B,UAA6B,MAAiB;;;;gBACpC,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAEpD,sBAAO;wBACH,OAAO,EAAE,OAAO;wBAChB,MAAM,EAAE,EAAE;qBACb,EAAC;;;KACL;IACL,sBAAC;AAAD,CAAC,AAbD,CAAqE,qBAAS,GAa7E;AAbY,0CAAe"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/validators/simple/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA4C;AAM5C;IAAqE,mCAAsD;IACvH,yBAAY,KAAuC;eAC/C,kBAAM,KAAK,CAAC;IAChB,CAAC;IAEY,yCAAe,GAA5B,UAA6B,MAAiB;;;;gBACpC,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAEpD,sBAAO;wBACH,OAAO,EAAE,OAAO;wBAChB,MAAM,EAAE,EAAE;qBACb,EAAC;;;KACL;IACL,sBAAC;AAAD,CAAC,AAbD,CAAqE,qBAAS,GAa7E;AAbY,0CAAe"}

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "thesimplevalidation",
   "description": "The simple validation",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "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",
@@ -33,14 +31,13 @@
     "lodash.keys": "4.2.0"
   },
   "devDependencies": {
-    "@types/lodash.clonedeep": "4.5.6",
-    "@types/lodash.get": "4.4.6",
-    "@types/lodash.isequal": "4.5.5",
-    "@types/lodash.keys": "4.2.6",
-    "@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

@@ -16,7 +16,8 @@ export class ValidationScope<TModel extends {}> {
 
     constructor(private setup: {
         getModel: () => TModel;
-        onValidationChanged?: (result: IValidationResult<TModel>, scope: ValidationScope<TModel>) => Promise<void>;
+        onValidationChanged?: (result: IValidationResult<TModel>) => Promise<void>;
+
     }) {
         this.originalModel = cloneDeep(setup.getModel());
         this.modelInfo = {} as any;
@@ -111,7 +112,7 @@ export class ValidationScope<TModel extends {}> {
             if (!propertyValidationResult.isValid) result.errors = [...result.errors, ...propertyValidationResult.errors];
         }
 
-        if (this.setup.onValidationChanged != null) await this.setup.onValidationChanged(result, this);
+        if (this.setup.onValidationChanged != null) await this.setup.onValidationChanged(result);
 
         return result;
     }

package/src/validators/max/index.ts

@@ -4,7 +4,6 @@ import { Validator } from "../../validator";
 
 export interface IMaxValidatorSetup<TModel, K extends keyof TModel> extends IValidatorSetup<TModel, K> {
     maxValue: () => number;
-    converter?: (val: TModel[K]) => unknown;
 }
 
 export class MaxValidator<TModel, K extends keyof TModel> extends Validator<TModel, K, IMaxValidatorSetup<TModel, K>> {
@@ -14,15 +13,14 @@ export class MaxValidator<TModel, K extends keyof TModel> extends Validator<TMod
 
     public async isValidInternal(value: TModel[K]): Promise<IValidationPropertyResult> {
         let isValid: boolean = true;
-        const val: unknown = this.setup.converter ? this.setup.converter(value) : value;
-        if (val != null) {
+        if (value != null) {
             const maxValue: number = this.setup.maxValue();
-            if (Array.isArray(val)) {
-                isValid = val.length <= maxValue;
-            } else if (typeof val === "string") {
-                isValid = val.length <= maxValue;
-            } else if (typeof val === "number") {
-                isValid = val <= 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

@@ -4,7 +4,6 @@ import { Validator } from "../../validator";
 
 export interface IMinValidatorSetup<TModel, K extends keyof TModel> extends IValidatorSetup<TModel, K> {
     minValue: () => number;
-    converter?: (val: TModel[K]) => unknown;
 }
 
 export class MinValidator<TModel, K extends keyof TModel> extends Validator<TModel, K, IMinValidatorSetup<TModel, K>> {
@@ -14,16 +13,15 @@ export class MinValidator<TModel, K extends keyof TModel> extends Validator<TMod
 
     public async isValidInternal(value: TModel[K]): Promise<IValidationPropertyResult> {
         let isValid: boolean = true;
-        const val: unknown = this.setup.converter ? this.setup.converter(value) : value;
-        if (val != null) {
+        if (value != null) {
             const minValue: number = this.setup.minValue();
             // tslint:disable-next-line:prefer-conditional-expression
-            if (Array.isArray(val)) {
-                isValid = val.length >= minValue;
-            } else if (typeof val === "string") {
-                isValid = val.length >= minValue;
-            } else if (typeof val === "number") {
-                isValid = val >= 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;
             }
         }