[fixed] reach with lazy()

Author: jquense

src/object.js

@@ -112,9 +112,8 @@ inherits(ObjectSchema, MixedSchema, {
 
   _validate(_value, opts = {}) {
     var errors = []
-      , endEarly, isStrict, recursive;
+      , endEarly, recursive;
 
-    isStrict = this._option('strict', opts)
     endEarly = this._option('abortEarly', opts)
     recursive = this._option('recursive', opts)
 

src/util/lazy.js

@@ -2,22 +2,25 @@ var { isSchema } = require('./_')
 
 class Lazy {
   constructor(mapFn) {
-    this.resolve = (value) =>  {
+    this._resolve = (value) =>  {
       let schema = mapFn(value)
       if (!isSchema(schema))
         throw new TypeError('lazy() functions must return a valid schema')
 
       return schema
     }
   }
+  resolve(context, parent, value) {
+    return this._resolve(value)
+  }
 
   cast(value, options) {
-    return this.resolve(value)
+    return this._resolve(value)
       .cast(value, options)
   }
 
   validate(value, options) {
-    return this.resolve(value)
+    return this._resolve(value)
       .validate(value, options)
   }
 }

src/util/reach.js

@@ -14,7 +14,7 @@ module.exports = function (obj, path, value, context) {
 
     if (isArray || has(obj, '_subType')) { // we skipped an array
       let idx = isArray ? parseInt(part, 10) : 0
-      obj = obj.resolve(context, parent)._subType;
+      obj = obj.resolve(context, parent, value)._subType;
 
       if (value) {
 
@@ -29,7 +29,7 @@ module.exports = function (obj, path, value, context) {
     }
 
     if (!isArray) {
-      obj = obj.resolve(context, parent);
+      obj = obj.resolve(context, parent, value);
 
       if (!has(obj, 'fields') || !has(obj.fields, part))
         throw new Error(
@@ -45,5 +45,5 @@ module.exports = function (obj, path, value, context) {
     }
   })
 
-  return obj && obj.resolve(value, parent)
+  return obj && obj.resolve(value, parent, value)
 }

test/yup.js

@@ -5,9 +5,7 @@ var Promise = require('promise/src/es6-extensions')
   , chaiAsPromised = require('chai-as-promised')
   , reach = require('../src/util/reach')
   , BadSet = require('../src/util/set')
-  , number = require('../src/number')
-  , array = require('../src/array')
-  , object = require('../src/object')
+  , { object, array, string, lazy, number } = require('../src')
   , _ = require('../src/util/_');
 
 chai.use(chaiAsPromised);
@@ -131,6 +129,27 @@ describe('Yup', function(){
       })
   })
 
+  it('should reach through lazy', async () => {
+    let types = {
+      '1': object({ foo: string() }),
+      '2': object({ foo: number() })
+    }
+
+    let err = await object({
+      x: array(
+        lazy(val => types[val.type])
+      )
+    })
+    .strict()
+    .validate({ x: [
+      { type: 1, foo: '4' },
+      { type: 2, foo: '5' }
+    ]})
+    .should.be.rejected
+
+    err.message.should.match(/must be a `number` type/)
+  })
+
   describe('BadSet', function(){
     it('should preserve primitive types', function(){
       var set = new BadSet()