@depup/typescript-eslint__eslint-plugin 8.58.1-depup.0 → 8.66.0-depup.0

package/README.md

@@ -13,10 +13,16 @@ npm install @depup/typescript-eslint__eslint-plugin
 
 | Field | Value |
 |-------|-------|
-| Original | [@typescript-eslint/eslint-plugin](https://www.npmjs.com/package/@typescript-eslint/eslint-plugin) @ 8.58.1 |
-| Processed | 2026-04-08 |
+| Original | [@typescript-eslint/eslint-plugin](https://www.npmjs.com/package/@typescript-eslint/eslint-plugin) @ 8.66.0 |
+| Processed | 2026-08-04 |
 | Smoke test | passed |
-| Deps updated | 0 |
+| Deps updated | 1 |
+
+## Dependency Changes
+
+| Dependency | From | To |
+|------------|------|-----|
+| ignore | ^7.0.5 | ^7.0.6 |
 
 ---
 

package/changes.json

@@ -1,5 +1,10 @@
 {
-  "bumped": {},
-  "timestamp": "2026-04-08T04:54:21.935Z",
-  "totalUpdated": 0
+  "bumped": {
+    "ignore": {
+      "from": "^7.0.5",
+      "to": "^7.0.6"
+    }
+  },
+  "timestamp": "2026-08-04T00:39:44.077Z",
+  "totalUpdated": 1
 }

package/dist/configs/eslintrc/all.d.ts

@@ -58,8 +58,6 @@ declare const _default: {
         'no-invalid-this': "off";
         '@typescript-eslint/no-invalid-this': "error";
         '@typescript-eslint/no-invalid-void-type': "error";
-        'no-loop-func': "off";
-        '@typescript-eslint/no-loop-func': "error";
         'no-magic-numbers': "off";
         '@typescript-eslint/no-magic-numbers': "error";
         '@typescript-eslint/no-meaningless-void-operator': "error";
@@ -75,8 +73,6 @@ declare const _default: {
         '@typescript-eslint/no-redeclare': "error";
         '@typescript-eslint/no-redundant-type-constituents': "error";
         '@typescript-eslint/no-require-imports': "error";
-        'no-restricted-imports': "off";
-        '@typescript-eslint/no-restricted-imports': "error";
         '@typescript-eslint/no-restricted-types': "error";
         'no-shadow': "off";
         '@typescript-eslint/no-shadow': "error";

package/dist/configs/eslintrc/all.js

@@ -65,8 +65,6 @@ module.exports = {
         'no-invalid-this': 'off',
         '@typescript-eslint/no-invalid-this': 'error',
         '@typescript-eslint/no-invalid-void-type': 'error',
-        'no-loop-func': 'off',
-        '@typescript-eslint/no-loop-func': 'error',
         'no-magic-numbers': 'off',
         '@typescript-eslint/no-magic-numbers': 'error',
         '@typescript-eslint/no-meaningless-void-operator': 'error',
@@ -82,8 +80,6 @@ module.exports = {
         '@typescript-eslint/no-redeclare': 'error',
         '@typescript-eslint/no-redundant-type-constituents': 'error',
         '@typescript-eslint/no-require-imports': 'error',
-        'no-restricted-imports': 'off',
-        '@typescript-eslint/no-restricted-imports': 'error',
         '@typescript-eslint/no-restricted-types': 'error',
         'no-shadow': 'off',
         '@typescript-eslint/no-shadow': 'error',

package/dist/configs/flat/all.js

@@ -78,8 +78,6 @@ exports.default = (plugin, parser) => [
             'no-invalid-this': 'off',
             '@typescript-eslint/no-invalid-this': 'error',
             '@typescript-eslint/no-invalid-void-type': 'error',
-            'no-loop-func': 'off',
-            '@typescript-eslint/no-loop-func': 'error',
             'no-magic-numbers': 'off',
             '@typescript-eslint/no-magic-numbers': 'error',
             '@typescript-eslint/no-meaningless-void-operator': 'error',
@@ -95,8 +93,6 @@ exports.default = (plugin, parser) => [
             '@typescript-eslint/no-redeclare': 'error',
             '@typescript-eslint/no-redundant-type-constituents': 'error',
             '@typescript-eslint/no-require-imports': 'error',
-            'no-restricted-imports': 'off',
-            '@typescript-eslint/no-restricted-imports': 'error',
             '@typescript-eslint/no-restricted-types': 'error',
             'no-shadow': 'off',
             '@typescript-eslint/no-shadow': 'error',

package/dist/index.d.ts

@@ -60,8 +60,6 @@ declare const _default: {
                 'no-invalid-this': "off";
                 '@typescript-eslint/no-invalid-this': "error";
                 '@typescript-eslint/no-invalid-void-type': "error";
-                'no-loop-func': "off";
-                '@typescript-eslint/no-loop-func': "error";
                 'no-magic-numbers': "off";
                 '@typescript-eslint/no-magic-numbers': "error";
                 '@typescript-eslint/no-meaningless-void-operator': "error";
@@ -77,8 +75,6 @@ declare const _default: {
                 '@typescript-eslint/no-redeclare': "error";
                 '@typescript-eslint/no-redundant-type-constituents': "error";
                 '@typescript-eslint/no-require-imports': "error";
-                'no-restricted-imports': "off";
-                '@typescript-eslint/no-restricted-imports': "error";
                 '@typescript-eslint/no-restricted-types': "error";
                 'no-shadow': "off";
                 '@typescript-eslint/no-shadow': "error";
@@ -798,7 +794,7 @@ declare const _default: {
         'no-dynamic-delete': import("@typescript-eslint/utils/ts-eslint").RuleModule<"dynamicDelete", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
-        'no-empty-function': import("@typescript-eslint/utils/ts-eslint").RuleModule<"unexpected" | "suggestComment", [{
+        'no-empty-function': import("@typescript-eslint/utils/ts-eslint").RuleModule<"suggestComment" | "unexpected", [{
             allow?: string[];
         }], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
@@ -882,7 +878,7 @@ declare const _default: {
         'no-non-null-asserted-nullish-coalescing': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noNonNullAssertedNullishCoalescing" | "suggestRemovingNonNull", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
-        'no-non-null-asserted-optional-chain': import("@typescript-eslint/utils/ts-eslint").RuleModule<"suggestRemovingNonNull" | "noNonNullOptionalChain", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+        'no-non-null-asserted-optional-chain': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noNonNullOptionalChain" | "suggestRemovingNonNull", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
         'no-non-null-assertion': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/no-non-null-assertion").MessageIds, [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
@@ -891,13 +887,13 @@ declare const _default: {
         'no-redeclare': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/no-redeclare").MessageIds, import("./rules/no-redeclare").Options, import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
-        'no-redundant-type-constituents': import("@typescript-eslint/utils/ts-eslint").RuleModule<"overrides" | "errorTypeOverrides" | "literalOverridden" | "overridden" | "primitiveOverridden", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+        'no-redundant-type-constituents': import("@typescript-eslint/utils/ts-eslint").RuleModule<"errorTypeOverrides" | "literalOverridden" | "overridden" | "overrides" | "primitiveOverridden", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
         'no-require-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noRequireImports", import("./rules/no-require-imports").Options, import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
-        'no-restricted-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patterns" | "patternWithCustomMessage", [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns] | import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject, import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+        'no-restricted-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patternWithCustomMessage" | "patterns", import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject | [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
         'no-restricted-types': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/no-restricted-types").MessageIds, import("./rules/no-restricted-types").Options, import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
@@ -945,7 +941,7 @@ declare const _default: {
         'no-unsafe-argument': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/no-unsafe-argument").MessageIds, [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
-        'no-unsafe-assignment': import("@typescript-eslint/utils/ts-eslint").RuleModule<"unsafeArraySpread" | "anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+        'no-unsafe-assignment': import("@typescript-eslint/utils/ts-eslint").RuleModule<"anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeArraySpread" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
             name: string;
         };
         'no-unsafe-call': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/no-unsafe-call").MessageIds, [], import("../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {

package/dist/index.js

@@ -1,6 +1,53 @@
 "use strict";
+/* eslint-disable import/first -- intentionally executing code before rest of the require()s. This will not work with ESM. */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+const ts = __importStar(require("typescript"));
+const [versionMajor, _versionMinor] = ts.versionMajorMinor
+    .split('.')
+    .map(Number);
+if (versionMajor >= 7) {
+    // eslint-disable-next-line no-console
+    console.error([
+        'typescript-eslint does not support TS 7.0.',
+        'Please see https://devblogs.microsoft.com/typescript/announcing-typescript-7-0/#running-side-by-side-with-typescript-6.0 to run typescript-eslint using the TS 6 API.',
+        "See also https://github.com/typescript-eslint/typescript-eslint/issues/10940 for tracking typescript-eslint's support for TS >=7.1",
+    ].join('\n'));
+    throw new Error('typescript-eslint does not support TS 7.0.');
+}
 const raw_plugin_1 = __importDefault(require("./raw-plugin"));
 module.exports = raw_plugin_1.default.plugin;

package/dist/raw-plugin.d.ts

@@ -82,8 +82,6 @@ declare const _default: {
                     'no-invalid-this': "off";
                     '@typescript-eslint/no-invalid-this': "error";
                     '@typescript-eslint/no-invalid-void-type': "error";
-                    'no-loop-func': "off";
-                    '@typescript-eslint/no-loop-func': "error";
                     'no-magic-numbers': "off";
                     '@typescript-eslint/no-magic-numbers': "error";
                     '@typescript-eslint/no-meaningless-void-operator': "error";
@@ -99,8 +97,6 @@ declare const _default: {
                     '@typescript-eslint/no-redeclare': "error";
                     '@typescript-eslint/no-redundant-type-constituents': "error";
                     '@typescript-eslint/no-require-imports': "error";
-                    'no-restricted-imports': "off";
-                    '@typescript-eslint/no-restricted-imports': "error";
                     '@typescript-eslint/no-restricted-types': "error";
                     'no-shadow': "off";
                     '@typescript-eslint/no-shadow': "error";
@@ -821,7 +817,7 @@ declare const _default: {
             'no-dynamic-delete': TSESLint.RuleModule<"dynamicDelete", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
-            'no-empty-function': TSESLint.RuleModule<"unexpected" | "suggestComment", [{
+            'no-empty-function': TSESLint.RuleModule<"suggestComment" | "unexpected", [{
                 allow?: string[];
             }], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
@@ -905,7 +901,7 @@ declare const _default: {
             'no-non-null-asserted-nullish-coalescing': TSESLint.RuleModule<"noNonNullAssertedNullishCoalescing" | "suggestRemovingNonNull", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
-            'no-non-null-asserted-optional-chain': TSESLint.RuleModule<"suggestRemovingNonNull" | "noNonNullOptionalChain", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
+            'no-non-null-asserted-optional-chain': TSESLint.RuleModule<"noNonNullOptionalChain" | "suggestRemovingNonNull", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
             'no-non-null-assertion': TSESLint.RuleModule<import("./rules/no-non-null-assertion").MessageIds, [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
@@ -914,13 +910,13 @@ declare const _default: {
             'no-redeclare': TSESLint.RuleModule<import("./rules/no-redeclare").MessageIds, import("./rules/no-redeclare").Options, import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
-            'no-redundant-type-constituents': TSESLint.RuleModule<"overrides" | "errorTypeOverrides" | "literalOverridden" | "overridden" | "primitiveOverridden", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
+            'no-redundant-type-constituents': TSESLint.RuleModule<"errorTypeOverrides" | "literalOverridden" | "overridden" | "overrides" | "primitiveOverridden", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
             'no-require-imports': TSESLint.RuleModule<"noRequireImports", import("./rules/no-require-imports").Options, import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
-            'no-restricted-imports': TSESLint.RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patterns" | "patternWithCustomMessage", [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns] | import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject, import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
+            'no-restricted-imports': TSESLint.RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patternWithCustomMessage" | "patterns", import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject | [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
             'no-restricted-types': TSESLint.RuleModule<import("./rules/no-restricted-types").MessageIds, import("./rules/no-restricted-types").Options, import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
@@ -968,7 +964,7 @@ declare const _default: {
             'no-unsafe-argument': TSESLint.RuleModule<import("./rules/no-unsafe-argument").MessageIds, [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
-            'no-unsafe-assignment': TSESLint.RuleModule<"unsafeArraySpread" | "anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
+            'no-unsafe-assignment': TSESLint.RuleModule<"anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeArraySpread" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
                 name: string;
             };
             'no-unsafe-call': TSESLint.RuleModule<import("./rules/no-unsafe-call").MessageIds, [], import("../rules").ESLintPluginDocs, TSESLint.RuleListener> & {

package/dist/rules/ban-ts-comment.js

@@ -54,19 +54,19 @@ exports.default = (0, util_1.createRule)({
                     },
                     'ts-check': {
                         $ref: '#/items/0/$defs/directiveConfigSchema',
-                        description: 'Whether allow ts-check directives, and with which restrictions.',
+                        description: 'Whether to allow ts-check directives, and with which restrictions.',
                     },
                     'ts-expect-error': {
                         $ref: '#/items/0/$defs/directiveConfigSchema',
-                        description: 'Whether and when expect-error directives, and with which restrictions.',
+                        description: 'Whether to allow ts-expect-error directives, and with which restrictions.',
                     },
                     'ts-ignore': {
                         $ref: '#/items/0/$defs/directiveConfigSchema',
-                        description: 'Whether allow ts-ignore directives, and with which restrictions.',
+                        description: 'Whether to allow ts-ignore directives, and with which restrictions.',
                     },
                     'ts-nocheck': {
                         $ref: '#/items/0/$defs/directiveConfigSchema',
-                        description: 'Whether allow ts-nocheck directives, and with which restrictions.',
+                        description: 'Whether to allow ts-nocheck directives, and with which restrictions.',
                     },
                 },
             },
@@ -121,7 +121,7 @@ exports.default = (0, util_1.createRule)({
                 }
                 return execDirectiveRegEx(commentDirectiveRegExSingleLine, comment.value);
             }
-            const commentLines = comment.value.split('\n');
+            const commentLines = comment.value.split(utils_1.ASTUtils.LINEBREAK_MATCHER);
             return execDirectiveRegEx(commentDirectiveRegExMultiLine, commentLines[commentLines.length - 1]);
         }
         return {

package/dist/rules/class-literal-property-style.js

@@ -113,22 +113,29 @@ exports.default = (0, util_1.createRule)({
                     if (hasDuplicateKeySetter) {
                         return;
                     }
+                    const getterBody = node.value.body;
                     context.report({
                         node: node.key,
                         messageId: 'preferFieldStyle',
-                        suggest: [
-                            {
+                        ...(0, util_1.getFixOrSuggest)({
+                            fixOrSuggest: node.decorators.length === 0 ? 'suggest' : 'none',
+                            suggestion: {
                                 messageId: 'preferFieldStyleSuggestion',
                                 fix(fixer) {
                                     const name = context.sourceCode.getText(node.key);
+                                    const closingParen = (0, util_1.nullThrows)(context.sourceCode.getTokenBefore(node.value.returnType ?? getterBody), 'Getter should have a closing parenthesis.');
+                                    const betweenParensAndBody = context.sourceCode
+                                        .getText()
+                                        .slice(closingParen.range[1], getterBody.range[0]);
                                     let text = '';
                                     text += printNodeModifiers(node, 'readonly');
                                     text += node.computed ? `[${name}]` : name;
-                                    text += ` = ${context.sourceCode.getText(argument)};`;
+                                    text += betweenParensAndBody;
+                                    text += `= ${context.sourceCode.getText(argument)};`;
                                     return fixer.replaceText(node, text);
                                 },
                             },
-                        ],
+                        }),
                     });
                 },
             }),

package/dist/rules/consistent-indexed-object-style.d.ts

@@ -1,5 +1,5 @@
 import type { TSESLint } from '@typescript-eslint/utils';
-export type MessageIds = 'preferIndexSignature' | 'preferIndexSignatureSuggestion' | 'preferRecord';
+export type MessageIds = 'preferIndexSignature' | 'preferIndexSignatureSuggestion' | 'preferRecord' | 'preferRecordSuggestion';
 export type Options = ['index-signature' | 'record'];
 declare const _default: TSESLint.RuleModule<MessageIds, Options, import("../../rules").ESLintPluginDocs, TSESLint.RuleListener> & {
     name: string;

package/dist/rules/consistent-indexed-object-style.js

@@ -17,6 +17,7 @@ exports.default = (0, util_1.createRule)({
             preferIndexSignature: 'An index signature is preferred over a record.',
             preferIndexSignatureSuggestion: 'Change into an index signature instead of a record.',
             preferRecord: 'A record is preferred over an index signature.',
+            preferRecordSuggestion: 'Change into a record instead of an index signature.',
         },
         schema: [
             {
@@ -28,6 +29,16 @@ exports.default = (0, util_1.createRule)({
     },
     defaultOptions: ['record'],
     create(context, [mode]) {
+        // The fixers rebuild the type from the text of a few sub-nodes, so a
+        // comment inside `node` but outside all of those preserved sub-nodes would
+        // be dropped by the fix. Returns true when at least one such comment exists.
+        function hasUnpreservedComments(node, ...preserved) {
+            return context.sourceCode
+                .getCommentsInside(node)
+                .some(comment => preserved.every(target => target == null ||
+                comment.range[0] < target.range[0] ||
+                comment.range[1] > target.range[1]));
+        }
         function checkMembers(members, node, parentId, prefix, postfix, safeFix = true) {
             if (members.length !== 1) {
                 return;
@@ -59,16 +70,24 @@ exports.default = (0, util_1.createRule)({
             context.report({
                 node,
                 messageId: 'preferRecord',
-                fix: safeFix
-                    ? (fixer) => {
-                        const key = context.sourceCode.getText(keyType.typeAnnotation);
-                        const value = context.sourceCode.getText(valueType.typeAnnotation);
-                        const record = member.readonly
-                            ? `Readonly<Record<${key}, ${value}>>`
-                            : `Record<${key}, ${value}>`;
-                        return fixer.replaceText(node, `${prefix}${record}${postfix}`);
-                    }
-                    : null,
+                ...(0, util_1.getFixOrSuggest)({
+                    fixOrSuggest: !safeFix
+                        ? 'none'
+                        : hasUnpreservedComments(node, keyType.typeAnnotation, valueType.typeAnnotation)
+                            ? 'suggest'
+                            : 'fix',
+                    suggestion: {
+                        messageId: 'preferRecordSuggestion',
+                        fix: (fixer) => {
+                            const key = context.sourceCode.getText(keyType.typeAnnotation);
+                            const value = context.sourceCode.getText(valueType.typeAnnotation);
+                            const record = member.readonly
+                                ? `Readonly<Record<${key}, ${value}>>`
+                                : `Record<${key}, ${value}>`;
+                            return fixer.replaceText(node, `${prefix}${record}${postfix}`);
+                        },
+                    },
+                }),
             });
         }
         return {
@@ -93,7 +112,9 @@ exports.default = (0, util_1.createRule)({
                         node,
                         messageId: 'preferIndexSignature',
                         ...(0, util_1.getFixOrSuggest)({
-                            fixOrSuggest: shouldFix ? 'fix' : 'suggest',
+                            fixOrSuggest: shouldFix && !hasUnpreservedComments(node, params[0], params[1])
+                                ? 'fix'
+                                : 'suggest',
                             suggestion: {
                                 messageId: 'preferIndexSignatureSuggestion',
                                 fix: fixer => {
@@ -146,28 +167,36 @@ exports.default = (0, util_1.createRule)({
                             }
                         }
                     }
-                    // There's no builtin Mutable<T> type, so we can't autofix it really.
-                    const canFix = node.readonly !== '-';
                     context.report({
                         node,
                         messageId: 'preferRecord',
-                        ...(canFix && {
-                            fix: (fixer) => {
-                                const keyType = context.sourceCode.getText(constraint);
-                                const valueType = node.typeAnnotation
-                                    ? context.sourceCode.getText(node.typeAnnotation)
-                                    : 'any';
-                                let recordText = `Record<${keyType}, ${valueType}>`;
-                                if (node.optional === '+' || node.optional === true) {
-                                    recordText = `Partial<${recordText}>`;
-                                }
-                                else if (node.optional === '-') {
-                                    recordText = `Required<${recordText}>`;
-                                }
-                                if (node.readonly === '+' || node.readonly === true) {
-                                    recordText = `Readonly<${recordText}>`;
-                                }
-                                return fixer.replaceText(node, recordText);
+                        ...(0, util_1.getFixOrSuggest)({
+                            // There's no builtin Mutable<T> type, so a `-readonly` mapped
+                            // type can't be represented as a Record and is left untouched.
+                            fixOrSuggest: node.readonly === '-'
+                                ? 'none'
+                                : hasUnpreservedComments(node, constraint, node.typeAnnotation)
+                                    ? 'suggest'
+                                    : 'fix',
+                            suggestion: {
+                                messageId: 'preferRecordSuggestion',
+                                fix: (fixer) => {
+                                    const keyType = context.sourceCode.getText(constraint);
+                                    const valueType = node.typeAnnotation
+                                        ? context.sourceCode.getText(node.typeAnnotation)
+                                        : 'any';
+                                    let recordText = `Record<${keyType}, ${valueType}>`;
+                                    if (node.optional === '+' || node.optional === true) {
+                                        recordText = `Partial<${recordText}>`;
+                                    }
+                                    else if (node.optional === '-') {
+                                        recordText = `Required<${recordText}>`;
+                                    }
+                                    if (node.readonly === '+' || node.readonly === true) {
+                                        recordText = `Readonly<${recordText}>`;
+                                    }
+                                    return fixer.replaceText(node, recordText);
+                                },
                             },
                         }),
                     });

package/dist/rules/index.d.ts

@@ -119,7 +119,7 @@ declare const rules: {
     'no-dynamic-delete': import("@typescript-eslint/utils/ts-eslint").RuleModule<"dynamicDelete", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
-    'no-empty-function': import("@typescript-eslint/utils/ts-eslint").RuleModule<"unexpected" | "suggestComment", [{
+    'no-empty-function': import("@typescript-eslint/utils/ts-eslint").RuleModule<"suggestComment" | "unexpected", [{
         allow?: string[];
     }], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
@@ -203,7 +203,7 @@ declare const rules: {
     'no-non-null-asserted-nullish-coalescing': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noNonNullAssertedNullishCoalescing" | "suggestRemovingNonNull", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
-    'no-non-null-asserted-optional-chain': import("@typescript-eslint/utils/ts-eslint").RuleModule<"suggestRemovingNonNull" | "noNonNullOptionalChain", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+    'no-non-null-asserted-optional-chain': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noNonNullOptionalChain" | "suggestRemovingNonNull", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
     'no-non-null-assertion': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./no-non-null-assertion").MessageIds, [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
@@ -212,13 +212,13 @@ declare const rules: {
     'no-redeclare': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./no-redeclare").MessageIds, import("./no-redeclare").Options, import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
-    'no-redundant-type-constituents': import("@typescript-eslint/utils/ts-eslint").RuleModule<"overrides" | "errorTypeOverrides" | "literalOverridden" | "overridden" | "primitiveOverridden", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+    'no-redundant-type-constituents': import("@typescript-eslint/utils/ts-eslint").RuleModule<"errorTypeOverrides" | "literalOverridden" | "overridden" | "overrides" | "primitiveOverridden", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
     'no-require-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"noRequireImports", import("./no-require-imports").Options, import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
-    'no-restricted-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patterns" | "patternWithCustomMessage", [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns] | import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject, import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+    'no-restricted-imports': import("@typescript-eslint/utils/ts-eslint").RuleModule<"everything" | "everythingWithCustomMessage" | "importName" | "importNameWithCustomMessage" | "path" | "pathWithCustomMessage" | "patternWithCustomMessage" | "patterns", import("eslint/lib/rules/no-restricted-imports").ArrayOfStringOrObject | [import("eslint/lib/rules/no-restricted-imports").ObjectOfPathsAndPatterns], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
     'no-restricted-types': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./no-restricted-types").MessageIds, import("./no-restricted-types").Options, import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
@@ -266,7 +266,7 @@ declare const rules: {
     'no-unsafe-argument': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./no-unsafe-argument").MessageIds, [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
-    'no-unsafe-assignment': import("@typescript-eslint/utils/ts-eslint").RuleModule<"unsafeArraySpread" | "anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+    'no-unsafe-assignment': import("@typescript-eslint/utils/ts-eslint").RuleModule<"anyAssignment" | "anyAssignmentThis" | "unsafeArrayPattern" | "unsafeArrayPatternFromTuple" | "unsafeArraySpread" | "unsafeAssignment" | "unsafeObjectPattern", [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
         name: string;
     };
     'no-unsafe-call': import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./no-unsafe-call").MessageIds, [], import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {

package/dist/rules/method-signature-style.d.ts

@@ -1,5 +1,5 @@
 export type Options = [('method' | 'property')?];
-export type MessageIds = 'errorMethod' | 'errorProperty';
+export type MessageIds = 'convertToMethodSignature' | 'errorMethod' | 'errorProperty';
 declare const _default: import("@typescript-eslint/utils/ts-eslint").RuleModule<MessageIds, Options, import("../../rules").ESLintPluginDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
     name: string;
 };

package/dist/rules/method-signature-style.js

@@ -10,7 +10,9 @@ exports.default = (0, util_1.createRule)({
             description: 'Enforce using a particular method signature syntax',
         },
         fixable: 'code',
+        hasSuggestions: true,
         messages: {
+            convertToMethodSignature: 'Convert to a method signature. This removes the `readonly` modifier, allowing the member to be reassigned.',
             errorMethod: 'Shorthand method signature is forbidden. Use a function property instead.',
             errorProperty: 'Function property signature is forbidden. Use a method shorthand instead.',
         },
@@ -32,9 +34,6 @@ exports.default = (0, util_1.createRule)({
             if (node.optional) {
                 key = `${key}?`;
             }
-            if (node.readonly) {
-                key = `readonly ${key}`;
-            }
             return key;
         }
         function getMethodParams(node) {
@@ -164,16 +163,30 @@ exports.default = (0, util_1.createRule)({
                     if (typeNode?.type !== utils_1.AST_NODE_TYPES.TSFunctionType) {
                         return;
                     }
+                    const fix = fixer => {
+                        const key = getMethodKey(propertyNode);
+                        const params = getMethodParams(typeNode);
+                        const returnType = getMethodReturnType(typeNode);
+                        const delimiter = getDelimiter(propertyNode);
+                        return fixer.replaceText(propertyNode, `${key}${params}: ${returnType}${delimiter}`);
+                    };
+                    // There is no syntax for a `readonly` method signature, so converting
+                    // a `readonly` function-typed property drops the `readonly` modifier.
+                    // That is a behavioral change (a method may be reassigned, a
+                    // `readonly` property may not), so it is offered as a suggestion
+                    // rather than applied as an autofix.
+                    if (propertyNode.readonly) {
+                        context.report({
+                            node: propertyNode,
+                            messageId: 'errorProperty',
+                            suggest: [{ messageId: 'convertToMethodSignature', fix }],
+                        });
+                        return;
+                    }
                     context.report({
                         node: propertyNode,
                         messageId: 'errorProperty',
-                        fix: fixer => {
-                            const key = getMethodKey(propertyNode);
-                            const params = getMethodParams(typeNode);
-                            const returnType = getMethodReturnType(typeNode);
-                            const delimiter = getDelimiter(propertyNode);
-                            return fixer.replaceText(propertyNode, `${key}${params}: ${returnType}${delimiter}`);
-                        },
+                        fix,
                     });
                 },
             }),

package/dist/rules/no-base-to-string.js

@@ -234,7 +234,7 @@ exports.default = (0, util_1.createRule)({
                 node.arguments[0]) {
                 const scope = context.sourceCode.getScope(node);
                 // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
-                const variable = scope.set.get('String');
+                const variable = utils_1.ASTUtils.findVariable(scope, 'String');
                 return !variable?.defs.length;
             }
             return false;
@@ -289,8 +289,8 @@ exports.default = (0, util_1.createRule)({
                 if ((0, util_1.getTypeName)(checker, leftType) === 'string') {
                     checkExpression(node.right, rightType);
                 }
-                else if ((0, util_1.getTypeName)(checker, rightType) === 'string' &&
-                    node.left.type !== utils_1.AST_NODE_TYPES.PrivateIdentifier) {
+                else if (node.left.type !== utils_1.AST_NODE_TYPES.PrivateIdentifier &&
+                    (0, util_1.getTypeName)(checker, rightType) === 'string') {
                     checkExpression(node.left, leftType);
                 }
             },