eslint-plugin-formatjs 8.0.1 → 8.0.3

package/index.js

@@ -639,7 +639,7 @@ function obsoleteTypes(context, replaced, replacement, fixer) {
 	}
 	return edits;
 }
-function catalogAnnotation(context, node) {
+function messageAnnotation(context, node, catalog) {
 	const parent = node.parent;
 	if (parent?.type !== "VariableDeclarator" || parent.init !== node) return;
 	const annotation = parent.id.typeAnnotation?.typeAnnotation;
@@ -663,7 +663,8 @@ function catalogAnnotation(context, node) {
 	function broad(type, seen = /* @__PURE__ */ new Set()) {
 		if (seen.has(type)) return false;
 		seen.add(type);
-		if (type.type === "TSTypeLiteral") return !!type.members?.every((member) => member.type === "TSPropertySignature" && !!member.typeAnnotation && descriptorType(member.typeAnnotation.typeAnnotation));
+		if (!catalog && imported(type, "MessageDescriptor")) return true;
+		if (type.type === "TSTypeLiteral") return catalog && !!type.members?.every((member) => member.type === "TSPropertySignature" && !!member.typeAnnotation && descriptorType(member.typeAnnotation.typeAnnotation));
 		let scope = context.sourceCode.getScope(type);
 		while (scope) {
 			const binding = scope.set.get(type.typeName?.name ?? "");
@@ -675,14 +676,15 @@ function catalogAnnotation(context, node) {
 		}
 		const parameters = (type.typeArguments ?? type.typeParameters)?.params;
 		if (type.typeName?.name === "Readonly" && parameters?.length === 1) return broad(parameters[0], seen);
-		return type.typeName?.name === "Record" && parameters?.length === 2 && descriptorType(parameters[1]);
+		return catalog && type.typeName?.name === "Record" && parameters?.length === 2 && descriptorType(parameters[1]);
 	}
 	function typedMap(type) {
+		if (!catalog) return imported(type, "TypedMessageDescriptor");
 		return type.type === "TSTypeLiteral" && !!type.members?.every((member) => member.type === "TSPropertySignature" && !!member.typeAnnotation && imported(member.typeAnnotation.typeAnnotation, "TypedMessageDescriptor"));
 	}
 	let base = annotation;
 	let generated = typedMap(annotation) ? annotation : void 0;
-	if (annotation.type === "TSIntersectionType" && annotation.types?.length === 2) {
+	if (catalog && annotation.type === "TSIntersectionType" && annotation.types?.length === 2) {
 		const [left, right] = annotation.types;
 		if (right.type === "TSTypeLiteral" && right.members?.every((member) => member.type === "TSPropertySignature" && !!member.typeAnnotation && imported(member.typeAnnotation.typeAnnotation, "TypedMessageDescriptor"))) {
 			base = left;
@@ -816,7 +818,7 @@ const rule$20 = {
 			contract: "Generate or refresh the ICU argument contract.",
 			invalid: "Cannot generate message types: {{error}}.",
 			manual: "Unsupported number of generic arguments; update the call manually.",
-			annotation: "Catalog annotation may erase ICU contracts; use per-message TypedMessageDescriptor types.",
+			annotation: "Message annotation may erase ICU contracts; use TypedMessageDescriptor types.",
 			dynamic: "Typed messages require static message strings and parser options for contract verification."
 		}
 	},
@@ -962,7 +964,7 @@ const rule$20 = {
 					});
 					return;
 				}
-				const annotation = imported.helper === "defineMessages" ? catalogAnnotation(context, node) : void 0;
+				const annotation = imported.helper === "defineMessages" || imported.helper === "defineMessage" ? messageAnnotation(context, node, catalog) : void 0;
 				if (annotation && !annotation.supported) {
 					context.report({
 						node: annotation.annotation,
@@ -973,7 +975,7 @@ const rule$20 = {
 				let contract;
 				let catalogType;
 				try {
-					if (annotation) catalogType = entries.length ? "{ " + entries.map((entry, index) => "readonly " + entry.key + ": import(" + JSON.stringify(imported.module) + ").TypedMessageDescriptor<" + types[index] + ">").join("; ") + " }" : "{}";
+					if (annotation) catalogType = !catalog ? "import(" + JSON.stringify(imported.module) + ").TypedMessageDescriptor" + (types[0] === "{}" ? "" : "<" + types[0] + ">") : entries.length ? "{ " + entries.map((entry, index) => "readonly " + entry.key + ": import(" + JSON.stringify(imported.module) + ").TypedMessageDescriptor" + (types[index] === "{}" ? "" : "<" + types[index] + ">")).join("; ") + " }" : "{}";
 					contract = !catalog ? types[0] : entries.length ? "{ " + entries.map((entry, index) => "readonly " + entry.key + ": " + types[index]).join("; ") + " }" : "{}";
 				} catch (error) {
 					context.report({
@@ -986,9 +988,11 @@ const rule$20 = {
 				const imports = hoistTypes(context, node, contract + (catalogType ? "\n" + catalogType : ""));
 				[contract, catalogType] = imports.text.split("\n");
 				const annotationMatches = !annotation || annotation.annotation === annotation.generated && renderType(annotation.generated) === catalogType;
-				const expected = `<${contract}>`;
 				const parameters = generic?.params;
-				if (parameters && parameters.length >= 1 && parameters.length <= 2 && renderType(parameters[0]) === contract && !generated && annotationMatches) return;
+				const omitContract = (imported.helper === "defineMessage" || catalog) && types.every((type) => type === "{}") && (!parameters || parameters.length === 1);
+				const expected = omitContract ? "" : `<${contract}>`;
+				if (omitContract && !generic && annotationMatches) return;
+				if (!omitContract && parameters && parameters.length >= 1 && parameters.length <= 2 && renderType(parameters[0]) === contract && !generated && annotationMatches) return;
 				if (generic && (!parameters || parameters.length < 1 || parameters.length > 2)) {
 					context.report({
 						node: generic,
@@ -1003,7 +1007,7 @@ const rule$20 = {
 						const edits = [
 							...imports.fix(fixer),
 							...obsoleteTypes(context, [...parameters?.[0] ? [parameters[0]] : [], ...annotation && !annotationMatches ? [annotation.annotation] : []], contract + (catalogType ?? ""), fixer),
-							generic && parameters?.[0] ? fixer.replaceTextRange([generic.range[0] + 1, parameters[0].range[1]], contract) : fixer.insertTextAfter(node.optional ? source.getTokenAfter(node.callee) : node.callee, expected)
+							omitContract && generic ? fixer.remove(generic) : generic && parameters?.[0] ? fixer.replaceTextRange([generic.range[0] + 1, parameters[0].range[1]], contract) : fixer.insertTextAfter(node.optional ? source.getTokenAfter(node.callee) : node.callee, expected)
 						];
 						if (annotation && !annotationMatches) edits.push(fixer.replaceText(annotation.annotation, catalogType));
 						return edits;
@@ -5263,7 +5267,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 	version: () => version$1
 });
 var name$1 = "eslint-plugin-formatjs";
-var version$1 = "8.0.1";
+var version$1 = "8.0.3";
 var description = "ESLint plugin for formatjs";
 var keywords = [
 	"eslint",