fromJSON makes use of defaultProps while deserializing a struct, fixes …

…#312
gcanti · Feb 24, 2018 · a5367d0 · a5367d0
1 parent fbac99f
commit a5367d0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/lib/fromJSON.js b/lib/fromJSON.js
@@ -55,10 +55,15 @@ function fromJSON(value, type, path) {
         });
       }
       var props = type.meta.props;
+      var defaultProps = type.meta.defaultProps;
       ret = {};
       for (k in props) {
+        var actual = value[k];
+        if (actual === undefined) {
+          actual = defaultProps[k];
+        }
         if (props.hasOwnProperty(k)) {
-          ret[k] = fromJSON(value[k], props[k], ( process.env.NODE_ENV !== 'production' ? path.concat(k + ': ' + getTypeName(props[k])) : null ));
+          ret[k] = fromJSON(actual, props[k], ( process.env.NODE_ENV !== 'production' ? path.concat(k + ': ' + getTypeName(props[k])) : null ));
         }
       }
       return new type(ret);

diff --git a/test/fromJSON.js b/test/fromJSON.js
@@ -98,6 +98,31 @@ describe('fromJSON', function () {
     }, '[tcomb] Invalid value undefined supplied to MyType/name: String');
   });
 
+  it('should handle struct with options.defaultProps', function () {
+    var MyType = t.struct({
+      surname: t.String,
+      number: t.Number
+    }, {
+      name: 'MyType',
+      defaultProps: {
+        surname: 'Canti',
+        get number() {
+          return 2;
+        }
+      }
+    });
+
+    var source = {};
+    var expected = {
+      surname: 'Canti',
+      number: 2
+    };
+    var json = jsonify(source);
+    var actual = fromJSON(json, MyType);
+    assert.ok(actual instanceof MyType);
+    assert.deepEqual(actual, expected);
+  });
+
   it('should handle interface', function () {
     var MyType = t.interface({
       name: t.String,