fix #174

Author: icebob

src/utils/schema.js

@@ -1,10 +1,16 @@
-import {get, set, each} from "lodash";
+import {get, set, each, isObject, isArray, isFunction, cloneDeep} from "lodash";
 
 // Create a new model by schema default values
 module.exports.createDefaultObject = function (schema, obj = {}){
 	each(schema.fields, (field) => {
-		if (get(obj, field.model) === undefined && field.default !== undefined)
-			set(obj, field.model, field.default);
+		if (get(obj, field.model) === undefined && field.default !== undefined) {
+			if (isFunction(field.default)) {
+				set(obj, field.model, field.default(field, schema, obj));
+			} else if (isObject(field.default) || isArray(field.default)) {
+				set(obj, field.model, cloneDeep(field.default));
+			} else
+				set(obj, field.model, field.default);
+		}
 	});
 	return obj;
 };

test/unit/specs/utils/schema.spec.js

@@ -1,3 +1,4 @@
+/* global sinon */
 import { expect } from "chai";
 import { clone } from "lodash";
 
@@ -7,14 +8,21 @@ describe("SchemaUtils", () => {
 
 	describe("test createDefaultObject function", () => {
 
+		let obj = { a: 5 };
+		let arr = [5, 3];
+
+		let cb = sinon.stub().returns(100);
+
 		let schema = {
 			fields: [
 				{	model: "id"									},
 				{	model: "name",		default: "Anonymous" 	},
 				{	model: "password"							},	
 				{	model: "age",		default: 30 			},	
 				{	model: "email"								},					
-				{	model: "skills",	default: [] 			},
+				{	model: "skills",	default: arr 			},
+				{	model: "data",		default: obj 			},
+				{	model: "fromFn",	default: cb 			},
 				{	model: "status",	default: true 			}
 			]
 		};
@@ -28,9 +36,17 @@ describe("SchemaUtils", () => {
 				id: 5,
 				name: "Anonymous",
 				age: 45,
-				skills: [],
+				skills: [5, 3],
+				data: { a: 5 },
+				fromFn: 100,
 				status: true
 			});
+
+			// Need to clone Object & Array
+			expect(res.skills).to.not.equal(arr);
+			expect(res.data).to.not.equal(obj);
+
+			expect(cb.calledOnce).to.be.true;
 		});