@discourse/lint-configs 2.17.0 → 2.17.2

package/eslint-rules/line-before-default-export.mjs

@@ -1,3 +1,7 @@
+function isCommentNode(node) {
+  return node.type === "Line" || node.type === "Block";
+}
+
 export default {
   meta: {
     type: "layout",
@@ -12,29 +16,38 @@ export default {
     const sourceCode = context.sourceCode;
 
     return {
-      Program(node) {
-        const body = node.body;
-        const index = body.findIndex(
-          (n) => n.type === "ExportDefaultDeclaration"
-        );
-
-        if (index === -1 || index === 0) {
-          // No default export or starts with the export
-          return;
+      ExportDefaultDeclaration(node) {
+        let targetNode = node;
+        if (node.declaration?.decorators?.length) {
+          targetNode = node.declaration.decorators[0];
         }
 
-        const currentToken = body[index];
-        const previousToken = sourceCode.getTokenBefore(currentToken);
-
-        const isPadded =
-          currentToken.loc.end.line - previousToken.loc.end.line > 1;
-
-        if (isPadded) {
-          return;
+        let previousToken;
+        while (true) {
+          previousToken = sourceCode.getTokenBefore(targetNode, {
+            includeComments: true,
+          });
+          if (!previousToken) {
+            // Top of file, no need for newline
+            return;
+          }
+
+          const isPadded =
+            targetNode.loc.start.line - previousToken.loc.end.line > 1;
+          if (isPadded) {
+            return;
+          }
+
+          if (isCommentNode(previousToken)) {
+            targetNode = previousToken;
+            continue;
+          }
+
+          break;
         }
 
         context.report({
-          node: body[index],
+          node: targetNode,
           message: "Expected blank line before the default export.",
 
           fix(fixer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discourse/lint-configs",
-  "version": "2.17.0",
+  "version": "2.17.2",
   "description": "Shareable lint configs for Discourse core, plugins, and themes",
   "author": "Discourse",
   "license": "MIT",