Merge branch 'master' into SpaceK33z-fix-schema-instanceof

SpaceK33z · SpaceK33z · commit 7add543b9df9 · 2016-11-04T10:31:26.000+01:00
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -4,7 +4,6 @@ fs.existsSync = fs.existsSync || path.existsSync;
 var resolve = require("enhanced-resolve");
 var interpret = require("interpret");
 var WebpackOptionsDefaulter = require("../lib/WebpackOptionsDefaulter");
-var validateWebpackOptions = require("../lib/validateWebpackOptions");
 
 module.exports = function(yargs, argv, convertOptions) {
 
diff --git a/lib/validateSchema.js b/lib/validateSchema.js
@@ -2,19 +2,17 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Gajus Kuizinas @gajus
 */
-var webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
 var Ajv = require("ajv");
 var ajv = new Ajv({
 	errorDataPath: "configuration",
 	allErrors: true,
 	verbose: true
 });
 require('ajv-keywords')(ajv);
-var validate = ajv.compile(webpackOptionsSchema);
 
-function validateWebpackOptions(options) {
+function validateSchema(schema, options) {
 	if(Array.isArray(options)) {
-		var errors = options.map(validateObject);
+		var errors = options.map(validateObject.bind(this, schema));
 		errors.forEach(function(list, idx) {
 			list.forEach(function applyPrefix(err) {
 				err.dataPath = "[" + idx + "]" + err.dataPath;
@@ -27,11 +25,12 @@ function validateWebpackOptions(options) {
 			return arr.concat(items);
 		}, []);
 	} else {
-		return validateObject(options);
+		return validateObject(schema, options);
 	}
 }
 
-function validateObject(options) {
+function validateObject(schema, options) {
+	var validate = ajv.compile(schema);
 	var valid = validate(options);
 	return valid ? [] : filterErrors(validate.errors);
 }
@@ -61,4 +60,4 @@ function filterErrors(errors) {
 	return newErrors;
 }
 
-module.exports = validateWebpackOptions;
+module.exports = validateSchema;
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -7,11 +7,12 @@ var MultiCompiler = require("./MultiCompiler");
 var NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
 var WebpackOptionsApply = require("./WebpackOptionsApply");
 var WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
-var validateWebpackOptions = require("./validateWebpackOptions");
+var validateSchema = require("./validateSchema");
 var WebpackOptionsValidationError = require("./WebpackOptionsValidationError");
+var webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
 
 function webpack(options, callback) {
-	var webpackOptionsValidationErrors = validateWebpackOptions(options);
+	var webpackOptionsValidationErrors = validateSchema(webpackOptionsSchema, options);
 	if(webpackOptionsValidationErrors.length) {
 		throw new WebpackOptionsValidationError(webpackOptionsValidationErrors);
 	}
@@ -52,7 +53,9 @@ webpack.WebpackOptionsApply = WebpackOptionsApply;
 webpack.Compiler = Compiler;
 webpack.MultiCompiler = MultiCompiler;
 webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
-webpack.validate = validateWebpackOptions;
+webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
+webpack.validateSchema = validateSchema;
+webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
 
 function exportPlugins(exports, path, plugins) {
 	plugins.forEach(function(name) {
