Code Style

Author: CodingCarlos

examples/chat.js

@@ -7,80 +7,78 @@ var userModel = {
 		type: 'string',
 		length: {		// For now, length do nothng.
 			max: 10,
-			min: 1
+			min: 1,
 		},
 		value: {
-			eq: 'Paco'
-		}
+			eq: 'Paco',
+		},
 	},
 	surname: {
 		type: 'string',
 		length: {		// For now, length do nothng.
 			max: 3,
-			min: 1
+			min: 1,
 		},
 		value: {
-			contains: 'os'
-		}
+			contains: 'os',
+		},
 	},
 	age: {
 		type: 'number',
 		value: {
 			max: 95,
-			min: 18
-		}
+			min: 18,
+		},
 	},
 	dni: {
 		type: 'string',
 		value: {
 			max: 95,
-			min: 18
+			min: 18,
 		},
 		func: function startOnFive(value) {
-			if(value.charAt(0) === '5') {
+			if (value.charAt(0) === '5') {
 				return true;
 			}
 
 			return false;
-		}
-	}
+		},
+	},
 };
-var User = Modelate('User').set(userModel);
+Modelate('User').set(userModel);
 
 // Modelate a user
 var myUserData = {
 	name: 'Paco',
 	surname: 'santos',
 	age: 19,
 	dni: '51402430A',
-	unexpected: 'property'
+	unexpected: 'property',
 };
-// var myUser = User.modelate(myUserData);
-// console.log(myUser);	
 
 var messageModel = {
 	user: {
 		type: 'object',
-		model: 'User'
+		model: 'User',
 	},
 	date: {
-		date: true
+		date: true,
 	},
 	message: {
 		type: 'string',
 		length: {
 			min: 1,
-			max: 255
-		}
-	}
+			max: 255,
+		},
+	},
 };
 var Message = Modelate('Message').set(messageModel);
 
 // Modelate a message
 var myMessageData = {
 	message: 'Using models inside models. Crazy.',
 	date: new Date(),
-	user: myUserData
+	user: myUserData,
 };
 var myMessage = Message.modelate(myMessageData);
-console.log(myMessage);	
+console.log(myMessage);

examples/user.js

@@ -6,51 +6,51 @@ var model = {
 		type: 'string',
 		length: {		// For now, length do nothng.
 			max: 10,
-			min: 1
+			min: 1,
 		},
 		value: {
-			eq: 'Paco'
-		}
+			eq: 'Paco',
+		},
 	},
 	surname: {
 		type: 'string',
 		length: {		// For now, length do nothng.
 			max: 3,
-			min: 1
+			min: 1,
 		},
 		value: {
-			contains: 'os'
-		}
+			contains: 'os',
+		},
 	},
 	age: {
 		type: 'number',
 		value: {
 			max: 95,
-			min: 18
-		}
+			min: 18,
+		},
 	},
 	dni: {
 		type: 'string',
 		value: {
 			max: 95,
-			min: 18
+			min: 18,
 		},
 		func: function startOnFive(value) {
-			if(value.charAt(0) === '5') {
+			if (value.charAt(0) === '5') {
 				return true;
 			}
 
 			return false;
-		}
-	}
+		},
+	},
 };
 var user = Modelate('User').set(model);
 
 var data = {
 	name: 'Paco',
 	surname: 'santos',
 	age: 19,
-	dni: '51402430A'
+	dni: '51402430A',
 };
 var result = user.modelate(data);
 

lib/model.js

@@ -3,7 +3,7 @@ const models = {};
 function model(data) {
 	// ToDo: Validate model
 	// ToDo: Check if model already exists to merge instead of set
-	
+
 	models[this.modelName] = data;
 
 	return this;
@@ -17,5 +17,5 @@ function get() {
 module.exports = {
 	models: models,
 	add: model,
-	get: get
+	get: get,
 };

lib/modelate.js

@@ -8,17 +8,17 @@ const validate = require('./validate').check;
  *	Options might be:
  *	 - model: {Object} A model to use (instead of this.modelName)
  *	@param data {Object} The data to validate
- *	@param opts {Object} Options for the modelate. 
+ *	@param opts {Object} Options for the modelate.
  */
 function modelate(data, opts) {
 	if (!this.modelName && opts && !opts.model) {
 		return {};
 	}
 
-	const model = opts && opts.model || models[this.modelName];
+	const model = (opts && opts.model) || models[this.modelName];
 	const result = util.clone(model);
 
-	for (let prop in model) {
+	for (const prop in model) {
 		if (validate(data[prop], model[prop])) {
 			result[prop] = data[prop];
 		} else {

lib/util.js

@@ -1,28 +1,28 @@
 /** Deep Copy
  *	Return a copy of the object passed as param, doing (recursivelly) copys of
  *	all the objects the initial has.
- *  
- *  Caution!!! 
+ *
+ *  Caution!!!
  *  This function is recursive. Copying a very deep object might concern heavy
  *  performance issues. Use your brain before the function.
- *  
+ *
  *	@param oldObj {Object} Object to clone
  */
 function deepCopy(oldObj) {
-		var newObj = oldObj;
-		if (oldObj && typeof oldObj === 'object') {
-				newObj = Object.prototype.toString.call(oldObj) === '[object Array]' ? [] : {};
-				for (var i in oldObj) {
-						newObj[i] = deepCopy(oldObj[i]);
-				}
+	var newObj = oldObj;
+	if (oldObj && typeof oldObj === 'object') {
+		newObj = Object.prototype.toString.call(oldObj) === '[object Array]' ? [] : {};
+		for (var i in oldObj) {
+			newObj[i] = deepCopy(oldObj[i]);
 		}
-		return newObj;
+	}
+	return newObj;
 }
 
 /** Merge
  *  Perform a complete merge of two objects.
  *
- *	Caution!!! 
+ *	Caution!!!
  *  A third parameter, avoidDeepCopy is also included to avoid creating a deep
  *  copy of the objects. With this parameter to true, original objects may get
  *  updated, linked or similar unexpected behaviour.
@@ -32,21 +32,22 @@ function deepCopy(oldObj) {
  *  @param avoidDeepCopy {booleam} Seting to true will update the "old" object
  */
 function merge(old, obj, avoidDeepCopy) {
-		let dest, orig;
-
-		if(avoidDeepCopy) {
-				dest = old;
-				orig = obj;
-		} else {
-				dest = deepCopy(old);
-				orig = deepCopy(obj);
-		}
-		
-		for(let prop in orig) {
-				dest[prop] = orig[prop];
-		}
+	let dest,
+		orig;
+
+	if (avoidDeepCopy) {
+		dest = old;
+		orig = obj;
+	} else {
+		dest = deepCopy(old);
+		orig = deepCopy(obj);
+	}
+
+	for (const prop in orig) {
+		dest[prop] = orig[prop];
+	}
 
-		return dest;
+	return dest;
 }
 
 /** Equal
@@ -69,7 +70,7 @@ function equal(a, b) {
 
 	if (arrA && arrB) {
 		if (a.length !== b.length) {
-				return false;
+			return false;
 		}
 
 		for (i = 0; i < a.length; i++) {
@@ -103,7 +104,7 @@ function equal(a, b) {
 
 		var regexpA = a instanceof RegExp;
 		var regexpB = b instanceof RegExp;
-		if (regexpA && regexpB) { 
+		if (regexpA && regexpB) {
 			return a.toString() === b.toString();
 		}
 		if (regexpA !== regexpB) {
@@ -117,7 +118,7 @@ function equal(a, b) {
 		}
 
 		for (i = 0; i < keys.length; i++) {
-			if(!equal(a[keys[i]], b[keys[i]])) {
+			if (!equal(a[keys[i]], b[keys[i]])) {
 				return false;
 			}
 		}
@@ -131,5 +132,5 @@ function equal(a, b) {
 module.exports = {
 	merge: merge,
 	equal: equal,
-	clone: deepCopy
-};
+	clone: deepCopy,
+};

lib/validate.js

@@ -4,29 +4,29 @@ const validators = ['type', 'length', 'value', 'func', 'model', 'date'];
 // const validators = ['type', 'length', 'value', 'func'];
 
 // Turn validator names to validator instances.
-for(let i = 0; i < validators.length; i++) {
+for (let i = 0; i < validators.length; i++) {
 	validators[i] = validator(validators[i]);
-} 
+}
 
 // Validate
 function validate(data, model) {
-	for(let i = 0; i < validators.length; i++) {
-		if(!validators[i].check(data, model)) {
+	for (let i = 0; i < validators.length; i++) {
+		if (!validators[i].check(data, model)) {
 			console.error('Validation for "' + data + '" failed! Reason: ', validators[i].name);
 			return false;
 		}
-	} 
-	
+	}
+
 	return true;
 }
 
 // Create new validator instances
 function validator(name) {
 	return {
 		name: name,
-		check: require('./validators/' + name)
+		check: require('./validators/' + name),
 	};
 }
 
 
-module.exports = {check: validate};
+module.exports = { check: validate };

lib/validators/date.js

@@ -1,26 +1,26 @@
 
-/**	
+/**
  *	Type validator
  *
  *	{
  *		date: true	// Check if data is a Date
  *	}
  */
 function isValid(data, model) {
-	if(!model.date) {
+	if (!model.date) {
 		return true;
 	}
 
 	if (data instanceof Date) {
 		return true;
-	} else {
-		// Try to parse data to Date;
-		var date = Date.parse(data);
-		if (!isNaN()) {
-			data = new Date(date);
-			return true;
-		}
 	}
+	// Try to parse data to Date;
+	var date = Date.parse(data);
+	if (!isNaN()) {
+		data = new Date(date);
+		return true;
+	}
+
 
 	return false;
 }