knight-validation 3.3.1 → 3.3.3

package/lib/lib/Validator.js

@@ -85,7 +85,7 @@ class Validator {
             let misfittingProperties = [];
             for (let entry of this.entries) {
                 let constraintOrValidatorName = entry.constraint ? (_a = entry.constraint) === null || _a === void 0 ? void 0 : _a.name : entry.validator ? entry.validator.constructor.name : '';
-                l.location = ['' + entry.properties + ' ' + constraintOrValidatorName];
+                l.location = ['' + JSON.stringify(entry.properties) + ' > ' + constraintOrValidatorName];
                 let propertyAlreadyHasAMisfit = false;
                 for (let property of entry.properties) {
                     if (misfittingProperties.indexOf(property) > -1) {
@@ -93,6 +93,9 @@ class Validator {
                         break;
                     }
                 }
+                if (entry.properties.length == 0 && misfittingProperties.indexOf(null) > -1) {
+                    propertyAlreadyHasAMisfit = true;
+                }
                 if (propertyAlreadyHasAMisfit) {
                     l.dev('Property already has misfit. Skipping...');
                     continue;
@@ -126,7 +129,7 @@ class Validator {
                         l.called('entry.constraint.validate');
                     }
                     else if (entry.properties.length == 1) {
-                        l.dev('Constraint is to be applied to one property. Fetching its value...');
+                        l.dev('Constraint is to be applied to one property');
                         let property = entry.properties[0];
                         let dotNotation = new DotNotation_1.DotNotation(property);
                         let value = dotNotation.get(object);
@@ -148,6 +151,9 @@ class Validator {
                         }
                         misfit.properties = entry.properties.slice();
                         misfittingProperties.push(...entry.properties);
+                        if (entry.properties.length == 0) {
+                            misfittingProperties.push(null);
+                        }
                         misfits.push(misfit);
                     }
                 }
@@ -160,9 +166,17 @@ class Validator {
                     let property = entry.properties[0];
                     let dotNotation = new DotNotation_1.DotNotation(property);
                     let value = dotNotation.get(object);
+                    if (typeof value != 'object' || value === null) {
+                        l.dev('Value of the property is not of type object or null. Skipping...', value);
+                        continue;
+                    }
                     if (value instanceof Array) {
                         l.dev('Value of the property is an array. Iterating its elements...');
                         for (let i = 0; i < value.length; i++) {
+                            if (typeof value[i] != 'object' || value[i] === null) {
+                                l.dev('Array element is not of type object or null. Skipping...', value[i]);
+                                continue;
+                            }
                             l.calling('entry.validator.validate', value[i], options);
                             let subMisfits = yield entry.validator.validate(value[i], options);
                             l.called('entry.validator.validate');
@@ -170,7 +184,12 @@ class Validator {
                                 l.dev('Validator returned misfits', subMisfits);
                                 l.creator('Adding prefix to misfit properties...', `${property}[${i}].`);
                                 for (let misfit of subMisfits) {
-                                    misfit.addPrefix(`${property}[${i}].`);
+                                    if (misfit.properties.length == 0) {
+                                        misfit.properties.push(`${property}[${i}]`);
+                                    }
+                                    else {
+                                        misfit.addPrefix(`${property}[${i}].`);
+                                    }
                                 }
                                 misfittingProperties.push(...entry.properties);
                                 misfits.push(...subMisfits);
@@ -186,7 +205,12 @@ class Validator {
                             l.dev('Validator returned misfits', subMisfits);
                             l.creator('Adding prefix to misfit properties...', property + '.');
                             for (let misfit of subMisfits) {
-                                misfit.addPrefix(property + '.');
+                                if (misfit.properties.length == 0) {
+                                    misfit.properties.push(property);
+                                }
+                                else {
+                                    misfit.addPrefix(property + '.');
+                                }
                             }
                             misfittingProperties.push(...entry.properties);
                             misfits.push(...subMisfits);

package/package.json

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