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

package/dist-types/agent/fetch-response-body-json.d.ts

@@ -1,4 +1,4 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
 export declare const ruleId = "fetch-response-body-json";
-declare const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'>;
+declare const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson' | 'refactorNeeded'>;
 export default rule;

package/dist-types/agent/fetch.d.ts

@@ -1,4 +1,5 @@
 import type { Node } from 'estree';
 export declare function getResponseBodyRetrievalText(responseVariableName: string): string;
+export declare function getResponseHeadersRetrievalText(responseVariableName: string): string;
 export declare function isInvalidResponseHeadersAccess(responseHeadersAccess: Node): boolean;
 export declare function hasAssertions(fixtureCall: Node): boolean;

package/dist-types/agent/response-reference.d.ts

@@ -11,6 +11,6 @@ export declare function analyzeResponseReferences(variableDeclaration: VariableD
     headersReferences: MemberExpression[];
     statusReferences: MemberExpression[];
     destructuringBodyVariable?: Scope.Variable | ObjectPattern;
-    destructuringHeadersVariable?: Scope.Variable;
+    destructuringHeadersVariable?: Scope.Variable | ObjectPattern;
     destructuringHeadersReferences?: MemberExpression[] | undefined;
 };

package/package.json

@@ -1 +1 @@
-{"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"}}
+{"name":"@checkdigit/eslint-plugin","version":"7.3.0-PR.75-743b","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.14.0","@typescript-eslint/utils":"8.14.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.15.0","@types/debug":"^4.1.12","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"^8.14.0","@typescript-eslint/rule-tester":"^8.14.0","eslint":"^9.15.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.6.3","eslint-plugin-eslint-plugin":"^6.3.2","eslint-plugin-import":"^2.31.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^1.1.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.14.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}

package/src/agent/agent-test-wiring.ts

@@ -41,12 +41,14 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
     schema: [],
   },
   defaultOptions: [],
+  // eslint-disable-next-line max-lines-per-function
   create(context) {
     log('Processing file:', context.filename);
     const sourceCode = context.sourceCode;
     const importDeclarations = new Map<string, TSESTree.ImportDeclaration>();
     let isFixtureUsed = false;
     let beforeAll: TSESTree.CallExpression | undefined;
+    let beforeEach: TSESTree.CallExpression | undefined;
     let afterAll: TSESTree.CallExpression | undefined;
 
     return {
@@ -68,11 +70,16 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
       'CallExpression[callee.name="beforeAll"]': (callExpression: TSESTree.CallExpression) => {
         beforeAll = callExpression;
       },
+      'CallExpression[callee.name="beforeEach"]': (callExpression: TSESTree.CallExpression) => {
+        beforeEach = callExpression;
+      },
       'CallExpression[callee.name="afterAll"]': (callExpression: TSESTree.CallExpression) => {
         afterAll = callExpression;
       },
+      // eslint-disable-next-line sonarjs/cognitive-complexity
       'Program:exit'(program) {
-        if (!isFixtureUsed || beforeAll === undefined) {
+        if (!isFixtureUsed || (beforeAll === undefined && beforeEach === undefined)) {
+          // only update test wiring if fixture is used
           return;
         }
 
@@ -81,7 +88,7 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
           let agentImportFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
           let fixturePluginImportFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
           let agentDeclarationFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
-          let beforeAllFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
+          let beforeAllOrEachFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
           let afterAllFixer: ((fixer: RuleFixer) => RuleFix) | undefined;
 
           const lastImportDeclaration = [...importDeclarations.values()].at(-1);
@@ -89,18 +96,21 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
 
           // make sure that afterAll is imported from jest
           const jestImportDeclaration = importDeclarations.get('@jest/globals');
-          if (
-            jestImportDeclaration &&
-            !jestImportDeclaration.specifiers.some(
-              (specifier) =>
-                specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier &&
-                specifier.imported.type === TSESTree.AST_NODE_TYPES.Identifier &&
-                specifier.imported.name === 'afterAll',
-            )
-          ) {
+          assert.ok(jestImportDeclaration);
+          const importsToAdd = ['afterAll', 'beforeAll'].filter(
+            (jestHook) =>
+              !jestImportDeclaration.specifiers.some(
+                (specifier) =>
+                  specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier &&
+                  specifier.imported.type === TSESTree.AST_NODE_TYPES.Identifier &&
+                  specifier.imported.name === jestHook,
+              ),
+          );
+          if (importsToAdd.length > 0) {
             const firstImportSpecifier = jestImportDeclaration.specifiers[0];
             assert.ok(firstImportSpecifier);
-            jestImportFixer = (fixer: RuleFixer) => fixer.insertTextBefore(firstImportSpecifier, 'afterAll, ');
+            jestImportFixer = (fixer: RuleFixer) =>
+              fixer.insertTextBefore(firstImportSpecifier, `${importsToAdd.join(', ')}, `);
           }
 
           // make sure that agent is imported
@@ -124,45 +134,60 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
               fixer.insertTextAfter(lastImportDeclaration, `\nimport fixturePlugin from '${fixturePluginImportPath}';`);
           }
 
-          // inject agent declaration and initialization to `beforeAll` block
-          const beforeAllArgument = beforeAll.arguments[0];
-          assert.ok(beforeAllArgument !== undefined);
-          if (!sourceCode.getText(beforeAllArgument).includes(STATEMENT_AGENT_CREATION)) {
-            if (
-              beforeAllArgument.type === TSESTree.AST_NODE_TYPES.ArrowFunctionExpression &&
-              beforeAllArgument.body.type === TSESTree.AST_NODE_TYPES.BlockStatement
-            ) {
-              const fixtureResetStatement = beforeAllArgument.body.body.find(
-                (statement) => sourceCode.getText(statement) === STATEMENT_FIXTURE_RESET_AWAITED,
+          // inject agent declaration and initialization
+          if (beforeAll === undefined) {
+            // create `beforeAll` block if it doesn't exist
+            beforeAllOrEachFixer = (fixer: RuleFixer) =>
+              fixer.insertTextBefore(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                beforeEach!,
+                [
+                  STATEMENT_AGENT_DECLARATION,
+                  `beforeAll(async () => {`,
+                  [STATEMENT_AGENT_CREATION, STATEMENT_AGENT_REGISTER, STATEMENT_AGENT_ENABLE].join('\n'),
+                  `});\n`,
+                ].join('\n'),
               );
-              assert.ok(fixtureResetStatement !== undefined);
-              beforeAllFixer = (fixer: RuleFixer) =>
-                fixer.replaceText(
-                  fixtureResetStatement,
-                  [
-                    STATEMENT_AGENT_CREATION,
-                    STATEMENT_AGENT_REGISTER,
-                    STATEMENT_AGENT_ENABLE,
-                    STATEMENT_FIXTURE_RESET_AWAITED,
-                  ].join('\n'),
-                );
-            } else {
-              beforeAllFixer = (fixer: RuleFixer) =>
-                fixer.replaceText(
-                  beforeAllArgument,
-                  [
-                    `async () => {`,
-                    STATEMENT_AGENT_CREATION,
-                    STATEMENT_AGENT_REGISTER,
-                    STATEMENT_AGENT_ENABLE,
-                    STATEMENT_FIXTURE_RESET_AWAITED,
-                    `}`,
-                  ].join('\n'),
+          } else {
+            const beforeAllArgument = beforeAll.arguments[0];
+            assert.ok(beforeAllArgument !== undefined);
+            if (!sourceCode.getText(beforeAllArgument).includes(STATEMENT_AGENT_CREATION)) {
+              if (
+                beforeAllArgument.type === TSESTree.AST_NODE_TYPES.ArrowFunctionExpression &&
+                beforeAllArgument.body.type === TSESTree.AST_NODE_TYPES.BlockStatement
+              ) {
+                const fixtureResetStatement = beforeAllArgument.body.body.find(
+                  (statement) => sourceCode.getText(statement) === STATEMENT_FIXTURE_RESET_AWAITED,
                 );
+                assert.ok(fixtureResetStatement !== undefined);
+                beforeAllOrEachFixer = (fixer: RuleFixer) =>
+                  fixer.replaceText(
+                    fixtureResetStatement,
+                    [
+                      STATEMENT_AGENT_CREATION,
+                      STATEMENT_AGENT_REGISTER,
+                      STATEMENT_AGENT_ENABLE,
+                      STATEMENT_FIXTURE_RESET_AWAITED,
+                    ].join('\n'),
+                  );
+              } else {
+                beforeAllOrEachFixer = (fixer: RuleFixer) =>
+                  fixer.replaceText(
+                    beforeAllArgument,
+                    [
+                      `async () => {`,
+                      STATEMENT_AGENT_CREATION,
+                      STATEMENT_AGENT_REGISTER,
+                      STATEMENT_AGENT_ENABLE,
+                      STATEMENT_FIXTURE_RESET_AWAITED,
+                      `}`,
+                    ].join('\n'),
+                  );
+              }
+              agentDeclarationFixer = (fixer: RuleFixer) =>
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                fixer.insertTextBefore(beforeAll!, `${STATEMENT_AGENT_DECLARATION}\n`);
             }
-            agentDeclarationFixer = (fixer: RuleFixer) =>
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              fixer.insertTextBefore(beforeAll!, `${STATEMENT_AGENT_DECLARATION}\n`);
           }
 
           // inject agent disposal to `afterAll` block
@@ -182,7 +207,8 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
               afterAllFixer = (fixer: RuleFixer) => fixer.insertTextAfter(lastStatement, STATEMENT_AGENT_DISPOSE);
             }
           } else {
-            const nextToken = sourceCode.getTokenAfter(beforeAll);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const nextToken = sourceCode.getTokenAfter(beforeAll ?? beforeEach!);
             afterAllFixer = (fixer: RuleFixer) =>
               fixer.insertTextAfter(
                 nextToken !== null && nextToken.type === AST_TOKEN_TYPES.Punctuator
@@ -198,12 +224,13 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
             agentImportFixer !== undefined ||
             fixturePluginImportFixer !== undefined ||
             agentDeclarationFixer !== undefined ||
-            beforeAllFixer !== undefined ||
+            beforeAllOrEachFixer !== undefined ||
             afterAllFixer !== undefined
           ) {
             context.report({
               messageId: 'updateTestWiring',
-              node: beforeAll,
+              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+              node: beforeAll ?? beforeEach!,
               *fix(fixer) {
                 if (jestImportFixer !== undefined) {
                   yield jestImportFixer(fixer);
@@ -217,8 +244,8 @@ const rule: ESLintUtils.RuleModule<'updateTestWiring' | 'unknownError'> = create
                 if (agentDeclarationFixer !== undefined) {
                   yield agentDeclarationFixer(fixer);
                 }
-                if (beforeAllFixer !== undefined) {
-                  yield beforeAllFixer(fixer);
+                if (beforeAllOrEachFixer !== undefined) {
+                  yield beforeAllOrEachFixer(fixer);
                 }
                 if (afterAllFixer !== undefined) {
                   yield afterAllFixer(fixer);

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

@@ -28,7 +28,7 @@ interface Change {
   // replacementText: string;
 }
 
-const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = createRule({
+const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson' | 'refactorNeeded'> = createRule({
   name: ruleId,
   meta: {
     type: 'suggestion',
@@ -36,6 +36,8 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
       description: 'Replace "response.body" with "await response.json()".',
     },
     messages: {
+      refactorNeeded:
+        'Please extract the fetch call and check its reponse status code before accessing its response body.',
       replaceBodyWithJson: 'Replace "response.body" with "await response.json()".',
       unknownError: 'Unknown error occurred in file "{{fileName}}": {{ error }}.',
     },
@@ -59,6 +61,14 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
             responseType.getProperties().some((symbol) => symbol.name === 'json');
 
           if (shouldReplace) {
+            if (responseBodyNode.object.type !== AST_NODE_TYPES.Identifier) {
+              context.report({
+                node: responseBodyNode,
+                messageId: 'refactorNeeded',
+              });
+              return;
+            }
+
             const enclosingFunction = getAncestor(
               responseBodyNode,
               (node: TSESTree.Node) =>
@@ -77,14 +87,23 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
             const enclosingStatementIndex = (enclosingFunction.body as TSESTree.BlockStatement).body.indexOf(
               enclosingStatement,
             );
-            const responseVariableName = (responseBodyNode.object as TSESTree.Identifier).name;
+            const responseVariableName = responseBodyNode.object.name;
             const isResponseBodyVariableDeclared =
               enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration &&
-              enclosingStatement.declarations.some((declaration) => declaration.init === responseBodyNode);
+              enclosingStatement.declarations.some(
+                (declaration) =>
+                  declaration.init === responseBodyNode ||
+                  (declaration.init?.type === AST_NODE_TYPES.TSAsExpression &&
+                    declaration.init.expression === responseBodyNode),
+              );
             const responseBodyVariableName = isResponseBodyVariableDeclared
-              ? (enclosingStatement.declarations.find((declaration) => declaration.init === responseBodyNode)
-                  ?.id as unknown as string)
-              : `${(responseBodyNode.object as TSESTree.Identifier).name}Body`;
+              ? (enclosingStatement.declarations.find(
+                  (declaration) =>
+                    declaration.init === responseBodyNode ||
+                    (declaration.init?.type === AST_NODE_TYPES.TSAsExpression &&
+                      declaration.init.expression === responseBodyNode),
+                )?.id as unknown as string)
+              : `${responseBodyNode.object.name}Body`;
 
             const change: Change = {
               enclosingFunction,
@@ -121,7 +140,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
           return;
         }
 
-        const fixes: { node: TSESTree.Node; text: string; insert: boolean }[] = [];
+        const fixes: { node: TSESTree.Node | TSESTree.Token; text: string; insert: boolean }[] = [];
         for (const changesByFunction of allChanges.values()) {
           for (const changesByResponse of changesByFunction.values()) {
             const orderedChanges = changesByResponse.sort(
@@ -141,8 +160,8 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
             let remainingChanges;
             if (!isResponseBodyVariableDeclared) {
               fixes.push({
-                node: enclosingStatement,
-                text: `const ${responseBodyVariableName} = await ${responseVariableName}.json();\n`,
+                node: context.sourceCode.getTokenBefore(enclosingStatement) as TSESTree.Token,
+                text: `\nconst ${responseBodyVariableName} = await ${responseVariableName}.json();`,
                 insert: true,
               });
               remainingChanges = orderedChanges;
@@ -161,12 +180,12 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
           }
         }
 
-        for (const fix of fixes) {
+        for (const fix of fixes.reverse()) {
           context.report({
             node: fix.node,
             messageId: 'replaceBodyWithJson',
             fix(fixer) {
-              return fix.insert ? fixer.insertTextBefore(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
+              return fix.insert ? fixer.insertTextAfter(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
             },
           });
         }

package/src/agent/fetch-then.ts

@@ -103,10 +103,12 @@ function createResponseAssertions(
             responseVariableName,
           );
         }
-        nonStatusAssertions.push(`assert.ok(${functionBody})`);
+        nonStatusAssertions.push(`assert.doesNotThrow(()=>${functionBody})`);
       } else if (assertionArgument.type === 'Identifier') {
         // callback assertion using function reference
-        nonStatusAssertions.push(`assert.ok(${sourceCode.getText(assertionArgument)}(${responseVariableName}))`);
+        nonStatusAssertions.push(
+          `assert.doesNotThrow(()=>${sourceCode.getText(assertionArgument)}(${responseVariableName}))`,
+        );
       } else if (assertionArgument.type === 'ObjectExpression' || assertionArgument.type === 'CallExpression') {
         // body deep equal assertion
         nonStatusAssertions.push(

package/src/agent/fetch.ts

@@ -8,6 +8,10 @@ export function getResponseBodyRetrievalText(responseVariableName: string) {
   return `await ${responseVariableName}.json()`;
 }
 
+export function getResponseHeadersRetrievalText(responseVariableName: string) {
+  return `${responseVariableName}.headers`;
+}
+
 export function isInvalidResponseHeadersAccess(responseHeadersAccess: Node): boolean {
   const responseHeaderAccessParent = getParent(responseHeadersAccess);
   if (responseHeaderAccessParent?.type === 'VariableDeclarator') {

package/src/agent/fix-function-call-arguments.ts

@@ -22,6 +22,7 @@ const DEFAULT_OPTIONS = {
     'Fixture<ResolvedServices>',
     'InboundContext',
     '{ get: () => string; }',
+    'Api',
   ],
 };
 
@@ -77,7 +78,21 @@ const rule: ESLintUtils.RuleModule<
 
         log('===== file name:', context.filename);
         log('callExpression:', sourceCode.getText(callExpression));
+
         try {
+          const actualParameters = callExpression.arguments;
+          if (
+            !actualParameters.some((actualParameter) => {
+              const actualType = typeChecker.getTypeAtLocation(
+                parserServices.esTreeNodeToTSNodeMap.get(actualParameter),
+              );
+              const actualTypeString = typeChecker.typeToString(actualType);
+              return typesToCheck.includes(actualTypeString) || actualTypeString.endsWith('RequestType');
+            })
+          ) {
+            return;
+          }
+
           const calleeTsNode = parserServices.esTreeNodeToTSNodeMap.get(callExpression.callee);
           const calleeType = typeChecker.getTypeAtLocation(calleeTsNode);
 
@@ -88,13 +103,14 @@ const rule: ESLintUtils.RuleModule<
           }
 
           const signature = signatures[0];
-          if (
-            signature === undefined ||
-            (signature.typeParameters !== undefined && signature.typeParameters.length > 0)
-          ) {
-            // ignore complex signatures with type parameters
-            return;
-          }
+          assert(signature);
+          // if (
+          //   signature === undefined ||
+          //   (signature.typeParameters !== undefined && signature.typeParameters.length > 0)
+          // ) {
+          //   // ignore complex signatures with type parameters
+          //   return;
+          // }
 
           log('signature:', signature.getDeclaration().getText());
           const expectedParameters = signature.getParameters();
@@ -105,7 +121,6 @@ const rule: ESLintUtils.RuleModule<
             ),
           );
           const expectedParametersCount = expectedParameters.length;
-          const actualParameters = callExpression.arguments;
           const actualParametersCount = actualParameters.length;
           if (actualParametersCount === 0) {
             return;
@@ -132,18 +147,15 @@ const rule: ESLintUtils.RuleModule<
             );
             log('actual type: #', actualParameterIndex, sourceCode.getText(actualParameter), actualTypeString);
 
-            if (!typesToCheck.includes(actualTypeString) && !actualTypeString.endsWith('RequestType')) {
-              // skip the parameter type checking if it's not in the candidate types
-              parametersToKeep.push(actualParameter);
-              expectedParameterIndex++;
-              log('skipped');
-            } else if (typeChecker.isTypeAssignableTo(actualType, expectedType)) {
-              parametersToKeep.push(actualParameter);
-              expectedParameterIndex++;
-              log('matched');
-            } else {
-              log('not matched');
+            if (
+              (typesToCheck.includes(actualTypeString) || actualTypeString.endsWith('RequestType')) &&
+              !typeChecker.isTypeAssignableTo(actualType, expectedType)
+            ) {
+              log('removing un-matched parameter', sourceCode.getText(actualParameter));
+              continue;
             }
+            parametersToKeep.push(actualParameter);
+            expectedParameterIndex++;
           }
 
           if (parametersToKeep.length === actualParametersCount) {

package/src/agent/no-fixture.ts

@@ -33,7 +33,7 @@ import getDocumentationUrl from '../get-documentation-url';
 import { getIndentation } from '../library/format';
 import { isValidPropertyName } from '../library/variable';
 import { analyzeResponseReferences } from './response-reference';
-import { getResponseBodyRetrievalText, hasAssertions } from './fetch';
+import { getResponseBodyRetrievalText, getResponseHeadersRetrievalText, hasAssertions } from './fetch';
 import { replaceEndpointUrlPrefixWithBasePath } from './url';
 
 export const ruleId = 'no-fixture';
@@ -48,6 +48,7 @@ interface FixtureCallInformation {
   assertions?: Expression[][];
   inlineStatementNode?: Node;
   inlineBodyReference?: MemberExpression;
+  inlineHeadersReference?: MemberExpression;
 }
 
 // recursively analyze the fixture/supertest call chain to collect information of request/response
@@ -80,6 +81,12 @@ function analyzeFixtureCall(call: SimpleCallExpression, results: FixtureCallInfo
       if (awaitParent.property.type === 'Identifier' && awaitParent.property.name === 'body') {
         results.inlineBodyReference = awaitParent;
       }
+      if (
+        awaitParent.property.type === 'Identifier' &&
+        (awaitParent.property.name === 'header' || awaitParent.property.name === 'headers')
+      ) {
+        results.inlineHeadersReference = awaitParent;
+      }
     } else if (enclosingStatement.type === 'VariableDeclaration') {
       results.variableDeclaration = enclosingStatement;
       results.rootNode = enclosingStatement;
@@ -156,10 +163,12 @@ function createResponseAssertions(
             responseVariableName,
           );
         }
-        nonStatusAssertions.push(`assert.ok(${functionBody})`);
+        nonStatusAssertions.push(`assert.doesNotThrow(()=>${functionBody})`);
       } else if (assertionArgument.type === 'Identifier') {
         // callback assertion using function reference
-        nonStatusAssertions.push(`assert.ok(${sourceCode.getText(assertionArgument)}(${responseVariableName}))`);
+        nonStatusAssertions.push(
+          `assert.doesNotThrow(()=>${sourceCode.getText(assertionArgument)}(${responseVariableName}))`,
+        );
       } else if (assertionArgument.type === 'ObjectExpression' || assertionArgument.type === 'CallExpression') {
         // body deep equal assertion
         nonStatusAssertions.push(
@@ -338,11 +347,19 @@ const rule: Rule.RuleModule = {
             (responseBodyReferences.length > 0 && !responseBodyReferences.some(isResponseBodyRedefinition));
           const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
 
+          const isResponseHeadersVariableRedefinitionNeeded =
+            (destructuringResponseHeadersVariable !== undefined &&
+              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+              (destructuringResponseHeadersVariable as ObjectPattern).type === 'ObjectPattern') ||
+            fixtureCallInformation.inlineHeadersReference !== undefined;
+          const redefineResponseHeadersVariableName = `${responseVariableNameToUse}Headers`;
+
           const isResponseVariableRedefinitionNeeded =
             (fixtureCallInformation.variableAssignment === undefined &&
               responseVariable === undefined &&
               fixtureCallInformation.assertions !== undefined) ||
-            isResponseBodyVariableRedefinitionNeeded;
+            isResponseBodyVariableRedefinitionNeeded ||
+            isResponseHeadersVariableRedefinitionNeeded;
 
           const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded
             ? [
@@ -350,16 +367,24 @@ const rule: Rule.RuleModule = {
                 ...(destructuringResponseBodyVariable
                   ? [
                       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                      `const ${(destructuringResponseBodyVariable as ObjectPattern).type === 'ObjectPattern' ? sourceCode.getText(destructuringResponseBodyVariable as ObjectPattern) : (destructuringResponseBodyVariable as Scope.Variable).name} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
+                      `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseBodyVariable as ObjectPattern).type === 'ObjectPattern' ? sourceCode.getText(destructuringResponseBodyVariable as ObjectPattern) : (destructuringResponseBodyVariable as Scope.Variable).name} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
                     ]
                   : isResponseBodyVariableRedefinitionNeeded
                     ? [
                         `const ${redefineResponseBodyVariableName} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
                       ]
                     : []),
+                // eslint-disable-next-line no-nested-ternary
                 ...(destructuringResponseHeadersVariable
-                  ? [`const ${destructuringResponseHeadersVariable.name} = ${responseVariableNameToUse}.headers`]
-                  : []),
+                  ? [
+                      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                      `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseHeadersVariable as ObjectPattern).type === 'ObjectPattern' ? sourceCode.getText(destructuringResponseHeadersVariable as ObjectPattern) : (destructuringResponseHeadersVariable as Scope.Variable).name} = ${getResponseHeadersRetrievalText(responseVariableNameToUse)}`,
+                    ]
+                  : isResponseHeadersVariableRedefinitionNeeded
+                    ? [
+                        `const ${redefineResponseHeadersVariableName} = ${getResponseHeadersRetrievalText(responseVariableNameToUse)}`,
+                      ]
+                    : []),
               ]
             : [];
 
@@ -367,14 +392,14 @@ const rule: Rule.RuleModule = {
             fixtureCallInformation,
             sourceCode,
             responseVariableNameToUse,
-            destructuringResponseHeadersVariable,
+            destructuringResponseHeadersVariable as Scope.Variable | undefined,
           );
 
           // add variable declaration if needed
           const fetchCallText = `fetch(${fetchUrlArgumentText}, ${fetchRequestArgumentLines})`;
           const fetchStatementText = !isResponseVariableRedefinitionNeeded
             ? fetchCallText
-            : `const ${responseVariableNameToUse} = await ${fetchCallText}`;
+            : `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${responseVariableNameToUse} = await ${fetchCallText}`;
 
           const nodeToReplace = isResponseVariableRedefinitionNeeded
             ? fixtureCallInformation.rootNode

package/src/agent/response-reference.ts

@@ -29,7 +29,7 @@ export function analyzeResponseReferences(
   headersReferences: MemberExpression[];
   statusReferences: MemberExpression[];
   destructuringBodyVariable?: Scope.Variable | ObjectPattern;
-  destructuringHeadersVariable?: Scope.Variable;
+  destructuringHeadersVariable?: Scope.Variable | ObjectPattern;
   destructuringHeadersReferences?: MemberExpression[] | undefined;
 } {
   const results: {
@@ -38,7 +38,7 @@ export function analyzeResponseReferences(
     headersReferences: MemberExpression[];
     statusReferences: MemberExpression[];
     destructuringBodyVariable?: Scope.Variable | ObjectPattern;
-    destructuringHeadersVariable?: Scope.Variable;
+    destructuringHeadersVariable?: Scope.Variable | ObjectPattern;
     destructuringHeadersReferences?: MemberExpression[] | undefined;
   } = {
     bodyReferences: [],
@@ -105,13 +105,20 @@ export function analyzeResponseReferences(
             getParent(parent)?.type !== 'CallExpression',
         );
     } else if (identifierParent.type === 'Property') {
-      // body reference through nested destruction, e.g. "const { body: {bodyPropertyName: renamedBodyPropertyName}, headers: {headerPropertyName: renamedHeaderPropertyName} } = ..."
       const parent = getParent(identifierParent);
       if (parent?.type === 'ObjectPattern') {
+        // body reference through nested destruction, e.g. "const { body: {bodyPropertyName: renamedBodyPropertyName}, headers: {headerPropertyName: renamedHeaderPropertyName} } = ..."
         const parent2 = getParent(parent);
         if (parent2?.type === 'Property' && parent2.key.type === 'Identifier' && parent2.key.name === 'body') {
           results.destructuringBodyVariable = parent;
         }
+        if (
+          parent2?.type === 'Property' &&
+          parent2.key.type === 'Identifier' &&
+          (parent2.key.name === 'header' || parent2.key.name === 'headers')
+        ) {
+          results.destructuringHeadersVariable = parent;
+        }
       }
     } else {
       log('+++++++ can not handle identifierParent', identifierParent);

package/src/require-resolve-full-response.ts

@@ -141,7 +141,7 @@ const rule: ESLintUtils.RuleModule<'invalidOptions' | 'unknownError'> = createRu
 
           const enclosingScopeNode = getEnclosingScopeNode(serviceCall);
           assert.ok(enclosingScopeNode, 'enclosingScopeNode is undefined');
-          const scope = scopeManager?.acquire(enclosingScopeNode); /*?*/
+          const scope = scopeManager?.acquire(enclosingScopeNode);
           assert.ok(scope, 'scope is undefined');
           const urlArgument = serviceCall.arguments[0];
           if (!isUrlArgumentValid(urlArgument, scope)) {