Populate model name in child model errors

Author: CodingCarlos

lib/modelate.js

@@ -8,6 +8,7 @@ const modify = require('./modify').check;
  *	Create a new modelate, validating all properties
  *	Options might be:
  *	 - model: {Object} A model to use (instead of this.modelName)
+ *	 - modelName: {String} A name for the model to use (instead of this.modelName)
  *	@param data {Object} The data to validate
  *	@param opts {Object} Options for the modelate.
  */
@@ -17,11 +18,13 @@ function modelate(data, opts) {
 		error: null
 	}
 
-	if ((!this.modelName && !(opts && !opts.model)) || !data || typeof data !== 'object') {
+	if ((!this.modelName && (!(opts && !opts.model) || !(opts && !opts.modelName))) || !data || typeof data !== 'object') {
 		return modelateResponse;
 	}
 
-	const model = (opts && opts.model) || models[this.modelName];
+	var modelName = (opts && opts.modelName) || this.modelName;
+
+	const model = (opts && opts.model) || models[modelName];
 	const result = util.clone(model) || {};
 	const errors = [];
 
@@ -30,7 +33,7 @@ function modelate(data, opts) {
 		data[prop] = modify(data[prop], model[prop]);
 
 		// Step 2: validate the result
-		if (validate(data[prop], model[prop], errors, this.modelName, prop)) {
+		if (validate(data[prop], model[prop], errors, modelName, prop)) {
 			result[prop] = data[prop];
 		} else {
 			delete result[prop];

lib/validators/model.js

@@ -12,13 +12,17 @@ function isValid(data, model, errors) {
 	if (!model.model) {
 		return true;
 	}
-
 	if(!models[model.model]) {
 		return false;
 	}
 
-	var validate = module.parent.parent.exports;
-	var valid = validate(data, { model: models[model.model] }, []);
+	// Load parent modelate
+	var modelate = module.parent.parent.exports;
+	// Launch modelate of data with requested model
+	var valid = modelate(data, { 
+		model: models[model.model], 
+		modelName: model.model 
+	}, []);
 
 	// Populate errors to parent model
 	if (valid.error) {