Merge branch 'master' of git://github.com/icebob/fastest-validator into feature_charset

sync fork

Author: andersonjoseph

examples/full.js

@@ -3,7 +3,7 @@
 const Validator = require("../index");
 const v = new Validator({
 	messages: {
-		stringMin: "A(z) '{name}' mező túl rövid. Minimum: {0}, Jelenleg: {1}"
+		stringMin: "A(z) '{field}' mező túl rövid. Minimum: {expected}, Jelenleg: {actual}"
 	}
 });
 

lib/messages.js

@@ -45,5 +45,7 @@ module.exports = {
 
 	email: "The '{field}' field must be a valid e-mail!",
 
+	url: "The '{field}' field must be a valid URL!",
+
 	enumValue: "The '{field} field value '{expected}' does not match any of the allowed values!",
 };

lib/rules/string.js

@@ -28,8 +28,10 @@ module.exports = function checkString(value, schema) {
 		return this.makeError("stringLength", schema.length, valueLength);
 	}	
 
-	if (schema.pattern != null && !schema.pattern.test(value)) {
-		return this.makeError("stringPattern", schema.pattern );
+	if (schema.pattern != null) {
+		const pattern = typeof schema.pattern == "string" ? new RegExp(schema.pattern, schema.patternFlags) : schema.pattern;
+		if (!pattern.test(value))
+			return this.makeError("stringPattern", pattern );
 	}
 
 	if (schema.contains != null && value.indexOf(schema.contains) === -1) {

lib/validator.js

@@ -33,19 +33,19 @@ function escapeEvalString(str) {
 	// Based on https://github.com/joliss/js-string-escape
 	return str.replace(escapeEvalRegex, function (character) {
 		switch (character) {
-			case "\"":
-			case "'":
-			case "\\":
-				return "\\" + character;
+		case "\"":
+		case "'":
+		case "\\":
+			return "\\" + character;
 			// Four possible LineTerminator characters need to be escaped:
-			case "\n":
-				return "\\n";
-			case "\r":
-				return "\\r";
-			case "\u2028":
-				return "\\u2028";
-			case "\u2029":
-				return "\\u2029";
+		case "\n":
+			return "\\n";
+		case "\r":
+			return "\\r";
+		case "\u2028":
+			return "\\u2028";
+		case "\u2029":
+			return "\\u2029";
 		}
 	});
 }
@@ -97,15 +97,15 @@ Validator.prototype.compile = function(schema) {
 
 		const rules = this.compileSchemaType(schema);
 		this.cache.clear();
-		return function(value) {
-			return self.checkSchemaType(value, rules, undefined, null);
+		return function(value, path, parent) {
+			return self.checkSchemaType(value, rules, path, parent || null);
 		};
 	} 
 
 	const rule = this.compileSchemaObject(schema);
 	this.cache.clear();
-	return function(value) {
-		return self.checkSchemaObject(value, rule, undefined, null);
+	return function(value, path, parent) {
+		return self.checkSchemaObject(value, rule, path, parent || null);
 	};
 };
 

test/messages.spec.js

@@ -38,6 +38,7 @@ describe("Test Messages", () => {
 		expect(msg.dateMax).toBeDefined();
 		expect(msg.forbidden).toBeDefined();
 		expect(msg.email).toBeDefined();
+		expect(msg.url).toBeDefined();
 
 	});
 

test/rules/string.spec.js

@@ -60,6 +60,13 @@ describe("Test checkString", () => {
 		expect(check("JOHN", s)).toEqual(true);
 	});
 
+	it("check pattern with string", () => {
+		const s = { type: "string", pattern: "^[A-Z]+$", patternFlags: "g" };
+		
+		expect(check("John", s)).toEqual({ type: "stringPattern", expected: /^[A-Z]+$/g });
+		expect(check("JOHN", s)).toEqual(true);
+	});
+
 	it("check contains", () => {
 		const s = { type: "string", contains: "bob" };
 

test/validator.spec.js

@@ -301,6 +301,63 @@ describe("Test compile (integration test)", () => {
 
 	});
 
+	describe("Test check generator with custom path & parent", () => {
+
+		it("when schema is defined as an array, and custom path & parent are specified, they should be forwarded to validators", () => {
+			const v = new Validator();
+			const customValidator = jest.fn().mockReturnValue(true);	// Will be called with (value, schema, path, parent)
+			v.add("customValidator", customValidator);
+
+			const validate = v.compile([{ type: "customValidator" }]);
+			const parent = {};
+			const res = validate({ customValue: 4711 }, "customPath", parent);
+
+			expect(res).toBe(true);
+			expect(customValidator.mock.calls[0][2]).toBe("customPath");
+			expect(customValidator.mock.calls[0][3]).toBe(parent);
+		});
+
+		it("when schema is defined as an array, path & parent should be set to default values in validators", () => {
+			const v = new Validator();
+			const customValidator = jest.fn().mockReturnValue(true);	// Will be called with (value, schema, path, parent)
+			v.add("customValidator", customValidator);
+
+			const validate = v.compile([{ type: "customValidator" }]);
+			const res = validate({ customValue: 4711 });
+
+			expect(res).toBe(true);
+			expect(customValidator.mock.calls[0][2]).toBeUndefined();
+			expect(customValidator.mock.calls[0][3]).toBeNull();
+		});
+
+		it("when schema is defined as an object, and custom path is specified, it should be forwarded to validators", () => {
+			// Note: as the item we validate always must be an object, there is no use
+			// of specifying a custom parent, like for the schema-as-array above. 
+			// The parent is currently used in the validator code (only forwarded to the generated
+			// function that validates all properties) and there is no way to test it.
+			const v = new Validator();
+			const customValidator = jest.fn().mockReturnValue(true);	// Will be called with (value, schema, path, parent)
+			v.add("customValidator", customValidator);
+
+			const validate = v.compile({ customValue: { type: "customValidator" } });
+			const res = validate({ customValue: 4711 }, "customPath");
+
+			expect(res).toBe(true);
+			expect(customValidator.mock.calls[0][2]).toBe("customPath.customValue");
+		});
+
+		it("when schema is defined as an object, path should be set to default value in validators", () => {
+			const v = new Validator();
+			const customValidator = jest.fn().mockReturnValue(true);	// Will be called with (value, schema, path, parent)
+			v.add("customValidator", customValidator);
+
+			const validate = v.compile({ customValue: { type: "customValidator" } });
+			const res = validate({ customValue: 4711 });
+
+			expect(res).toBe(true);
+			expect(customValidator.mock.calls[0][2]).toBe("customValue");
+		});
+	});
 });
 
 describe("Test nested schema", () => {