knight-validation 2.0.0 → 2.0.3

package/lib/lib/constraints/TypeOf.js

@@ -1,17 +1,4 @@
 "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) {
@@ -21,74 +8,63 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 Constraint_1 = require("../Constraint");
-var Misfit_1 = require("../Misfit");
-var TypeOf = /** @class */ (function (_super) {
-    __extends(TypeOf, _super);
-    function TypeOf(valueType) {
-        var _this = _super.call(this) || this;
-        _this.valueType = valueType;
-        return _this;
+exports.TypeOf = void 0;
+const Constraint_1 = require("../Constraint");
+const Misfit_1 = require("../Misfit");
+class TypeOf extends Constraint_1.Constraint {
+    constructor(...valueTypes) {
+        super();
+        this.valueTypes = valueTypes;
     }
-    TypeOf.prototype.validate = function (obj, field) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.defaultValidation(obj, field, function (value) { return __awaiter(_this, void 0, void 0, function () {
-                        var misfit, typeOfValue, misfit;
-                        return __generator(this, function (_a) {
-                            if (typeof this.valueType == 'string') {
-                                if (typeof value !== this.valueType) {
-                                    misfit = new Misfit_1.default;
-                                    misfit.values = { actualType: typeof value, expectedType: this.valueType };
-                                    return [2 /*return*/, misfit];
-                                }
-                            }
-                            else {
-                                if (!(value instanceof this.valueType)) {
-                                    typeOfValue = typeof value;
-                                    if (typeOfValue == 'object') {
-                                        typeOfValue = value.constructor.name;
-                                    }
-                                    misfit = new Misfit_1.default;
-                                    misfit.values = { actualType: typeOfValue, expectedType: this.valueType.name };
-                                    return [2 /*return*/, misfit];
-                                }
-                            }
-                            return [2 /*return*/];
-                        });
-                    }); })];
-            });
+    validate(value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (value === undefined) {
+                return null;
+            }
+            for (let valueType of this.valueTypes) {
+                if (typeof valueType == 'string') {
+                    if (typeof value === valueType) {
+                        return null;
+                    }
+                }
+                else if (valueType === null) {
+                    if (value === null) {
+                        return null;
+                    }
+                }
+                else if (value instanceof valueType) {
+                    return null;
+                }
+            }
+            let actualType;
+            if (typeof value == 'object' && value !== null) {
+                actualType = value.constructor.name;
+            }
+            else if (value === null) {
+                actualType = null;
+            }
+            else {
+                actualType = typeof value;
+            }
+            let misfit = new Misfit_1.Misfit(this.name);
+            misfit.values = {
+                actual: actualType,
+                types: []
+            };
+            for (let valueType of this.valueTypes) {
+                if (typeof valueType == 'string') {
+                    misfit.values.types.push(valueType);
+                }
+                else if (valueType === null) {
+                    misfit.values.types.push(null);
+                }
+                else {
+                    misfit.values.types.push(valueType.name);
+                }
+            }
+            return misfit;
         });
-    };
-    return TypeOf;
-}(Constraint_1.default));
-exports.default = TypeOf;
+    }
+}
+exports.TypeOf = TypeOf;

package/lib/lib/constraints/Unique.d.ts

@@ -1,7 +1,10 @@
-import Constraint from '../Constraint';
-import Misfit from '../Misfit';
-export default class Unique extends Constraint {
-    isUnique: (value: any, obj: any) => Promise<boolean>;
-    constructor(isUnique: (obj: any, field: string | string[]) => Promise<boolean>);
-    validate(obj: any, field: string | string[]): Promise<Misfit | undefined>;
+import { Constraint } from '../Constraint';
+import { Misfit } from '../Misfit';
+export interface UniqueMisfitValues {
+    notUniqueValue: any;
+}
+export declare class Unique extends Constraint<any, UniqueMisfitValues> {
+    isUnique: (value: any) => Promise<boolean>;
+    constructor(isUnique: (value: any) => Promise<boolean>);
+    validate(value: any): Promise<Misfit<UniqueMisfitValues> | null>;
 }

package/lib/lib/constraints/Unique.js

@@ -1,17 +1,4 @@
 "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) {
@@ -21,61 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 Constraint_1 = require("../Constraint");
-var Misfit_1 = require("../Misfit");
-var Unique = /** @class */ (function (_super) {
-    __extends(Unique, _super);
-    function Unique(isUnique) {
-        var _this = _super.call(this) || this;
-        _this.isUnique = isUnique;
-        return _this;
+exports.Unique = void 0;
+const Constraint_1 = require("../Constraint");
+const Misfit_1 = require("../Misfit");
+class Unique extends Constraint_1.Constraint {
+    constructor(isUnique) {
+        super();
+        this.isUnique = isUnique;
     }
-    Unique.prototype.validate = function (obj, field) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (this.isFieldAbsent(obj, field)) {
-                            return [2 /*return*/];
-                        }
-                        return [4 /*yield*/, this.isUnique(obj, field)];
-                    case 1:
-                        if (!(_a.sent())) {
-                            return [2 /*return*/, new Misfit_1.default(this.name)];
-                        }
-                        return [2 /*return*/];
-                }
-            });
+    validate(value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (value === undefined) {
+                return null;
+            }
+            if (!(yield this.isUnique(value))) {
+                return new Misfit_1.Misfit(this.name, { notUniqueValue: value });
+            }
+            return null;
         });
-    };
-    return Unique;
-}(Constraint_1.default));
-exports.default = Unique;
+    }
+}
+exports.Unique = Unique;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knight-validation",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "A validation lib",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -8,13 +8,13 @@
     "lib/**/*"
   ],
   "devDependencies": {
-    "@types/chai": "^4.2.7",
-    "@types/mocha": "^5.2.7",
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
     "@types/node": "^13.5.0",
-    "chai": "^4.2.0",
-    "mocha": "^7.0.0",
-    "ts-node": "^8.4.1",
-    "typescript": "^3.7.2"
+    "chai": "^4.3.6",
+    "mocha": "^10.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.2"
   },
   "scripts": {
     "test": "mocha -r ts-node/register \"test/**/*.test.ts\"",

package/lib/lib/constraints/Max.d.ts

@@ -1,7 +0,0 @@
-import Constraint from '../Constraint';
-import Misfit from '../Misfit';
-export default class Max extends Constraint {
-    max: number;
-    constructor(max: number);
-    validate(obj: any, field: string | string[]): Promise<Misfit | undefined>;
-}

package/lib/lib/constraints/Max.js

@@ -1,84 +0,0 @@
-"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 Constraint_1 = require("../Constraint");
-var Misfit_1 = require("../Misfit");
-var Max = /** @class */ (function (_super) {
-    __extends(Max, _super);
-    function Max(max) {
-        var _this = _super.call(this) || this;
-        _this.max = max;
-        return _this;
-    }
-    Max.prototype.validate = function (obj, field) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.defaultValidation(obj, field, function (value) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            if (typeof value == 'number') {
-                                return [2 /*return*/, value > this.max ? new Misfit_1.default : undefined];
-                            }
-                            if (typeof value == 'string') {
-                                return [2 /*return*/, value.length > this.max ? new Misfit_1.default : undefined];
-                            }
-                            if (value instanceof Array) {
-                                return [2 /*return*/, value.length > this.max ? new Misfit_1.default : undefined];
-                            }
-                            return [2 /*return*/];
-                        });
-                    }); })];
-            });
-        });
-    };
-    return Max;
-}(Constraint_1.default));
-exports.default = Max;

package/lib/lib/constraints/QuickConstraint.d.ts

@@ -1,7 +0,0 @@
-import Constraint from '../Constraint';
-import Misfit from '../Misfit';
-export default class QuickConstraint extends Constraint {
-    validateFn: (obj: any, field: string | string[]) => Promise<Misfit | undefined>;
-    constructor(name: string, validate: (obj: any, field: string | string[]) => Promise<Misfit | undefined>);
-    validate(obj: any, field: string | string[]): Promise<Misfit | undefined>;
-}

package/lib/lib/constraints/QuickConstraint.js

@@ -1,70 +0,0 @@
-"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 Constraint_1 = require("../Constraint");
-var QuickConstraint = /** @class */ (function (_super) {
-    __extends(QuickConstraint, _super);
-    function QuickConstraint(name, validate) {
-        var _this = _super.call(this) || this;
-        _this.name = name;
-        _this.validateFn = validate;
-        return _this;
-    }
-    QuickConstraint.prototype.validate = function (obj, field) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.validateFn(obj, field)];
-            });
-        });
-    };
-    return QuickConstraint;
-}(Constraint_1.default));
-exports.default = QuickConstraint;

package/lib/lib/fieldsEqual.d.ts

@@ -1 +0,0 @@
-export default function fieldsEqual(a1?: string[], a2?: string[]): boolean;

package/lib/lib/fieldsEqual.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function fieldsEqual(a1, a2) {
-    if (!a1 || !a2) {
-        return false;
-    }
-    if (a1.length != a2.length) {
-        return false;
-    }
-    for (var i = 0; i < a1.length; i++) {
-        if (a2.indexOf(a1[i]) == -1) {
-            return false;
-        }
-    }
-    return true;
-}
-exports.default = fieldsEqual;