Added U.clone().

petersirka · petersirka · commit 22eb30880247 · 2016-01-04T13:59:21.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -1,6 +1,7 @@
 ======= 1.9.6 (BETA)
 
 - added: MailMessage.manually() and removes auto-sending mail --> works only with F.mail() and controller.Mail().
+- added: U.clone(obj, [skip])
 
 - updated: F.mail() supports themes with view nema like this `=default/someview'`
 - updated: @{import()} supports movies and images
diff --git a/test/test-utils.js b/test/test-utils.js
@@ -355,12 +355,13 @@ function other() {
 
 	assert.ok(JSON.stringify(utils.extend({ id: 1 })) === '{"id":1}', 'utils.extend() - undefined');
 
-	utils.copy(obj, { name: 'Peter', age: 25 });
+	var anonymous = { name: 'Peter', age: 25, arr: [1, 2, 3] };
 	assert.ok(!obj.name, 'utils.copy(2)');
-
 	assert.ok(utils.copy({ name: 'Janko' }).name === 'Janko', 'utils.copy(1)');
 
-	utils.extend(obj, { name: 'Peter', age: 25 });
+	utils.extend(obj, anonymous);
+	obj.arr.push(4);
+	assert.ok(obj.arr.length !== anonymous.length, 'utils.copy(2)');
 	assert.ok(obj.name === 'Peter' && obj.age === 25, 'utils.extend()');
 
 	utils.copy({ name: 'A', age: -1 }, obj);
diff --git a/utils.js b/utils.js
@@ -1065,12 +1065,73 @@ exports.extend = function(target, source, rewrite) {
 	while (i--) {
 		var key = keys[i];
 		if (rewrite || target[key] === undefined)
-			target[key] = source[key];
+			target[key] = exports.clone(source[key]);
 	}
 
 	return target;
 };
 
+/**
+ * Clones object
+ * @param {Object} obj
+ * @param {Object} skip Optional, can be only object e.g. { name: true, age: true }.
+ * @param {Boolean} skipFunctions It doesn't clone functions, optional --> default false.
+ * @return {Object}
+ */
+exports.clone = function(obj, skip, skipFunctions) {
+
+	if (!obj)
+		return obj;
+
+	var type = typeof(obj);
+
+	if (type !== OBJECT)
+		return obj;
+
+	var length;
+	var o;
+
+	if (obj instanceof Array) {
+
+		length = obj.length;
+		o = new Array(length);
+
+		for (var i = 0; i < length; i++) {
+			type = typeof(obj[i]);
+			if (type !== OBJECT) {
+				if (skipFunctions && type === FUNCTION)
+					continue;
+				o[i] = obj[i];
+				continue;
+			}
+			o[i] = exports.clone(obj[i], skip, skipFunctions);
+		}
+
+		return o;
+	}
+
+	o = {};
+
+	for (var m in obj) {
+
+		if (skip && skip[m])
+			continue;
+
+		var val = obj[m];
+		var type = typeof(val);
+		if (type !== OBJECT) {
+			if (skipFunctions && type === FUNCTION)
+				continue;
+			o[m] = val;
+			continue;
+		}
+
+		o[m] = exports.clone(obj[m], skip, skipFunctions);
+	}
+
+	return o;
+}
+
 /**
  * Copy values from object to object
  * @param {Object} source Object source
@@ -1092,12 +1153,10 @@ exports.copy = function(source, target) {
 	var i = keys.length;
 
 	while (i--) {
-
 		var key = keys[i];
 		if (target[key] === undefined)
 			continue;
-
-		target[key] = source[key];
+		target[key] = exports.clone(source[key]);
 	}
 
 	return target;
