isvalid 4.0.8 → 4.0.9

package/lib/formalize.js

@@ -96,10 +96,14 @@ const formalizeAny = (schema, options = {}) => {
 		throw new SchemaError(schema, 'Schemas must have at least on validator of `type`, `post`/`pre` and/or `equal`.');
 	}
 
+	const convenienceNames = {
+		'autowrap': 'autoWrap' // Fix younger Kristian
+	};
+
 	// Copy schema.
 	let formalizedSchema = {};
 	for (let key in schema) {
-		formalizedSchema[key] = schema[key];
+		formalizedSchema[convenienceNames[key] || key] = schema[key];
 	}
 
 	// Validators common to all types.
@@ -126,7 +130,7 @@ const formalizeAny = (schema, options = {}) => {
 			'schema': 'any',
 			'len': [ 'string', 'number' ],
 			'unique': [ 'boolean' ],
-			'autowrap': [ 'boolean' ]
+			'autoWrap': [ 'boolean' ]
 		});
 		if (isSameType('string', typeName(type))) merge(validators, {
 			'len': [ 'string', 'number' ],
@@ -149,6 +153,8 @@ const formalizeAny = (schema, options = {}) => {
 	// for non-supported validators at the same time.
 	for (let key in formalizedSchema) {
 
+		key = convenienceNames[key] || key;
+
 		let validator = validators[key];
 		let test = formalizedSchema[key];
 

package/lib/validate.js

@@ -83,7 +83,7 @@ const validateArray = async (data, schema, options, keyPath, validatedData) => {
 
 		if (!Array.isArray(data)) {
 
-			if (checkBoolValue('autowrap', schema, options.defaults)) {
+			if (checkBoolValue('autoWrap', schema, options.defaults)) {
 				return await validateArray([data], schema, options, keyPath, validatedData);
 			} else {
 				throw new ValidationError(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isvalid",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "Async JSON validation library for node.js.",
   "main": "./index.js",
   "type": "module",

package/test/validate.js

@@ -616,24 +616,24 @@ describe('validate', function() {
 				});
 			});
 		});
-		describe('autowrap', function() {
-			it('should come back with non-array wrapped in array', () => {
+		describe('autoWrap', function() {
+			it('should come back with non-array wrapped in array.', () => {
 				return expect(isvalid({
 					test: true
 				}, {
 					type: Array,
-					autowrap: true,
+					autoWrap: true,
 					schema: {
 						test: Boolean
 					}
 				})).to.eventually.be.an('array').and.to.have.property(0).and.to.have.property('test', true);
 			});
-			it('should come back with type error if autowrap and not matching sub-schema.', () => {
+			it('should come back with type error if autoWrap and not matching sub-schema.', () => {
 				return expect(isvalid({
 					test: 'Not a boolean'
 				}, {
 					type: Array,
-					autowrap: true,
+					autoWrap: true,
 					schema: {
 						test: Boolean
 					}}))
@@ -641,7 +641,7 @@ describe('validate', function() {
 					.and.to.be.instanceOf(ValidationError)
 					.and.have.property('validator', 'type');
 			});
-			it('should come back with type error if no autowrap and matching sub-schema.', () => {
+			it('should come back with type error if no autoWrap and matching sub-schema.', () => {
 				return expect(isvalid({
 					test: true
 				}, [{
@@ -653,8 +653,8 @@ describe('validate', function() {
 			it('should prioritize concrete over defaults.', () => {
 				return expect(isvalid(true, {
 					type: Array,
-					autowrap: false
-				}, { defaults: { autowrap: true }}))
+					autoWrap: false
+				}, { defaults: { autoWrap: true }}))
 					.to.eventually.be.rejectedWith('Is not of type array.')
 					.and.to.be.instanceOf(ValidationError)
 					.and.have.property('validator', 'type');