@checkdigit/eslint-plugin 6.6.0-PR.75-a513 → 6.6.0-PR.75-bbf4

package/dist-mjs/library/ts-tree.mjs

@@ -0,0 +1,72 @@
+// src/library/ts-tree.ts
+import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+function getParent(node) {
+  return node.parent;
+}
+function getAncestor(node, matcher, exitMatcher) {
+  const parent = getParent(node);
+  if (!parent) {
+    return void 0;
+  } else if (typeof matcher === "string" && parent.type === matcher) {
+    return parent;
+  } else if (typeof matcher === "function" && matcher(parent)) {
+    return parent;
+  } else if (typeof exitMatcher === "string" && parent.type === exitMatcher) {
+    return void 0;
+  } else if (typeof exitMatcher === "function" && exitMatcher(parent)) {
+    return void 0;
+  }
+  return getAncestor(parent, matcher, exitMatcher);
+}
+function isBlockStatement(node) {
+  return node.type.endsWith("Statement") || node.type.endsWith("Declaration");
+}
+function getEnclosingStatement(node) {
+  return getAncestor(node, isBlockStatement);
+}
+function getEnclosingScopeNode(node) {
+  return getAncestor(
+    node,
+    (parentNode) => ["FunctionExpression", "FunctionDeclaration", "ArrowFunctionExpression", "Program"].includes(parentNode.type)
+  );
+}
+function isUsedInArrayOrAsArgument(node) {
+  if (isBlockStatement(node)) {
+    return false;
+  }
+  const parent = getParent(node);
+  if (!parent) {
+    return false;
+  }
+  if (parent.type === AST_NODE_TYPES.ArrayExpression || parent.type === AST_NODE_TYPES.CallExpression && parent.arguments.includes(node)) {
+    return true;
+  }
+  return isUsedInArrayOrAsArgument(parent);
+}
+function getEnclosingFunction(node) {
+  if (node.type === AST_NODE_TYPES.FunctionDeclaration || node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.ArrowFunctionExpression) {
+    return node;
+  }
+  const parent = getParent(node);
+  if (!parent) {
+    return;
+  }
+  return getEnclosingFunction(parent);
+}
+function getTypeParentNode(node) {
+  if (!node) {
+    return void 0;
+  }
+  return node.type === AST_NODE_TYPES.TSTypeAnnotation || node.type === AST_NODE_TYPES.TSAsExpression ? node : getTypeParentNode(node.parent);
+}
+export {
+  getAncestor,
+  getEnclosingFunction,
+  getEnclosingScopeNode,
+  getEnclosingStatement,
+  getParent,
+  getTypeParentNode,
+  isBlockStatement,
+  isUsedInArrayOrAsArgument
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xpYnJhcnkvdHMtdHJlZS50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLHNCQUFnQztBQVFsQyxTQUFTLFVBQVUsTUFBdUQ7QUFDL0UsU0FBUSxLQUF3QztBQUNsRDtBQUVPLFNBQVMsWUFDZCxNQUNBLFNBQ0EsYUFDMkI7QUFDM0IsUUFBTSxTQUFTLFVBQVUsSUFBSTtBQUM3QixNQUFJLENBQUMsUUFBUTtBQUNYLFdBQU87QUFBQSxFQUNULFdBQVcsT0FBTyxZQUFZLFlBQVksT0FBTyxTQUFTLFNBQVM7QUFDakUsV0FBTztBQUFBLEVBQ1QsV0FBVyxPQUFPLFlBQVksY0FBYyxRQUFRLE1BQU0sR0FBRztBQUMzRCxXQUFPO0FBQUEsRUFDVCxXQUFXLE9BQU8sZ0JBQWdCLFlBQVksT0FBTyxTQUFTLGFBQWE7QUFDekUsV0FBTztBQUFBLEVBQ1QsV0FBVyxPQUFPLGdCQUFnQixjQUFjLFlBQVksTUFBTSxHQUFHO0FBQ25FLFdBQU87QUFBQSxFQUNUO0FBQ0EsU0FBTyxZQUFZLFFBQVEsU0FBUyxXQUFXO0FBQ2pEO0FBRU8sU0FBUyxpQkFBaUIsTUFBcUI7QUFDcEQsU0FBTyxLQUFLLEtBQUssU0FBUyxXQUFXLEtBQUssS0FBSyxLQUFLLFNBQVMsYUFBYTtBQUM1RTtBQUVPLFNBQVMsc0JBQXNCLE1BQXFCO0FBQ3pELFNBQU8sWUFBWSxNQUFNLGdCQUFnQjtBQUMzQztBQUVPLFNBQVMsc0JBQXNCLE1BQXFCO0FBQ3pELFNBQU87QUFBQSxJQUFZO0FBQUEsSUFBTSxDQUFDLGVBQ3hCLENBQUMsc0JBQXNCLHVCQUF1QiwyQkFBMkIsU0FBUyxFQUFFLFNBQVMsV0FBVyxJQUFJO0FBQUEsRUFDOUc7QUFDRjtBQUVPLFNBQVMsMEJBQTBCLE1BQXFCO0FBQzdELE1BQUksaUJBQWlCLElBQUksR0FBRztBQUMxQixXQUFPO0FBQUEsRUFDVDtBQUVBLFFBQU0sU0FBUyxVQUFVLElBQUk7QUFDN0IsTUFBSSxDQUFDLFFBQVE7QUFDWCxXQUFPO0FBQUEsRUFDVDtBQUVBLE1BQ0UsT0FBTyxTQUFTLGVBQWUsbUJBQzlCLE9BQU8sU0FBUyxlQUFlLGtCQUFrQixPQUFPLFVBQVUsU0FBUyxJQUEyQixHQUN2RztBQUNBLFdBQU87QUFBQSxFQUNUO0FBR0EsU0FBTywwQkFBMEIsTUFBTTtBQUN6QztBQUVPLFNBQVMscUJBQXFCLE1BQXFCO0FBQ3hELE1BQ0UsS0FBSyxTQUFTLGVBQWUsdUJBQzdCLEtBQUssU0FBUyxlQUFlLHNCQUM3QixLQUFLLFNBQVMsZUFBZSx5QkFDN0I7QUFDQSxXQUFPO0FBQUEsRUFDVDtBQUVBLFFBQU0sU0FBUyxVQUFVLElBQUk7QUFDN0IsTUFBSSxDQUFDLFFBQVE7QUFDWDtBQUFBLEVBQ0Y7QUFDQSxTQUFPLHFCQUFxQixNQUFNO0FBQ3BDO0FBRU8sU0FBUyxrQkFDZCxNQUNpRTtBQUNqRSxNQUFJLENBQUMsTUFBTTtBQUNULFdBQU87QUFBQSxFQUNUO0FBQ0EsU0FBTyxLQUFLLFNBQVMsZUFBZSxvQkFBb0IsS0FBSyxTQUFTLGVBQWUsaUJBQ2pGLE9BQ0Esa0JBQWtCLEtBQUssTUFBTTtBQUNuQzsiLAogICJuYW1lcyI6IFtdCn0K

package/dist-mjs/{fixture → library}/variable.mjs

@@ -1,8 +1,8 @@
-// src/fixture/variable.ts
+// src/library/variable.ts
 function isValidPropertyName(name) {
   return typeof name === "string" && /^[a-zA-Z_$][a-zA-Z_$0-9]*$/u.test(name);
 }
 export {
   isValidPropertyName
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2ZpeHR1cmUvdmFyaWFibGUudHMiXSwKICAibWFwcGluZ3MiOiAiO0FBRU8sU0FBUyxvQkFBb0IsTUFBZTtBQUNqRCxTQUFPLE9BQU8sU0FBUyxZQUFZLDhCQUE4QixLQUFLLElBQUk7QUFDNUU7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xpYnJhcnkvdmFyaWFibGUudHMiXSwKICAibWFwcGluZ3MiOiAiO0FBRU8sU0FBUyxvQkFBb0IsTUFBZTtBQUNqRCxTQUFPLE9BQU8sU0FBUyxZQUFZLDhCQUE4QixLQUFLLElBQUk7QUFDNUU7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist-types/index.d.ts

@@ -12,7 +12,6 @@ declare const _default: {
         "invalid-json-stringify": import("eslint").Rule.RuleModule;
         "no-promise-instance-method": import("eslint").Rule.RuleModule;
         "no-fixture": import("eslint").Rule.RuleModule;
-        "fetch-header-getter": import("eslint").Rule.RuleModule;
         "fetch-then": import("eslint").Rule.RuleModule;
         "no-service-wrapper": import("@typescript-eslint/utils/ts-eslint").RuleModule<"unknownError" | "preferNativeFetch" | "invalidOptions", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
         "no-status-code": import("@typescript-eslint/utils/ts-eslint").RuleModule<"unknownError" | "replaceStatusCode", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
@@ -55,7 +54,6 @@ declare const _default: {
         agent: {
             rules: {
                 "@checkdigit/no-fixture": string;
-                "@checkdigit/fetch-header-getter": string;
                 "@checkdigit/fetch-then": string;
                 "@checkdigit/no-service-wrapper": string;
                 "@checkdigit/no-status-code": string;

package/dist-types/{ast → library}/ts-tree.d.ts

@@ -6,3 +6,4 @@ export declare function getEnclosingStatement(node: TSESTree.Node): TSESTree.Nod
 export declare function getEnclosingScopeNode(node: TSESTree.Node): TSESTree.Node | undefined;
 export declare function isUsedInArrayOrAsArgument(node: TSESTree.Node): boolean;
 export declare function getEnclosingFunction(node: TSESTree.Node): TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | undefined;
+export declare function getTypeParentNode(node: TSESTree.Node | undefined): TSESTree.TSTypeAnnotation | TSESTree.TSAsExpression | undefined;

package/package.json

@@ -1 +1 @@
-{"name":"@checkdigit/eslint-plugin","version":"6.6.0-PR.75-a513","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","require":"./dist-cjs/index.cjs","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-cjs","dist-mjs","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-cjs/**/*.test.cjs","!dist-cjs/**/*.spec.cjs","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-cjs":"rimraf dist-cjs && npx builder --type=commonjs --sourceMap --entryPoint=index.ts --outDir=dist-cjs --outFile=index.cjs --external=espree && echo \"module.exports = module.exports.default;\" >> dist-cjs/index.cjs","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 --ignore-path .gitignore .","lint:fix":"eslint --ignore-path .gitignore . --fix","prepublishOnly":"npm run build:dist-types && npm run build:dist-cjs && 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":"7.18.0","@typescript-eslint/utils":"7.18.0","ts-api-utils":"^1.3.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^5.5.0","@checkdigit/typescript-config":"6.0.0","@types/eslint":"^8.56.10","@typescript-eslint/eslint-plugin":"^7.18.0","@typescript-eslint/parser":"^7.18.0","@typescript-eslint/rule-tester":"7.18.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-plugin":"^6.2.0","eslint-plugin-import":"^2.29.1","eslint-plugin-no-only-tests":"^3.1.0","eslint-plugin-no-secrets":"^1.0.2","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"0.24.0"},"peerDependencies":{"eslint":">=8 <9"},"engines":{"node":">=20.14"}}
+{"name":"@checkdigit/eslint-plugin","version":"6.6.0-PR.75-bbf4","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","require":"./dist-cjs/index.cjs","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-cjs","dist-mjs","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-cjs/**/*.test.cjs","!dist-cjs/**/*.spec.cjs","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-cjs":"rimraf dist-cjs && npx builder --type=commonjs --sourceMap --entryPoint=index.ts --outDir=dist-cjs --outFile=index.cjs --external=espree && echo \"module.exports = module.exports.default;\" >> dist-cjs/index.cjs","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 --ignore-path .gitignore .","lint:fix":"eslint --ignore-path .gitignore . --fix","prepublishOnly":"npm run build:dist-types && npm run build:dist-cjs && 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":"7.18.0","@typescript-eslint/utils":"7.18.0","ts-api-utils":"^1.3.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^5.5.0","@checkdigit/typescript-config":"6.0.0","@types/eslint":"^8.56.10","@typescript-eslint/eslint-plugin":"^7.18.0","@typescript-eslint/parser":"^7.18.0","@typescript-eslint/rule-tester":"7.18.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-plugin":"^6.2.0","eslint-plugin-import":"^2.29.1","eslint-plugin-no-only-tests":"^3.1.0","eslint-plugin-no-secrets":"^1.0.2","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"0.24.0","http-status-codes":"^2.3.0"},"peerDependencies":{"eslint":">=8 <9"},"engines":{"node":">=20.14"}}

package/src/{fixture → agent}/add-url-domain.ts

@@ -43,8 +43,8 @@ const rule = createRule({
             return;
           }
 
-          const urlText = sourceCode.getText(basePathDeclarator.init); /*?*/
-          const replacement = addBasePathUrlDomain(urlText); /*?*/
+          const urlText = sourceCode.getText(basePathDeclarator.init);
+          const replacement = addBasePathUrlDomain(urlText);
 
           if (replacement !== urlText) {
             context.report({

package/src/{fixture/fetch-response-header-getter-ts.ts → agent/fetch-response-header-getter.ts}

@@ -10,6 +10,7 @@ import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils'
 import getDocumentationUrl from '../get-documentation-url';
 
 export const ruleId = 'fetch-response-header-getter-ts';
+const HEADER_BUILTIN_FUNCTIONS = Object.keys(Headers.prototype);
 
 const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
 
@@ -34,37 +35,38 @@ const rule = createRule({
     const sourceCode = context.sourceCode;
 
     return {
-      'MemberExpression[object.property.name="headers"]': (responseHeadersAccess: TSESTree.MemberExpression) => {
+      MemberExpression: (responseHeadersAccess: TSESTree.MemberExpression) => {
         try {
           if (
             responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier &&
-            responseHeadersAccess.property.name === 'get'
+            HEADER_BUILTIN_FUNCTIONS.includes(responseHeadersAccess.property.name)
           ) {
-            // getter is already being used
+            // skip Headers's built-in function calls
             return;
           }
 
           const responseHeadersTsNode = parserServices.esTreeNodeToTSNodeMap.get(responseHeadersAccess.object);
-          const responseType = typeChecker.getTypeAtLocation(responseHeadersTsNode);
-
-          const shouldReplace = responseType.getProperties().some((symbol) => symbol.name === 'get');
-          if (!shouldReplace) {
+          let responseHeadersType = typeChecker.getTypeAtLocation(responseHeadersTsNode);
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          responseHeadersType = responseHeadersType.isUnion() ? responseHeadersType.types[0]! : responseHeadersType;
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          const responseHeadersTypeName = // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            (responseHeadersType.symbol ?? responseHeadersType.aliasSymbol)?.escapedName;
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+          if (responseHeadersTypeName !== 'Headers' && responseHeadersTypeName !== 'HeaderGetter') {
             return;
           }
 
-          // let replacementText = 'xxx';
-          // if (responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier) {
-          //   replacementText = `${sourceCode.getText(responseHeadersAccess.object)}.get(${sourceCode.getText(responseHeadersAccess.property)})`;
-          // }
           let replacementText: string;
-          if (responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier) {
-            replacementText = `${sourceCode.getText(responseHeadersAccess.object)}.get(${sourceCode.getText(responseHeadersAccess.property)})`;
-          } else if (responseHeadersAccess.property.type === AST_NODE_TYPES.TemplateLiteral) {
+          if (!responseHeadersAccess.computed) {
+            // e.g. headers.etag
+            replacementText = `${sourceCode.getText(responseHeadersAccess.object)}.get('${sourceCode.getText(responseHeadersAccess.property)}')`;
+          } else if (
+            responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier ||
+            responseHeadersAccess.property.type === AST_NODE_TYPES.Literal ||
+            responseHeadersAccess.property.type === AST_NODE_TYPES.TemplateLiteral
+          ) {
             replacementText = `${sourceCode.getText(responseHeadersAccess.object)}.get(${sourceCode.getText(responseHeadersAccess.property)})`;
-          } else if (responseHeadersAccess.property.type === AST_NODE_TYPES.Literal) {
-            replacementText = responseHeadersAccess.computed
-              ? `${sourceCode.getText(responseHeadersAccess.object)}.get(${sourceCode.getText(responseHeadersAccess.property)})`
-              : `${sourceCode.getText(responseHeadersAccess.object)}.get('${sourceCode.getText(responseHeadersAccess.property)}')`;
           } else {
             throw new Error(`Unexpected property type: ${responseHeadersAccess.property.type}`);
           }
@@ -89,14 +91,21 @@ const rule = createRule({
           });
         }
       },
-      'CallExpression[callee.property.name="get"]:not([callee.object.name="request"])': (
-        responseHeadersAccess: TSESTree.CallExpression,
-      ) => {
+
+      // convert response.get() to response.headers.get()
+      'CallExpression[callee.property.name="get"]': (responseHeadersAccess: TSESTree.CallExpression) => {
         try {
           if (responseHeadersAccess.callee.type !== AST_NODE_TYPES.MemberExpression) {
             return;
           }
 
+          // skip request-like calls
+          if (
+            responseHeadersAccess.callee.object.type !== AST_NODE_TYPES.Identifier ||
+            responseHeadersAccess.callee.object.name === 'request'
+          ) {
+            return;
+          }
           const responseNode = responseHeadersAccess.callee.object;
           const responseHeadersTsNode = parserServices.esTreeNodeToTSNodeMap.get(responseNode);
           const responseType = typeChecker.getTypeAtLocation(responseHeadersTsNode);
@@ -104,6 +113,8 @@ const rule = createRule({
           if (typeName === 'InboundContext' || typeName.endsWith('RequestType')) {
             return;
           }
+
+          // make sure the response type has "headers" property
           const hasHeadersProperty = responseType.getProperties().some((symbol) => symbol.name === 'headers');
           if (!hasHeadersProperty) {
             return;

package/src/{fixture → agent}/fetch-then.ts

@@ -8,12 +8,12 @@
 
 import type { CallExpression, Expression, MemberExpression, SimpleCallExpression } from 'estree';
 import { type Rule, type Scope, SourceCode } from 'eslint';
-import { getEnclosingFunction, getEnclosingStatement, getParent, isUsedInArrayOrAsArgument } from '../ast/tree';
+import { getEnclosingFunction, getEnclosingStatement, getParent, isUsedInArrayOrAsArgument } from '../library/tree';
 import { hasAssertions, isInvalidResponseHeadersAccess } from './fetch';
 import { strict as assert } from 'node:assert';
 import getDocumentationUrl from '../get-documentation-url';
-import { getIndentation } from '../ast/format';
-import { isValidPropertyName } from './variable';
+import { getIndentation } from '../library/format';
+import { isValidPropertyName } from '../library/variable';
 import { replaceEndpointUrlPrefixWithBasePath } from './url';
 
 export const ruleId = 'fetch-then';

package/src/{fixture → agent}/fetch.ts

@@ -1,6 +1,6 @@
 // fixture/fetch.ts
 
-import { getParent, isBlockStatement } from '../ast/tree';
+import { getParent, isBlockStatement } from '../library/tree';
 import type { Node } from 'estree';
 
 export function getResponseBodyRetrievalText(responseVariableName: string) {

package/src/{fixture → agent}/no-fixture.ts

@@ -23,13 +23,13 @@ import {
   getEnclosingStatement,
   getParent,
   isUsedInArrayOrAsArgument,
-} from '../ast/tree';
+} from '../library/tree';
 import { getResponseBodyRetrievalText, hasAssertions } from './fetch';
 import { analyzeResponseReferences } from './response-reference';
 import { strict as assert } from 'node:assert';
 import getDocumentationUrl from '../get-documentation-url';
-import { getIndentation } from '../ast/format';
-import { isValidPropertyName } from './variable';
+import { getIndentation } from '../library/format';
+import { isValidPropertyName } from '../library/variable';
 import { replaceEndpointUrlPrefixWithBasePath } from './url';
 
 export const ruleId = 'no-fixture';

package/src/{fixture → agent}/no-full-response.ts

@@ -9,7 +9,7 @@
 import { ESLintUtils, TSESTree } from '@typescript-eslint/utils';
 import { strict as assert } from 'node:assert';
 import getDocumentationUrl from '../get-documentation-url';
-import { getTypeParentNode } from './ts-tree';
+import { getTypeParentNode } from '../library/ts-tree';
 
 export const ruleId = 'no-full-response';
 

package/src/{fixture → agent}/no-service-wrapper.ts

@@ -11,8 +11,8 @@ import { DefinitionType, type Scope } from '@typescript-eslint/scope-manager';
 import { PLAIN_URL_REGEXP, TOKENIZED_URL_REGEXP, replaceEndpointUrlPrefixWithDomain } from './url';
 import { strict as assert } from 'node:assert';
 import getDocumentationUrl from '../get-documentation-url';
-import { getEnclosingScopeNode } from '../ast/ts-tree';
-import { getIndentation } from '../ast/format';
+import { getEnclosingScopeNode } from '../library/ts-tree';
+import { getIndentation } from '../library/format';
 
 export const ruleId = 'no-service-wrapper';
 

package/src/{fixture → agent}/response-reference.ts

@@ -9,7 +9,7 @@
 import type { MemberExpression, VariableDeclaration } from 'estree';
 import { type Scope } from 'eslint';
 import { strict as assert } from 'node:assert';
-import { getParent } from '../ast/tree';
+import { getParent } from '../library/tree';
 
 /**
  * analyze response related variables and their references

package/src/index.ts

@@ -6,19 +6,18 @@
  * This code is licensed under the MIT license (see LICENSE.txt for details).
  */
 
-import addUrlDomain, { ruleId as addUrlDomainRuleId } from './fixture/add-url-domain';
-import fetchHeaderGetter, { ruleId as fetchHeaderGetterRuleId } from './fixture/fetch-header-getter';
-import fetchResponseBodyJson, { ruleId as fetchResponseBodyJsonRuleId } from './fixture/fetch-response-body-json';
-import fetchResponseHeaderGetterTs, {
-  ruleId as fetchResponseHeaderGetterTsRuleId,
-} from './fixture/fetch-response-header-getter-ts';
-import fetchThen, { ruleId as fetchThenRuleId } from './fixture/fetch-then';
+import addUrlDomain, { ruleId as addUrlDomainRuleId } from './agent/add-url-domain';
+import fetchResponseBodyJson, { ruleId as fetchResponseBodyJsonRuleId } from './agent/fetch-response-body-json';
+import fetchResponseHeaderGetter, {
+  ruleId as fetchResponseHeaderGetterRuleId,
+} from './agent/fetch-response-header-getter';
+import fetchThen, { ruleId as fetchThenRuleId } from './agent/fetch-then';
 import invalidJsonStringify, { ruleId as invalidJsonStringifyRuleId } from './invalid-json-stringify';
-import noFixture, { ruleId as noFixtureRuleId } from './fixture/no-fixture';
-import noFullResponse, { ruleId as noFullResponseRuleId } from './fixture/no-full-response';
+import noFixture, { ruleId as noFixtureRuleId } from './agent/no-fixture';
+import noFullResponse, { ruleId as noFullResponseRuleId } from './agent/no-full-response';
 import noPromiseInstanceMethod, { ruleId as noPromiseInstanceMethodRuleId } from './no-promise-instance-method';
-import noServiceWrapper, { ruleId as noServiceWrapperRuleId } from './fixture/no-service-wrapper';
-import noStatusCode, { ruleId as noStatusCodeRuleId } from './fixture/no-status-code';
+import noServiceWrapper, { ruleId as noServiceWrapperRuleId } from './agent/no-service-wrapper';
+import noStatusCode, { ruleId as noStatusCodeRuleId } from './agent/no-status-code';
 import filePathComment from './file-path-comment';
 import noCardNumbers from './no-card-numbers';
 import noTestImport from './no-test-import';
@@ -43,12 +42,11 @@ export default {
     [invalidJsonStringifyRuleId]: invalidJsonStringify,
     [noPromiseInstanceMethodRuleId]: noPromiseInstanceMethod,
     [noFixtureRuleId]: noFixture,
-    [fetchHeaderGetterRuleId]: fetchHeaderGetter,
     [fetchThenRuleId]: fetchThen,
     [noServiceWrapperRuleId]: noServiceWrapper,
     [noStatusCodeRuleId]: noStatusCode,
     [fetchResponseBodyJsonRuleId]: fetchResponseBodyJson,
-    [fetchResponseHeaderGetterTsRuleId]: fetchResponseHeaderGetterTs,
+    [fetchResponseHeaderGetterRuleId]: fetchResponseHeaderGetter,
     [addUrlDomainRuleId]: addUrlDomain,
     [noFullResponseRuleId]: noFullResponse,
   },
@@ -86,12 +84,11 @@ export default {
     agent: {
       rules: {
         [`@checkdigit/${noFixtureRuleId}`]: 'error',
-        [`@checkdigit/${fetchHeaderGetterRuleId}`]: 'error',
         [`@checkdigit/${fetchThenRuleId}`]: 'error',
         [`@checkdigit/${noServiceWrapperRuleId}`]: 'error',
         [`@checkdigit/${noStatusCodeRuleId}`]: 'error',
         [`@checkdigit/${fetchResponseBodyJsonRuleId}`]: 'error',
-        [`@checkdigit/${fetchResponseHeaderGetterTsRuleId}`]: 'error',
+        [`@checkdigit/${fetchResponseHeaderGetterRuleId}`]: 'error',
         [`@checkdigit/${addUrlDomainRuleId}`]: 'error',
         [`@checkdigit/${noFullResponseRuleId}`]: 'error',
       },

package/src/{ast → library}/ts-tree.ts

@@ -88,3 +88,14 @@ export function getEnclosingFunction(node: TSESTree.Node) {
   }
   return getEnclosingFunction(parent);
 }
+
+export function getTypeParentNode(
+  node: TSESTree.Node | undefined,
+): TSESTree.TSTypeAnnotation | TSESTree.TSAsExpression | undefined {
+  if (!node) {
+    return undefined;
+  }
+  return node.type === AST_NODE_TYPES.TSTypeAnnotation || node.type === AST_NODE_TYPES.TSAsExpression
+    ? node
+    : getTypeParentNode(node.parent);
+}

package/dist-mjs/ast/format.mjs

@@ -1,14 +0,0 @@
-// src/ast/format.ts
-import "@typescript-eslint/utils";
-import { strict as assert } from "node:assert";
-function getIndentation(node, sourceCode) {
-  assert.ok(node.loc);
-  const line = sourceCode.lines[node.loc.start.line - 1];
-  assert.ok(line !== void 0);
-  const indentMatch = line.match(/^\s*/u);
-  return indentMatch ? indentMatch[0] : "";
-}
-export {
-  getIndentation
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FzdC9mb3JtYXQudHMiXSwKICAibWFwcGluZ3MiOiAiO0FBUUEsT0FBbUM7QUFHbkMsU0FBUyxVQUFVLGNBQWM7QUFFMUIsU0FBUyxlQUFlLE1BQTRCLFlBQThDO0FBQ3ZHLFNBQU8sR0FBRyxLQUFLLEdBQUc7QUFDbEIsUUFBTSxPQUFPLFdBQVcsTUFBTSxLQUFLLElBQUksTUFBTSxPQUFPLENBQUM7QUFDckQsU0FBTyxHQUFHLFNBQVMsTUFBUztBQUM1QixRQUFNLGNBQWMsS0FBSyxNQUFNLE9BQU87QUFDdEMsU0FBTyxjQUFjLFlBQVksQ0FBQyxJQUFJO0FBQ3hDOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist-mjs/ast/ts-tree.mjs

@@ -1,65 +0,0 @@
-// src/ast/ts-tree.ts
-import { AST_NODE_TYPES } from "@typescript-eslint/utils";
-function getParent(node) {
-  return node.parent;
-}
-function getAncestor(node, matcher, exitMatcher) {
-  const parent = getParent(node);
-  if (!parent) {
-    return void 0;
-  } else if (typeof matcher === "string" && parent.type === matcher) {
-    return parent;
-  } else if (typeof matcher === "function" && matcher(parent)) {
-    return parent;
-  } else if (typeof exitMatcher === "string" && parent.type === exitMatcher) {
-    return void 0;
-  } else if (typeof exitMatcher === "function" && exitMatcher(parent)) {
-    return void 0;
-  }
-  return getAncestor(parent, matcher, exitMatcher);
-}
-function isBlockStatement(node) {
-  return node.type.endsWith("Statement") || node.type.endsWith("Declaration");
-}
-function getEnclosingStatement(node) {
-  return getAncestor(node, isBlockStatement);
-}
-function getEnclosingScopeNode(node) {
-  return getAncestor(
-    node,
-    (parentNode) => ["FunctionExpression", "FunctionDeclaration", "ArrowFunctionExpression", "Program"].includes(parentNode.type)
-  );
-}
-function isUsedInArrayOrAsArgument(node) {
-  if (isBlockStatement(node)) {
-    return false;
-  }
-  const parent = getParent(node);
-  if (!parent) {
-    return false;
-  }
-  if (parent.type === AST_NODE_TYPES.ArrayExpression || parent.type === AST_NODE_TYPES.CallExpression && parent.arguments.includes(node)) {
-    return true;
-  }
-  return isUsedInArrayOrAsArgument(parent);
-}
-function getEnclosingFunction(node) {
-  if (node.type === AST_NODE_TYPES.FunctionDeclaration || node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.ArrowFunctionExpression) {
-    return node;
-  }
-  const parent = getParent(node);
-  if (!parent) {
-    return;
-  }
-  return getEnclosingFunction(parent);
-}
-export {
-  getAncestor,
-  getEnclosingFunction,
-  getEnclosingScopeNode,
-  getEnclosingStatement,
-  getParent,
-  isBlockStatement,
-  isUsedInArrayOrAsArgument
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FzdC90cy10cmVlLnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsc0JBQWdDO0FBUWxDLFNBQVMsVUFBVSxNQUF1RDtBQUMvRSxTQUFRLEtBQXdDO0FBQ2xEO0FBRU8sU0FBUyxZQUNkLE1BQ0EsU0FDQSxhQUMyQjtBQUMzQixRQUFNLFNBQVMsVUFBVSxJQUFJO0FBQzdCLE1BQUksQ0FBQyxRQUFRO0FBQ1gsV0FBTztBQUFBLEVBQ1QsV0FBVyxPQUFPLFlBQVksWUFBWSxPQUFPLFNBQVMsU0FBUztBQUNqRSxXQUFPO0FBQUEsRUFDVCxXQUFXLE9BQU8sWUFBWSxjQUFjLFFBQVEsTUFBTSxHQUFHO0FBQzNELFdBQU87QUFBQSxFQUNULFdBQVcsT0FBTyxnQkFBZ0IsWUFBWSxPQUFPLFNBQVMsYUFBYTtBQUN6RSxXQUFPO0FBQUEsRUFDVCxXQUFXLE9BQU8sZ0JBQWdCLGNBQWMsWUFBWSxNQUFNLEdBQUc7QUFDbkUsV0FBTztBQUFBLEVBQ1Q7QUFDQSxTQUFPLFlBQVksUUFBUSxTQUFTLFdBQVc7QUFDakQ7QUFFTyxTQUFTLGlCQUFpQixNQUFxQjtBQUNwRCxTQUFPLEtBQUssS0FBSyxTQUFTLFdBQVcsS0FBSyxLQUFLLEtBQUssU0FBUyxhQUFhO0FBQzVFO0FBRU8sU0FBUyxzQkFBc0IsTUFBcUI7QUFDekQsU0FBTyxZQUFZLE1BQU0sZ0JBQWdCO0FBQzNDO0FBRU8sU0FBUyxzQkFBc0IsTUFBcUI7QUFDekQsU0FBTztBQUFBLElBQVk7QUFBQSxJQUFNLENBQUMsZUFDeEIsQ0FBQyxzQkFBc0IsdUJBQXVCLDJCQUEyQixTQUFTLEVBQUUsU0FBUyxXQUFXLElBQUk7QUFBQSxFQUM5RztBQUNGO0FBRU8sU0FBUywwQkFBMEIsTUFBcUI7QUFDN0QsTUFBSSxpQkFBaUIsSUFBSSxHQUFHO0FBQzFCLFdBQU87QUFBQSxFQUNUO0FBRUEsUUFBTSxTQUFTLFVBQVUsSUFBSTtBQUM3QixNQUFJLENBQUMsUUFBUTtBQUNYLFdBQU87QUFBQSxFQUNUO0FBRUEsTUFDRSxPQUFPLFNBQVMsZUFBZSxtQkFDOUIsT0FBTyxTQUFTLGVBQWUsa0JBQWtCLE9BQU8sVUFBVSxTQUFTLElBQTJCLEdBQ3ZHO0FBQ0EsV0FBTztBQUFBLEVBQ1Q7QUFHQSxTQUFPLDBCQUEwQixNQUFNO0FBQ3pDO0FBRU8sU0FBUyxxQkFBcUIsTUFBcUI7QUFDeEQsTUFDRSxLQUFLLFNBQVMsZUFBZSx1QkFDN0IsS0FBSyxTQUFTLGVBQWUsc0JBQzdCLEtBQUssU0FBUyxlQUFlLHlCQUM3QjtBQUNBLFdBQU87QUFBQSxFQUNUO0FBRUEsUUFBTSxTQUFTLFVBQVUsSUFBSTtBQUM3QixNQUFJLENBQUMsUUFBUTtBQUNYO0FBQUEsRUFDRjtBQUNBLFNBQU8scUJBQXFCLE1BQU07QUFDcEM7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist-mjs/fixture/fetch-header-getter.mjs

@@ -1,71 +0,0 @@
-// src/fixture/fetch-header-getter.ts
-import { analyzeResponseReferences } from "./response-reference.mjs";
-import { strict as assert } from "node:assert";
-import getDocumentationUrl from "../get-documentation-url.mjs";
-import { getParent } from "../ast/tree.mjs";
-import { isInvalidResponseHeadersAccess } from "./fetch.mjs";
-var ruleId = "fetch-header-getter";
-var rule = {
-  meta: {
-    type: "problem",
-    docs: {
-      description: "Make sure getter is used to access response headers.",
-      url: getDocumentationUrl(ruleId)
-    },
-    messages: {
-      shouldUseHeaderGetter: "Getter should be used to access response headers."
-    },
-    fixable: "code",
-    schema: []
-  },
-  create(context) {
-    const sourceCode = context.sourceCode;
-    const scopeManager = sourceCode.scopeManager;
-    return {
-      'VariableDeclarator[init.argument.callee.name="fetch"]': (fetchCall) => {
-        const variableDeclaration = getParent(fetchCall);
-        assert.ok(variableDeclaration?.type === "VariableDeclaration");
-        const { variable: responseVariable, headersReferences: responseHeadersReferences } = analyzeResponseReferences(
-          variableDeclaration,
-          scopeManager
-        );
-        assert.ok(responseVariable);
-        const directHeadersReferences = responseHeadersReferences.filter((headersReference) => {
-          const headersAccess = getParent(headersReference);
-          return headersAccess?.type !== "VariableDeclarator";
-        });
-        const indirectHeadersReferences = responseHeadersReferences.map(getParent).filter((parent) => parent?.type === "VariableDeclarator").map((declarator) => declarator.id.name).map((redefinedHeadersVariableName) => {
-          const headersVariable = responseVariable.scope.variables.find((variable) => {
-            const identifier = variable.identifiers[0];
-            return identifier?.type === "Identifier" && identifier.name === redefinedHeadersVariableName;
-          });
-          return headersVariable?.references.map((reference) => reference.identifier) ?? [];
-        }).flat();
-        const invalidHeadersReferences = [...directHeadersReferences, ...indirectHeadersReferences].filter(
-          isInvalidResponseHeadersAccess
-        );
-        invalidHeadersReferences.forEach((headersReference) => {
-          const headerAccess = getParent(headersReference);
-          if (headerAccess?.type === "MemberExpression") {
-            const headerNameNode = headerAccess.property;
-            const headerName = headerAccess.computed ? sourceCode.getText(headerNameNode) : `'${sourceCode.getText(headerNameNode)}'`;
-            const replacementText = `${sourceCode.getText(headerAccess.object)}.get(${headerName})`;
-            context.report({
-              node: headerAccess,
-              messageId: "shouldUseHeaderGetter",
-              fix(fixer) {
-                return fixer.replaceText(headerAccess, replacementText);
-              }
-            });
-          }
-        });
-      }
-    };
-  }
-};
-var fetch_header_getter_default = rule;
-export {
-  fetch_header_getter_default as default,
-  ruleId
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2ZpeHR1cmUvZmV0Y2gtaGVhZGVyLWdldHRlci50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFVQSxTQUFTLGlDQUFpQztBQUMxQyxTQUFTLFVBQVUsY0FBYztBQUNqQyxPQUFPLHlCQUF5QjtBQUNoQyxTQUFTLGlCQUFpQjtBQUMxQixTQUFTLHNDQUFzQztBQUV4QyxJQUFNLFNBQVM7QUFFdEIsSUFBTSxPQUF3QjtBQUFBLEVBQzVCLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxNQUNiLEtBQUssb0JBQW9CLE1BQU07QUFBQSxJQUNqQztBQUFBLElBQ0EsVUFBVTtBQUFBLE1BQ1IsdUJBQXVCO0FBQUEsSUFDekI7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLE9BQU8sU0FBUztBQUNkLFVBQU0sYUFBYSxRQUFRO0FBQzNCLFVBQU0sZUFBZSxXQUFXO0FBRWhDLFdBQU87QUFBQSxNQUNMLHlEQUF5RCxDQUFDLGNBQWtDO0FBQzFGLGNBQU0sc0JBQXNCLFVBQVUsU0FBUztBQUMvQyxlQUFPLEdBQUcscUJBQXFCLFNBQVMscUJBQXFCO0FBQzdELGNBQU0sRUFBRSxVQUFVLGtCQUFrQixtQkFBbUIsMEJBQTBCLElBQUk7QUFBQSxVQUNuRjtBQUFBLFVBQ0E7QUFBQSxRQUNGO0FBQ0EsZUFBTyxHQUFHLGdCQUFnQjtBQUUxQixjQUFNLDBCQUEwQiwwQkFBMEIsT0FBTyxDQUFDLHFCQUFxQjtBQUNyRixnQkFBTSxnQkFBZ0IsVUFBVSxnQkFBZ0I7QUFDaEQsaUJBQU8sZUFBZSxTQUFTO0FBQUEsUUFDakMsQ0FBQztBQUVELGNBQU0sNEJBQTRCLDBCQUMvQixJQUFJLFNBQVMsRUFDYixPQUFPLENBQUMsV0FBeUMsUUFBUSxTQUFTLG9CQUFvQixFQUN0RixJQUFJLENBQUMsZUFBZ0IsV0FBVyxHQUFrQixJQUFJLEVBQ3RELElBQUksQ0FBQyxpQ0FBaUM7QUFDckMsZ0JBQU0sa0JBQWtCLGlCQUFpQixNQUFNLFVBQVUsS0FBSyxDQUFDLGFBQWE7QUFDMUUsa0JBQU0sYUFBYSxTQUFTLFlBQVksQ0FBQztBQUN6QyxtQkFBTyxZQUFZLFNBQVMsZ0JBQWdCLFdBQVcsU0FBUztBQUFBLFVBQ2xFLENBQUM7QUFDRCxpQkFBTyxpQkFBaUIsV0FBVyxJQUFJLENBQUMsY0FBYyxVQUFVLFVBQVUsS0FBSyxDQUFDO0FBQUEsUUFDbEYsQ0FBQyxFQUNBLEtBQUs7QUFFUixjQUFNLDJCQUEyQixDQUFDLEdBQUcseUJBQXlCLEdBQUcseUJBQXlCLEVBQUU7QUFBQSxVQUMxRjtBQUFBLFFBQ0Y7QUFFQSxpQ0FBeUIsUUFBUSxDQUFDLHFCQUFxQjtBQUNyRCxnQkFBTSxlQUFlLFVBQVUsZ0JBQWdCO0FBQy9DLGNBQUksY0FBYyxTQUFTLG9CQUFvQjtBQUM3QyxrQkFBTSxpQkFBaUIsYUFBYTtBQUNwQyxrQkFBTSxhQUFhLGFBQWEsV0FDNUIsV0FBVyxRQUFRLGNBQWMsSUFDakMsSUFBSSxXQUFXLFFBQVEsY0FBYyxDQUFDO0FBQzFDLGtCQUFNLGtCQUFrQixHQUFHLFdBQVcsUUFBUSxhQUFhLE1BQU0sQ0FBQyxRQUFRLFVBQVU7QUFFcEYsb0JBQVEsT0FBTztBQUFBLGNBQ2IsTUFBTTtBQUFBLGNBQ04sV0FBVztBQUFBLGNBQ1gsSUFBSSxPQUFPO0FBQ1QsdUJBQU8sTUFBTSxZQUFZLGNBQWMsZUFBZTtBQUFBLGNBQ3hEO0FBQUEsWUFDRixDQUFDO0FBQUEsVUFDSDtBQUFBLFFBQ0YsQ0FBQztBQUFBLE1BQ0g7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGO0FBRUEsSUFBTyw4QkFBUTsiLAogICJuYW1lcyI6IFtdCn0K