Merge pull request #98 from icebob/next

Beta2

Author: icebob

CHANGELOG.md

@@ -1,6 +1,13 @@
 --------------------------------------------------
-<a name="1.0.0"></a>
-# 1.0.0 (2019-11-xx)
+<a name="1.0.0-beta2"></a>
+# 1.0.0-beta2 (2019-11-15)
+
+## Changes
+- fix array rule return value issue.
+
+--------------------------------------------------
+<a name="1.0.0-beta1"></a>
+# 1.0.0-beta1 (2019-11-15)
 
 The full library has been rewritten. It uses code generators in order to be much faster.
 

README.md

@@ -25,15 +25,15 @@
 * unit tests & 100% coverage
 
 # How fast?
-Very fast! ~5 million validations/sec (on Intel i7-4770K, Node.JS: 10.16.0)
+Very fast! 8 million validations/sec (on Intel i7-4770K, Node.JS: 10.16.0)
 ```
 √ validate                        8,461,975 rps
 ```
 
 Compared to other popular libraries:
 
-[![Result](https://user-images.githubusercontent.com/306521/47523074-79cdec80-d897-11e8-86a0-ad07556be8bc.png)](https://github.com/icebob/validator-benchmark#result)
-> 100x faster than Joi.
+[![Result](https://user-images.githubusercontent.com/306521/68978853-404a8500-07fc-11ea-94e4-0c25546dad04.png)](https://github.com/icebob/validator-benchmark#result)
+> 50x faster than Joi.
 
 **Would you like to test it?**
 

examples/next.js

@@ -20,9 +20,9 @@ v.add("even", function({ schema, messages }, path, context) {
 });
 
 const schema = {
-	id: "number|positive|integer|convert",
-	name: "string|min: 3|max: 255|padStart: 5",
-	token: "forbidden|remove",
+	//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"] },
@@ -59,7 +59,8 @@ const schema = {
 			weightMin: "The '${field}' must be greater than {expected}! Actual: {actual}"
 		}
 	}*/
-	num: { type: "even" }
+	includes: { type: "multi", optional: true, rules: [ { type: "string" }, { type: "array", items: "string" } ] },
+	//num: { type: "even" }
 };
 
 const check = v.compile(schema);
@@ -90,6 +91,9 @@ const obj = {
 
 	createdAt: Date.now(),
 
+	//includes: "test1",
+	//includes: ["test1", "test2"],
+
 	weight: 10,
 	num: 2
 };

lib/rules/array.js

@@ -87,6 +87,8 @@ module.exports = function({ schema, messages }, path, context) {
 		*/
 		src.push(`
 			}
+
+			return value;
 		`);
 	}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "fastest-validator",
-  "version": "1.0.0-beta1",
+  "version": "1.0.0-beta2",
   "description": "The fastest JS validator library for NodeJS",
   "main": "index.js",
   "browser": "dist/index.min.js",

package.json

@@ -91,4 +91,23 @@ describe("Test rule: array", () => {
 		]);
 	});
 
+	describe("Test sanitization", () => {
+
+		it("should trim all items", () => {
+			let schema = {
+				roles: { type: "array", items: "string|trim" }
+			};
+			let check = v.compile(schema);
+
+			const obj = {
+				roles: ["  admin", "user   ", "  moderator  "]
+			};
+
+			expect(check(obj)).toEqual(true);
+			expect(obj).toEqual({
+				roles: ["admin", "user", "moderator"]
+			});
+		});
+
+	});
 });

test/rules/array.spec.js

@@ -96,4 +96,24 @@ describe('TypeScript Definitions', () => {
             ]);
         });
     });
+
+	describe("Test sanitization", () => {
+
+		it("should trim all items", () => {
+			let schema = {
+				roles: { type: "array", items: "string|trim" } as RuleArray
+			};
+			let check = v.compile(schema);
+
+			const obj = {
+				roles: ["  admin", "user   ", "  moderator  "]
+			};
+
+			expect(check(obj)).toEqual(true);
+			expect(obj).toEqual({
+				roles: ["admin", "user", "moderator"]
+			});
+		});
+
+	});
 });