Add enhanced shorthand rules

Author: icebob

examples/next.js

@@ -8,9 +8,9 @@ let v = new Validator({
 });
 
 const schema = {
-	//id: { type: "number", positive: true, integer: true, convert: true },
-	//name: { type: "string", min: 3, max: 255, padStart: 5 },
-	token: { type: "forbidden", remove: true },
+	id: "number|positive|integer|convert",
+	name: "string|min: 3|max: 255|padStart: 5",
+	token: "forbidden|remove",
 	//password: { type: "string", min: 6 },
 	//confirmPassword: { type: "equal", field: "password" },
 	//roles: { type: "array", items: "string", min: 1, default: ["user"] },

lib/validator.js

@@ -239,9 +239,31 @@ class Validator {
 	 */
 	getRuleFromSchema(schema) {
 		if (typeof schema === "string") {
+			const str = schema;
+			const p = str.split("|").map(s => s.trim());
 			schema = {
-				type: schema
+				type: p[0]
 			};
+			p.slice(1).map(s => {
+				const idx = s.indexOf(":");
+				if (idx !== -1) {
+					const key = s.substr(0, idx).trim();
+					let value = s.substr(idx + 1).trim();
+					if (value === "true" || value === "false")
+						value = value === "true";
+					else if (!Number.isNaN(Number(value))) {
+						value = Number(value);
+					}
+					schema[key] = value;
+				} else {
+					// boolean value
+					if (s.startsWith("no-"))
+						schema[s.slice(3)] = false;
+					else
+						schema[s] = true;
+				}
+			});
+
 		} else if (Array.isArray(schema)) {
 			if (schema.length == 0)
 				throw new Error("Invalid schema.");

test/validator.spec.js

@@ -120,11 +120,6 @@ describe("Test getRuleFromSchema method", () => {
 
 	const v = new Validator();
 
-	it("should convert string shorthand", () => {
-		const res = v.getRuleFromSchema("string");
-		expect(res.schema).toEqual({ type: "string" });
-	});
-
 	it("should convert array to multi rule", () => {
 		const res = v.getRuleFromSchema([
 			"string",
@@ -172,6 +167,25 @@ describe("Test getRuleFromSchema method", () => {
 			v.compile(schema);
 		}).toThrowError("Invalid 's' type in validator schema.");
 	});
+
+	describe("Test string shorthard rules", () => {
+
+		it("should convert only type", () => {
+			const res = v.getRuleFromSchema("string");
+			expect(res.schema).toEqual({ type: "string" });
+		});
+
+		it("should convert with properties", () => {
+			const res = v.getRuleFromSchema("string|min:3 | max : 10| trim");
+			expect(res.schema).toEqual({ type: "string", min: 3, max: 10, trim: true });
+		});
+
+		it("should convert with disabled properties", () => {
+			const res = v.getRuleFromSchema("string|no-empty|trim:true|alpha:false|some:1234kg");
+			expect(res.schema).toEqual({ type: "string", empty: false, alpha: false, trim: true, some: "1234kg" });
+		});
+
+	});
 });
 
 describe("Test compile (integration test)", () => {