fix(defaults): handle nested defaults correctly

Fix #16
boosterfuels · Jan 27, 2019 · c02b89b · c02b89b
1 parent 5352e1a
commit c02b89b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/src/defaults.js b/src/defaults.js
@@ -9,7 +9,7 @@ const shouldSkipPath = require('./util').shouldSkipPath;
 
 function applyDefaults(obj, schema, projection) {
   _.each(Object.keys(schema._obj), key => {
-    const def = defaults(obj, obj[key], schema, key, projection)
+    const def = defaults(obj, obj[key], schema, key, projection);
     if (def !== void 0 && obj[key] == null) {
       obj[key] = def;
     }
@@ -33,12 +33,20 @@ function defaults(root, v, schema, path, projection) {
   }
 
   if (schemaPath.$type === Object && schemaPath.$schema) {
-    _.each(schemaPath.$schema, (value, key) => {
-      const def = defaults(root, _.get(v, key), schema, join(fakePath, key), projection);
+    _.each(schemaPath.$schema, (childSchemaPath, key) => {
+      const fullPath = join(fakePath, key);
+      const value = _.get(v, key);
+      // Might have nested defaults even if this level isn't nullish
+      const def = defaults(root, value, schema, fullPath, projection);
       if (def !== void 0 && value == null) {
+        if (v == null) {
+          v = {};
+        }
         v[key] = def;
       }
     });
+
+    return v;
   }
   if (schemaPath.$type === Array) {
     _.each(v || [], (value, index) => {
@@ -47,6 +55,8 @@ function defaults(root, v, schema, path, projection) {
         v[index] = def;
       }
     });
+
+    return v;
   }
 }
 

diff --git a/test/unit.test.js b/test/unit.test.js
@@ -433,6 +433,36 @@ describe('unmarshal()', function() {
     assert.ok(val.createdAt.getTime() >= now, `${val.createdAt}, ${now}`);
   });
 
+  it('deep defaults', function() {
+    const C = new Archetype({
+      firstName: {
+        $type: 'string',
+        $default: () => 'test'
+      },
+      name: {
+        first: {
+          $type: 'string',
+          $default: () => 'test'
+        }
+      },
+      multiple: {
+        a: {
+          $type: 'string',
+          $default: () => 'test'
+        },
+        b: {
+          $type: 'string'
+        }
+      }
+    }).compile('c');
+
+    let v = new C({ multiple: { b: 'foo' } });
+    assert.equal(v.firstName, 'test');
+    assert.equal(v.name.first, 'test');
+    assert.equal(v.multiple.a, 'test');
+    assert.equal(v.multiple.b, 'foo');
+  });
+
   it('no defaults for projecton', function() {
     const now = Date.now();
     const Model = new Archetype({