@checkdigit/eslint-plugin 7.3.0-PR.75-f90a → 7.3.0-PR.75-4919

package/README.md

@@ -15,7 +15,7 @@ Copyright (c) 2021-2024 [Check Digit, LLC](https://checkdigit.com)
 - `@checkdigit/no-test-import`
 - `@checkdigit/no-promise-instance-method`
 - `@checkdigit/invalid-json-stringify`
-- `@checkdigit/no-full-response`
+- `@checkdigit/no-legacy-service-typing`
 - `@checkdigit/require-resolve-full-response`
 - `@checkdigit/require-type-out-of-type-only-imports`
 

package/dist-mjs/agent/fetch-response-body-json.mjs

@@ -1,6 +1,8 @@
 // src/agent/fetch-response-body-json.ts
+import { strict as assert } from "node:assert";
 import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
 import getDocumentationUrl from "../get-documentation-url.mjs";
+import { getAncestor } from "../library/ts-tree.mjs";
 var ruleId = "fetch-response-body-json";
 var createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
 var rule = createRule({
@@ -21,29 +23,47 @@ var rule = createRule({
   create(context) {
     const parserServices = ESLintUtils.getParserServices(context);
     const typeChecker = parserServices.program.getTypeChecker();
-    const sourceCode = context.sourceCode;
+    const allChanges = /* @__PURE__ */ new Map();
     return {
-      'MemberExpression[property.name="body"]': (responseBody) => {
+      'MemberExpression[property.name="body"]': (responseBodyNode) => {
         try {
-          const responseNode = parserServices.esTreeNodeToTSNodeMap.get(responseBody.object);
+          const responseNode = parserServices.esTreeNodeToTSNodeMap.get(responseBodyNode.object);
           const responseType = typeChecker.getTypeAtLocation(responseNode);
           const shouldReplace = responseType.getProperties().some((symbol) => symbol.name === "body") && responseType.getProperties().some((symbol) => symbol.name === "json");
           if (shouldReplace) {
-            const responseText = sourceCode.getText(responseBody.object);
-            const needAwait = responseBody.parent.type !== AST_NODE_TYPES.ReturnStatement;
-            const replacementText = needAwait ? `(await ${responseText}.json())` : `${responseText}.json()`;
-            context.report({
-              messageId: "replaceBodyWithJson",
-              node: responseBody,
-              fix(fixer) {
-                return fixer.replaceText(responseBody, replacementText);
-              }
-            });
+            const enclosingFunction = getAncestor(
+              responseBodyNode,
+              (node) => node.type === AST_NODE_TYPES.ArrowFunctionExpression || node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.FunctionDeclaration
+            );
+            const enclosingStatement = getAncestor(
+              responseBodyNode,
+              (node) => (node.type === AST_NODE_TYPES.VariableDeclaration || node.type === AST_NODE_TYPES.ExpressionStatement || node.type === AST_NODE_TYPES.ReturnStatement) && node.parent.type === AST_NODE_TYPES.BlockStatement
+            );
+            const enclosingStatementIndex = enclosingFunction.body.body.indexOf(
+              enclosingStatement
+            );
+            const responseVariableName = responseBodyNode.object.name;
+            const isResponseBodyVariableDeclared = enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration && enclosingStatement.declarations.some((declaration) => declaration.init === responseBodyNode);
+            const responseBodyVariableName = isResponseBodyVariableDeclared ? enclosingStatement.declarations.find((declaration) => declaration.init === responseBodyNode)?.id : `${responseBodyNode.object.name}Body`;
+            const change = {
+              enclosingFunction,
+              enclosingStatement,
+              enclosingStatementIndex,
+              responseVariableName,
+              responseBodyNode,
+              responseBodyVariableName,
+              isResponseBodyVariableDeclared
+            };
+            const changesByFunction = allChanges.get(enclosingFunction) ?? /* @__PURE__ */ new Map();
+            const changesByResponse = changesByFunction.get(responseVariableName) ?? [];
+            changesByResponse.push(change);
+            changesByFunction.set(responseVariableName, changesByResponse);
+            allChanges.set(enclosingFunction, changesByFunction);
           }
         } catch (error) {
           console.error(`Failed to apply ${ruleId} rule for file "${context.filename}":`, error);
           context.report({
-            node: responseBody,
+            node: responseBodyNode,
             messageId: "unknownError",
             data: {
               fileName: context.filename,
@@ -51,6 +71,57 @@ var rule = createRule({
             }
           });
         }
+      },
+      "Program:exit": () => {
+        if (allChanges.size === 0) {
+          return;
+        }
+        const fixes = [];
+        for (const changesByFunction of allChanges.values()) {
+          for (const changesByResponse of changesByFunction.values()) {
+            const orderedChanges = changesByResponse.sort(
+              (changeA, changeB) => changeA.enclosingStatementIndex - changeB.enclosingStatementIndex
+            );
+            const firstChange = orderedChanges[0];
+            assert(firstChange);
+            const {
+              responseBodyNode,
+              responseVariableName,
+              responseBodyVariableName,
+              isResponseBodyVariableDeclared,
+              enclosingStatement
+            } = firstChange;
+            let remainingChanges;
+            if (!isResponseBodyVariableDeclared) {
+              fixes.push({
+                node: enclosingStatement,
+                text: `const ${responseBodyVariableName} = await ${responseVariableName}.json();
+`,
+                insert: true
+              });
+              remainingChanges = orderedChanges;
+            } else {
+              fixes.push({
+                node: responseBodyNode,
+                text: `await ${responseVariableName}.json()`,
+                insert: false
+              });
+              remainingChanges = orderedChanges.slice(1);
+            }
+            for (const change of remainingChanges) {
+              fixes.push({ node: change.responseBodyNode, text: responseBodyVariableName, insert: false });
+            }
+          }
+        }
+        for (const fix of fixes) {
+          context.report({
+            node: fix.node,
+            messageId: "replaceBodyWithJson",
+            fix(fixer) {
+              return fix.insert ? fixer.insertTextBefore(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
+            }
+          });
+        }
       }
     };
   }
@@ -60,4 +131,4 @@ export {
   fetch_response_body_json_default as default,
   ruleId
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L2ZldGNoLXJlc3BvbnNlLWJvZHktanNvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLGdCQUFnQixtQkFBNkI7QUFFdEQsT0FBTyx5QkFBeUI7QUFFekIsSUFBTSxTQUFTO0FBRXRCLElBQU0sYUFBYSxZQUFZLFlBQVksQ0FBQyxTQUFTLG9CQUFvQixJQUFJLENBQUM7QUFFOUUsSUFBTSxPQUF1RSxXQUFXO0FBQUEsRUFDdEYsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFBYTtBQUFBLElBQ2Y7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLHFCQUFxQjtBQUFBLE1BQ3JCLGNBQWM7QUFBQSxJQUNoQjtBQUFBLElBQ0EsU0FBUztBQUFBLElBQ1QsUUFBUSxDQUFDO0FBQUEsRUFDWDtBQUFBLEVBQ0EsZ0JBQWdCLENBQUM7QUFBQSxFQUNqQixPQUFPLFNBQVM7QUFDZCxVQUFNLGlCQUFpQixZQUFZLGtCQUFrQixPQUFPO0FBQzVELFVBQU0sY0FBYyxlQUFlLFFBQVEsZUFBZTtBQUMxRCxVQUFNLGFBQWEsUUFBUTtBQUUzQixXQUFPO0FBQUEsTUFDTCwwQ0FBMEMsQ0FBQyxpQkFBNEM7QUFDckYsWUFBSTtBQUNGLGdCQUFNLGVBQWUsZUFBZSxzQkFBc0IsSUFBSSxhQUFhLE1BQU07QUFDakYsZ0JBQU0sZUFBZSxZQUFZLGtCQUFrQixZQUFZO0FBRS9ELGdCQUFNLGdCQUNKLGFBQWEsY0FBYyxFQUFFLEtBQUssQ0FBQyxXQUFXLE9BQU8sU0FBUyxNQUFNLEtBQ3BFLGFBQWEsY0FBYyxFQUFFLEtBQUssQ0FBQyxXQUFXLE9BQU8sU0FBUyxNQUFNO0FBRXRFLGNBQUksZUFBZTtBQUNqQixrQkFBTSxlQUFlLFdBQVcsUUFBUSxhQUFhLE1BQU07QUFDM0Qsa0JBQU0sWUFBWSxhQUFhLE9BQU8sU0FBUyxlQUFlO0FBQzlELGtCQUFNLGtCQUFrQixZQUFZLFVBQVUsWUFBWSxhQUFhLEdBQUcsWUFBWTtBQUV0RixvQkFBUSxPQUFPO0FBQUEsY0FDYixXQUFXO0FBQUEsY0FDWCxNQUFNO0FBQUEsY0FDTixJQUFJLE9BQU87QUFDVCx1QkFBTyxNQUFNLFlBQVksY0FBYyxlQUFlO0FBQUEsY0FDeEQ7QUFBQSxZQUNGLENBQUM7QUFBQSxVQUNIO0FBQUEsUUFDRixTQUFTLE9BQU87QUFFZCxrQkFBUSxNQUFNLG1CQUFtQixNQUFNLG1CQUFtQixRQUFRLFFBQVEsTUFBTSxLQUFLO0FBQ3JGLGtCQUFRLE9BQU87QUFBQSxZQUNiLE1BQU07QUFBQSxZQUNOLFdBQVc7QUFBQSxZQUNYLE1BQU07QUFBQSxjQUNKLFVBQVUsUUFBUTtBQUFBLGNBQ2xCLE9BQU8saUJBQWlCLFFBQVEsTUFBTSxTQUFTLElBQUksS0FBSyxVQUFVLEtBQUs7QUFBQSxZQUN6RTtBQUFBLFVBQ0YsQ0FBQztBQUFBLFFBQ0g7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFDRixDQUFDO0FBRUQsSUFBTyxtQ0FBUTsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L2ZldGNoLXJlc3BvbnNlLWJvZHktanNvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLFVBQVUsY0FBYztBQUVqQyxTQUFTLGdCQUFnQixtQkFBNkI7QUFFdEQsT0FBTyx5QkFBeUI7QUFDaEMsU0FBUyxtQkFBbUI7QUFFckIsSUFBTSxTQUFTO0FBRXRCLElBQU0sYUFBYSxZQUFZLFlBQVksQ0FBQyxTQUFTLG9CQUFvQixJQUFJLENBQUM7QUFhOUUsSUFBTSxPQUF1RSxXQUFXO0FBQUEsRUFDdEYsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFBYTtBQUFBLElBQ2Y7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLHFCQUFxQjtBQUFBLE1BQ3JCLGNBQWM7QUFBQSxJQUNoQjtBQUFBLElBQ0EsU0FBUztBQUFBLElBQ1QsUUFBUSxDQUFDO0FBQUEsRUFDWDtBQUFBLEVBQ0EsZ0JBQWdCLENBQUM7QUFBQSxFQUNqQixPQUFPLFNBQVM7QUFDZCxVQUFNLGlCQUFpQixZQUFZLGtCQUFrQixPQUFPO0FBQzVELFVBQU0sY0FBYyxlQUFlLFFBQVEsZUFBZTtBQUMxRCxVQUFNLGFBQWEsb0JBQUksSUFBMEM7QUFFakUsV0FBTztBQUFBLE1BQ0wsMENBQTBDLENBQUMscUJBQWdEO0FBQ3pGLFlBQUk7QUFDRixnQkFBTSxlQUFlLGVBQWUsc0JBQXNCLElBQUksaUJBQWlCLE1BQU07QUFDckYsZ0JBQU0sZUFBZSxZQUFZLGtCQUFrQixZQUFZO0FBRS9ELGdCQUFNLGdCQUNKLGFBQWEsY0FBYyxFQUFFLEtBQUssQ0FBQyxXQUFXLE9BQU8sU0FBUyxNQUFNLEtBQ3BFLGFBQWEsY0FBYyxFQUFFLEtBQUssQ0FBQyxXQUFXLE9BQU8sU0FBUyxNQUFNO0FBRXRFLGNBQUksZUFBZTtBQUNqQixrQkFBTSxvQkFBb0I7QUFBQSxjQUN4QjtBQUFBLGNBQ0EsQ0FBQyxT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

package/package.json

@@ -1 +1 @@
-{"name":"@checkdigit/eslint-plugin","version":"7.3.0-PR.75-f90a","description":"Check Digit eslint plugins","keywords":["eslint","eslintplugin"],"homepage":"https://github.com/checkdigit/eslint-plugin#readme","bugs":{"url":"https://github.com/checkdigit/eslint-plugin/issues"},"repository":{"type":"git","url":"https://github.com/checkdigit/eslint-plugin"},"license":"MIT","author":"Check Digit, LLC","sideEffects":false,"type":"module","exports":{".":{"types":"./dist-types/index.d.ts","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-mjs","!src/**/test/**","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/test/**","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-mjs/**/test/**","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-mjs":"rimraf dist-mjs && npx builder --type=module --sourceMap --outDir=dist-mjs && node dist-mjs/index.mjs","build:dist-types":"rimraf dist-types && npx builder --type=types --outDir=dist-types","ci:compile":"tsc --noEmit","ci:coverage":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=true","ci:lint":"npm run lint","ci:style":"npm run prettier","ci:test":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=false","lint":"eslint --max-warnings 0 .","lint:fix":"eslint --max-warnings 0 --fix .","prepare":"","prepublishOnly":"npm run build:dist-types && npm run build:dist-mjs","prettier":"prettier --ignore-path .gitignore --list-different .","prettier:fix":"prettier --ignore-path .gitignore --write .","test":"npm run ci:compile && npm run ci:test && npm run ci:lint && npm run ci:style"},"prettier":"@checkdigit/prettier-config","jest":{"preset":"@checkdigit/jest-config"},"dependencies":{"@typescript-eslint/type-utils":"8.13.0","@typescript-eslint/utils":"8.13.0","debug":"^4.3.7","ts-api-utils":"^1.4.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^5.5.1","@checkdigit/typescript-config":"^8.0.0","@eslint/js":"^9.14.0","@types/debug":"^4.1.12","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"8.13.0","@typescript-eslint/rule-tester":"8.13.0","eslint":"^9.14.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.6.3","eslint-plugin-eslint-plugin":"^6.3.1","eslint-plugin-import":"^2.31.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^1.0.2","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"1.0.4","http-status-codes":"^2.3.0","rimraf":"^6.0.1","typescript-eslint":"8.13.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}
+{"name":"@checkdigit/eslint-plugin","version":"7.3.0-PR.75-4919","description":"Check Digit eslint plugins","keywords":["eslint","eslintplugin"],"homepage":"https://github.com/checkdigit/eslint-plugin#readme","bugs":{"url":"https://github.com/checkdigit/eslint-plugin/issues"},"repository":{"type":"git","url":"https://github.com/checkdigit/eslint-plugin"},"license":"MIT","author":"Check Digit, LLC","sideEffects":false,"type":"module","exports":{".":{"types":"./dist-types/index.d.ts","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-mjs","!src/**/test/**","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/test/**","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-mjs/**/test/**","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-mjs":"rimraf dist-mjs && npx builder --type=module --sourceMap --outDir=dist-mjs && node dist-mjs/index.mjs","build:dist-types":"rimraf dist-types && npx builder --type=types --outDir=dist-types","ci:compile":"tsc --noEmit","ci:coverage":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=true","ci:lint":"npm run lint","ci:style":"npm run prettier","ci:test":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=false","lint":"eslint --max-warnings 0 .","lint:fix":"eslint --max-warnings 0 --fix .","prepare":"","prepublishOnly":"npm run build:dist-types && npm run build:dist-mjs","prettier":"prettier --ignore-path .gitignore --list-different .","prettier:fix":"prettier --ignore-path .gitignore --write .","test":"npm run ci:compile && npm run ci:test && npm run ci:lint && npm run ci:style"},"prettier":"@checkdigit/prettier-config","jest":{"preset":"@checkdigit/jest-config"},"dependencies":{"@typescript-eslint/type-utils":"8.13.0","@typescript-eslint/utils":"8.13.0","debug":"^4.3.7","ts-api-utils":"^1.4.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^5.5.1","@checkdigit/typescript-config":"^8.0.0","@eslint/js":"^9.14.0","@types/debug":"^4.1.12","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"8.13.0","@typescript-eslint/rule-tester":"8.13.0","eslint":"^9.14.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.6.3","eslint-plugin-eslint-plugin":"^6.3.1","eslint-plugin-import":"^2.31.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^1.0.2","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"1.0.4","http-status-codes":"^2.3.0","rimraf":"^6.0.1","typescript-eslint":"8.13.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}

package/src/agent/fetch-response-body-json.ts

@@ -6,14 +6,28 @@
  * This code is licensed under the MIT license (see LICENSE.txt for details).
  */
 
+import { strict as assert } from 'node:assert';
+
 import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils';
 
 import getDocumentationUrl from '../get-documentation-url';
+import { getAncestor } from '../library/ts-tree';
 
 export const ruleId = 'fetch-response-body-json';
 
 const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
 
+interface Change {
+  enclosingFunction: TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclaration;
+  enclosingStatement: TSESTree.VariableDeclaration | TSESTree.ExpressionStatement | TSESTree.ReturnStatement;
+  enclosingStatementIndex: number;
+  responseBodyNode: TSESTree.MemberExpression;
+  responseVariableName: string;
+  responseBodyVariableName: string;
+  isResponseBodyVariableDeclared: boolean;
+  // replacementText: string;
+}
+
 const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = createRule({
   name: ruleId,
   meta: {
@@ -32,12 +46,12 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
   create(context) {
     const parserServices = ESLintUtils.getParserServices(context);
     const typeChecker = parserServices.program.getTypeChecker();
-    const sourceCode = context.sourceCode;
+    const allChanges = new Map<TSESTree.Node, Map<string, Change[]>>();
 
     return {
-      'MemberExpression[property.name="body"]': (responseBody: TSESTree.MemberExpression) => {
+      'MemberExpression[property.name="body"]': (responseBodyNode: TSESTree.MemberExpression) => {
         try {
-          const responseNode = parserServices.esTreeNodeToTSNodeMap.get(responseBody.object);
+          const responseNode = parserServices.esTreeNodeToTSNodeMap.get(responseBodyNode.object);
           const responseType = typeChecker.getTypeAtLocation(responseNode);
 
           const shouldReplace =
@@ -45,23 +59,54 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
             responseType.getProperties().some((symbol) => symbol.name === 'json');
 
           if (shouldReplace) {
-            const responseText = sourceCode.getText(responseBody.object);
-            const needAwait = responseBody.parent.type !== AST_NODE_TYPES.ReturnStatement;
-            const replacementText = needAwait ? `(await ${responseText}.json())` : `${responseText}.json()`;
-
-            context.report({
-              messageId: 'replaceBodyWithJson',
-              node: responseBody,
-              fix(fixer) {
-                return fixer.replaceText(responseBody, replacementText);
-              },
-            });
+            const enclosingFunction = getAncestor(
+              responseBodyNode,
+              (node: TSESTree.Node) =>
+                node.type === AST_NODE_TYPES.ArrowFunctionExpression ||
+                node.type === AST_NODE_TYPES.FunctionExpression ||
+                node.type === AST_NODE_TYPES.FunctionDeclaration,
+            ) as TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclaration;
+            const enclosingStatement = getAncestor(
+              responseBodyNode,
+              (node: TSESTree.Node) =>
+                (node.type === AST_NODE_TYPES.VariableDeclaration ||
+                  node.type === AST_NODE_TYPES.ExpressionStatement ||
+                  node.type === AST_NODE_TYPES.ReturnStatement) &&
+                node.parent.type === AST_NODE_TYPES.BlockStatement,
+            ) as TSESTree.VariableDeclaration | TSESTree.ExpressionStatement | TSESTree.ReturnStatement;
+            const enclosingStatementIndex = (enclosingFunction.body as TSESTree.BlockStatement).body.indexOf(
+              enclosingStatement,
+            );
+            const responseVariableName = (responseBodyNode.object as TSESTree.Identifier).name;
+            const isResponseBodyVariableDeclared =
+              enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration &&
+              enclosingStatement.declarations.some((declaration) => declaration.init === responseBodyNode);
+            const responseBodyVariableName = isResponseBodyVariableDeclared
+              ? (enclosingStatement.declarations.find((declaration) => declaration.init === responseBodyNode)
+                  ?.id as unknown as string)
+              : `${(responseBodyNode.object as TSESTree.Identifier).name}Body`;
+
+            const change: Change = {
+              enclosingFunction,
+              enclosingStatement,
+              enclosingStatementIndex,
+              responseVariableName,
+              responseBodyNode,
+              responseBodyVariableName,
+              isResponseBodyVariableDeclared,
+            };
+
+            const changesByFunction = allChanges.get(enclosingFunction) ?? new Map<string, Change[]>();
+            const changesByResponse = changesByFunction.get(responseVariableName) ?? [];
+            changesByResponse.push(change);
+            changesByFunction.set(responseVariableName, changesByResponse);
+            allChanges.set(enclosingFunction, changesByFunction);
           }
         } catch (error) {
           // eslint-disable-next-line no-console
           console.error(`Failed to apply ${ruleId} rule for file "${context.filename}":`, error);
           context.report({
-            node: responseBody,
+            node: responseBodyNode,
             messageId: 'unknownError',
             data: {
               fileName: context.filename,
@@ -70,6 +115,62 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
           });
         }
       },
+
+      'Program:exit': () => {
+        if (allChanges.size === 0) {
+          return;
+        }
+
+        const fixes: { node: TSESTree.Node; text: string; insert: boolean }[] = [];
+        for (const changesByFunction of allChanges.values()) {
+          for (const changesByResponse of changesByFunction.values()) {
+            const orderedChanges = changesByResponse.sort(
+              (changeA, changeB) => changeA.enclosingStatementIndex - changeB.enclosingStatementIndex,
+            );
+            const firstChange = orderedChanges[0];
+            assert(firstChange);
+
+            const {
+              responseBodyNode,
+              responseVariableName,
+              responseBodyVariableName,
+              isResponseBodyVariableDeclared,
+              enclosingStatement,
+            } = firstChange;
+
+            let remainingChanges;
+            if (!isResponseBodyVariableDeclared) {
+              fixes.push({
+                node: enclosingStatement,
+                text: `const ${responseBodyVariableName} = await ${responseVariableName}.json();\n`,
+                insert: true,
+              });
+              remainingChanges = orderedChanges;
+            } else {
+              fixes.push({
+                node: responseBodyNode,
+                text: `await ${responseVariableName}.json()`,
+                insert: false,
+              });
+              remainingChanges = orderedChanges.slice(1);
+            }
+
+            for (const change of remainingChanges) {
+              fixes.push({ node: change.responseBodyNode, text: responseBodyVariableName, insert: false });
+            }
+          }
+        }
+
+        for (const fix of fixes) {
+          context.report({
+            node: fix.node,
+            messageId: 'replaceBodyWithJson',
+            fix(fixer) {
+              return fix.insert ? fixer.insertTextBefore(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
+            },
+          });
+        }
+      },
     };
   },
 });

package/src/no-legacy-service-typing.ts

@@ -1,4 +1,4 @@
-// no-full-response.ts
+// no-legacy-service-typing.ts
 
 /*
  * Copyright (c) 2021-2024 Check Digit, LLC