logic fix

Author: 0x0a0d

lib/validator.js

@@ -140,19 +140,17 @@ class Validator {
 	 * @param {any} value
 	 */
 	clone(value) {
-		if (value == null || value.constructor !== 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;
-			}, {});
+		if (value != null) {
+			if (Array.isArray(value)) {
+				return value.map(val => this.clone(val));
+			} else if (value.constructor === Object) {
+				return Object.keys(value).reduce((obj, key) => {
+					obj[key] = this.clone(value[key]);
+					return obj;
+				}, {});
+			}
 		}
+		return value;
 	}
 
 	/**
@@ -162,25 +160,17 @@ class Validator {
 	 * @param {any} vals - keep values that will merge to ref
 	 */
 	removeChildrenAndMerge(target, vals) {
-		if (target == null || target.constructor !== Object) {
-			// dont need to change
-			return;
-		}
-
-		if (vals == null || vals.constructor !== 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);
+		if (target != null && vals != null) {
+			if (Array.isArray(target) && Array.isArray(vals)) {
+				target.splice(0, target.length, ...vals);
+			} else if (target.constructor === Object && vals.constructor === Object) {
+				// clear children
+				Object.keys(target).forEach(key => {
+					delete target[key];
+				});
+				// merge
+				Object.assign(target, vals);
+			}
 		}
 	}
 
@@ -375,8 +365,8 @@ class Validator {
 
 	/**
 	 * Parse rule from shorthand string
-	 * @param {String} str shorthand string
-	 * @param {Object} schema schema reference
+	 * @param {String} str - shorthand string
+	 * @return {Object} - schema reference
 	 */
 
 	parseShortHand(str) {