isvalid 4.0.13 → 4.0.15

package/lib/formalize.js

@@ -9,7 +9,7 @@
 import merge from 'merge';
 import SchemaError from './errors/schema.js';
 import { instanceTypeName, typeName, isSameType } from './utils.js';
-import { formalize as _formalize } from './ranges.js';
+import { formalize as _formalizeRange, testFormalizedRange } from './ranges.js';
 import { all as allPlugins } from './plugins.js';
 
 const finalize = (formalizedSchema, nonFormalizedSchema) => {
@@ -128,7 +128,7 @@ const formalizeAny = (schema, options = {}) => {
 		});
 		if (isSameType('array', typeName(type))) merge(validators, {
 			'schema': 'any',
-			'len': [ 'string', 'number' ],
+			'len': [ 'string', 'number', testFormalizedRange ],
 			'unique': [ 'boolean' ],
 			'autoWrap': [ 'boolean' ]
 		});
@@ -139,7 +139,7 @@ const formalizeAny = (schema, options = {}) => {
 			'enum': [ 'array' ]
 		});
 		if (isSameType('number', typeName(type))) merge(validators, {
-			'range': [ 'string', 'number' ],
+			'range': [ 'string', 'number', testFormalizedRange ],
 			'float': [ 'string' ]
 		});
 	}
@@ -203,10 +203,10 @@ const formalizeAny = (schema, options = {}) => {
 		}
 
 		// Ensure validator is of correct type.
-		if (typeof validator !== 'undefined' && validator !== 'any' && validator.indexOf(instanceTypeName(test)) == -1) {
+		if (typeof validator !== 'undefined' && validator !== 'any' && Array.isArray(validator) && !validator.some((validator) => typeof validator === 'function' ? validator(test) : validator === instanceTypeName(test))) {
 			throw new SchemaError(
 				schema,
-				`Validator '${key}' must be of type(s) ${validators[key].join(', ')}.`
+				`Validator '${key}' must be of type(s) ${validators[key].filter((validator) => typeof validator === 'string').join(', ')}.`
 			);
 		}
 
@@ -277,7 +277,7 @@ const formalizeAny = (schema, options = {}) => {
 
 	// Check len
 	if (typeof formalizedSchema.len !== 'undefined') {
-		formalizedSchema.len = _formalize(formalizedSchema.len, {
+		formalizedSchema.len = _formalizeRange(formalizedSchema.len, {
 			allowNegative: false,
 			allowNonIntegers: false
 		});
@@ -285,7 +285,7 @@ const formalizeAny = (schema, options = {}) => {
 
 	// Check range
 	if (typeof formalizedSchema.range !== 'undefined') {
-		formalizedSchema.range = _formalize(formalizedSchema.range, {
+		formalizedSchema.range = _formalizeRange(formalizedSchema.range, {
 			allowNegative: true,
 			allowNonIntegers: true
 		});

package/lib/ranges.js

@@ -8,8 +8,19 @@ export function testIndex(ranges, value) {
 	});
 }
 
+export function testFormalizedRange(range) {
+	if (!Array.isArray(range)) return false;
+	if (range.some((range) => typeof range !== 'object')) return false;
+	return range.every((range) => {
+		if (Object.keys(range).length != 2) return false;
+		return ['lower', 'upper'].every((key) => typeof range[key] !== 'undefined');
+	});
+}
+
 export function formalize(ranges, options) {
 
+	if (testFormalizedRange(ranges)) return ranges;
+
 	// Convert to string if ranges is a Number.
 	if (ranges !== undefined && typeof ranges === 'number') {
 		ranges = ranges.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isvalid",
-  "version": "4.0.13",
+  "version": "4.0.15",
   "description": "Async JSON validation library for node.js.",
   "main": "./index.js",
   "type": "module",
@@ -19,11 +19,11 @@
     "merge": "^2.1.1"
   },
   "devDependencies": {
-    "@trenskow/caseit": "^1.3.9",
+    "@trenskow/caseit": "^1.3.10",
     "body-parser": "^1.20.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "express": "^4.18.2",
     "mocha": "^10.2.0",
     "supertest": "^6.3.3"

package/test/ranges.js

@@ -47,4 +47,10 @@ describe('ranges', function() {
 	it ('should allow for decimal values.', function() {
 		expect(r('(-2.2)-2.2', 0.1)).to.equal(true);
 	});
+	it ('should allow for already formalized ranges.', function() {
+		expect(r([{
+			lower: 0,
+			upper: 2
+		}], 1)).to.equal(true);
+	});
 });