Merge pull request #300 from 2fd/validate_properties

Validate properties

test/index.js

@@ -12,7 +12,7 @@ var forOwn = mout.object.forOwn;
 var gray = colors.gray;
 
 var log = require('./lib/log');
-var JsonFile = require('./lib/JsonFile');
+var PackageOverrideFile = require('./lib/PackageOverrideFile');
 var OverrideFile = require('./lib/OverrideFile');
 var OverridesList = require('./lib/OverridesList');
 
@@ -39,11 +39,12 @@ program
  */
 var error = function(msg){
 
+
 	if(!program.onlyErrors)
 		log.error(msg);
 
 	if(Array.isArray(msg)) {
-		error.summary.concat(msg);
+		error.summary = error.summary.concat(msg);
 
 	} else {
 		error.summary.push(msg);
@@ -80,7 +81,7 @@ var ok = function(msg){
  */
 var overrideFile = new OverrideFile();
 
-if(overrideFile.errors().length) {
+if(overrideFile.hasErrors()) {
 	// json format errors
 	error(overrideFile.errors());
 
@@ -137,9 +138,9 @@ forOwn(endpoints, function(Endpoint, endpointName){
 		if(program.args.length && program.args.indexOf(fileinfo.canonicalPackageName) === -1 )
 			return;
 
-		var overrideFile = new JsonFile(fileinfo.path);
+		var packageOverrideFile = new PackageOverrideFile(fileinfo.path);
-		if(overrideFile.errors().length)
+		if(packageOverrideFile.hasErrors())
-			return error( util.format('%s is not valid json file \n - %s', gray(fileinfo.path), overrideFile.errors().join('\n -')) );
+			return error( util.format('%s is not valid package override file \n - %s', gray(fileinfo.path), packageOverrideFile.errors().join('\n -')) );
 
 		ok( fileinfo.canonicalPackageName + '@' + fileinfo.packageVersion );
 	});
@@ -150,7 +151,6 @@ forOwn(endpoints, function(Endpoint, endpointName){
 //
 // SUMMARY LOG
 //
-
 if(error.summary.length) {
 	log.n()
 		('Error summary ................')

test/lib/JsonFile.js

@@ -44,6 +44,11 @@ JsonFile.prototype.errors = function(){
 	return this._errors;
 };
 
+JsonFile.prototype.hasErrors = function(){
+
+	return this._errors.length > 0;
+};
+
 JsonFile.prototype.forEach = function(fn){
 
 	forOwn(this._json, fn, this);

test/lib/PackageOverrideFile.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var util = require('util');
+var mout = require('mout');
+var cyan = require('colors/safe').cyan;
+var forEach = mout.array.forEach;
+var isEmpty = mout.lang.isEmpty;
+var deepClone = mout.lang.deepClone;
+var objectUnset = mout.object.unset;
+
+var JsonFile = require('./JsonFile');
+var ALLOWED_PROPERTIES = [
+	'main',
+	'registry',
+	'dependencies',
+	'devDependencies',
+	'directories.lib',
+	'directories.dist',
+	'format',
+	'map',
+	'files',
+	'ignore',
+	'shim',
+
+	'jspmNodeConversion',
+	'browser'
+];
+
+/**
+ * @constructor PackageOverrideFile
+ */
+var PackageOverrideFile = module.exports = function PackageOverrideFile(file){
+
+	if( !(this instanceof PackageOverrideFile) )
+		return new PackageOverrideFile();
+
+	JsonFile.call(this, file);
+
+	if(!this.hasErrors())
+	{
+		var notAllowedProperties = deepClone(this._json);
+
+		forEach(ALLOWED_PROPERTIES, function(allowedProperty){
+
+			objectUnset(notAllowedProperties, allowedProperty);
+
+		});
+
+		if(isEmpty(notAllowedProperties.directories))
+			objectUnset(notAllowedProperties, 'directories');
+
+		if(!isEmpty(notAllowedProperties))
+			this.error( this._file + ' contains not allowed properties: \n\t' + cyan( JSON.stringify(notAllowedProperties) ) );
+	}
+
+};
+
+util.inherits(PackageOverrideFile, JsonFile);