allow passing primitives as object key values

hudson-taylor · Feb 7, 2016 · 1be2e16 · 1be2e16
1 parent 4e7837b
commit 1be2e16
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -38,7 +38,15 @@ function makeValidator(validatorName, validatorFunc) {
       if((validatorFunc.hasChildValidators == 'array' && Array.isArray(arg)) || (typeof arg === validatorFunc.hasChildValidators)) {
 
         if(Object.keys(arg).every(function(k) {
-          return arg[k].hasOwnProperty('$validators');
+          let t = arg[k];
+          let _v = t ? validators[t.name] : null;
+          if(_v) {
+            let v = _v();
+            t = v;
+            arg[k] = v;
+            return true;
+          }
+          return t.hasOwnProperty('$validators');
         })) {
           childValidators = arg;
           continue;

diff --git a/test-src/validator.js b/test-src/validator.js
@@ -496,4 +496,28 @@ describe("Validator", function() {
 
   });
 
+  describe("Primitives", function() {
+
+    it("should allow passing primitives as object key values", function() {
+
+      let schema = s.Object({
+        bool:   Boolean,
+        string: String,
+        num:    Number
+      });
+
+      schema.validate({
+        bool:   true,
+        string: "hello world",
+        num:    5
+      });
+
+      assert.equal(schema.$validators.bool.$name, 'FastBoolean');
+      assert.equal(schema.$validators.string.$name, 'FastString');
+      assert.equal(schema.$validators.num.$name, 'FastNumber');
+
+    });
+
+  });
+
 });