rebuild

lib/array.js

@@ -4,6 +4,10 @@ exports.__esModule = true;
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _typeName = require('type-name');
+
+var _typeName2 = _interopRequireDefault(_typeName);
+
 var _inherits = require('./util/inherits');
 
 var _inherits2 = _interopRequireDefault(_inherits);
@@ -12,6 +16,10 @@ var _isAbsent = require('./util/isAbsent');
 
 var _isAbsent2 = _interopRequireDefault(_isAbsent);
 
+var _isSchema = require('./util/isSchema');
+
+var _isSchema2 = _interopRequireDefault(_isSchema);
+
 var _mixed = require('./mixed');
 
 var _mixed2 = _interopRequireDefault(_mixed);
@@ -38,7 +46,9 @@ function ArraySchema(type) {
 
   _mixed2.default.call(this, { type: 'array' });
 
-  this._subType = null;
+  // `undefined` specifically means uninitialized, as opposed to
+  // "no subtype"
+  this._subType = undefined;
 
   this.withMutation(function () {
     _this.transform(function (values) {
@@ -112,9 +122,25 @@ function ArraySchema(type) {
       });
     });
   },
+
+
+  // concat(schema) {
+  //   var next = MixedSchema.prototype.concat.call(this, schema)
+  //
+  //   next._subType = schema._subType === undefined
+  //     ? this._subType
+  //     : schema._subType;
+  //
+  //   return next
+  // },
+
   of: function of(schema) {
     var next = this.clone();
+
+    if (schema !== false && !(0, _isSchema2.default)(schema)) throw new TypeError('`array.of()` sub-schema must be a valid yup schema, or `false` to negate a current sub-schema. ' + 'got: ' + (0, _typeName2.default)(schema) + ' instead');
+
     next._subType = schema;
+
     return next;
   },
   required: function required(msg) {

lib/util/reach.js

@@ -23,15 +23,16 @@ module.exports = function (obj, path, value, context) {
     var part = isBracket ? trim(_part) : _part;
 
     if (isArray || (0, _has2.default)(obj, '_subType')) {
-      // we skipped an array
+      // we skipped an array: foo[].bar
       var idx = isArray ? parseInt(part, 10) : 0;
+
       obj = obj.resolve({ context: context, parent: parent, value: value })._subType;
 
       if (value) {
-
         if (isArray && idx >= value.length) {
           throw new Error('Yup.reach cannot resolve an array item at index: ' + _part + ', in the path: ' + path + '. ' + 'because there is no value at that index. ');
         }
+
         value = value[idx];
       }
     }
@@ -49,5 +50,9 @@ module.exports = function (obj, path, value, context) {
     }
   });
 
-  return obj && obj.resolve({ context: context, parent: parent, value: value });
+  if (obj) {
+    obj = obj.resolve({ context: context, parent: parent, value: value });
+  }
+
+  return obj;
 };