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

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/dist-mjs/agent/no-fixture.mjs

@@ -39,6 +39,9 @@ function analyzeFixtureCall(call, results, sourceCode) {
     } else if (enclosingStatement.type === "VariableDeclaration") {
       results.variableDeclaration = enclosingStatement;
       results.rootNode = enclosingStatement;
+    } else if (enclosingStatement.type === "ExpressionStatement" && enclosingStatement.expression.type === "AssignmentExpression") {
+      results.variableAssignment = enclosingStatement;
+      results.rootNode = enclosingStatement;
     } else {
       results.rootNode = parent;
     }
@@ -118,6 +121,12 @@ function createResponseAssertions(fixtureCallInformation, sourceCode, responseVa
   };
 }
 function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scopeVariablesMap) {
+  if (fixtureCallInformation.variableAssignment) {
+    assert.ok(
+      fixtureCallInformation.variableAssignment.expression.type === "AssignmentExpression" && fixtureCallInformation.variableAssignment.expression.left.type === "Identifier"
+    );
+    return fixtureCallInformation.variableAssignment.expression.left.name;
+  }
   if (fixtureCallInformation.variableDeclaration) {
     const firstDeclaration = fixtureCallInformation.variableDeclaration.declarations[0];
     if (firstDeclaration && firstDeclaration.id.type === "Identifier") {
@@ -221,7 +230,7 @@ ${indentation}`);
           );
           const isResponseBodyVariableRedefinitionNeeded = destructuringResponseBodyVariable !== void 0 || fixtureCallInformation.inlineBodyReference !== void 0 || responseBodyReferences.length > 0 && !responseBodyReferences.some(isResponseBodyRedefinition);
           const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
-          const isResponseVariableRedefinitionNeeded = responseVariable === void 0 && fixtureCallInformation.assertions !== void 0 || isResponseBodyVariableRedefinitionNeeded;
+          const isResponseVariableRedefinitionNeeded = fixtureCallInformation.variableAssignment === void 0 && responseVariable === void 0 && fixtureCallInformation.assertions !== void 0 || isResponseBodyVariableRedefinitionNeeded;
           const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded ? [
             // eslint-disable-next-line no-nested-ternary
             ...destructuringResponseBodyVariable ? [
@@ -324,4 +333,4 @@ export {
   no_fixture_default as default,
   ruleId
 };
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-fixture.ts"],
  "mappings": "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",
  "names": []
}

+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-fixture.ts"],
  "mappings": "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",
  "names": []
}


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-1f63","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/agent/no-fixture.ts

@@ -12,6 +12,7 @@ import type {
   AwaitExpression,
   CallExpression,
   Expression,
+  ExpressionStatement,
   MemberExpression,
   Node,
   ObjectPattern,
@@ -38,9 +39,10 @@ import { replaceEndpointUrlPrefixWithBasePath } from './url';
 export const ruleId = 'no-fixture';
 
 interface FixtureCallInformation {
-  rootNode: AwaitExpression | ReturnStatement | VariableDeclaration | SimpleCallExpression;
+  rootNode: AwaitExpression | ReturnStatement | VariableDeclaration | SimpleCallExpression | ExpressionStatement;
   fixtureNode: AwaitExpression | SimpleCallExpression;
   variableDeclaration?: VariableDeclaration;
+  variableAssignment?: ExpressionStatement;
   requestBody?: Expression;
   requestHeaders?: { name: Expression; value: Expression }[];
   assertions?: Expression[][];
@@ -81,6 +83,12 @@ function analyzeFixtureCall(call: SimpleCallExpression, results: FixtureCallInfo
     } else if (enclosingStatement.type === 'VariableDeclaration') {
       results.variableDeclaration = enclosingStatement;
       results.rootNode = enclosingStatement;
+    } else if (
+      enclosingStatement.type === 'ExpressionStatement' &&
+      enclosingStatement.expression.type === 'AssignmentExpression'
+    ) {
+      results.variableAssignment = enclosingStatement;
+      results.rootNode = enclosingStatement;
     } else {
       results.rootNode = parent;
     }
@@ -190,6 +198,14 @@ function getResponseVariableNameToUse(
   fixtureCallInformation: FixtureCallInformation,
   scopeVariablesMap: Map<Scope.Scope, string[]>,
 ) {
+  if (fixtureCallInformation.variableAssignment) {
+    assert.ok(
+      fixtureCallInformation.variableAssignment.expression.type === 'AssignmentExpression' &&
+        fixtureCallInformation.variableAssignment.expression.left.type === 'Identifier',
+    );
+    return fixtureCallInformation.variableAssignment.expression.left.name;
+  }
+
   if (fixtureCallInformation.variableDeclaration) {
     const firstDeclaration = fixtureCallInformation.variableDeclaration.declarations[0];
     if (firstDeclaration && firstDeclaration.id.type === 'Identifier') {
@@ -323,7 +339,9 @@ const rule: Rule.RuleModule = {
           const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
 
           const isResponseVariableRedefinitionNeeded =
-            (responseVariable === undefined && fixtureCallInformation.assertions !== undefined) ||
+            (fixtureCallInformation.variableAssignment === undefined &&
+              responseVariable === undefined &&
+              fixtureCallInformation.assertions !== undefined) ||
             isResponseBodyVariableRedefinitionNeeded;
 
           const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded

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