type-check the value returned by a custom reviver, fromJSON module

barm · Jul 14, 2016 · 97d03fe · 97d03fe
1 parent 06aa7a7
commit 97d03fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - **Bug Fix**
   - add support for class constructors, `fromJSON` module (@gcanti)
+  - type-check the value returned by a custom reviver, `fromJSON` module (@gcanti)
 
 # v3.2.6
 

diff --git a/lib/fromJSON.js b/lib/fromJSON.js
@@ -14,7 +14,7 @@ function fromJSON(value, type) {
   }
 
   if (isFunction(type.fromJSON)) {
-    return type.fromJSON(value);
+    return type(type.fromJSON(value));
   }
 
   if (!isType(type)) {

diff --git a/test/fromJSON.js b/test/fromJSON.js
@@ -27,9 +27,9 @@ describe('fromJSON', function () {
   it('should handle a static fromJSON function attached to the type', function () {
     var MyType = t.refinement(t.String, function () { return true; });
     MyType.fromJSON = function (s) {
-      return s.length;
+      return s + 'ok';
     };
-    assert.equal(fromJSON('aaa', MyType), 3);
+    assert.equal(fromJSON('aaa', MyType), 'aaaok');
   });
 
   it('should handle class constructors', function () {