fix: molnarg#38

not equivalent rafactoring of code. fixes issue with empty object validataion
vedmalex · Jun 1, 2015 · 487d9dc · 487d9dc
1 parent 7cbbd0a
commit 487d9dc
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/patterns/object.js b/lib/patterns/object.js
@@ -33,7 +33,7 @@ var ObjectSchema = module.exports = Schema.patterns.ObjectSchema = Schema.extend
                 if (error = self.stringProps[key].value.errors(instance[key])) {
                     errors[key] = error
                 }
-            } else if (self.stringProps[key].min > 0) {
+            } else if (self.stringProps[key].min > 0 && self.stringProps[key].value.validate(instance[key])) {
                 errors[key] = 'key is not present in the object'
             }
         })
@@ -88,11 +88,8 @@ var ObjectSchema = module.exports = Schema.patterns.ObjectSchema = Schema.extend
 
         // Simple string properties
         var stringPropsValid = Object.keys(this.stringProps).every(function(key) {
-            if (key in instance) {
-                return self.stringProps[key].value.validate(instance[key])
-            } else {
-                return self.stringProps[key].min === 0
-            }
+            return (self.stringProps[key].min === 0 && !(key in instance)) ||
+            (self.stringProps[key].value.validate(instance[key]));
         })
         if (!stringPropsValid) return false