knight-validation 3.1.0 → 3.2.0

package/lib/lib/Validator.d.ts

@@ -13,12 +13,14 @@ export declare class Validator<T = any> {
     options?: ValidatorOptions;
     entries: ValidatorEntry<T>[];
     constructor(options?: ValidatorOptions);
-    add(property: string, constraint: Constraint<T>, condition?: (object: T) => Promise<boolean>): void;
+    add(constraint: Constraint, condition?: (object: T) => Promise<boolean>): void;
+    add(constraintName: string, validate: (value: any) => Promise<Misfit | null>, condition?: (object: T) => Promise<boolean>): void;
+    add(property: string, constraint: Constraint, condition?: (object: T) => Promise<boolean>): void;
     add(property: string, constraintName: string, validate: (value: any) => Promise<Misfit | null>, condition?: (object: T) => Promise<boolean>): void;
-    add(properties: string[], constraint: Constraint<T>, condition?: (object: T) => Promise<boolean>): void;
+    add(properties: string[], constraint: Constraint, condition?: (object: T) => Promise<boolean>): void;
     add(properties: string[], constraintName: string, validate: (object: T, properties: string[]) => Promise<Misfit | null>, condition?: (object: T) => Promise<boolean>): void;
     add(property: string, validator: Validator<any>, condition?: (object: T) => Promise<boolean>): void;
-    add(validator: Validator<any>): void;
+    add(validator: Validator<T>): void;
     validate(object: T, options?: ValidatorOptions): Promise<Misfit[]>;
 }
 export {};

package/lib/lib/Validator.js

@@ -25,7 +25,21 @@ class Validator {
                 this.entries.push(propertyConstraint);
             }
         }
-        else {
+        else if (args[0] instanceof Constraint_1.Constraint) {
+            this.entries.push({
+                properties: [],
+                constraint: args[0],
+                condition: args.length > 1 ? args[1] : undefined
+            });
+        }
+        else if (typeof args[0] == 'string' && typeof args[1] == 'function') {
+            this.entries.push({
+                properties: [],
+                constraint: new QuickConstraint_1.QuickConstraint(args[0], args[1]),
+                condition: args.length > 2 ? args[2] : undefined
+            });
+        }
+        else if (typeof args[0] == 'string' || Array.isArray(args[0])) {
             let properties = typeof args[0] == 'string' ? [args[0]] : args[0];
             let constraint = undefined;
             let validator = undefined;
@@ -79,8 +93,8 @@ class Validator {
                 }
                 let atLeastOnePropertyExists = false;
                 for (let property of entry.properties) {
-                    let dotNotification = new DotNotation_1.DotNotation(property);
-                    if (dotNotification.exists(object)) {
+                    let dotNotation = new DotNotation_1.DotNotation(property);
+                    if (dotNotation.exists(object)) {
                         atLeastOnePropertyExists = true;
                         break;
                     }
@@ -90,10 +104,13 @@ class Validator {
                 }
                 if (entry.constraint != undefined) {
                     let misfit;
-                    if (entry.properties.length == 1) {
+                    if (entry.properties.length == 0) {
+                        misfit = yield entry.constraint.validate(object);
+                    }
+                    else if (entry.properties.length == 1) {
                         let property = entry.properties[0];
-                        let dotNotification = new DotNotation_1.DotNotation(property);
-                        let value = dotNotification.get(object);
+                        let dotNotation = new DotNotation_1.DotNotation(property);
+                        let value = dotNotation.get(object);
                         misfit = yield entry.constraint.validate(value);
                     }
                     else {
@@ -113,8 +130,8 @@ class Validator {
                         throw new Error('Using another validator only works for one property');
                     }
                     let property = entry.properties[0];
-                    let dotNotification = new DotNotation_1.DotNotation(property);
-                    let value = dotNotification.get(object);
+                    let dotNotation = new DotNotation_1.DotNotation(property);
+                    let value = dotNotation.get(object);
                     if (value === undefined) {
                         continue;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knight-validation",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "A validation lib",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",