Add modifiers

Author: CodingCarlos

lib/modelate.js

@@ -2,6 +2,7 @@ const util = require('./util');
 
 const models = require('./model').models;
 const validate = require('./validate').check;
+const modify = require('./modify').check;
 
 /**
  *	Create a new modelate, validating all properties
@@ -19,6 +20,10 @@ function modelate(data, opts) {
 	const result = util.clone(model) || {};
 
 	for (const prop in model) {
+		// Step 1: Apply the modifiers
+		data[prop] = modify(data[prop], model[prop]);
+
+		// Step 2: validate the result
 		if (validate(data[prop], model[prop])) {
 			result[prop] = data[prop];
 		} else {

lib/validators/default.js lib/modifiers/default.jslib/validators/default.js renamed to lib/modifiers/default.js

@@ -8,11 +8,11 @@
  */
 function isValid(data, model) {
 	if (!model.default) {
-		return true;
+		return null;
 	}
 
 	if (!data) {
-		data = model.default;
+		return model.default;
 	}
 }
 

lib/modify.js

@@ -0,0 +1,38 @@
+
+// Add modifier names here
+const modifiers = ['default'];
+
+// Turn modifier names to modifier instances.
+for (let i = 0; i < modifiers.length; i++) {
+	modifiers[i] = modifier(modifiers[i]);
+}
+
+/**
+ *	Validate
+ *	
+ *	@param data {Object} Data to validate
+ *	@param model {Object} Model to apply validations
+ */
+function modify(data, model) {
+	for (let i = 0; i < modifiers.length; i++) {
+		const newValue = modifiers[i].check(data, model);
+		return newValue ? newValue : data;
+	}
+
+	return true;
+}
+
+/**
+ *	Create new modifier instances
+ */
+function modifier(name) {
+	return {
+		name: name,
+		check: require('./modifiers/' + name),
+	};
+}
+
+module.exports = {
+	modifiers: modifiers, 
+	check: modify 
+};

lib/validate.js

@@ -1,6 +1,6 @@
 
 // Add validator names here
-const validators = ['type', 'length', 'value', 'func', 'model', 'date', 'value', 'default'];
+const validators = ['type', 'length', 'value', 'func', 'model', 'date', 'value'];
 
 // Turn validator names to validator instances.
 for (let i = 0; i < validators.length; i++) {