@blumintinc/eslint-plugin-blumint 1.20.176 → 1.20.177

package/lib/index.js

@@ -223,7 +223,7 @@ function noFrontendImportsFromFunctionsPatterns(pattern) {
 module.exports = {
     meta: {
         name: '@blumintinc/eslint-plugin-blumint',
-        version: '1.20.176',
+        version: '1.20.177',
     },
     parseOptions: {
         ecmaVersion: 2020,

package/lib/rules/jsdoc-above-field.js

@@ -108,22 +108,62 @@ exports.jsdocAboveField = (0, createRule_1.createRule)({
                     : node.range[1],
             };
         };
+        const containerOf = (node) => {
+            const parent = node.parent;
+            if (parent?.type === utils_1.AST_NODE_TYPES.TSTypeLiteral) {
+                return { node: parent, members: parent.members, separator: ';' };
+            }
+            if (parent?.type === utils_1.AST_NODE_TYPES.TSInterfaceBody) {
+                return { node: parent, members: parent.body, separator: ';' };
+            }
+            if (parent?.type === utils_1.AST_NODE_TYPES.ClassBody) {
+                return { node: parent, members: parent.body, separator: ';' };
+            }
+            if (parent?.type === utils_1.AST_NODE_TYPES.ObjectExpression) {
+                return { node: parent, members: parent.properties, separator: ',' };
+            }
+            return undefined;
+        };
+        /**
+         * Whether nothing but the container's closing brace follows the block, so
+         * the field it trails is the only member it can belong to.
+         */
+        const closesContainer = (node, comment) => {
+            const container = containerOf(node);
+            if (!container) {
+                return false;
+            }
+            const closeBrace = sourceCode.getLastToken(container.node);
+            if (!closeBrace || comment.range[1] > closeBrace.range[0]) {
+                return false;
+            }
+            return !container.members.some((member) => member.range[0] >= comment.range[1]);
+        };
         /**
          * Attaches a trailing JSDoc block by token order rather than by line.
          *
-         * Prettier reflows a multi-line block that trails a field onto its own
-         * line, ahead of the member's separator: the block that followed
-         * `timeout: number;` ends up between `timeout: number` and its `;`. Keying
-         * on the comment sharing the field's line makes the rule inert on exactly
-         * the formatted source it has to police, so a block the separator still
-         * follows counts as this member's however many lines down it starts.
+         * Prettier is not idempotent on a multi-line block that trails a field. One
+         * pass reflows it onto its own line ahead of the member's separator, so the
+         * block that followed `timeout: number;` sits between `timeout: number` and
+         * its `;`; the next pass moves the separator back in front of it, and that
+         * separator-first spelling is the fixed point formatted source converges
+         * to. Both intermediates and the fixed point document the field above them,
+         * so keying on the comment sharing the field's line — or on the separator
+         * still following it — leaves the rule inert on the shape it exists to
+         * police.
+         *
+         * Past the separator the member has ended and position alone stops naming
+         * an owner: an own-line block there reads as the leading documentation of
+         * the next field. That reading needs a next field, so it is unavailable on
+         * the last member of a container, where the preceding field is the only
+         * candidate left.
          *
-         * Past the separator the member has ended and position alone no longer
-         * identifies an owner: an own-line block there is the leading documentation
-         * of the next field, or a note about the enclosing shape. Only the same-line
-         * spelling can be claimed there, which is why that arm survives.
+         * A blank line is the one signal that survives the round trip intact:
+         * prettier preserves an authored one and never inserts one while reflowing,
+         * so a block held off by an empty line is a deliberate note about the
+         * enclosing shape rather than displaced documentation.
          */
-        const trailingJSDocFor = (span) => {
+        const trailingJSDocFor = (node, span) => {
             return allComments.find((comment) => {
                 if (!isJSDocBlock(comment)) {
                     return false;
@@ -131,11 +171,13 @@ exports.jsdocAboveField = (0, createRule_1.createRule)({
                 if (comment.range[0] < span.offset) {
                     return false;
                 }
+                const between = sourceCode.text.slice(span.offset, comment.range[0]);
                 const precedesSeparator = comment.range[1] <= span.separatorEnd;
                 if (!precedesSeparator && comment.loc.start.line !== span.line) {
-                    return false;
+                    if (!closesContainer(node, comment) || /\n[^\S\n]*\n/.test(between)) {
+                        return false;
+                    }
                 }
-                const between = sourceCode.text.slice(span.offset, comment.range[0]);
                 return /^[\s;,]*$/.test(between);
             });
         };
@@ -236,22 +278,6 @@ exports.jsdocAboveField = (0, createRule_1.createRule)({
          */
         const lineIndentOf = (node) => /^[ \t]*/.exec(sourceCode.lines[node.loc.start.line - 1] ?? '')?.[0] ??
             '';
-        const containerOf = (node) => {
-            const parent = node.parent;
-            if (parent?.type === utils_1.AST_NODE_TYPES.TSTypeLiteral) {
-                return { node: parent, members: parent.members, separator: ';' };
-            }
-            if (parent?.type === utils_1.AST_NODE_TYPES.TSInterfaceBody) {
-                return { node: parent, members: parent.body, separator: ';' };
-            }
-            if (parent?.type === utils_1.AST_NODE_TYPES.ClassBody) {
-                return { node: parent, members: parent.body, separator: ';' };
-            }
-            if (parent?.type === utils_1.AST_NODE_TYPES.ObjectExpression) {
-                return { node: parent, members: parent.properties, separator: ',' };
-            }
-            return undefined;
-        };
         /**
          * A member's separator sits inside its range for type and class members
          * but outside it for object literal properties, so both spellings have to
@@ -314,7 +340,7 @@ exports.jsdocAboveField = (0, createRule_1.createRule)({
                     jsdoc: member === node
                         ? comment
                         : isRelevantNode(member)
-                            ? trailingJSDocFor(fieldSpanOf(member))
+                            ? trailingJSDocFor(member, fieldSpanOf(member))
                             : undefined,
                 };
             });
@@ -420,7 +446,7 @@ exports.jsdocAboveField = (0, createRule_1.createRule)({
                 return;
             }
             const span = fieldSpanOf(node);
-            const jsdocComment = trailingJSDocFor(span);
+            const jsdocComment = trailingJSDocFor(node, span);
             if (!jsdocComment) {
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blumintinc/eslint-plugin-blumint",
-  "version": "1.20.176",
+  "version": "1.20.177",
   "description": "Custom eslint rules for use within BluMint",
   "author": {
     "name": "Brodie McGuire",

package/release-manifest.json

@@ -1,4 +1,18 @@
 [
+  {
+    "version": "1.20.177",
+    "date": "2026-08-26T16:36:01.459Z",
+    "rules": [
+      {
+        "name": "jsdoc-above-field",
+        "changeType": "fix",
+        "issues": [
+          2145
+        ],
+        "summary": "claim a trailing block that closes its container (closes #2145)"
+      }
+    ]
+  },
   {
     "version": "1.20.176",
     "date": "2026-08-26T11:56:32.903Z",