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

Author: icebob

lib/rules/string.js

@@ -137,7 +137,7 @@ module.exports = function checkString({ schema, messages }, path, context) {
 
 		src.push(`
 			if (!${pattern.toString()}.test(value))
-				${this.makeError({ type: "stringPattern", expected: "\"" + pattern.toString() + "\"", actual: "origValue", messages })}
+				${this.makeError({ type: "stringPattern", expected: "\"" + pattern.toString().replace('"', "\\\"") + "\"", actual: "origValue", messages })}
 		`);
 	}
 

test/rules/string.spec.js

@@ -62,6 +62,13 @@ describe("Test rule: string", () => {
 		expect(check("JOHN")).toEqual(true);
 	});
 
+	it('check pattern with a quote', () => {
+		const check = v.compile({ $$root: true, type: 'string', pattern: /^[a-z0-9 .\-'?!":;\\/,_]+$/i });
+
+		expect(check('John^')).toEqual([{ field: undefined, type: 'stringPattern', expected: '/^[a-z0-9 .\-\'?!":;\\/,_]+$/i', actual: 'John^', message: 'The \'\' field fails to match the required pattern.' }]);
+		expect(check('JOHN')).toEqual(true);
+	});
+
 	it("check contains", () => {
 		const check = v.compile({ $$root: true, type: "string", contains: "bob" });
 

test/typescript/rules/string.spec.ts

@@ -64,7 +64,14 @@ describe('TypeScript Definitions', () => {
             expect(check('JOHN')).toEqual(true);
         });
 
-        it('check contains', () => {
+		it('check pattern with a quote', () => {
+			const check = v.compile({ $$root: true, type: 'string', pattern: /^[a-z0-9 .\-'?!":;\\/,_]+$/i } as RuleString);
+
+			expect(check('John^')).toEqual([{ field: undefined, type: 'stringPattern', expected: '/^[a-z0-9 .\-\'?!":;\\/,_]+$/i', actual: 'John^', message: 'The \'\' field fails to match the required pattern.' }]);
+			expect(check('JOHN')).toEqual(true);
+		});
+
+		it('check contains', () => {
             const check = v.compile({ $$root: true, type: 'string', contains: 'bob' });
 
             expect(check('John')).toEqual([{ type: 'stringContains', expected: 'bob', actual: 'John', message: 'The \'\' field must contain the \'bob\' text.' }]);