eslint-plugin-formatjs 6.6.1 → 6.6.2

package/index.js

@@ -23,7 +23,6 @@ const FORMAT_FUNCTION_NAMES = /* @__PURE__ */ new Set([
 	"$t"
 ]);
 const COMPONENT_NAMES = /* @__PURE__ */ new Set(["FormattedMessage"]);
-const DECLARATION_FUNCTION_NAMES = /* @__PURE__ */ new Set(["defineMessage"]);
 function getSettings({ settings }) {
 	return settings.formatjs ?? settings;
 }
@@ -76,21 +75,29 @@ function staticallyEvaluateStringConcat(node) {
 	const left = getStaticStringFromBinaryExpressionOperand(node.left);
 	return left !== void 0 && right !== void 0 ? [left + right, true] : ["", false];
 }
-function isIntlFormatMessageCall(node) {
-	if (node.type !== "CallExpression") return false;
-	if (node.arguments.length < 1 || node.arguments[0].type !== "ObjectExpression") return false;
-	if (node.callee.type === "MemberExpression") return (node.callee.object.type === "Identifier" && node.callee.object.name === "intl" || node.callee.object.type === "MemberExpression" && node.callee.object.property.type === "Identifier" && node.callee.object.property.name === "intl") && node.callee.property.type === "Identifier" && (node.callee.property.name === "formatMessage" || node.callee.property.name === "$t");
-	if (node.callee.type === "Identifier") return FORMAT_FUNCTION_NAMES.has(node.callee.name);
-	return false;
+function unwrapObjectExpression(node) {
+	switch (node?.type) {
+		case "TSAsExpression":
+		case "TSSatisfiesExpression":
+		case "TSNonNullExpression":
+		case "TSTypeAssertion": return unwrapObjectExpression(node.expression);
+		case "ObjectExpression": return node;
+	}
 }
-function isSingleMessageDescriptorDeclaration(node, functionNames) {
-	return node.type === "CallExpression" && node.callee.type === "Identifier" && functionNames.has(node.callee.name);
+function getCalleeName(node) {
+	if (node.type === "Identifier") return node.name;
+	if (node.type === "MemberExpression" && node.property.type === "Identifier") return node.property.name;
 }
-function isMultipleMessageDescriptorDeclaration(node) {
-	return node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "defineMessages";
+function isIntlFormatMessageCall(node, additionalFunctionNames = []) {
+	if (node.type === "ChainExpression") return isIntlFormatMessageCall(node.expression, additionalFunctionNames);
+	if (node.type !== "CallExpression") return false;
+	const descriptor = node.arguments[0];
+	const calleeName = getCalleeName(node.callee);
+	return !!(calleeName && (FORMAT_FUNCTION_NAMES.has(calleeName) || additionalFunctionNames.includes(calleeName)) && descriptor?.type !== "SpreadElement" && unwrapObjectExpression(descriptor));
 }
-function extractMessageDescriptor(node) {
-	if (!node || node.type !== "ObjectExpression") return;
+function extractMessageDescriptor(expression) {
+	const node = unwrapObjectExpression(expression);
+	if (!node) return;
 	const result = {
 		messageDescriptorNode: node,
 		message: {},
@@ -100,8 +107,8 @@ function extractMessageDescriptor(node) {
 		idValueNode: void 0
 	};
 	for (const prop of node.properties) {
-		if (prop.type !== "Property" || prop.key.type !== "Identifier") continue;
-		const propName = prop.key.name;
+		if (prop.type !== "Property") continue;
+		const propName = prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "Literal" ? prop.key.value : void 0;
 		if (propName !== "id" && propName !== "defaultMessage" && propName !== "description") continue;
 		const valueNode = prop.value;
 		const value = isStaticMessageExpression(valueNode) ? getStaticStringFromMessageExpression(valueNode) : void 0;
@@ -171,14 +178,13 @@ function extractMessageDescriptorFromJSXElement(node) {
 	if (!result.messagePropNode && !result.descriptionNode && !result.idPropNode && hasSpreadAttribute) return;
 	return [result, values];
 }
-function extractMessageDescriptors(node) {
-	if (!node || node.type !== "ObjectExpression" || !node.properties.length) return [];
+function extractMessageDescriptors(expression) {
+	const node = unwrapObjectExpression(expression);
+	if (!node) return [];
 	const msgs = [];
 	for (const prop of node.properties) {
 		if (prop.type !== "Property") continue;
-		const msg = prop.value;
-		if (msg.type !== "ObjectExpression") continue;
-		const nodeInfo = extractMessageDescriptor(msg);
+		const nodeInfo = extractMessageDescriptor(prop.value);
 		if (nodeInfo) msgs.push(nodeInfo);
 	}
 	return msgs;
@@ -190,10 +196,13 @@ function extractMessages(node, { additionalComponentNames, additionalFunctionNam
 		const args0 = node.arguments[0];
 		const args1 = node.arguments[1];
 		if (!args0 || args0.type === "SpreadElement") return [];
-		if (!excludeMessageDeclCalls && isSingleMessageDescriptorDeclaration(node, DECLARATION_FUNCTION_NAMES) || isIntlFormatMessageCall(node) || isSingleMessageDescriptorDeclaration(node, allFormatFunctionNames)) {
+		const calleeName = getCalleeName(node.callee);
+		if (!calleeName) return [];
+		if (calleeName === "defineMessages") return excludeMessageDeclCalls ? [] : extractMessageDescriptors(args0).map((msg) => [msg, void 0]);
+		if (calleeName === "defineMessage" ? !excludeMessageDeclCalls : allFormatFunctionNames.has(calleeName)) {
 			const msgDescriptorNodeInfo = extractMessageDescriptor(args0);
 			if (msgDescriptorNodeInfo && (!args1 || args1.type !== "SpreadElement")) return [[msgDescriptorNodeInfo, args1]];
-		} else if (!excludeMessageDeclCalls && isMultipleMessageDescriptorDeclaration(node)) return extractMessageDescriptors(args0).map((msg) => [msg, void 0]);
+		}
 	} else if (node.type === "JSXOpeningElement" && node.name && node.name.type === "JSXIdentifier" && allComponentNames.has(node.name.name)) {
 		const msgDescriptorNodeInfo = extractMessageDescriptorFromJSXElement(node);
 		if (msgDescriptorNodeInfo) return [msgDescriptorNodeInfo];
@@ -4268,9 +4277,10 @@ const rule$3 = {
 		schema: []
 	},
 	create(context) {
+		const { additionalFunctionNames } = getSettings(context);
 		return { JSXElement: (node) => {
 			node.children.forEach((child) => {
-				if (child.type !== "JSXExpressionContainer" || !isIntlFormatMessageCall(child.expression)) return;
+				if (child.type !== "JSXExpressionContainer" || !isIntlFormatMessageCall(child.expression, additionalFunctionNames)) return;
 				context.report({
 					node: child,
 					messageId: "jsxChildren"
@@ -4573,7 +4583,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 	version: () => version$1
 });
 var name$1 = "eslint-plugin-formatjs";
-var version$1 = "6.6.1";
+var version$1 = "6.6.2";
 var description = "ESLint plugin for formatjs";
 var keywords = [
 	"eslint",
@@ -4598,7 +4608,7 @@ var dependencies = {
 	"@formatjs/ts-transformer": "workspace:*",
 	"@types/estree-jsx": "1",
 	"@types/picomatch": "4",
-	"@unicode/unicode-17.0.0": "1",
+	"@unicode/unicode-17.0.0": "2",
 	"magic-string": "1",
 	"picomatch": "2 || 3 || 4"
 };