eslint-plugin-formatjs 7.0.0 → 8.0.0

package/index.js

@@ -639,6 +639,17 @@ function checkInlineMessage(context, node) {
 	const imports = hoistTypes(context, node, contract);
 	contract = imports.text;
 	const parameters = generic?.params;
+	if (contract === "{}" && node.arguments.length === 1) {
+		if (!generic) return true;
+		if (parameters?.length === 1) {
+			context.report({
+				node: generic,
+				messageId: "contract",
+				fix: (fixer) => fixer.remove(generic)
+			});
+			return true;
+		}
+	}
 	if (parameters && parameters.length >= 1 && parameters.length <= 2 && renderType(parameters[0]) === contract && !generated) return true;
 	if (generic && (!parameters || parameters.length > 2)) {
 		context.report({
@@ -769,19 +780,18 @@ const rule$20 = {
 				const generated = !!generic && /^<\s*\/\* @formatjs-generated \*\//.test(source.getText(generic));
 				const options = node.arguments[1];
 				const typed = staticObject(options) && options.properties.length === 1 && options.properties.some((p) => p.type === "Property" && (p.key.type === "Identifier" ? p.key.name : p.key.type === "Literal" ? p.key.value : void 0) === "typed" && p.value.type === "Literal" && p.value.value === true);
-				if (!typed && !generated && !context.options[0]?.generateTypes) return;
-				if (!typed && generic && !generated && !context.options[0]?.generateTypes) return;
+				if (!generic && !typed && !context.options[0]?.generateTypes) return;
 				if (node.arguments.length > 2 || options && !typed) return;
 				const descriptor = node.arguments[0];
 				if (!staticObject(descriptor)) {
-					if (typed || generated) context.report({
+					if (generic || typed) context.report({
 						node,
 						messageId: "dynamic"
 					});
 					return;
 				}
 				if (imported.helper === "defineMessages" && !descriptor.properties.every((p) => p.type === "Property" && staticObject(p.value))) {
-					if (typed || generated) context.report({
+					if (generic || typed) context.report({
 						node,
 						messageId: "dynamic"
 					});
@@ -795,7 +805,7 @@ const rule$20 = {
 					}
 				}, getSettings(context));
 				if (messages.some(([message]) => typeof message.message.defaultMessage !== "string" || !staticMessage(message.messageNode ?? void 0)) || messages.length !== (imported.helper === "defineMessage" ? 1 : descriptor.properties.length)) {
-					if (typed || generated) context.report({
+					if (generic || typed) context.report({
 						node,
 						messageId: "dynamic"
 					});
@@ -841,7 +851,7 @@ const rule$20 = {
 				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 && typed && !generated && annotationMatches) return;
+				if (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,
@@ -855,11 +865,6 @@ const rule$20 = {
 					fix(fixer) {
 						const edits = [...imports.fix(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)];
 						if (annotation && !annotationMatches) edits.push(fixer.replaceText(annotation.annotation, catalogType));
-						if (!typed) {
-							const close = source.getLastToken(node);
-							const previous = source.getTokenBefore(close);
-							edits.push(fixer.insertTextBefore(close, `${previous.value === "," ? "" : ","} {typed: true}`));
-						}
 						return edits;
 					}
 				});
@@ -5117,7 +5122,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 	version: () => version$1
 });
 var name$1 = "eslint-plugin-formatjs";
-var version$1 = "7.0.0";
+var version$1 = "8.0.0";
 var description = "ESLint plugin for formatjs";
 var keywords = [
 	"eslint",