refactor of ValidateSchema and Validation.test to es6

dennis-johnson-dev · dennis-johnson-dev · commit fe217ab7e7d3 · 2017-01-21T10:43:22.000-07:00
diff --git a/lib/validateSchema.js b/lib/validateSchema.js
@@ -2,8 +2,10 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Gajus Kuizinas @gajus
 */
-var Ajv = require("ajv");
-var ajv = new Ajv({
+"use strict";
+
+const Ajv = require("ajv");
+const ajv = new Ajv({
 	errorDataPath: "configuration",
 	allErrors: true,
 	verbose: true
@@ -12,16 +14,16 @@ require("ajv-keywords")(ajv, ["instanceof"]);
 
 function validateSchema(schema, options) {
 	if(Array.isArray(options)) {
-		var errors = options.map(validateObject.bind(this, schema));
-		errors.forEach(function(list, idx) {
+		const errors = options.map((options) => validateObject(schema, options));
+		errors.forEach((list, idx) => {
 			list.forEach(function applyPrefix(err) {
 				err.dataPath = "[" + idx + "]" + err.dataPath;
 				if(err.children) {
 					err.children.forEach(applyPrefix);
 				}
 			});
 		});
-		return errors.reduce(function(arr, items) {
+		return errors.reduce((arr, items) => {
 			return arr.concat(items);
 		}, []);
 	} else {
@@ -30,20 +32,20 @@ function validateSchema(schema, options) {
 }
 
 function validateObject(schema, options) {
-	var validate = ajv.compile(schema);
-	var valid = validate(options);
+	const validate = ajv.compile(schema);
+	const valid = validate(options);
 	return valid ? [] : filterErrors(validate.errors);
 }
 
 function filterErrors(errors) {
-	var newErrors = [];
-	errors.forEach(function(err) {
-		var dataPath = err.dataPath;
-		var children = [];
-		newErrors = newErrors.filter(function(oldError) {
-			if(oldError.dataPath.indexOf(dataPath) >= 0) {
+	let newErrors = [];
+	errors.forEach((err) => {
+		const dataPath = err.dataPath;
+		let children = [];
+		newErrors = newErrors.filter((oldError) => {
+			if(oldError.dataPath.includes(dataPath)) {
 				if(oldError.children) {
-					oldError.children.forEach(function(child) {
+					oldError.children.forEach((child) => {
 						children.push(child);
 					});
 				}
@@ -58,7 +60,7 @@ function filterErrors(errors) {
 		}
 		newErrors.push(err);
 	});
-	//console.log(JSON.stringify(newErrors, 0, 2));
+
 	return newErrors;
 }
 
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -1,9 +1,11 @@
-var should = require("should");
-var webpack = require("../lib/webpack");
-var WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
+"use strict";
+
+const should = require("should");
+const webpack = require("../lib/webpack");
+const WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
 
 describe("Validation", function() {
-	var testCases = [{
+	const testCases = [{
 		name: "undefined configuration",
 		config: undefined,
 		message: [
