Merge pull request #13 from webpack/feat-undefined-for-enum

feat: added `undefinedAsNull` for enums
webpack · Jun 13, 2023 · ac7e6c4 · ac7e6c4
2 parents dd695e2 + b7ab93f
commit ac7e6c4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/format-schemas/index.js b/format-schemas/index.js
@@ -101,6 +101,9 @@ const PROPERTIES = [
 	"enum",
 
 	"absolutePath",
+
+	"undefinedAsNull",
+
 	"minLength",
 
 	"minimum",

diff --git a/precompile-schemas/index.js b/precompile-schemas/index.js
@@ -62,14 +62,22 @@ ajv.addKeyword({
 	},
 });
 
+ajv.addKeyword({
+	keyword: "undefinedAsNull",
+	schemaType: "boolean",
+
+	code(ctx) {
+		// Nothing, just to avoid failing
+	},
+});
 ajv.removeKeyword("enum");
 ajv.addKeyword({
 	keyword: "enum",
 	schemaType: "array",
 	$data: true,
 
 	code(ctx) {
-		const { data, schema } = ctx;
+		const { data, schema, parentSchema } = ctx;
 		for (const item of schema) {
 			if (typeof item === "object" && item !== null) {
 				throw new Error(
@@ -81,8 +89,17 @@ ajv.addKeyword({
 				);
 			}
 		}
+
 		ctx.fail(
-			schema.map((x) => _`${data} !== ${x}`).reduce((a, b) => _`${a} && ${b}`)
+			schema
+				.map((x) => {
+					if (x === null && parentSchema.undefinedAsNull) {
+						return _`${data} !== null && ${data} !== undefined`;
+					}
+
+					return _`${data} !== ${x}`;
+				})
+				.reduce((a, b) => _`${a} && ${b}`)
 		);
 	},
 });

diff --git a/schemas-lint/index.js b/schemas-lint/index.js
@@ -35,6 +35,7 @@ for (const filename of schemas) {
 			"oneOf",
 			"anyOf",
 			"absolutePath",
+			"undefinedAsNull",
 			"description",
 			"enum",
 			"minLength",