@so1ve/eslint-plugin 3.23.0 → 3.25.0

package/dist/index.mjs

@@ -259,23 +259,26 @@ const rule$7 = createEslintRule({
 		function checkExport(node) {
 			exportNodes.push(node);
 		}
-		function shouldHaveNewline(node, direction) {
+		function checkNewline(node, direction) {
 			let token;
-			let commentLine;
 			let expectedLine;
 			let tokenLine;
 			if (direction === "after") {
-				token = sourceCode.getTokenAfter(node);
-				commentLine = sourceCode.getCommentsAfter(node)[0]?.loc.start.line;
-				expectedLine = node.loc.end.line + 1;
+				const endNode = sourceCode.getCommentsAfter(node).find((c) => c.loc.start.line === node.loc.end.line) ?? node;
+				token = sourceCode.getTokenAfter(endNode);
+				const nextComment = sourceCode.getCommentsAfter(endNode)[0];
+				expectedLine = endNode.loc.end.line + 1;
 				tokenLine = token?.loc.start.line;
-			} else {
-				token = sourceCode.getTokenBefore(node);
-				commentLine = sourceCode.getCommentsBefore(node)[0]?.loc.end.line;
-				expectedLine = node.loc.start.line - 1;
-				tokenLine = token?.loc.end.line;
+				const commentLine = nextComment?.loc.start.line;
+				if (token && (expectedLine === tokenLine || expectedLine === commentLine || tokenLine === endNode.loc.end.line) && token.value !== "}" && token.value !== "<\/script>") return endNode;
+				return null;
 			}
-			return token && (expectedLine === tokenLine || expectedLine === commentLine) && (direction === "after" ? token.value !== "}" && token.value !== "<\/script>" : true);
+			const startNode = sourceCode.getCommentsBefore(node)[0] || node;
+			token = sourceCode.getTokenBefore(startNode);
+			expectedLine = startNode.loc.start.line - 1;
+			tokenLine = token?.loc.end.line;
+			if (token && expectedLine === tokenLine) return startNode;
+			return null;
 		}
 		return {
 			ImportDeclaration(node) {
@@ -285,24 +288,31 @@ const rule$7 = createEslintRule({
 			ExportDefaultDeclaration: checkExport,
 			ExportAllDeclaration: checkExport,
 			"Program:exit"() {
-				if (lastImportNode && shouldHaveNewline(lastImportNode, "after")) context.report({
+				const lastImportFixNode = lastImportNode ? checkNewline(lastImportNode, "after") : null;
+				if (lastImportNode && lastImportFixNode) context.report({
 					node: lastImportNode,
 					messageId: "newlineAfterLastImport",
-					fix: (fixer) => fixer.insertTextAfter(lastImportNode, "\n")
+					fix: (fixer) => fixer.insertTextAfter(lastImportFixNode, "\n")
 				});
 				for (const node of exportNodes) {
 					const prevNode = getPreviousNode(node);
-					if ((!prevNode || !isExportDeclaration(prevNode)) && !(lastImportNode && prevNode === lastImportNode) && shouldHaveNewline(node, "before")) context.report({
-						node,
-						messageId: "newlineBeforeExport",
-						fix: (fixer) => fixer.insertTextBefore(node, "\n")
-					});
+					if ((!prevNode || !isExportDeclaration(prevNode)) && (!lastImportNode || prevNode !== lastImportNode)) {
+						const beforeFixNode = checkNewline(node, "before");
+						if (beforeFixNode) context.report({
+							node,
+							messageId: "newlineBeforeExport",
+							fix: (fixer) => fixer.insertTextBefore(beforeFixNode, "\n")
+						});
+					}
 					const nextNode = getNextNode(node);
-					if (nextNode && !isExportDeclaration(nextNode) && shouldHaveNewline(node, "after")) context.report({
-						node,
-						messageId: "newlineAfterExport",
-						fix: (fixer) => fixer.insertTextAfter(node, "\n")
-					});
+					if (nextNode && !isExportDeclaration(nextNode)) {
+						const afterFixNode = checkNewline(node, "after");
+						if (afterFixNode) context.report({
+							node,
+							messageId: "newlineAfterExport",
+							fix: (fixer) => fixer.insertTextAfter(afterFixNode, "\n")
+						});
+					}
 				}
 			}
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-plugin",
-  "version": "3.23.0",
+  "version": "3.25.0",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "type": "module",
   "keywords": [