Fill in default field values when cloning records.

mtth · Dec 16, 2015 · 98eb097 · 98eb097
1 parent 1d5d14c
commit 98eb097
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/lib/schemas.js b/lib/schemas.js
@@ -1720,7 +1720,12 @@ RecordType.prototype._copy = function (val, opts) {
   var i, l, field, value;
   for (i = 0, l = this._fields.length; i < l; i++) {
     field = this._fields[i];
-    value = field._type._copy(val[field._name], opts);
+    value = val[field._name];
+    if (value === undefined && field.hasOwnProperty('getDefault')) {
+      value = field.getDefault();
+    } else {
+      value = field._type._copy(val[field._name], opts);
+    }
     if (hook) {
       value = hook(field, value, this);
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "avsc",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Blazing fast serialization",
   "homepage": "https://github.com/mtth/avsc",
   "keywords": [

diff --git a/test/test_schemas.js b/test/test_schemas.js
@@ -1500,6 +1500,22 @@ suite('types', function () {
       assert.equal(t.getSchema(true), '"earth.Person"');
     });
 
+    test('fromString', function () {
+      var t = createType({
+        type: 'record',
+        name: 'Person',
+        fields: [
+          {name: 'age', type: 'int'},
+          {name: 'name', type: 'string', 'default': 'UNKNOWN'}
+        ]
+      });
+      assert.deepEqual(
+        t.fromString('{"age": 23}'),
+        {age: 23, name: 'UNKNOWN'}
+      );
+      assert.throws(function () { t.fromString('{}'); });
+    });
+
     test('toString record', function () {
       var T = createType({
         type: 'record',
@@ -1527,6 +1543,31 @@ suite('types', function () {
       assert.deepEqual(c.$clone(), c);
     });
 
+    test('clone field default', function () {
+      var t = createType({
+        type: 'record',
+        name: 'Person',
+        fields: [
+          {name: 'id', type: 'int'},
+          {name: 'name', type: 'string', 'default': 'UNKNOWN'},
+          {name: 'age', type: ['null', 'int'], 'default': null},
+        ]
+      });
+      assert.deepEqual(
+        t.clone({id: 1, name: 'Ann'}),
+        {id: 1, name: 'Ann', age: null}
+      );
+      assert.deepEqual(
+        t.clone({id: 1, name: 'Ann', age: {'int': 21}}),
+        {id: 1, name: 'Ann', age: {'int': 21}}
+      );
+      assert.deepEqual(
+        t.clone({id: 1, name: 'Ann', age: 21}, {wrapUnions: true}),
+        {id: 1, name: 'Ann', age: {'int': 21}}
+      );
+      assert.throws(function () { t.clone({}); });
+    });
+
     test('clone field hook', function () {
       var t = createType({
         type: 'record',