Added better validation for entry in option schema (webpack#3567)

halfzebra · TheLarkInn · commit 29a1b545641c · 2017-01-03T23:23:57.000-06:00
Added better validation for entry in option schema (webpack#3567) * Added better validation for entry in option schema * Fixed option validation schema * Improved error reporting for empty entry bundle * Added a test for empty entry bundle
diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js
@@ -95,6 +95,7 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE
 			var missingProperty = err.params.missingProperty.replace(/^\./, "");
 			return dataPath + " misses the property '" + missingProperty + "'.\n" +
 				getSchemaPartText(err.parentSchema, ["properties", missingProperty]);
+		case "minItems":
 		case "minLength":
 			if(err.params.limit === 1)
 				return dataPath + " should not be empty.";
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -37,22 +37,19 @@
     },
     "entry": {
       "description": "The entry point(s) of the compilation.",
-      "anyOf": [
+      "oneOf": [
         {
+          "minProperties": 1,
           "additionalProperties": {
-            "anyOf": [
+            "oneOf": [
               {
                 "description": "The string is resolved to a module which is loaded upon startup.",
                 "minLength": 1,
                 "type": "string"
               },
               {
-                "allOf": [
-                  {
-                    "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"
-                  }
-                ],
-                "description": "All modules are loaded upon startup. The last one is exported."
+                "description": "All modules are loaded upon startup. The last one is exported.",
+                "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"
               }
             ]
           },
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -38,6 +38,26 @@ describe("Validation", function() {
 			"    * configuration.entry should be an array:",
 			"      [non-empty string]"
 		]
+	}, {
+		name: "empty entry bundle array",
+		config: {
+			entry: {
+				"bundle": []
+			}
+		},
+		message: [
+			" - configuration.entry should be one of these:",
+			"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
+			"   The entry point(s) of the compilation.",
+			"   Details:",
+			"    * configuration.entry['bundle'] should be a string.",
+			"    * configuration.entry['bundle'] should not be empty.",
+			"    * configuration.entry['bundle'] should be one of these:",
+			"      non-empty string | [non-empty string]",
+			"    * configuration.entry should be a string.",
+			"    * configuration.entry should be an array:",
+			"      [non-empty string]"
+		]
 	}, {
 		name: "invalid instanceof",
 		config: {

Original file line number	Diff line number	Diff line change
`@@ -37,22 +37,19 @@`
`37`	`37`	`},`
`38`	`38`	`"entry": {`
`39`	`39`	`"description": "The entry point(s) of the compilation.",`
`40`		`- "anyOf": [`
	`40`	`+ "oneOf": [`
`41`	`41`	`{`
	`42`	`+ "minProperties": 1,`
`42`	`43`	`"additionalProperties": {`
`43`		`- "anyOf": [`
	`44`	`+ "oneOf": [`
`44`	`45`	`{`
`45`	`46`	`"description": "The string is resolved to a module which is loaded upon startup.",`
`46`	`47`	`"minLength": 1,`
`47`	`48`	`"type": "string"`
`48`	`49`	`},`
`49`	`50`	`{`
`50`		`- "allOf": [`
`51`		`- {`
`52`		`- "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"`
`53`		`- }`
`54`		`- ],`
`55`		`- "description": "All modules are loaded upon startup. The last one is exported."`
	`51`	`+ "description": "All modules are loaded upon startup. The last one is exported.",`
	`52`	`+ "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"`
`56`	`53`	`}`
`57`	`54`	`]`
`58`	`55`	`},`