Fix validation schema accepting invalid values when instanceof is used

SpaceK33z · SpaceK33z · commit c8fd63803659 · 2016-11-03T23:52:59.000+01:00
diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js
@@ -75,6 +75,8 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE
 			}
 			return dataPath + " should be " + err.params.type + ":\n" +
 				getSchemaPartText(err.parentSchema);
+		case "instanceof":
+			return dataPath + " should be an instance of " + getSchemaPartText(err.parentSchema) + ".";
 		case "required":
 			var missingProperty = err.params.missingProperty.replace(/^\./, "");
 			return dataPath + " misses the property '" + missingProperty + "'.\n" +
diff --git a/lib/validateWebpackOptions.js b/lib/validateWebpackOptions.js
@@ -9,6 +9,7 @@ var ajv = new Ajv({
 	allErrors: true,
 	verbose: true
 });
+require('ajv-keywords')(ajv);
 var validate = ajv.compile(webpackOptionsSchema);
 
 function validateWebpackOptions(options) {
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "acorn": "^4.0.3",
     "ajv": "^4.7.0",
+    "ajv-keywords": "^1.1.1",
     "async": "^2.1.2",
     "enhanced-resolve": "^2.2.0",
     "interpret": "^1.0.0",
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -33,6 +33,17 @@ describe("Validation", function() {
 			"   object { <key>: string | [string] } | string | [string]",
 			"   The entry point(s) of the compilation."
 		]
+	}, {
+		name: "invalid instanceof",
+		config: {
+			entry: "a",
+			module: {
+				exprContextRegExp: 1337
+			}
+		},
+		message: [
+			" - configuration.module.exprContextRegExp should be an instance of RegExp.",
+		]
 	}, {
 		name: "multiple errors",
 		config: {

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE`
`75`	`75`	`}`
`76`	`76`	`return dataPath + " should be " + err.params.type + ":\n" +`
`77`	`77`	`getSchemaPartText(err.parentSchema);`
	`78`	`+ case "instanceof":`
	`79`	`+ return dataPath + " should be an instance of " + getSchemaPartText(err.parentSchema) + ".";`
`78`	`80`	`case "required":`
`79`	`81`	`var missingProperty = err.params.missingProperty.replace(/^\./, "");`
`80`	`82`	`return dataPath + " misses the property '" + missingProperty + "'.\n" +`