@checkdigit/eslint-plugin 6.8.0-PR.83-33f3 → 6.9.0-PR.86-3a12

package/dist-cjs/metafile.json

@@ -12193,6 +12193,27 @@
       ],
       "format": "cjs"
     },
+    "src/no-duplicated-imports.ts": {
+      "bytes": 4278,
+      "imports": [
+        {
+          "path": "node_modules/@typescript-eslint/utils/dist/index.js",
+          "kind": "import-statement",
+          "original": "@typescript-eslint/utils"
+        },
+        {
+          "path": "node:assert",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "src/get-documentation-url.ts",
+          "kind": "import-statement",
+          "original": "./get-documentation-url"
+        }
+      ],
+      "format": "esm"
+    },
     "src/library/ts-tree.ts": {
       "bytes": 2883,
       "imports": [
@@ -12241,6 +12262,22 @@
       ],
       "format": "esm"
     },
+    "src/require-fixed-services-import.ts": {
+      "bytes": 1467,
+      "imports": [
+        {
+          "path": "node_modules/@typescript-eslint/utils/dist/index.js",
+          "kind": "import-statement",
+          "original": "@typescript-eslint/utils"
+        },
+        {
+          "path": "src/get-documentation-url.ts",
+          "kind": "import-statement",
+          "original": "./get-documentation-url"
+        }
+      ],
+      "format": "esm"
+    },
     "src/require-resolve-full-response.ts": {
       "bytes": 7652,
       "imports": [
@@ -12334,13 +12371,18 @@
       "format": "esm"
     },
     "src/index.ts": {
-      "bytes": 3510,
+      "bytes": 3990,
       "imports": [
         {
           "path": "src/invalid-json-stringify.ts",
           "kind": "import-statement",
           "original": "./invalid-json-stringify"
         },
+        {
+          "path": "src/no-duplicated-imports.ts",
+          "kind": "import-statement",
+          "original": "./no-duplicated-imports"
+        },
         {
           "path": "src/agent/no-full-response.ts",
           "kind": "import-statement",
@@ -12351,6 +12393,11 @@
           "kind": "import-statement",
           "original": "./no-promise-instance-method"
         },
+        {
+          "path": "src/require-fixed-services-import.ts",
+          "kind": "import-statement",
+          "original": "./require-fixed-services-import"
+        },
         {
           "path": "src/require-resolve-full-response.ts",
           "kind": "import-statement",
@@ -12918,6 +12965,11 @@
           "kind": "require-call",
           "external": true
         },
+        {
+          "path": "node:assert",
+          "kind": "require-call",
+          "external": true
+        },
         {
           "path": "node:assert",
           "kind": "require-call",
@@ -15175,7 +15227,7 @@
           "bytesInOutput": 2215
         },
         "src/index.ts": {
-          "bytesInOutput": 2304
+          "bytesInOutput": 2494
         },
         "package.json": {
           "bytesInOutput": 2998
@@ -15186,15 +15238,21 @@
         "src/invalid-json-stringify.ts": {
           "bytesInOutput": 2471
         },
+        "src/no-duplicated-imports.ts": {
+          "bytesInOutput": 3724
+        },
         "src/library/ts-tree.ts": {
-          "bytesInOutput": 2070
+          "bytesInOutput": 2078
         },
         "src/agent/no-full-response.ts": {
-          "bytesInOutput": 2000
+          "bytesInOutput": 2006
         },
         "src/no-promise-instance-method.ts": {
           "bytesInOutput": 1275
         },
+        "src/require-fixed-services-import.ts": {
+          "bytesInOutput": 1254
+        },
         "src/require-resolve-full-response.ts": {
           "bytesInOutput": 7354
         },
@@ -15229,7 +15287,7 @@
           "bytesInOutput": 3362
         }
       },
-      "bytes": 4232449
+      "bytes": 4241869
     }
   }
 }

package/dist-mjs/index.mjs

@@ -1,7 +1,11 @@
 // src/index.ts
 import invalidJsonStringify, { ruleId as invalidJsonStringifyRuleId } from "./invalid-json-stringify.mjs";
+import noDuplicatedImports, { ruleId as noDuplicatedImportsRuleId } from "./no-duplicated-imports.mjs";
 import noFullResponse, { ruleId as noFullResponseRuleId } from "./agent/no-full-response.mjs";
 import noPromiseInstanceMethod, { ruleId as noPromiseInstanceMethodRuleId } from "./no-promise-instance-method.mjs";
+import requireFixedServicesImport, {
+  ruleId as requireFixedServicesImportRuleId
+} from "./require-fixed-services-import.mjs";
 import requireResolveFullResponse, {
   ruleId as requireResolveFullResponseRuleId
 } from "./require-resolve-full-response.mjs";
@@ -32,6 +36,8 @@ var src_default = {
     [noPromiseInstanceMethodRuleId]: noPromiseInstanceMethod,
     [noFullResponseRuleId]: noFullResponse,
     [requireResolveFullResponseRuleId]: requireResolveFullResponse,
+    [noDuplicatedImportsRuleId]: noDuplicatedImports,
+    [requireFixedServicesImportRuleId]: requireFixedServicesImport,
     [requireTypeOutOfTypeOnlyImportsRuleId]: requireTypeOutOfTypeOnlyImports
   },
   configs: {
@@ -50,6 +56,8 @@ var src_default = {
         [`@checkdigit/${noPromiseInstanceMethodRuleId}`]: "error",
         [`@checkdigit/${noFullResponseRuleId}`]: "error",
         [`@checkdigit/${requireResolveFullResponseRuleId}`]: "error",
+        [`@checkdigit/${noDuplicatedImportsRuleId}`]: "error",
+        [`@checkdigit/${requireFixedServicesImportRuleId}`]: "error",
         [`@checkdigit/${requireTypeOutOfTypeOnlyImportsRuleId}`]: "error"
       }
     },
@@ -73,4 +81,4 @@ var src_default = {
 export {
   src_default as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLE9BQU8sd0JBQXdCLFVBQVUsa0NBQWtDO0FBQzNFLE9BQU8sa0JBQWtCLFVBQVUsNEJBQTRCO0FBQy9ELE9BQU8sMkJBQTJCLFVBQVUscUNBQXFDO0FBQ2pGLE9BQU87QUFBQSxFQUNMLFVBQVU7QUFBQSxPQUNMO0FBQ1AsT0FBTztBQUFBLEVBQ0wsVUFBVTtBQUFBLE9BQ0w7QUFDUCxPQUFPLHFCQUFxQjtBQUM1QixPQUFPLG1CQUFtQjtBQUMxQixPQUFPLGtCQUFrQjtBQUN6QixPQUFPLFlBQVk7QUFDbkIsT0FBTyxzQkFBc0I7QUFDN0IsT0FBTywyQkFBMkI7QUFDbEMsT0FBTyxrQkFBa0I7QUFDekIsT0FBTyx5Q0FBeUM7QUFDaEQsT0FBTyx5QkFBeUI7QUFFaEMsSUFBTyxjQUFRO0FBQUEsRUFDYixPQUFPO0FBQUEsSUFDTCxxQkFBcUI7QUFBQSxJQUNyQixtQkFBbUI7QUFBQSxJQUNuQixXQUFXO0FBQUEsSUFDWCx5QkFBeUI7QUFBQSxJQUN6QixrQkFBa0I7QUFBQSxJQUNsQixzQkFBc0I7QUFBQSxJQUN0Qiw4QkFBOEI7QUFBQSxJQUM5QiwyQ0FBMkM7QUFBQSxJQUMzQywyQkFBMkI7QUFBQSxJQUMzQixDQUFDLDBCQUEwQixHQUFHO0FBQUEsSUFDOUIsQ0FBQyw2QkFBNkIsR0FBRztBQUFBLElBQ2pDLENBQUMsb0JBQW9CLEdBQUc7QUFBQSxJQUN4QixDQUFDLGdDQUFnQyxHQUFHO0FBQUEsSUFDcEMsQ0FBQyxxQ0FBcUMsR0FBRztBQUFBLEVBQzNDO0FBQUEsRUFDQSxTQUFTO0FBQUEsSUFDUCxLQUFLO0FBQUEsTUFDSCxPQUFPO0FBQUEsUUFDTCwrQkFBK0I7QUFBQSxRQUMvQixpQ0FBaUM7QUFBQSxRQUNqQyx1QkFBdUI7QUFBQSxRQUN2QixxQ0FBcUM7QUFBQSxRQUNyQyxrQ0FBa0M7QUFBQSxRQUNsQywwQ0FBMEM7QUFBQSxRQUMxQyx1REFBdUQ7QUFBQSxRQUN2RCx1Q0FBdUM7QUFBQSxRQUN2Qyw4QkFBOEI7QUFBQSxRQUM5QixDQUFDLGVBQWUsMEJBQTBCLEVBQUUsR0FBRztBQUFBLFFBQy9DLENBQUMsZUFBZSw2QkFBNkIsRUFBRSxHQUFHO0FBQUEsUUFDbEQsQ0FBQyxlQUFlLG9CQUFvQixFQUFFLEdBQUc7QUFBQSxRQUN6QyxDQUFDLGVBQWUsZ0NBQWdDLEVBQUUsR0FBRztBQUFBLFFBQ3JELENBQUMsZUFBZSxxQ0FBcUMsRUFBRSxHQUFHO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxhQUFhO0FBQUEsTUFDWCxPQUFPO0FBQUEsUUFDTCwrQkFBK0I7QUFBQSxRQUMvQixpQ0FBaUM7QUFBQSxRQUNqQyx1QkFBdUI7QUFBQSxRQUN2QixxQ0FBcUM7QUFBQSxRQUNyQyxrQ0FBa0M7QUFBQSxRQUNsQywwQ0FBMEM7QUFBQSxRQUMxQyx1REFBdUQ7QUFBQSxRQUN2RCx1Q0FBdUM7QUFBQSxRQUN2Qyw4QkFBOEI7QUFBQSxRQUM5QixDQUFDLGVBQWUsMEJBQTBCLEVBQUUsR0FBRztBQUFBLFFBQy9DLENBQUMsZUFBZSw2QkFBNkIsRUFBRSxHQUFHO0FBQUEsTUFDcEQ7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLE9BQU8sd0JBQXdCLFVBQVUsa0NBQWtDO0FBQzNFLE9BQU8sdUJBQXVCLFVBQVUsaUNBQWlDO0FBQ3pFLE9BQU8sa0JBQWtCLFVBQVUsNEJBQTRCO0FBQy9ELE9BQU8sMkJBQTJCLFVBQVUscUNBQXFDO0FBQ2pGLE9BQU87QUFBQSxFQUNMLFVBQVU7QUFBQSxPQUNMO0FBQ1AsT0FBTztBQUFBLEVBQ0wsVUFBVTtBQUFBLE9BQ0w7QUFDUCxPQUFPO0FBQUEsRUFDTCxVQUFVO0FBQUEsT0FDTDtBQUNQLE9BQU8scUJBQXFCO0FBQzVCLE9BQU8sbUJBQW1CO0FBQzFCLE9BQU8sa0JBQWtCO0FBQ3pCLE9BQU8sWUFBWTtBQUNuQixPQUFPLHNCQUFzQjtBQUM3QixPQUFPLDJCQUEyQjtBQUNsQyxPQUFPLGtCQUFrQjtBQUN6QixPQUFPLHlDQUF5QztBQUNoRCxPQUFPLHlCQUF5QjtBQUVoQyxJQUFPLGNBQVE7QUFBQSxFQUNiLE9BQU87QUFBQSxJQUNMLHFCQUFxQjtBQUFBLElBQ3JCLG1CQUFtQjtBQUFBLElBQ25CLFdBQVc7QUFBQSxJQUNYLHlCQUF5QjtBQUFBLElBQ3pCLGtCQUFrQjtBQUFBLElBQ2xCLHNCQUFzQjtBQUFBLElBQ3RCLDhCQUE4QjtBQUFBLElBQzlCLDJDQUEyQztBQUFBLElBQzNDLDJCQUEyQjtBQUFBLElBQzNCLENBQUMsMEJBQTBCLEdBQUc7QUFBQSxJQUM5QixDQUFDLDZCQUE2QixHQUFHO0FBQUEsSUFDakMsQ0FBQyxvQkFBb0IsR0FBRztBQUFBLElBQ3hCLENBQUMsZ0NBQWdDLEdBQUc7QUFBQSxJQUNwQyxDQUFDLHlCQUF5QixHQUFHO0FBQUEsSUFDN0IsQ0FBQyxnQ0FBZ0MsR0FBRztBQUFBLElBQ3BDLENBQUMscUNBQXFDLEdBQUc7QUFBQSxFQUMzQztBQUFBLEVBQ0EsU0FBUztBQUFBLElBQ1AsS0FBSztBQUFBLE1BQ0gsT0FBTztBQUFBLFFBQ0wsK0JBQStCO0FBQUEsUUFDL0IsaUNBQWlDO0FBQUEsUUFDakMsdUJBQXVCO0FBQUEsUUFDdkIscUNBQXFDO0FBQUEsUUFDckMsa0NBQWtDO0FBQUEsUUFDbEMsMENBQTBDO0FBQUEsUUFDMUMsdURBQXVEO0FBQUEsUUFDdkQsdUNBQXVDO0FBQUEsUUFDdkMsOEJBQThCO0FBQUEsUUFDOUIsQ0FBQyxlQUFlLDBCQUEwQixFQUFFLEdBQUc7QUFBQSxRQUMvQyxDQUFDLGVBQWUsNkJBQTZCLEVBQUUsR0FBRztBQUFBLFFBQ2xELENBQUMsZUFBZSxvQkFBb0IsRUFBRSxHQUFHO0FBQUEsUUFDekMsQ0FBQyxlQUFlLGdDQUFnQyxFQUFFLEdBQUc7QUFBQSxRQUNyRCxDQUFDLGVBQWUseUJBQXlCLEVBQUUsR0FBRztBQUFBLFFBQzlDLENBQUMsZUFBZSxnQ0FBZ0MsRUFBRSxHQUFHO0FBQUEsUUFDckQsQ0FBQyxlQUFlLHFDQUFxQyxFQUFFLEdBQUc7QUFBQSxNQUM1RDtBQUFBLElBQ0Y7QUFBQSxJQUNBLGFBQWE7QUFBQSxNQUNYLE9BQU87QUFBQSxRQUNMLCtCQUErQjtBQUFBLFFBQy9CLGlDQUFpQztBQUFBLFFBQ2pDLHVCQUF1QjtBQUFBLFFBQ3ZCLHFDQUFxQztBQUFBLFFBQ3JDLGtDQUFrQztBQUFBLFFBQ2xDLDBDQUEwQztBQUFBLFFBQzFDLHVEQUF1RDtBQUFBLFFBQ3ZELHVDQUF1QztBQUFBLFFBQ3ZDLDhCQUE4QjtBQUFBLFFBQzlCLENBQUMsZUFBZSwwQkFBMEIsRUFBRSxHQUFHO0FBQUEsUUFDL0MsQ0FBQyxlQUFlLDZCQUE2QixFQUFFLEdBQUc7QUFBQSxNQUNwRDtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQ0Y7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist-mjs/no-duplicated-imports.mjs

@@ -0,0 +1,87 @@
+// src/no-duplicated-imports.ts
+import { ESLintUtils, TSESTree } from "@typescript-eslint/utils";
+import { strict as assert } from "node:assert";
+import getDocumentationUrl from "./get-documentation-url.mjs";
+var ruleId = "no-duplicated-imports";
+var createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
+var rule = createRule({
+  name: ruleId,
+  meta: {
+    type: "suggestion",
+    docs: {
+      description: 'Merge duplicated import statements with the same "from".'
+    },
+    messages: {
+      mergeDuplicatedImports: 'Merge duplicated import statements with the same "from".'
+    },
+    fixable: "code",
+    schema: []
+  },
+  defaultOptions: [],
+  create(context) {
+    const sourceCode = context.sourceCode;
+    const importDeclarations = /* @__PURE__ */ new Map();
+    return {
+      ImportDeclaration(node) {
+        const moduleName = node.source.value;
+        let declarations = importDeclarations.get(moduleName);
+        if (declarations === void 0) {
+          declarations = [];
+          importDeclarations.set(moduleName, declarations);
+        }
+        declarations.push(node);
+      },
+      "Program:exit"() {
+        for (const [moduleName, declarations] of importDeclarations.entries()) {
+          if (declarations.length <= 1) {
+            continue;
+          }
+          const firstDeclaration = declarations[0];
+          assert.ok(firstDeclaration);
+          const isAllTypeOnly = declarations.every(
+            (declaration) => declaration.importKind === "type" || declaration.specifiers.every(
+              (specifier) => specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === "type"
+            )
+          );
+          context.report({
+            messageId: "mergeDuplicatedImports",
+            node: firstDeclaration,
+            fix(fixer) {
+              const fixes = [];
+              const defaultSpecifier = declarations.flatMap(
+                (declaration) => declaration.specifiers.map(
+                  (specifier) => specifier.type === TSESTree.AST_NODE_TYPES.ImportDefaultSpecifier ? specifier : void 0
+                )
+              ).filter(Boolean);
+              const defaultSpecifierText = defaultSpecifier[0] ? sourceCode.getText(defaultSpecifier[0]) : void 0;
+              const mergedSpecifiers = declarations.flatMap((declaration) => {
+                const isCurrentDeclarationTypeOnly = declaration.importKind === "type" || declaration.specifiers.every(
+                  (specifier) => specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === "type"
+                );
+                return declaration.specifiers.filter((specifier) => specifier.type !== TSESTree.AST_NODE_TYPES.ImportDefaultSpecifier).map(
+                  (specifier) => (
+                    // eslint-disable-next-line no-nested-ternary
+                    isAllTypeOnly ? sourceCode.getText(specifier).replace("type ", "") : isCurrentDeclarationTypeOnly ? `type ${sourceCode.getText(specifier)}` : sourceCode.getText(specifier)
+                  )
+                );
+              });
+              const mergedSpecifiersText = `${isAllTypeOnly ? "type " : ""}{ ${mergedSpecifiers.join(", ")} }`;
+              const mergedImport = `import ${[defaultSpecifierText, mergedSpecifiersText].filter(Boolean).join(", ")} from '${moduleName}';`;
+              fixes.push(fixer.replaceText(firstDeclaration, mergedImport));
+              declarations.slice(1).forEach((declaration) => {
+                fixes.push(fixer.removeRange([declaration.range[0], declaration.range[1] + 1]));
+              });
+              return fixes;
+            }
+          });
+        }
+      }
+    };
+  }
+});
+var no_duplicated_imports_default = rule;
+export {
+  no_duplicated_imports_default as default,
+  ruleId
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL25vLWR1cGxpY2F0ZWQtaW1wb3J0cy50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLGFBQWEsZ0JBQWdCO0FBQ3RDLFNBQVMsVUFBVSxjQUFjO0FBQ2pDLE9BQU8seUJBQXlCO0FBRXpCLElBQU0sU0FBUztBQUV0QixJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBRTlFLElBQU0sT0FBTyxXQUFXO0FBQUEsRUFDdEIsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFBYTtBQUFBLElBQ2Y7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLHdCQUF3QjtBQUFBLElBQzFCO0FBQUEsSUFDQSxTQUFTO0FBQUEsSUFDVCxRQUFRLENBQUM7QUFBQSxFQUNYO0FBQUEsRUFDQSxnQkFBZ0IsQ0FBQztBQUFBLEVBQ2pCLE9BQU8sU0FBUztBQUNkLFVBQU0sYUFBYSxRQUFRO0FBQzNCLFVBQU0scUJBQXFCLG9CQUFJLElBQTBDO0FBRXpFLFdBQU87QUFBQSxNQUNMLGtCQUFrQixNQUFNO0FBQ3RCLGNBQU0sYUFBYSxLQUFLLE9BQU87QUFDL0IsWUFBSSxlQUFlLG1CQUFtQixJQUFJLFVBQVU7QUFDcEQsWUFBSSxpQkFBaUIsUUFBVztBQUM5Qix5QkFBZSxDQUFDO0FBQ2hCLDZCQUFtQixJQUFJLFlBQVksWUFBWTtBQUFBLFFBQ2pEO0FBQ0EscUJBQWEsS0FBSyxJQUFJO0FBQUEsTUFDeEI7QUFBQSxNQUNBLGlCQUFpQjtBQUNmLG1CQUFXLENBQUMsWUFBWSxZQUFZLEtBQUssbUJBQW1CLFFBQVEsR0FBRztBQUNyRSxjQUFJLGFBQWEsVUFBVSxHQUFHO0FBQzVCO0FBQUEsVUFDRjtBQUVBLGdCQUFNLG1CQUFtQixhQUFhLENBQUM7QUFDdkMsaUJBQU8sR0FBRyxnQkFBZ0I7QUFFMUIsZ0JBQU0sZ0JBQWdCLGFBQWE7QUFBQSxZQUNqQyxDQUFDLGdCQUNDLFlBQVksZUFBZSxVQUMzQixZQUFZLFdBQVc7QUFBQSxjQUNyQixDQUFDLGNBQ0MsVUFBVSxTQUFTLFNBQVMsZUFBZSxtQkFBbUIsVUFBVSxlQUFlO0FBQUEsWUFDM0Y7QUFBQSxVQUNKO0FBRUEsa0JBQVEsT0FBTztBQUFBLFlBQ2IsV0FBVztBQUFBLFlBQ1gsTUFBTTtBQUFBLFlBQ04sSUFBSSxPQUFPO0FBQ1Qsb0JBQU0sUUFBUSxDQUFDO0FBRWYsb0JBQU0sbUJBQW1CLGFBQ3RCO0FBQUEsZ0JBQVEsQ0FBQyxnQkFDUixZQUFZLFdBQVc7QUFBQSxrQkFBSSxDQUFDLGNBQzFCLFVBQVUsU0FBUyxTQUFTLGVBQWUseUJBQXlCLFlBQVk7QUFBQSxnQkFDbEY7QUFBQSxjQUNGLEVBQ0MsT0FBTyxPQUFPO0FBQ2pCLG9CQUFNLHVCQUF1QixpQkFBaUIsQ0FBQyxJQUFJLFdBQVcsUUFBUSxpQkFBaUIsQ0FBQyxDQUFDLElBQUk7QUFFN0Ysb0JBQU0sbUJBQW1CLGFBQWEsUUFBUSxDQUFDLGdCQUFnQjtBQUM3RCxzQkFBTSwrQkFDSixZQUFZLGVBQWUsVUFDM0IsWUFBWSxXQUFXO0FBQUEsa0JBQ3JCLENBQUMsY0FDQyxVQUFVLFNBQVMsU0FBUyxlQUFlLG1CQUFtQixVQUFVLGVBQWU7QUFBQSxnQkFDM0Y7QUFDRix1QkFBTyxZQUFZLFdBQ2hCLE9BQU8sQ0FBQyxjQUFjLFVBQVUsU0FBUyxTQUFTLGVBQWUsc0JBQXNCLEVBQ3ZGO0FBQUEsa0JBQUksQ0FBQztBQUFBO0FBQUEsb0JBRUosZ0JBQ0ksV0FBVyxRQUFRLFNBQVMsRUFBRSxRQUFRLFNBQVMsRUFBRSxJQUNqRCwrQkFDRSxRQUFRLFdBQVcsUUFBUSxTQUFTLENBQUMsS0FDckMsV0FBVyxRQUFRLFNBQVM7QUFBQTtBQUFBLGdCQUNwQztBQUFBLGNBQ0osQ0FBQztBQUNELG9CQUFNLHVCQUF1QixHQUFHLGdCQUFnQixVQUFVLEVBQUUsS0FBSyxpQkFBaUIsS0FBSyxJQUFJLENBQUM7QUFHNUYsb0JBQU0sZUFBZSxVQUFVLENBQUMsc0JBQXNCLG9CQUFvQixFQUFFLE9BQU8sT0FBTyxFQUFFLEtBQUssSUFBSSxDQUFDLFVBQVUsVUFBVTtBQUMxSCxvQkFBTSxLQUFLLE1BQU0sWUFBWSxrQkFBa0IsWUFBWSxDQUFDO0FBRzVELDJCQUFhLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0I7QUFDN0Msc0JBQU0sS0FBSyxNQUFNLFlBQVksQ0FBQyxZQUFZLE1BQU0sQ0FBQyxHQUFHLFlBQVksTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7QUFBQSxjQUNoRixDQUFDO0FBRUQscUJBQU87QUFBQSxZQUNUO0FBQUEsVUFDRixDQUFDO0FBQUEsUUFDSDtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGLENBQUM7QUFFRCxJQUFPLGdDQUFROyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist-mjs/require-fixed-services-import.mjs

@@ -0,0 +1,46 @@
+// src/require-fixed-services-import.ts
+import { ESLintUtils } from "@typescript-eslint/utils";
+import getDocumentationUrl from "./get-documentation-url.mjs";
+var ruleId = "require-fixed-services-import";
+var createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
+var SERVICE_TYPINGS_IMPORT_PATH_PREFIX = /(?<path>\.\.\/)+services\/.*/u;
+var rule = createRule({
+  name: ruleId,
+  meta: {
+    type: "suggestion",
+    docs: {
+      description: 'Require fixed "from" with service typing imports from "src/services".'
+    },
+    messages: {
+      updateServicesImportFrom: 'Update service typing imports to be from the fixed "src/services" path.'
+    },
+    fixable: "code",
+    schema: []
+  },
+  defaultOptions: [],
+  create(context) {
+    return {
+      ImportDeclaration(node) {
+        const moduleName = node.source.value;
+        if (SERVICE_TYPINGS_IMPORT_PATH_PREFIX.test(moduleName)) {
+          context.report({
+            messageId: "updateServicesImportFrom",
+            node: node.source,
+            *fix(fixer) {
+              yield fixer.replaceText(
+                node.source,
+                `'${moduleName.slice(0, moduleName.indexOf("../services") + "../services".length)}'`
+              );
+            }
+          });
+        }
+      }
+    };
+  }
+});
+var require_fixed_services_import_default = rule;
+export {
+  require_fixed_services_import_default as default,
+  ruleId
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtZml4ZWQtc2VydmljZXMtaW1wb3J0LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsbUJBQW1CO0FBQzVCLE9BQU8seUJBQXlCO0FBRXpCLElBQU0sU0FBUztBQUV0QixJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBQzlFLElBQU0scUNBQXFDO0FBRTNDLElBQU0sT0FBTyxXQUFXO0FBQUEsRUFDdEIsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFBYTtBQUFBLElBQ2Y7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLDBCQUEwQjtBQUFBLElBQzVCO0FBQUEsSUFDQSxTQUFTO0FBQUEsSUFDVCxRQUFRLENBQUM7QUFBQSxFQUNYO0FBQUEsRUFDQSxnQkFBZ0IsQ0FBQztBQUFBLEVBQ2pCLE9BQU8sU0FBUztBQUNkLFdBQU87QUFBQSxNQUNMLGtCQUFrQixNQUFNO0FBQ3RCLGNBQU0sYUFBYSxLQUFLLE9BQU87QUFDL0IsWUFBSSxtQ0FBbUMsS0FBSyxVQUFVLEdBQUc7QUFDdkQsa0JBQVEsT0FBTztBQUFBLFlBQ2IsV0FBVztBQUFBLFlBQ1gsTUFBTSxLQUFLO0FBQUEsWUFDWCxDQUFDLElBQUksT0FBTztBQUNWLG9CQUFNLE1BQU07QUFBQSxnQkFDVixLQUFLO0FBQUEsZ0JBQ0wsSUFBSSxXQUFXLE1BQU0sR0FBRyxXQUFXLFFBQVEsYUFBYSxJQUFJLGNBQWMsTUFBTSxDQUFDO0FBQUEsY0FDbkY7QUFBQSxZQUNGO0FBQUEsVUFDRixDQUFDO0FBQUEsUUFDSDtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGLENBQUM7QUFFRCxJQUFPLHdDQUFROyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist-types/index.d.ts

@@ -13,6 +13,8 @@ declare const _default: {
         "no-promise-instance-method": import("eslint").Rule.RuleModule;
         "no-full-response": import("@typescript-eslint/utils/ts-eslint").RuleModule<"removeFullResponse" | "unknownError", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
         "require-resolve-full-response": import("@typescript-eslint/utils/ts-eslint").RuleModule<"unknownError" | "invalidOptions", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+        "no-duplicated-imports": import("@typescript-eslint/utils/ts-eslint").RuleModule<"mergeDuplicatedImports", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+        "require-fixed-services-import": import("@typescript-eslint/utils/ts-eslint").RuleModule<"updateServicesImportFrom", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
         "require-type-out-of-type-only-imports": import("@typescript-eslint/utils/ts-eslint").RuleModule<"moveTypeOutside", never[], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     };
     configs: {
@@ -31,6 +33,8 @@ declare const _default: {
                 "@checkdigit/no-promise-instance-method": string;
                 "@checkdigit/no-full-response": string;
                 "@checkdigit/require-resolve-full-response": string;
+                "@checkdigit/no-duplicated-imports": string;
+                "@checkdigit/require-fixed-services-import": string;
                 "@checkdigit/require-type-out-of-type-only-imports": string;
             };
         };

package/dist-types/no-duplicated-imports.d.ts

@@ -0,0 +1,4 @@
+import { ESLintUtils } from '@typescript-eslint/utils';
+export declare const ruleId = "no-duplicated-imports";
+declare const rule: ESLintUtils.RuleModule<"mergeDuplicatedImports", never[], ESLintUtils.RuleListener>;
+export default rule;

package/dist-types/require-fixed-services-import.d.ts

@@ -0,0 +1,4 @@
+import { ESLintUtils } from '@typescript-eslint/utils';
+export declare const ruleId = "require-fixed-services-import";
+declare const rule: ESLintUtils.RuleModule<"updateServicesImportFrom", never[], ESLintUtils.RuleListener>;
+export default rule;

package/package.json

@@ -1 +1 @@
-{"name":"@checkdigit/eslint-plugin","version":"6.8.0-PR.83-33f3","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 && node 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.1","@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.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":"0.24.0","http-status-codes":"^2.3.0"},"peerDependencies":{"eslint":">=8 <9"},"engines":{"node":">=20.14"}}
+{"name":"@checkdigit/eslint-plugin","version":"6.9.0-PR.86-3a12","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 && node 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.1","@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.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":"0.24.0","http-status-codes":"^2.3.0"},"peerDependencies":{"eslint":">=8 <9"},"engines":{"node":">=20.14"}}

package/src/index.ts

@@ -7,8 +7,12 @@
  */
 
 import invalidJsonStringify, { ruleId as invalidJsonStringifyRuleId } from './invalid-json-stringify';
+import noDuplicatedImports, { ruleId as noDuplicatedImportsRuleId } from './no-duplicated-imports';
 import noFullResponse, { ruleId as noFullResponseRuleId } from './agent/no-full-response';
 import noPromiseInstanceMethod, { ruleId as noPromiseInstanceMethodRuleId } from './no-promise-instance-method';
+import requireFixedServicesImport, {
+  ruleId as requireFixedServicesImportRuleId,
+} from './require-fixed-services-import';
 import requireResolveFullResponse, {
   ruleId as requireResolveFullResponseRuleId,
 } from './require-resolve-full-response';
@@ -40,6 +44,8 @@ export default {
     [noPromiseInstanceMethodRuleId]: noPromiseInstanceMethod,
     [noFullResponseRuleId]: noFullResponse,
     [requireResolveFullResponseRuleId]: requireResolveFullResponse,
+    [noDuplicatedImportsRuleId]: noDuplicatedImports,
+    [requireFixedServicesImportRuleId]: requireFixedServicesImport,
     [requireTypeOutOfTypeOnlyImportsRuleId]: requireTypeOutOfTypeOnlyImports,
   },
   configs: {
@@ -58,6 +64,8 @@ export default {
         [`@checkdigit/${noPromiseInstanceMethodRuleId}`]: 'error',
         [`@checkdigit/${noFullResponseRuleId}`]: 'error',
         [`@checkdigit/${requireResolveFullResponseRuleId}`]: 'error',
+        [`@checkdigit/${noDuplicatedImportsRuleId}`]: 'error',
+        [`@checkdigit/${requireFixedServicesImportRuleId}`]: 'error',
         [`@checkdigit/${requireTypeOutOfTypeOnlyImportsRuleId}`]: 'error',
       },
     },

package/src/no-duplicated-imports.ts

@@ -0,0 +1,116 @@
+// no-duplicated-imports.ts
+
+/*
+ * Copyright (c) 2021-2024 Check Digit, LLC
+ *
+ * This code is licensed under the MIT license (see LICENSE.txt for details).
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils';
+import { strict as assert } from 'node:assert';
+import getDocumentationUrl from './get-documentation-url';
+
+export const ruleId = 'no-duplicated-imports';
+
+const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
+
+const rule = createRule({
+  name: ruleId,
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Merge duplicated import statements with the same "from".',
+    },
+    messages: {
+      mergeDuplicatedImports: 'Merge duplicated import statements with the same "from".',
+    },
+    fixable: 'code',
+    schema: [],
+  },
+  defaultOptions: [],
+  create(context) {
+    const sourceCode = context.sourceCode;
+    const importDeclarations = new Map<string, TSESTree.ImportDeclaration[]>();
+
+    return {
+      ImportDeclaration(node) {
+        const moduleName = node.source.value;
+        let declarations = importDeclarations.get(moduleName);
+        if (declarations === undefined) {
+          declarations = [];
+          importDeclarations.set(moduleName, declarations);
+        }
+        declarations.push(node);
+      },
+      'Program:exit'() {
+        for (const [moduleName, declarations] of importDeclarations.entries()) {
+          if (declarations.length <= 1) {
+            continue;
+          }
+
+          const firstDeclaration = declarations[0];
+          assert.ok(firstDeclaration);
+
+          const isAllTypeOnly = declarations.every(
+            (declaration) =>
+              declaration.importKind === 'type' ||
+              declaration.specifiers.every(
+                (specifier) =>
+                  specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === 'type',
+              ),
+          );
+
+          context.report({
+            messageId: 'mergeDuplicatedImports',
+            node: firstDeclaration,
+            fix(fixer) {
+              const fixes = [];
+
+              const defaultSpecifier = declarations
+                .flatMap((declaration) =>
+                  declaration.specifiers.map((specifier) =>
+                    specifier.type === TSESTree.AST_NODE_TYPES.ImportDefaultSpecifier ? specifier : undefined,
+                  ),
+                )
+                .filter(Boolean);
+              const defaultSpecifierText = defaultSpecifier[0] ? sourceCode.getText(defaultSpecifier[0]) : undefined;
+
+              const mergedSpecifiers = declarations.flatMap((declaration) => {
+                const isCurrentDeclarationTypeOnly =
+                  declaration.importKind === 'type' ||
+                  declaration.specifiers.every(
+                    (specifier) =>
+                      specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === 'type',
+                  );
+                return declaration.specifiers
+                  .filter((specifier) => specifier.type !== TSESTree.AST_NODE_TYPES.ImportDefaultSpecifier)
+                  .map((specifier) =>
+                    // eslint-disable-next-line no-nested-ternary
+                    isAllTypeOnly
+                      ? sourceCode.getText(specifier).replace('type ', '')
+                      : isCurrentDeclarationTypeOnly
+                        ? `type ${sourceCode.getText(specifier)}`
+                        : sourceCode.getText(specifier),
+                  );
+              });
+              const mergedSpecifiersText = `${isAllTypeOnly ? 'type ' : ''}{ ${mergedSpecifiers.join(', ')} }`;
+
+              // Replace the first import with the merged import
+              const mergedImport = `import ${[defaultSpecifierText, mergedSpecifiersText].filter(Boolean).join(', ')} from '${moduleName}';`;
+              fixes.push(fixer.replaceText(firstDeclaration, mergedImport));
+
+              // Remove the remaining imports
+              declarations.slice(1).forEach((declaration) => {
+                fixes.push(fixer.removeRange([declaration.range[0], declaration.range[1] + 1]));
+              });
+
+              return fixes;
+            },
+          });
+        }
+      },
+    };
+  },
+});
+
+export default rule;

package/src/require-fixed-services-import.ts

@@ -0,0 +1,52 @@
+// require-fixed-services-import.ts
+
+/*
+ * Copyright (c) 2021-2024 Check Digit, LLC
+ *
+ * This code is licensed under the MIT license (see LICENSE.txt for details).
+ */
+
+import { ESLintUtils } from '@typescript-eslint/utils';
+import getDocumentationUrl from './get-documentation-url';
+
+export const ruleId = 'require-fixed-services-import';
+
+const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
+const SERVICE_TYPINGS_IMPORT_PATH_PREFIX = /(?<path>\.\.\/)+services\/.*/u;
+
+const rule = createRule({
+  name: ruleId,
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Require fixed "from" with service typing imports from "src/services".',
+    },
+    messages: {
+      updateServicesImportFrom: 'Update service typing imports to be from the fixed "src/services" path.',
+    },
+    fixable: 'code',
+    schema: [],
+  },
+  defaultOptions: [],
+  create(context) {
+    return {
+      ImportDeclaration(node) {
+        const moduleName = node.source.value;
+        if (SERVICE_TYPINGS_IMPORT_PATH_PREFIX.test(moduleName)) {
+          context.report({
+            messageId: 'updateServicesImportFrom',
+            node: node.source,
+            *fix(fixer) {
+              yield fixer.replaceText(
+                node.source,
+                `'${moduleName.slice(0, moduleName.indexOf('../services') + '../services'.length)}'`,
+              );
+            },
+          });
+        }
+      },
+    };
+  },
+});
+
+export default rule;