eslint-plugin-nextfriday 5.0.0 → 5.0.1

package/lib/index.js

@@ -4,7 +4,7 @@ import path from "path";
 import emojiRegex from "emoji-regex";
 //#region package.json
 var name = "eslint-plugin-nextfriday";
-var version = "5.0.0";
+var version = "5.0.1";
 //#endregion
 //#region src/rules/boolean-naming-prefix.ts
 const createRule$26 = ESLintUtils.RuleCreator((name) => `https://github.com/next-friday/eslint-plugin-nextfriday/blob/main/docs/rules/${name.replaceAll("-", "_").toUpperCase()}.md`);
@@ -1750,9 +1750,6 @@ const noHelperFunctionInTest = ESLintUtils.RuleCreator((name) => `https://github
 //#endregion
 //#region src/rules/no-inline-nested-object.ts
 const createRule$11 = ESLintUtils.RuleCreator((name) => `https://github.com/next-friday/eslint-plugin-nextfriday/blob/main/docs/rules/${name.replaceAll("-", "_").toUpperCase()}.md`);
-function isObjectOrArray(node) {
-	return node.type === AST_NODE_TYPES.ObjectExpression || node.type === AST_NODE_TYPES.ArrayExpression || node.type === AST_NODE_TYPES.TSAsExpression;
-}
 function getInnerExpression(node) {
 	if (node.type === AST_NODE_TYPES.TSAsExpression) return getInnerExpression(node.expression);
 	return node;
@@ -1775,7 +1772,7 @@ const noInlineNestedObject = createRule$11({
 	name: "no-inline-nested-object",
 	meta: {
 		type: "layout",
-		docs: { description: "Require object or array values that contain further nested objects or arrays to span multiple lines" },
+		docs: { description: "Require object or array values passed to functions, returned, or used as JSX attributes to span multiple lines when they contain nested objects or arrays" },
 		fixable: "whitespace",
 		messages: { requireMultiline: "Inline collections containing nested objects or arrays should span multiple lines" },
 		schema: []
@@ -1783,32 +1780,54 @@ const noInlineNestedObject = createRule$11({
 	defaultOptions: [],
 	create(context) {
 		const { sourceCode } = context;
-		return { Property(node) {
-			if (!node.value || !isObjectOrArray(node.value)) return;
-			const valueNode = getInnerExpression(node.value);
-			if (valueNode.type !== AST_NODE_TYPES.ObjectExpression && valueNode.type !== AST_NODE_TYPES.ArrayExpression) return;
-			if (!valueNode.loc) return;
-			if (valueNode.loc.start.line !== valueNode.loc.end.line) return;
-			if (!containsNestedStructure(valueNode)) return;
-			const elements = valueNode.type === AST_NODE_TYPES.ObjectExpression ? valueNode.properties : valueNode.elements;
+		function checkValue(node) {
+			if (!node) return;
+			const inner = getInnerExpression(node);
+			if (inner.type !== AST_NODE_TYPES.ObjectExpression && inner.type !== AST_NODE_TYPES.ArrayExpression) return;
+			if (!inner.loc) return;
+			if (inner.loc.start.line !== inner.loc.end.line) return;
+			if (!containsNestedStructure(inner)) return;
+			const elements = inner.type === AST_NODE_TYPES.ObjectExpression ? inner.properties : inner.elements;
 			context.report({
-				node: valueNode,
+				node: inner,
 				messageId: "requireMultiline",
 				fix(fixer) {
-					const openBrace = sourceCode.getFirstToken(valueNode);
-					const closeBrace = sourceCode.getLastToken(valueNode);
-					if (!openBrace || !closeBrace) return null;
-					const indent = " ".repeat(node.loc?.start.column ?? 0);
-					const innerIndent = `${indent}  `;
+					const lineIndentMatch = (sourceCode.lines[inner.loc.start.line - 1] ?? "").match(/^(\s*)/);
+					const lineIndent = lineIndentMatch ? lineIndentMatch[1] : "";
+					const innerIndent = `${lineIndent}  `;
 					const elementTexts = elements.filter((el) => el !== null).map((el) => sourceCode.getText(el));
-					const isObject = valueNode.type === AST_NODE_TYPES.ObjectExpression;
+					const isObject = inner.type === AST_NODE_TYPES.ObjectExpression;
 					const openChar = isObject ? "{" : "[";
 					const closeChar = isObject ? "}" : "]";
-					const newContent = `${openChar}\n${elementTexts.map((text) => `${innerIndent}${text},`).join("\n")}\n${indent}${closeChar}`;
-					return fixer.replaceText(valueNode, newContent);
+					const newContent = `${openChar}\n${elementTexts.map((text) => `${innerIndent}${text},`).join("\n")}\n${lineIndent}${closeChar}`;
+					return fixer.replaceText(inner, newContent);
 				}
 			});
-		} };
+		}
+		function checkArguments(args) {
+			args.forEach((arg) => {
+				if (arg.type === AST_NODE_TYPES.SpreadElement) return;
+				checkValue(arg);
+			});
+		}
+		return {
+			CallExpression(node) {
+				checkArguments(node.arguments);
+			},
+			NewExpression(node) {
+				checkArguments(node.arguments);
+			},
+			ReturnStatement(node) {
+				checkValue(node.argument);
+			},
+			ArrowFunctionExpression(node) {
+				if (node.body.type !== AST_NODE_TYPES.BlockStatement) checkValue(node.body);
+			},
+			JSXExpressionContainer(node) {
+				if (node.expression.type === AST_NODE_TYPES.JSXEmptyExpression) return;
+				checkValue(node.expression);
+			}
+		};
 	}
 });
 //#endregion