Update instance properties after every query

lib/Instance.js

@@ -29,34 +29,40 @@ function Instance(model, doc, isNew) {
 
 	var oldDoc = _.cloneDeep(doc);
 	var newDoc = _.cloneDeep(doc);
-
-	var schema = {};
 
-	for(var property in doc)
-		schema[property] = false;
-
-	for(var property in model.schema)
-		schema[property] = model.schema[property];
+	var schema = {};
 
-	for(var targetProperty in schema) {
-		(function(targetProperty) {
-			Object.defineProperty($, targetProperty, {
-				get: function() {
-					/// <value type="Object">Get the most recent value for this field</value>
-					return newDoc[targetProperty];
-				},
-				set: function(value) {
-					/// <value type="Object">Set the value of this field. Changes may be committed by calling save() on this instance.</value>
-					var validation = validate(schema[targetProperty], value, targetProperty, model.extraValidators);
-					if (!validation.passed) throw validation.toError();
-
-					newDoc[targetProperty] = value;
-				},
-				enumerable: true
-			});
-		})(targetProperty);
+	function addSchemaProperties() {	
+
+		for(var property in newDoc)
+			schema[property] = false;
+
+		for(var property in model.schema)
+			schema[property] = model.schema[property];
+
+		for(var targetProperty in schema) {
+			if(!$.hasOwnProperty(targetProperty))
+				(function(targetProperty) {
+					Object.defineProperty($, targetProperty, {
+						get: function() {
+							/// <value type="Object">Get the most recent value for this field</value>
+							return newDoc[targetProperty];
+						},
+						set: function(value) {
+							/// <value type="Object">Set the value of this field. Changes may be committed by calling save() on this instance.</value>
+							var validation = validate(schema[targetProperty], value, targetProperty, model.extraValidators);
+							if (!validation.passed) throw validation.toError();
+
+							newDoc[targetProperty] = value;
+						},
+						enumerable: true
+					});
+				})(targetProperty);
+		}
 	}
 
+	addSchemaProperties();
+
 	for (var methodName in model.options.methods) {		
 		(function (methodName) {
 			Object.defineProperty($, methodName, {
@@ -127,6 +133,8 @@ function Instance(model, doc, isNew) {
 					transform.down(options.transforms, inserted);
 
 					oldDoc = newDoc = inserted;
+
+					addSchemaProperties();
 
 					isNew = false;
 
@@ -163,6 +171,8 @@ function Instance(model, doc, isNew) {
 								newDoc = _.clone(updated);
 								oldDoc = _.clone(updated);
 
+								addSchemaProperties();
+
 								return cb(null, $);
 							});
 						} else return cb(null, $);
@@ -202,6 +212,8 @@ function Instance(model, doc, isNew) {
 
 				oldDoc = newDoc = updated;
 
+				addSchemaProperties();
+
 				if(callback) return callback(null, $);
 			});
 		}