lint

Author: jquense

.eslintrc

@@ -1,37 +1,3 @@
-{
-  "parser": "babel-eslint",
-  "extends": "eslint:recommended",
-  "globals": {
-    "sinon": true,
-    "expect": true,
-    "TestHelpers": true,
-  },
-  "env": {
-    "browser": true,
-    "node": true,
-    "mocha": true,
-  },
-  "rules": {
-    "eqeqeq": 0,
-    "no-loop-func": 0,
-    "comma-dangle": 0,
-    "no-eval": 2,
-    "strict": 0,
-    "eol-last": 0,
-    "dot-notation": [2, { "allowKeywords": true }],
-    "semi": [0, "never"],
-    "curly": 0,
-    "no-undef": 2,
-    "quotes": [2, "single", "avoid-escape"],
-    "no-trailing-spaces": 0,
-    "no-underscore-dangle": 0,
-    "no-multi-spaces": 0,
-    "no-unused-expressions": 0,
-    "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
-    "no-use-before-define": 0,
-    "key-spacing": 0,
-    "consistent-return": 0,
-    "no-shadow": 0,
-    "no-sequences": 0
-  }
-}
+
+parser: babel-eslint
+extends: jason

CHANGELOG.md

@@ -170,7 +170,7 @@ v0.14.1 - Tue, 16 Feb 2016 19:51:25 GMT
 v0.14.0 - Mon, 08 Feb 2016 16:17:40 GMT
 ---------------------------------------
 
-- [86b6446](../../commit/86b6446) [fixed] camelcase should maintain leading underscores
+- [86b6446](../../commit/86b6446) [fixed] camelCase should maintain leading underscores
 
 
 

README.md

@@ -82,8 +82,8 @@ json separate from validating it, via the `cast` method.
     - [`object.shape(fields: object, noSortEdges: ?Array<[string, string]>): Schema`](#objectshapefields-object-nosortedges-arraystring-string-schema)
     - [`object.from(fromKey: string, toKey: string, alias: boolean = false): Schema`](#objectfromfromkey-string-tokey-string-alias-boolean--false-schema)
     - [`object.noUnknown(onlyKnownKeys: boolean = true, message: ?string): Schema`](#objectnounknownonlyknownkeys-boolean--true-message-string-schema)
-    - [`object.camelcase(): Schema`](#objectcamelcase-schema)
-    - [`object.constantcase(): Schema`](#objectconstantcase-schema)
+    - [`object.camelCase(): Schema`](#objectcamelCase-schema)
+    - [`object.constantCase(): Schema`](#objectconstantCase-schema)
 - [Extending Schema Types](#extending-schema-types)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -697,8 +697,8 @@ Provide an arbitrary `regex` to match the value against.
 
 ```javascript
 var v = string().matches(/(hi|bye)/);
-v.isValid('hi').should.eventually.equal(true)
-v.isValid('nope').should.eventually.equal(false)
+v.isValid('hi').should.eventually().equal(true)
+v.isValid('nope').should.eventually().equal(false)
 ```
 
 #### `string.email(message: ?string): Schema`
@@ -935,11 +935,11 @@ inst.cast({ prop: 5, other: 6}) // => { myProp: 5, other: 6, Other: 6 }
 Validate that the object value only contains keys specified in `shape`, pass `false` as the first
 argument to disable the check. Restricting keys to known, also enables `stripUnknown` option, when not in strict mode.
 
-#### `object.camelcase(): Schema`
+#### `object.camelCase(): Schema`
 
 Transforms all object keys to camelCase
 
-#### `object.constantcase(): Schema`
+#### `object.constantCase(): Schema`
 
 Transforms all object keys to CONSTANT_CASE.
 

benchmark/fixture.js

@@ -66,7 +66,7 @@ var ChildAttribute = object({
 
   seqID: number()
 
-}).camelcase()
+}).camelCase()
 
 var schema = object({
 
@@ -93,11 +93,11 @@ var schema = object({
       valueID: number(),
       text: string()
     })
-    .camelcase()
+    .camelCase()
   ),
 
   children: array().of(ChildAttribute)
-}).camelcase()
+}).camelCase()
 
 
 module.exports = {

karma.conf.js

@@ -6,12 +6,11 @@ module.exports = function (config) {
 
     basePath: '',
 
-    frameworks: ['mocha'],
+    frameworks: ['mocha', 'sinon-chai'],
 
     reporters: ['mocha'],
 
     files: [
-      require.resolve('sinon/pkg/sinon-1.17.3.js'),
       'tests-webpack.js'
     ],
 
@@ -31,9 +30,6 @@ module.exports = function (config) {
     webpack: {
       devtool: 'inline-source-map',
       cache: true,
-      resolve: {
-        extensions: ['', '.js', '.jsx']
-      },
       module: {
         loaders: [
           {

lib/Condition.js

@@ -14,6 +14,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+function callOrConcat(schema) {
+  if (typeof schema === 'function') return schema;
+
+  return function (base) {
+    return base.concat(schema);
+  };
+}
+
 var Conditional = function () {
   function Conditional(refs, options) {
     var _this = this;
@@ -27,6 +35,9 @@ var Conditional = function () {
 
     this.refs = [].concat(refs);
 
+    then = callOrConcat(then);
+    otherwise = callOrConcat(otherwise);
+
     if (typeof options === 'function') this.fn = options;else {
       (function () {
         if (!(0, _has2.default)(options, 'is')) throw new TypeError('`is:` is required for `when()` conditions');
@@ -48,8 +59,10 @@ var Conditional = function () {
             values[_key2] = arguments[_key2];
           }
 
-          var ctx = values.pop();
-          return isFn.apply(undefined, values) ? ctx.concat(then) : ctx.concat(otherwise);
+          var currentSchema = values.pop();
+          var option = isFn.apply(undefined, values) ? then : otherwise;
+
+          return option(currentSchema);
         };
       })();
     }

lib/array.js

@@ -4,6 +4,8 @@ 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 _templateObject = _taggedTemplateLiteralLoose(['', '[', ']'], ['', '[', ']']);
+
 var _typeName = require('type-name');
 
 var _typeName2 = _interopRequireDefault(_typeName);
@@ -20,6 +22,10 @@ var _isSchema = require('./util/isSchema');
 
 var _isSchema2 = _interopRequireDefault(_isSchema);
 
+var _makePath = require('./util/makePath');
+
+var _makePath2 = _interopRequireDefault(_makePath);
+
 var _mixed = require('./mixed');
 
 var _mixed2 = _interopRequireDefault(_mixed);
@@ -32,6 +38,8 @@ var _runValidations2 = _interopRequireDefault(_runValidations);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _taggedTemplateLiteralLoose(strings, raw) { strings.raw = raw; return strings; }
+
 var hasLength = function hasLength(value) {
   return !(0, _isAbsent2.default)(value) && value.length > 0;
 };
@@ -99,7 +107,7 @@ function ArraySchema(type) {
       }
 
       var validations = value.map(function (item, idx) {
-        var path = (options.path || '') + '[' + idx + ']';
+        var path = (0, _makePath2.default)(_templateObject, options.path, idx);
 
         // object._validate note for isStrict explanation
         var innerOptions = _extends({}, options, {
@@ -122,22 +130,10 @@ 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');
+    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. ' + 'not: ' + (0, _typeName2.default)(schema));
 
     next._subType = schema;
 

lib/mixed.js

@@ -2,10 +2,6 @@
 
 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 _has = require('lodash/has');
 
 var _has2 = _interopRequireDefault(_has);
@@ -160,24 +156,25 @@ SchemaType.prototype = {
     return this;
   },
   cast: function cast(value) {
-    var opts = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-    var schema = this.resolve(opts);
+    var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-    var result = schema._cast(value, opts);
+    var resolvedSchema = this.resolve(options);
+    var result = resolvedSchema._cast(value, options);
 
-    if (opts.assert !== false && !this.isType(result)) {
-      throw new TypeError('Expected ' + (opts.path || 'field') + ' to be type: "' + this._type + '". ' + ('Got "' + (0, _typeName2.default)(value) + '" instead.'));
+    if (value !== undefined && options.assert !== false && resolvedSchema.isType(result) !== true) {
+      var formattedValue = JSON.stringify(value);
+      var formattedResult = JSON.stringify(result);
+      throw new TypeError('The value of ' + (options.path || 'field') + ' could not be cast to a value ' + ('that satisfies the schema type: "' + resolvedSchema._type + '". \n\n') + ('attempted value: ' + JSON.stringify(value) + ' \n') + (formattedResult !== formattedValue ? 'result of cast: ' + JSON.stringify(result) : ''));
     }
 
     return result;
   },
-  _cast: function _cast(_value) {
+  _cast: function _cast(rawValue) {
     var _this2 = this;
 
-    var value = _value === undefined ? _value : this.transforms.reduce(function (value, transform) {
-      return transform.call(_this2, value, _value);
-    }, _value);
+    var value = rawValue === undefined ? rawValue : this.transforms.reduce(function (value, fn) {
+      return fn.call(_this2, value, rawValue);
+    }, rawValue);
 
     if (value === undefined && (0, _has2.default)(this, '_default')) {
       value = this.default();
@@ -195,34 +192,28 @@ SchemaType.prototype = {
 
     return nodeify(schema._validate(value, options), cb);
   },
-
-
-  //-- tests
   _validate: function _validate(_value) {
     var _this3 = this;
 
     var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-    var value = _value,
-        schema = void 0,
-        endEarly = void 0,
-        isStrict = void 0;
+    var value = _value;
 
-    schema = this;
-    isStrict = this._option('strict', options);
-    endEarly = this._option('abortEarly', options);
+    var isStrict = this._option('strict', options);
+    var endEarly = this._option('abortEarly', options);
 
     var path = options.path;
     var label = this._label;
 
     if (!isStrict) {
+
       value = this._cast(value, _extends({ assert: false }, options));
     }
     // value is cast, we can check if it meets type requirements
     var validationParams = { value: value, path: path, schema: this, options: options, label: label };
     var initialTests = [];
 
-    if (schema._typeError) initialTests.push(this._typeError(validationParams));
+    if (this._typeError) initialTests.push(this._typeError(validationParams));
 
     if (this._whitelistError) initialTests.push(this._whitelistError(validationParams));
 
@@ -258,8 +249,9 @@ SchemaType.prototype = {
   },
   default: function _default(def) {
     if (arguments.length === 0) {
-      var dflt = (0, _has2.default)(this, '_default') ? this._default : this._defaultDefault;
-      return typeof dflt === 'function' ? dflt.call(this) : (0, _clone2.default)(dflt);
+      var defaultValue = (0, _has2.default)(this, '_default') ? this._default : this._defaultDefault;
+
+      return typeof defaultValue === 'function' ? defaultValue.call(this) : (0, _clone2.default)(defaultValue);
     }
 
     var next = this.clone();
@@ -308,7 +300,7 @@ SchemaType.prototype = {
     var isExclusive = opts.exclusive || opts.name && next._exclusive[opts.name] === true;
 
     if (opts.exclusive && !opts.name) {
-      throw new TypeError('You cannot have an exclusive validation without a `name`');
+      throw new TypeError('Exclusive tests must provide a unique `name` identifying the test');
     }
 
     next._exclusive[opts.name] = !!opts.exclusive;
@@ -343,8 +335,8 @@ SchemaType.prototype = {
     var next = this.clone();
 
     next._typeError = (0, _createValidation2.default)({
-      message: message,
       name: 'typeError',
+      message: message,
       test: function test(value) {
         if (value !== undefined && !this.schema.isType(value)) return this.createError({
           params: {
@@ -361,8 +353,6 @@ SchemaType.prototype = {
 
     var next = this.clone();
 
-    if (next.tests.length) throw new TypeError('Cannot specify values when there are validation rules specified');
-
     enums.forEach(function (val) {
       next._blacklist.delete(val);
       next._whitelist.add(val);