eslint-plugin-formatjs 8.0.2 → 8.0.4

package/index.js

@@ -63,7 +63,7 @@ function messageTypes(ast, module, ignoreList = []) {
 		else type = `import(${JSON.stringify(module)}).MessageTag`;
 		return `readonly ${JSON.stringify(name)}${ignored.has(name) ? "?" : ""}: ${type}`;
 	});
-	return fields.length ? `{ ${fields.join("; ")} }` : "{}";
+	return fields.length ? `{ ${fields.join("; ")} }` : `import(${JSON.stringify(module)}).NoMessageValues`;
 }
 //#endregion
 //#region packages/eslint-plugin-formatjs/util.ts
@@ -538,7 +538,7 @@ function hoistTypes(context, node, contract) {
 	const occupied = new Set(source.scopeManager?.scopes.flatMap((scope) => scope.variables.map((variable) => variable.name)));
 	const resolved = /* @__PURE__ */ new Map();
 	return {
-		text: contract.replace(/import\(("(?:[^"\\]|\\.)*")\)\.(MessageTag|MessageValuesOf|MessageValue|TypedMessageDescriptor)/g, (reference, quotedModule, imported) => {
+		text: contract.replace(/import\(("(?:[^"\\]|\\.)*")\)\.(MessageTag|MessageValuesOf|MessageValue|NoMessageValues|TypedMessageDescriptor)/g, (reference, quotedModule, imported) => {
 			if (resolved.has(reference)) return resolved.get(reference);
 			const module = JSON.parse(quotedModule);
 			for (const declaration of source.ast.body) {
@@ -762,10 +762,11 @@ function checkInlineMessage(context, node) {
 		});
 		return true;
 	}
+	const emptyContract = contract === `import(${JSON.stringify(module)}).NoMessageValues`;
 	const imports = hoistTypes(context, node, contract);
 	contract = imports.text;
 	const parameters = generic?.params;
-	if (contract === "{}" && node.arguments.length === 1) {
+	if (emptyContract && node.arguments.length === 1) {
 		if (!generic) return true;
 		if (parameters?.length === 1) {
 			context.report({
@@ -974,8 +975,9 @@ const rule$20 = {
 				}
 				let contract;
 				let catalogType;
+				const emptyContract = `import(${JSON.stringify(imported.module)}).NoMessageValues`;
 				try {
-					if (annotation) catalogType = !catalog ? "import(" + JSON.stringify(imported.module) + ").TypedMessageDescriptor<" + types[0] + ">" : 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] === emptyContract ? "" : "<" + types[0] + ">") : entries.length ? "{ " + entries.map((entry, index) => "readonly " + entry.key + ": import(" + JSON.stringify(imported.module) + ").TypedMessageDescriptor" + (types[index] === emptyContract ? "" : "<" + types[index] + ">")).join("; ") + " }" : "{}";
 					contract = !catalog ? types[0] : entries.length ? "{ " + entries.map((entry, index) => "readonly " + entry.key + ": " + types[index]).join("; ") + " }" : "{}";
 				} catch (error) {
 					context.report({
@@ -985,12 +987,14 @@ const rule$20 = {
 					});
 					return;
 				}
-				const imports = hoistTypes(context, node, contract + (catalogType ? "\n" + catalogType : ""));
+				const parameters = generic?.params;
+				const omitContract = (imported.helper === "defineMessage" || catalog) && types.every((type) => type === emptyContract) && (!parameters || parameters.length === 1);
+				const imports = hoistTypes(context, node, (omitContract ? "" : 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 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,
@@ -1005,7 +1009,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;
@@ -5265,7 +5269,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 	version: () => version$1
 });
 var name$1 = "eslint-plugin-formatjs";
-var version$1 = "8.0.2";
+var version$1 = "8.0.4";
 var description = "ESLint plugin for formatjs";
 var keywords = [
 	"eslint",