clone value object to validate

merge without change ref of value object after validated

Author: 0x0a0d

lib/rules/multi.js

@@ -19,7 +19,7 @@ module.exports = function({ schema, messages }, path, context) {
 		`);
 
 		const rule = this.getRuleFromSchema(schema.rules[i]);
-		src.push(this.compileRule(rule, context, path, "var tmpVal = context.fn[%%INDEX%%](value, field, parent, errors, context);", "tmpVal"));
+		src.push(this.compileRule(rule, context, path, "var tmpVal = context.fn[%%INDEX%%](context.validator.clone(value), field, parent, errors, context);", "tmpVal"));
 		src.push(`
 				if (errors.length == errBefore) {
 					hasValid = true;
@@ -32,6 +32,7 @@ module.exports = function({ schema, messages }, path, context) {
 	src.push(`
 		if (hasValid) {
 			errors.length = prevErrLen;
+			context.validator.removeChildrenAndMerge(value, newVal);
 		}
 		
 		return newVal;

lib/validator.js

@@ -106,7 +106,7 @@ class Validator {
 			// We should set default-value when value is undefined or null, not skip! (Except when null is allowed)
 			skipUndefinedValue = false;
 			if (rule.schema.nullable !== true) skipNullValue = false;
-			
+
 			let defaultValue;
 			if (typeof rule.schema.default === "function") {
 				if (!context.customs[rule.index]) context.customs[rule.index] = {};
@@ -120,7 +120,7 @@ class Validator {
 				value = ${defaultValue};
 				${resVar} = value;
 			`;
-			
+
 		} else {
 			handleNoValue = this.makeError({ type: "required", actual: "value", messages: rule.messages });
 		}
@@ -134,6 +134,56 @@ class Validator {
 		return src.join("\n");
 	}
 
+	/**
+	 * Simple clone value
+	 *
+	 * @param {any} value
+	 */
+	clone(value) {
+		if (value == null || typeof value !== "object") {
+			// dont need to clone
+			return value;
+		}
+
+		if (Array.isArray(value)) {
+			return value.map(val => this.clone(val));
+		} else {
+			return Object.keys(value).reduce((obj, key) => {
+				obj[key] = this.clone(value[key]);
+				return obj;
+			}, {});
+		}
+	}
+
+	/**
+	 * replace children content without change parent reference
+	 *
+	 * @param {any} target - target need to keep ref
+	 * @param {any} vals - keep values that will merge to ref
+	 */
+	removeChildrenAndMerge(target, vals) {
+		if (target == null || typeof target !== "object") {
+			// dont need to change
+			return;
+		}
+
+		if (vals == null || typeof vals !== "object") {
+			// unexpected, dont change
+			return;
+		}
+
+		if (Array.isArray(target) && Array.isArray(vals)) {
+			target.splice(0, target.length, ...vals);
+		} else {
+			// clear children
+			Object.keys(target).forEach(key => {
+				delete target[key];
+			});
+			// merge
+			Object.assign(target, vals);
+		}
+	}
+
 	/**
 	 * Compile a schema
 	 *
@@ -322,7 +372,7 @@ class Validator {
 
 		return rule;
 	}
-   
+
 	/**
 	 * Parse rule from shorthand string
 	 * @param {String} str shorthand string
@@ -397,7 +447,7 @@ class Validator {
 	 * @param {String} opts.path
 	 * @param {Object} opts.schema
 	 * @param {Object} opts.context
- 	 * @param {Object} opts.messages
+	 * @param {Object} opts.messages
 	 */
 	makeCustomValidator({ vName = "value", fnName = "custom", ruleIndex, path, schema, context, messages }) {
 		const ruleVName = "rule" + ruleIndex;

test/typescript/validator.spec.ts

@@ -120,7 +120,8 @@ describe('TypeScript Definitions', () => {
                 customs: expect.any(Object),
                 rules: expect.any(Array),
                 fn: expect.any(Array),
-                index: 2
+                index: 2,
+                validator: expect.any(Validator)
             };
 
             expect(validFn).toHaveBeenCalledTimes(1);

test/validator.spec.js

@@ -158,7 +158,8 @@ describe("Test add", () => {
 			customs: expect.any(Object),
 			rules: expect.any(Array),
 			fn: expect.any(Array),
-			index: 2
+			index: 2,
+			validator: expect.any(Validator)
 		};
 
 
@@ -496,7 +497,7 @@ describe("Test custom validation v1", () => {
 					fn(value);
 					if (value % 2 !== 0) return [{ type: "evenNumber", actual: value }];
 				}
-			}, 
+			},
 			b: {
 				type: "number",
 				custom(value){
@@ -696,3 +697,129 @@ describe("Test addMessage" , () => {
 	expect(v.messages.string).toBe("C");
 });
 
+describe("Test clone (simple)" , () => {
+	const v = new Validator();
+	it("should matches expected array", () => {
+		const actual = [
+			[
+				1, 2, {
+					a: 3,
+					b:"4",
+					c: [
+						{
+							d: 5,
+							e: "6",
+							f: false
+						}
+					]
+				}
+			]
+		];
+		const expected = [
+			[
+				1, 2, {
+					a: 3,
+					b:"4",
+					c: [
+						{
+							d: 5,
+							e: "6",
+							f: false
+						}
+					]
+				}
+			]
+		];
+		expect(v.clone(actual)).toMatchObject(expected);
+	});
+	it("should matches expected object", () => {
+		const actual = {
+			a: "1",
+			b: 2,
+			c: true,
+			d: [
+				{
+					e: "3",
+					f: 4,
+					g: {
+						h: "5",
+						i: false,
+						j: [
+							{
+								k: "7",
+								l: 8
+							}
+						]
+					}
+				}
+			]
+		};
+		const expected = {
+			a: "1",
+			b: 2,
+			c: true,
+			d: [
+				{
+					e: "3",
+					f: 4,
+					g: {
+						h: "5",
+						i: false,
+						j: [
+							{
+								k: "7",
+								l: 8
+							}
+						]
+					}
+				}
+			]
+		};
+		expect(v.clone(actual)).toMatchObject(expected);
+	});
+});
+
+describe("Test replaceAndMerge" , () => {
+	const v = new Validator();
+	it("should work on array", () => {
+		const target = [1,2,3,4];
+		const ref = target; // keep reference
+		const vals = [
+			[
+				1, 2, {
+					a: 3,
+					b:"4",
+					c: [
+						{
+							d: 5,
+							e: "6",
+							f: false
+						}
+					]
+				}
+			]
+		];
+		v.removeChildrenAndMerge(target, vals);
+		expect(ref).toBe(target);
+		expect(target).toMatchObject(vals);
+	});
+	it("should work on object", () => {
+		const target = {a: "1"};
+		const ref = target; // keep reference
+		const vals = {
+			a: 3,
+			b:"4",
+			c: [
+				{
+					d: 5,
+					e: "6",
+					f: false
+				}
+			]
+		};
+		v.removeChildrenAndMerge(target, vals);
+		expect(ref).toBe(target);
+		expect(target).toMatchObject(vals);
+	});
+});
+