eslint-plugin-formatjs 6.5.0 → 6.6.1

package/index.js

@@ -234,23 +234,36 @@ let Element = /* @__PURE__ */ function(Element) {
 	Element["tag"] = "tag";
 	return Element;
 }({});
+function isBlocklisted(blocklist, type, element) {
+	return blocklist.some((entry) => {
+		if (typeof entry === "string") return entry === type;
+		if (entry.type !== type) return false;
+		if (!("value" in element) || element.value !== entry.allow.variable) return true;
+		const allowedOptions = entry.allow.options;
+		if (!allowedOptions) return false;
+		if (!isSelectElement(element) && !isPluralElement(element)) return true;
+		const options = Object.keys(element.options);
+		return options.length !== allowedOptions.length || options.some((option) => !allowedOptions.includes(option));
+	});
+}
 function verifyAst$7(blocklist, ast) {
 	const errors = [];
 	for (const el of ast) {
-		if (isLiteralElement(el) && blocklist.includes("literal")) errors.push(getMessage("literal"));
-		if (isArgumentElement(el) && blocklist.includes("argument")) errors.push(getMessage("argument"));
-		if (isNumberElement(el) && blocklist.includes("number")) errors.push(getMessage("number"));
-		if (isDateElement(el) && blocklist.includes("date")) errors.push(getMessage("date"));
-		if (isTimeElement(el) && blocklist.includes("time")) errors.push(getMessage("time"));
-		if (isSelectElement(el) && blocklist.includes("select")) errors.push(getMessage("select"));
-		if (isTagElement(el) && blocklist.includes("tag")) errors.push(getMessage("tag"));
+		if (isLiteralElement(el) && isBlocklisted(blocklist, "literal", el)) errors.push(getMessage("literal"));
+		if (isArgumentElement(el) && isBlocklisted(blocklist, "argument", el)) errors.push(getMessage("argument"));
+		if (isNumberElement(el) && isBlocklisted(blocklist, "number", el)) errors.push(getMessage("number"));
+		if (isDateElement(el) && isBlocklisted(blocklist, "date", el)) errors.push(getMessage("date"));
+		if (isTimeElement(el) && isBlocklisted(blocklist, "time", el)) errors.push(getMessage("time"));
+		if (isSelectElement(el) && isBlocklisted(blocklist, "select", el)) errors.push(getMessage("select"));
+		if (isTagElement(el) && isBlocklisted(blocklist, "tag", el)) errors.push(getMessage("tag"));
+		if (isTagElement(el)) errors.push(...verifyAst$7(blocklist, el.children));
 		if (isPluralElement(el)) {
-			if (blocklist.includes("plural")) errors.push(getMessage("argument"));
-			if (el.pluralType === "ordinal" && blocklist.includes("selectordinal")) errors.push(getMessage("selectordinal"));
+			if (isBlocklisted(blocklist, "plural", el)) errors.push(getMessage("argument"));
+			if (el.pluralType === "ordinal" && isBlocklisted(blocklist, "selectordinal", el)) errors.push(getMessage("selectordinal"));
 		}
 		if (isSelectElement(el) || isPluralElement(el)) {
 			const { options } = el;
-			for (const selector of Object.keys(options)) verifyAst$7(blocklist, options[selector].value);
+			for (const selector of Object.keys(options)) errors.push(...verifyAst$7(blocklist, options[selector].value));
 		}
 	}
 	return errors;
@@ -291,10 +304,33 @@ const rule$20 = {
 		fixable: "code",
 		schema: [{
 			type: "array",
-			items: {
+			items: { oneOf: [{
 				type: "string",
 				enum: Object.keys(Element)
-			}
+			}, {
+				type: "object",
+				additionalProperties: false,
+				required: ["type", "allow"],
+				properties: {
+					type: {
+						type: "string",
+						enum: Object.keys(Element)
+					},
+					allow: {
+						type: "object",
+						additionalProperties: false,
+						required: ["variable"],
+						properties: {
+							variable: { type: "string" },
+							options: {
+								type: "array",
+								uniqueItems: true,
+								items: { type: "string" }
+							}
+						}
+					}
+				}
+			}] }
 		}],
 		messages: {
 			...CORE_MESSAGES,
@@ -4537,7 +4573,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 	version: () => version$1
 });
 var name$1 = "eslint-plugin-formatjs";
-var version$1 = "6.5.0";
+var version$1 = "6.6.1";
 var description = "ESLint plugin for formatjs";
 var keywords = [
 	"eslint",
@@ -4639,7 +4675,17 @@ plugin.configs = {
 				other: true
 			}],
 			"formatjs/no-literal-string-in-jsx": ["error", { props: { include: [["*", "{label,placeholder,title}"]] } }],
-			"formatjs/blocklist-elements": ["error", ["selectordinal"]],
+			"formatjs/blocklist-elements": ["error", ["selectordinal", {
+				type: "select",
+				allow: {
+					variable: "gender",
+					options: [
+						"male",
+						"female",
+						"other"
+					]
+				}
+			}]],
 			"formatjs/prefer-full-sentence": "error"
 		}
 	},
@@ -4663,7 +4709,17 @@ plugin.configs = {
 				other: true
 			}],
 			"formatjs/no-literal-string-in-jsx": ["warn", { props: { include: [["*", "{label,placeholder,title}"]] } }],
-			"formatjs/blocklist-elements": ["error", ["selectordinal"]],
+			"formatjs/blocklist-elements": ["error", ["selectordinal", {
+				type: "select",
+				allow: {
+					variable: "gender",
+					options: [
+						"male",
+						"female",
+						"other"
+					]
+				}
+			}]],
 			"formatjs/prefer-full-sentence": "error"
 		}
 	}