refactor: optimize code

JoshuaKGoldberg · Jan 22, 2025 · bdd58dc · bdd58dc
1 parent 6e362f6
commit bdd58dc
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/src/rules/no-empty-fields.ts b/src/rules/no-empty-fields.ts
@@ -4,15 +4,51 @@ import * as ESTree from "estree";
 
 import { createRule, PackageJsonRuleContext } from "../createRule";
 
+const getDataAndMessageId = (
+	node:
+		| JsonAST.JSONArrayExpression
+		| JsonAST.JSONObjectExpression
+		| JsonAST.JSONProperty,
+): {
+	data: Record<string, string>;
+	messageId: "emptyFields" | "emptyExpression";
+} => {
+	switch (node.type) {
+		case "JSONProperty":
+			return {
+				data: {
+					field: (node.key as JsonAST.JSONStringLiteral).value,
+				},
+				messageId: "emptyFields",
+			};
+		case "JSONArrayExpression":
+			return {
+				data: {
+					expressionType: "array",
+				},
+				messageId: "emptyExpression",
+			};
+		case "JSONObjectExpression":
+			return {
+				data: {
+					expressionType: "object",
+				},
+				messageId: "emptyExpression",
+			};
+	}
+};
+
 const report = (
 	context: PackageJsonRuleContext,
 	node:
 		| JsonAST.JSONArrayExpression
 		| JsonAST.JSONObjectExpression
 		| JsonAST.JSONProperty,
 ) => {
+	const { data, messageId } = getDataAndMessageId(node);
 	context.report({
-		messageId: "emptyFields",
+		data,
+		messageId,
 		node: node as unknown as ESTree.Node,
 		suggest: [
 			{
@@ -74,7 +110,10 @@ export const rule = createRule({
 		},
 		hasSuggestions: true,
 		messages: {
-			emptyFields: "This empty field does nothing and can be removed.",
+			emptyFields:
+				"The field '{{field}}' does nothing and can be removed.",
+			emptyExpression:
+				"This {{expressionType}} does nothing and can be removed.",
 			remove: "Remove this empty field.",
 		},
 		schema: [],

diff --git a/src/tests/rules/no-empty-fields.test.ts b/src/tests/rules/no-empty-fields.test.ts
@@ -39,7 +39,7 @@ ruleTester.run("no-empty-fields", rule, {
 `,
 			errors: [
 				{
-					messageId: "emptyFields",
+					messageId: "emptyExpression",
 					suggestions: [
 						{
 							messageId: "remove",
@@ -61,7 +61,7 @@ ruleTester.run("no-empty-fields", rule, {
 `,
 			errors: [
 				{
-					messageId: "emptyFields",
+					messageId: "emptyExpression",
 					suggestions: [
 						{
 							messageId: "remove",
@@ -74,7 +74,7 @@ ruleTester.run("no-empty-fields", rule, {
 					],
 				},
 				{
-					messageId: "emptyFields",
+					messageId: "emptyExpression",
 					suggestions: [
 						{
 							messageId: "remove",