@blumintinc/eslint-plugin-blumint 1.20.144 → 1.20.145

package/lib/index.js

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

package/lib/rules/no-always-true-false-conditions.js

@@ -3,6 +3,81 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.noAlwaysTrueFalseConditions = void 0;
 const createRule_1 = require("../utils/createRule");
 const utils_1 = require("@typescript-eslint/utils");
+const ASTHelpers_1 = require("../utils/ASTHelpers");
+const BREAKABLE = new Set([
+    utils_1.AST_NODE_TYPES.WhileStatement,
+    utils_1.AST_NODE_TYPES.DoWhileStatement,
+    utils_1.AST_NODE_TYPES.ForStatement,
+    utils_1.AST_NODE_TYPES.ForInStatement,
+    utils_1.AST_NODE_TYPES.ForOfStatement,
+    utils_1.AST_NODE_TYPES.SwitchStatement,
+]);
+/**
+ * Whether `body` can leave the loop that owns it.
+ *
+ * An unlabeled `break` binds to the nearest enclosing loop or switch, so a
+ * nested breakable is still walked but its own unlabeled breaks do not count; a
+ * labeled one counts when it names this loop. `return` and `throw` leave the
+ * loop as well, unless they sit inside a nested function, which has its own.
+ */
+function canExitLoop(body, label) {
+    let escapes = false;
+    const visit = (node, insideNestedBreakable) => {
+        if (escapes)
+            return;
+        switch (node.type) {
+            case utils_1.AST_NODE_TYPES.FunctionDeclaration:
+            case utils_1.AST_NODE_TYPES.FunctionExpression:
+            case utils_1.AST_NODE_TYPES.ArrowFunctionExpression:
+                return;
+            case utils_1.AST_NODE_TYPES.BreakStatement:
+                if (node.label ? node.label.name === label : !insideNestedBreakable) {
+                    escapes = true;
+                }
+                return;
+            case utils_1.AST_NODE_TYPES.ReturnStatement:
+            case utils_1.AST_NODE_TYPES.ThrowStatement:
+                escapes = true;
+                return;
+            default:
+                break;
+        }
+        const nested = insideNestedBreakable || BREAKABLE.has(node.type);
+        for (const [key, value] of Object.entries(node)) {
+            if (key === 'parent')
+                continue;
+            if (Array.isArray(value)) {
+                for (const child of value) {
+                    if (ASTHelpers_1.ASTHelpers.isNode(child))
+                        visit(child, nested);
+                }
+            }
+            else if (ASTHelpers_1.ASTHelpers.isNode(value)) {
+                visit(value, nested);
+            }
+        }
+    };
+    visit(body, false);
+    return escapes;
+}
+/**
+ * `while (true)` and `do … while (true)` around a `break` are how a loop whose
+ * exit is only known mid-body is written — cursor pagination being the usual
+ * case. The condition is the point, and unlike an `if` it cannot be removed:
+ * the only way to satisfy the report is to rewrite the loop as `for (;;)`,
+ * which this rule already accepts because it has no test node to check. A
+ * literal `true` over a body with no way out is still reported, since that loop
+ * really does run forever (#1973).
+ */
+function isDeliberateInfiniteLoop(loop) {
+    if (loop.test?.type !== utils_1.AST_NODE_TYPES.Literal || loop.test.value !== true) {
+        return false;
+    }
+    const label = loop.parent?.type === utils_1.AST_NODE_TYPES.LabeledStatement
+        ? loop.parent.label.name
+        : null;
+    return canExitLoop(loop.body, label);
+}
 exports.noAlwaysTrueFalseConditions = (0, createRule_1.createRule)({
     name: 'no-always-true-false-conditions',
     meta: {
@@ -1498,15 +1573,19 @@ exports.noAlwaysTrueFalseConditions = (0, createRule_1.createRule)({
             },
             // Check while loops
             WhileStatement(node) {
+                if (isDeliberateInfiniteLoop(node))
+                    return;
                 checkCondition(node.test);
             },
             // Check do-while loops
             DoWhileStatement(node) {
+                if (isDeliberateInfiniteLoop(node))
+                    return;
                 checkCondition(node.test);
             },
             // Check for loop conditions
             ForStatement(node) {
-                if (node.test) {
+                if (node.test && !isDeliberateInfiniteLoop(node)) {
                     checkCondition(node.test);
                 }
             },

package/lib/rules/no-explicit-return-type.js

@@ -8,6 +8,7 @@ const importRemoval_1 = require("../utils/importRemoval");
 const typeDeclarationRemoval_1 = require("../utils/typeDeclarationRemoval");
 const replacementSegments_1 = require("../utils/replacementSegments");
 const lexicalScope_1 = require("../utils/lexicalScope");
+const arrowAnnotationGap_1 = require("../utils/arrowAnnotationGap");
 const defaultOptions = {
     allowRecursiveFunctions: true,
     allowOverloadedFunctions: true,
@@ -780,25 +781,6 @@ function batchAnnotations(source, candidates) {
     });
     return [...batches.values()];
 }
-/**
- * A comment whose meaning is tied to where it sits. Re-emitting one somewhere
- * else retargets it — a disable directive lands on an unrelated line and a
- * `@ts-expect-error` becomes an error of its own — so a removal that would move
- * one is withheld instead.
- */
-function isPositionalDirective(comment) {
-    if ((0, disableDirectives_1.parseDisableDirectives)([comment]).length > 0) {
-        return true;
-    }
-    const value = comment.value.trim();
-    return value.startsWith('@ts-expect-error') || value.startsWith('@ts-ignore');
-}
-/** The indentation of the line `offset` sits on, for a carried line break. */
-function indentAt(source, offset) {
-    const lineStart = source.text.lastIndexOf('\n', offset - 1) + 1;
-    const [indent] = /^[ \t]*/.exec(source.text.slice(lineStart, offset)) ?? [''];
-    return indent;
-}
 /**
  * Whether the span deletes a whole declaration of the program.
  *
@@ -827,9 +809,9 @@ function carriedText(source, range) {
         .filter((comment) => comment.range[0] >= range[0] && comment.range[1] <= range[1]);
     if (comments.length === 0)
         return '';
-    if (comments.some(isPositionalDirective))
+    if (comments.some(arrowAnnotationGap_1.isPositionalDirective))
         return null;
-    const indent = indentAt(source, range[0]);
+    const indent = (0, arrowAnnotationGap_1.indentAt)(source, range[0]);
     const segments = comments.map((comment) => ({
         text: source.text.slice(comment.range[0], comment.range[1]),
         breakAfter: (0, replacementSegments_1.requiresLineBreakAfter)(comment),
@@ -846,70 +828,20 @@ function carriedText(source, range) {
             : ' ';
     return `${lead}${body}${trail}`;
 }
-/** Every character the syntactic grammar counts as a LineTerminator. */
-const LINE_TERMINATOR = /[\n\r\u2028\u2029]/;
-const textOf = (source, range) => source.text.slice(range[0], range[1]);
-/**
- * The span an arrow's return annotation occupies between the parameter list and
- * the `=>`, together with that arrow token.
- *
- * The span holds the annotation, whitespace and comments and nothing else,
- * which is what makes it safe to rewrite wholesale: no binding reference can
- * hide in it beyond the ones the annotation itself names.
- */
-function arrowAnnotationGap(source, returnType) {
-    const parametersEnd = source.getTokenBefore(returnType);
-    const arrow = source.getTokenAfter(returnType, {
-        filter: (token) => token.value === '=>',
-    });
-    if (!parametersEnd || !arrow)
-        return null;
-    const gap = [parametersEnd.range[1], arrow.range[0]];
-    return containsRange(gap, returnType.range) ? { gap, arrow } : null;
-}
-/**
- * Re-emits `comments` on the far side of the arrow, where a line terminator is
- * inert, consuming the horizontal whitespace the arrow already had after it so
- * the body keeps a single separator.
- */
-function hoistPastArrow(source, arrow, comments) {
-    const indent = indentAt(source, arrow.range[0]);
-    const trailingText = source.text.slice(arrow.range[1]);
-    const [spacing] = /^[ \t]*/.exec(trailingText) ?? [''];
-    const body = (0, replacementSegments_1.joinSegmentBody)(comments.map((comment) => ({
-        text: textOf(source, comment.range),
-        breakAfter: true,
-    })), indent);
-    const rest = trailingText.slice(spacing.length);
-    const separator = LINE_TERMINATOR.test(rest.charAt(0))
-        ? ''
-        : (0, replacementSegments_1.requiresLineBreakAfter)(comments[comments.length - 1])
-            ? `\n${indent}`
-            : ' ';
-    return {
-        range: [arrow.range[1], arrow.range[1] + spacing.length],
-        text: ` ${body}${separator}`,
-    };
-}
 /**
  * The edits that strip one annotation, carrying every comment the strip
  * strands rather than deleting it (#1877). `null` withholds the fix, for a
  * comment whose meaning is its position and which cannot stay where it is.
  *
  * An arrow is the one subject whose annotation sits inside a restricted
- * production: `ArrowParameters [no LineTerminator here] =>` forbids a line
- * terminator between the parameter list and the arrow, and a block comment
- * carrying a line terminator IS one to the grammar. A comment left there — or
- * carried there from inside the annotation — therefore turns the output into a
- * hard SyntaxError that only V8 reports, since `@typescript-eslint/parser`
- * accepts it (#1964). Such a comment is re-emitted past the `=>` instead, the
- * nearest position outside the restricted gap that cannot itself begin one;
- * hoisting it above the enclosing line would anchor an insertion at a column
- * zero that may sit inside a template literal or JSX text, where the comment
- * would become content rather than code.
+ * production, so its edits come from the shared planner that answers for that
+ * grammar (#1964). The removal span handed to it is the annotation's own
+ * range: unlike the planner's other caller, nothing here reaches back over the
+ * whitespace ahead of the `:`.
  *
  * Every other subject ends its parameter list at a body or a semicolon, so its
- * stranded comments stay where they were written.
+ * stranded comments stay where they were written and a deletion that carries
+ * them in place is correct.
  */
 function planAnnotationEdits(source, entry) {
     const range = entry.returnType.range;
@@ -917,53 +849,7 @@ function planAnnotationEdits(source, entry) {
         const carried = carriedText(source, range);
         return carried === null ? null : [{ range, text: carried }];
     }
-    const gapInfo = arrowAnnotationGap(source, entry.returnType);
-    if (!gapInfo)
-        return null;
-    const { gap, arrow } = gapInfo;
-    const comments = source
-        .getAllComments()
-        .filter((comment) => containsRange(gap, comment.range));
-    const stranded = comments.filter((comment) => containsRange(range, comment.range));
-    // What the plain deletion would leave between the parameters and the arrow.
-    // A comment left there contributes its own text, so a line comment or a
-    // multi-line block comment shows up here as the line terminator it is.
-    const residue = `${textOf(source, [gap[0], range[0]])}${textOf(source, [
-        range[1],
-        gap[1],
-    ])}`;
-    // The plain deletion is kept wherever it already lands a legal gap and
-    // strands nothing, so no output that survives today moves by a byte.
-    if (stranded.length === 0 && !LINE_TERMINATOR.test(residue)) {
-        return [{ range, text: '' }];
-    }
-    // Rewriting the gap collapses the lines it spanned, which moves the line a
-    // directive inside it points at, so the whole fix is withheld rather than
-    // retargeting one. The gap a directive can share with nothing else is left
-    // untouched by the branch above.
-    if (comments.some(isPositionalDirective))
-        return null;
-    const hoisted = comments.filter(replacementSegments_1.requiresOwnLine);
-    const inline = comments
-        .filter((comment) => !(0, replacementSegments_1.requiresOwnLine)(comment))
-        .map((comment) => textOf(source, comment.range));
-    const edits = [
-        { range: gap, text: inline.length === 0 ? ' ' : ` ${inline.join(' ')} ` },
-    ];
-    if (hoisted.length > 0) {
-        edits.push(hoistPastArrow(source, arrow, hoisted));
-    }
-    return edits;
-}
-/**
- * ESLint applies a fix whole or not at all, and rejects one whose edits
- * overlap. Two spans planned independently — an annotation and the declaration
- * that strands it — can only overlap if a premise here is wrong, so an overlap
- * withdraws the fix rather than throwing at apply time.
- */
-function isDisjoint(edits) {
-    const sorted = [...edits].sort((left, right) => left.range[0] - right.range[0]);
-    return sorted.every((edit, index) => index === 0 || sorted[index - 1].range[1] <= edit.range[0]);
+    return (0, arrowAnnotationGap_1.planArrowAnnotationEdits)(source, entry.returnType, range);
 }
 /**
  * The edits a single fix makes for `batch`: the annotations themselves plus the
@@ -1002,7 +888,7 @@ function planRemoval(source, removalSource, batch) {
             return null;
         edits.push({ range, text: carried });
     }
-    return isDisjoint(edits) ? edits : null;
+    return (0, arrowAnnotationGap_1.isDisjoint)(edits) ? edits : null;
 }
 exports.noExplicitReturnType = (0, createRule_1.createRule)({
     name: 'no-explicit-return-type',

package/lib/rules/no-redundant-annotation-assertion.js

@@ -175,6 +175,49 @@ function annotationRemovalRange(typeAnnotation, sourceCode) {
 function typeText(type, checker) {
     return checker.typeToString(type, undefined, typeFormatFlags());
 }
+/**
+ * Whether the checker failed to resolve `type` to a real one.
+ *
+ * `@typescript-eslint/parser` hands back parser services even with no
+ * `parserOptions.project`, but the program it builds then has no lib, so every
+ * type naming a global degrades: array types collapse to one shared anonymous
+ * `{}` (no symbol), and generic references such as `Map<K, V>` become the error
+ * type. Both are assignable to everything and stringify alike, so two unrelated
+ * types compare equal — `string[]` and `number[]` are literally the same object.
+ * Answering "no type information" with a report is what made this rule delete
+ * annotations and silently change a binding's type (#1972).
+ *
+ * A genuine `{}`, `{ a: number }` or `() => void` carries a `__type` symbol, so
+ * only the degraded forms match here. Under a real `tsconfig` nothing does.
+ */
+function isUnresolvedType(type) {
+    const candidate = type;
+    if ((type.flags & ts.TypeFlags.Any) !== 0 &&
+        candidate.intrinsicName === 'error') {
+        return true;
+    }
+    return (candidate.objectFlags !== undefined &&
+        (candidate.objectFlags & ts.ObjectFlags.Anonymous) !== 0 &&
+        !type.symbol);
+}
+/**
+ * Whitespace inside a type is not part of it, so `Map<string, A>` and
+ * `Map<string,A>` must compare equal. Spaces between two word characters are
+ * kept so `keyof A` cannot collapse onto a type named `keyofA`.
+ */
+function normalizeTypeSpelling(text) {
+    return text
+        .replace(/\s+/g, ' ')
+        .replace(/\s*([<>,[\]()|&{}:;?])\s*/g, '$1')
+        .trim();
+}
+/**
+ * The comparison form drops spacing the developer chose, so a type spanning
+ * several lines is flattened for the message but otherwise quoted as written.
+ */
+function displayTypeSpelling(text) {
+    return text.replace(/\s+/g, ' ').trim();
+}
 function unwrapAlias(type, checker) {
     const aliasSymbol = type
         .aliasSymbol;
@@ -335,8 +378,13 @@ function doTypeTextsMatch(representations) {
         annotationCanonical === assertionCanonical ||
         annotationStructural === assertionStructural);
 }
-function selectMatchingTypeRepresentation(representations) {
-    return representations.annotationText;
+/**
+ * The message names the type the developer is looking at, so it is the
+ * annotation's own spelling rather than `typeToString`, which renders
+ * `ValidResult[]` as `Array<ValidResult>` and an unresolved type as `{}`.
+ */
+function selectMatchingTypeRepresentation(annotationSpelling) {
+    return annotationSpelling;
 }
 /**
  * Checks if two types are effectively equal for the purpose of identifying redundant assertions.
@@ -363,16 +411,32 @@ function areTypesEffectivelyEqual(annotationType, assertionType, representations
  * @param services The parser services.
  * @returns The matching type string if the types are effectively equal, null otherwise.
  */
-function haveMatchingTypes(annotation, assertion, checker, services) {
+function haveMatchingTypes(annotation, assertion, checker, services, sourceCode) {
     const annotationType = getComparableType(annotation, checker, services);
     const assertionType = getComparableType(assertion, checker, services);
     if (!annotationType || !assertionType)
         return null;
+    const annotationText = sourceCode.getText(annotation);
+    const annotationSpelling = normalizeTypeSpelling(annotationText);
+    const reportedType = displayTypeSpelling(annotationText);
+    /**
+     * With either side unresolved the checker cannot separate "same type" from
+     * "no type information", so fall back to how the two are written. Identical
+     * spellings in one scope denote one type, which keeps every genuinely
+     * redundant pair reportable while the mismatched pairs that motivated this
+     * fallback — `string[]` against `number[]` — no longer match.
+     */
+    if (isUnresolvedType(annotationType) || isUnresolvedType(assertionType)) {
+        const assertionSpelling = normalizeTypeSpelling(sourceCode.getText(assertion));
+        return annotationSpelling === assertionSpelling
+            ? selectMatchingTypeRepresentation(reportedType)
+            : null;
+    }
     const representations = getTypeRepresentations(annotationType, assertionType, checker);
     if (!areTypesEffectivelyEqual(annotationType, assertionType, representations, checker)) {
         return null;
     }
-    return selectMatchingTypeRepresentation(representations);
+    return selectMatchingTypeRepresentation(reportedType);
 }
 function getReturnAssertionSite(node) {
     const value = node.type === utils_1.AST_NODE_TYPES.MethodDefinition ? node.value : node;
@@ -866,7 +930,7 @@ exports.noRedundantAnnotationAssertion = (0, createRule_1.createRule)({
          */
         const isReportSuppressed = (0, disableDirectives_1.createSuppressionChecker)(context);
         function collectIfRedundant(annotation, assertion, reportNode, fixerTarget, arrowReturnType) {
-            const matchingType = haveMatchingTypes(annotation.typeAnnotation, assertion, checker, parserServices);
+            const matchingType = haveMatchingTypes(annotation.typeAnnotation, assertion, checker, parserServices, sourceCode);
             if (!matchingType)
                 return null;
             const site = {

package/lib/rules/no-undefined-null-passthrough.js

@@ -265,6 +265,21 @@ function checkImplicitReturn(node, context) {
     }
     if (!paramName)
         return;
+    /**
+     * A body that is the parameter itself — `(value) => value` — is not reported.
+     * What this rule looks for is a function that ANSWERS a nullish argument by
+     * handing the absence back: a guard, an `&&`, a ternary whose alternate is
+     * nullish. The identity function has no nullish-specific behaviour at all, so
+     * the prescribed remedy (validate up front, or return a concrete fallback)
+     * does not apply to it — least of all to `items.filter((x) => x)`, the
+     * standard truthiness filter, or to a generic `identity` helper.
+     *
+     * Every other spelling of that same function — a block-bodied arrow, a
+     * declaration, a function expression — was already accepted, so reporting
+     * only the implicit-return form made the verdict turn on body spelling. The
+     * test suite recorded that asymmetry as a deferred question and asked that a
+     * carve-out settle both spellings at once; this is that carve-out (#1974).
+     */
     if (isNullishPassthroughExpression(node.body, paramName)) {
         context.report({
             node,
@@ -272,14 +287,6 @@ function checkImplicitReturn(node, context) {
             data: { paramName },
         });
     }
-    else if (node.body.type === 'Identifier' && node.body.name === paramName) {
-        // Check for (param) => param
-        context.report({
-            node,
-            messageId: 'unexpected',
-            data: { paramName },
-        });
-    }
 }
 /**
  * Check if an expression is testing if a parameter is null or undefined

package/package.json

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

package/release-manifest.json

@@ -1,4 +1,34 @@
 [
+  {
+    "version": "1.20.145",
+    "date": "2026-08-12T16:05:12.174Z",
+    "rules": [
+      {
+        "name": "no-always-true-false-conditions",
+        "changeType": "fix",
+        "issues": [
+          1973
+        ],
+        "summary": "accept a literal loop test the body can exit (closes #1973)"
+      },
+      {
+        "name": "no-redundant-annotation-assertion",
+        "changeType": "fix",
+        "issues": [
+          1972
+        ],
+        "summary": "do not treat unresolved types as identical (closes #1972)"
+      },
+      {
+        "name": "no-undefined-null-passthrough",
+        "changeType": "fix",
+        "issues": [
+          1974
+        ],
+        "summary": "stop reporting the identity function (closes #1974)"
+      }
+    ]
+  },
   {
     "version": "1.20.144",
     "date": "2026-08-12T12:16:01.495Z",