@checkdigit/eslint-plugin 7.6.1 → 7.6.2-PR.108-2c27

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

@@ -1,9 +1,11 @@
 // src/require-fixed-services-import.ts
-import { ESLintUtils } from "@typescript-eslint/utils";
+import { strict as assert } from "node:assert";
+import { AST_NODE_TYPES, 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(?!\/index(?:\.ts)?)\/.*/u;
+var SERVICE_TYPINGS_IMPORT_PATH = /(?<path>\.\.\/)+services(?!\/index(?:\.ts)?)\/.*/u;
+var SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION = /(?<path>\.\.\/)+services\/(?<service>\w+)\/(?<version>v\d+)(?<index>\/index(?:\.ts)?)?/u;
 var rule = createRule({
   name: ruleId,
   meta: {
@@ -12,28 +14,66 @@ var rule = createRule({
       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.'
+      updateServicesImportSpecifier: "Update service typing import specifiers to be from the corresponding service version namespace.",
+      updateServicesImportSource: 'Update service typing imports to be from the fixed "src/services" path.',
+      renameServiceTypeReference: "Rename service type reference using the corresponding service version namespace."
     },
     fixable: "code",
     schema: []
   },
   defaultOptions: [],
   create(context) {
+    const importedServiceTypeMapping = /* @__PURE__ */ new Map();
     return {
-      ImportDeclaration(node) {
-        const moduleName = node.source.value;
-        if (SERVICE_TYPINGS_IMPORT_PATH_PREFIX.test(moduleName)) {
+      ImportDeclaration(importDeclaration) {
+        const moduleName = importDeclaration.source.value;
+        if (SERVICE_TYPINGS_IMPORT_PATH.test(moduleName)) {
+          const match = SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION.exec(moduleName);
+          if (match?.groups) {
+            const { service, version } = match.groups;
+            assert.ok(service !== void 0 && version !== void 0);
+            for (const specifier of importDeclaration.specifiers) {
+              if (specifier.type === AST_NODE_TYPES.ImportSpecifier && specifier.imported.type === AST_NODE_TYPES.Identifier) {
+                importedServiceTypeMapping.set(specifier.imported.name, service);
+              }
+            }
+            const rangeStart = importDeclaration.specifiers[0]?.range[0];
+            assert.ok(rangeStart !== void 0);
+            const rangeEnd = importDeclaration.specifiers.at(-1)?.range[1];
+            assert.ok(rangeEnd !== void 0);
+            context.report({
+              messageId: "updateServicesImportSpecifier",
+              node: importDeclaration.source,
+              *fix(fixer) {
+                yield fixer.replaceTextRange([rangeStart, rangeEnd], `${service}V${version.slice(1)} as ${service}`);
+              }
+            });
+          }
           context.report({
-            messageId: "updateServicesImportFrom",
-            node: node.source,
+            messageId: "updateServicesImportSource",
+            node: importDeclaration.source,
             *fix(fixer) {
               yield fixer.replaceText(
-                node.source,
-                `'${moduleName.slice(0, moduleName.indexOf("../services") + "../services".length)}'`
+                importDeclaration.source,
+                `'${moduleName.slice(0, moduleName.indexOf("../services"))}../services/index.ts'`
               );
             }
           });
         }
+      },
+      TSTypeReference(typeReference) {
+        if (typeReference.typeName.type === AST_NODE_TYPES.Identifier && importedServiceTypeMapping.has(typeReference.typeName.name)) {
+          const referencedTypeName = typeReference.typeName.name;
+          const serviceNamespace = importedServiceTypeMapping.get(referencedTypeName);
+          assert.ok(serviceNamespace !== void 0);
+          context.report({
+            messageId: "renameServiceTypeReference",
+            node: typeReference.typeName,
+            fix(fixer) {
+              return fixer.replaceText(typeReference.typeName, `${serviceNamespace}.${referencedTypeName}`);
+            }
+          });
+        }
       }
     };
   }
@@ -43,4 +83,4 @@ export {
   require_fixed_services_import_default as default,
   ruleId
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtZml4ZWQtc2VydmljZXMtaW1wb3J0LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsbUJBQW1CO0FBRTVCLE9BQU8seUJBQXlCO0FBRXpCLElBQU0sU0FBUztBQUV0QixJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBQzlFLElBQU0scUNBQXFDO0FBRTNDLElBQU0sT0FBMkQsV0FBVztBQUFBLEVBQzFFLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxJQUNmO0FBQUEsSUFDQSxVQUFVO0FBQUEsTUFDUiwwQkFBMEI7QUFBQSxJQUM1QjtBQUFBLElBQ0EsU0FBUztBQUFBLElBQ1QsUUFBUSxDQUFDO0FBQUEsRUFDWDtBQUFBLEVBQ0EsZ0JBQWdCLENBQUM7QUFBQSxFQUNqQixPQUFPLFNBQVM7QUFDZCxXQUFPO0FBQUEsTUFDTCxrQkFBa0IsTUFBTTtBQUN0QixjQUFNLGFBQWEsS0FBSyxPQUFPO0FBQy9CLFlBQUksbUNBQW1DLEtBQUssVUFBVSxHQUFHO0FBQ3ZELGtCQUFRLE9BQU87QUFBQSxZQUNiLFdBQVc7QUFBQSxZQUNYLE1BQU0sS0FBSztBQUFBLFlBQ1gsQ0FBQyxJQUFJLE9BQU87QUFDVixvQkFBTSxNQUFNO0FBQUEsZ0JBQ1YsS0FBSztBQUFBLGdCQUNMLElBQUksV0FBVyxNQUFNLEdBQUcsV0FBVyxRQUFRLGFBQWEsSUFBSSxjQUFjLE1BQU0sQ0FBQztBQUFBLGNBQ25GO0FBQUEsWUFDRjtBQUFBLFVBQ0YsQ0FBQztBQUFBLFFBQ0g7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFDRixDQUFDO0FBRUQsSUFBTyx3Q0FBUTsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtZml4ZWQtc2VydmljZXMtaW1wb3J0LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsVUFBVSxjQUFjO0FBRWpDLFNBQVMsZ0JBQWdCLG1CQUE2QjtBQUV0RCxPQUFPLHlCQUF5QjtBQUV6QixJQUFNLFNBQVM7QUFFdEIsSUFBTSxhQUFhLFlBQVksWUFBWSxDQUFDLFNBQVMsb0JBQW9CLElBQUksQ0FBQztBQUM5RSxJQUFNLDhCQUE4QjtBQUNwQyxJQUFNLDJDQUNKO0FBRUYsSUFBTSxPQUVGLFdBQVc7QUFBQSxFQUNiLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxJQUNmO0FBQUEsSUFDQSxVQUFVO0FBQUEsTUFDUiwrQkFDRTtBQUFBLE1BQ0YsNEJBQTRCO0FBQUEsTUFDNUIsNEJBQTRCO0FBQUEsSUFDOUI7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLGdCQUFnQixDQUFDO0FBQUEsRUFDakIsT0FBTyxTQUFTO0FBQ2QsVUFBTSw2QkFBNkIsb0JBQUksSUFBb0I7QUFFM0QsV0FBTztBQUFBLE1BQ0wsa0JBQWtCLG1CQUFtQjtBQUNuQyxjQUFNLGFBQWEsa0JBQWtCLE9BQU87QUFDNUMsWUFBSSw0QkFBNEIsS0FBSyxVQUFVLEdBQUc7QUFDaEQsZ0JBQU0sUUFBUSx5Q0FBeUMsS0FBSyxVQUFVO0FBQ3RFLGNBQUksT0FBTyxRQUFRO0FBRWpCLGtCQUFNLEVBQUUsU0FBUyxRQUFRLElBQUksTUFBTTtBQUNuQyxtQkFBTyxHQUFHLFlBQVksVUFBYSxZQUFZLE1BQVM7QUFHeEQsdUJBQVcsYUFBYSxrQkFBa0IsWUFBWTtBQUNwRCxrQkFDRSxVQUFVLFNBQVMsZUFBZSxtQkFDbEMsVUFBVSxTQUFTLFNBQVMsZUFBZSxZQUMzQztBQUNBLDJDQUEyQixJQUFJLFVBQVUsU0FBUyxNQUFNLE9BQU87QUFBQSxjQUNqRTtBQUFBLFlBQ0Y7QUFFQSxrQkFBTSxhQUFhLGtCQUFrQixXQUFXLENBQUMsR0FBRyxNQUFNLENBQUM7QUFDM0QsbUJBQU8sR0FBRyxlQUFlLE1BQVM7QUFDbEMsa0JBQU0sV0FBVyxrQkFBa0IsV0FBVyxHQUFHLEVBQUUsR0FBRyxNQUFNLENBQUM7QUFDN0QsbUJBQU8sR0FBRyxhQUFhLE1BQVM7QUFFaEMsb0JBQVEsT0FBTztBQUFBLGNBQ2IsV0FBVztBQUFBLGNBQ1gsTUFBTSxrQkFBa0I7QUFBQSxjQUN4QixDQUFDLElBQUksT0FBTztBQUNWLHNCQUFNLE1BQU0saUJBQWlCLENBQUMsWUFBWSxRQUFRLEdBQUcsR0FBRyxPQUFPLElBQUksUUFBUSxNQUFNLENBQUMsQ0FBQyxPQUFPLE9BQU8sRUFBRTtBQUFBLGNBQ3JHO0FBQUEsWUFDRixDQUFDO0FBQUEsVUFDSDtBQUdBLGtCQUFRLE9BQU87QUFBQSxZQUNiLFdBQVc7QUFBQSxZQUNYLE1BQU0sa0JBQWtCO0FBQUEsWUFDeEIsQ0FBQyxJQUFJLE9BQU87QUFDVixvQkFBTSxNQUFNO0FBQUEsZ0JBQ1Ysa0JBQWtCO0FBQUEsZ0JBQ2xCLElBQUksV0FBVyxNQUFNLEdBQUcsV0FBVyxRQUFRLGFBQWEsQ0FBQyxDQUFDO0FBQUEsY0FDNUQ7QUFBQSxZQUNGO0FBQUEsVUFDRixDQUFDO0FBQUEsUUFDSDtBQUFBLE1BQ0Y7QUFBQSxNQUVBLGdCQUFnQixlQUF5QztBQUN2RCxZQUNFLGNBQWMsU0FBUyxTQUFTLGVBQWUsY0FDL0MsMkJBQTJCLElBQUksY0FBYyxTQUFTLElBQUksR0FDMUQ7QUFDQSxnQkFBTSxxQkFBcUIsY0FBYyxTQUFTO0FBQ2xELGdCQUFNLG1CQUFtQiwyQkFBMkIsSUFBSSxrQkFBa0I7QUFDMUUsaUJBQU8sR0FBRyxxQkFBcUIsTUFBUztBQUN4QyxrQkFBUSxPQUFPO0FBQUEsWUFDYixXQUFXO0FBQUEsWUFDWCxNQUFNLGNBQWM7QUFBQSxZQUNwQixJQUFJLE9BQU87QUFDVCxxQkFBTyxNQUFNLFlBQVksY0FBYyxVQUFVLEdBQUcsZ0JBQWdCLElBQUksa0JBQWtCLEVBQUU7QUFBQSxZQUM5RjtBQUFBLFVBQ0YsQ0FBQztBQUFBLFFBQ0g7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFDRixDQUFDO0FBRUQsSUFBTyx3Q0FBUTsiLAogICJuYW1lcyI6IFtdCn0K

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

@@ -1,4 +1,4 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
 export declare const ruleId = "require-fixed-services-import";
-declare const rule: ESLintUtils.RuleModule<'updateServicesImportFrom'>;
+declare const rule: ESLintUtils.RuleModule<'updateServicesImportSpecifier' | 'updateServicesImportSource' | 'renameServiceTypeReference'>;
 export default rule;

package/package.json

@@ -1,96 +1 @@
-{
-  "name": "@checkdigit/eslint-plugin",
-  "version": "7.6.1",
-  "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.18.0",
-    "@typescript-eslint/utils": "^8.18.0",
-    "ts-api-utils": "^2.0.0"
-  },
-  "devDependencies": {
-    "@checkdigit/jest-config": "^6.0.2",
-    "@checkdigit/prettier-config": "^6.0.0",
-    "@checkdigit/typescript-config": "^9.0.0",
-    "@eslint/js": "^9.16.0",
-    "@types/eslint": "^9.6.1",
-    "@types/eslint-config-prettier": "^6.11.3",
-    "@typescript-eslint/parser": "^8.18.0",
-    "@typescript-eslint/rule-tester": "^8.18.0",
-    "eslint": "^9.16.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.7.0",
-    "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": "^2.1.1",
-    "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.18.0"
-  },
-  "peerDependencies": {
-    "eslint": ">=9 <10"
-  },
-  "engines": {
-    "node": ">=20.17"
-  }
-}
+{"name":"@checkdigit/eslint-plugin","version":"7.6.2-PR.108-2c27","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.18.0","@typescript-eslint/utils":"^8.18.0","ts-api-utils":"^2.0.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^6.0.0","@checkdigit/typescript-config":"^9.0.0","@eslint/js":"^9.16.0","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"^8.18.0","@typescript-eslint/rule-tester":"^8.18.0","eslint":"^9.16.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.7.0","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":"^2.1.1","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.18.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}

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

@@ -6,16 +6,22 @@
  * This code is licensed under the MIT license (see LICENSE.txt for details).
  */
 
-import { ESLintUtils } from '@typescript-eslint/utils';
+import { strict as assert } from 'node:assert';
+
+import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils';
 
 import getDocumentationUrl from './get-documentation-url.ts';
 
 export const ruleId = 'require-fixed-services-import';
 
 const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
-const SERVICE_TYPINGS_IMPORT_PATH_PREFIX = /(?<path>\.\.\/)+services(?!\/index(?:\.ts)?)\/.*/u;
+const SERVICE_TYPINGS_IMPORT_PATH = /(?<path>\.\.\/)+services(?!\/index(?:\.ts)?)\/.*/u;
+const SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION =
+  /(?<path>\.\.\/)+services\/(?<service>\w+)\/(?<version>v\d+)(?<index>\/index(?:\.ts)?)?/u;
 
-const rule: ESLintUtils.RuleModule<'updateServicesImportFrom'> = createRule({
+const rule: ESLintUtils.RuleModule<
+  'updateServicesImportSpecifier' | 'updateServicesImportSource' | 'renameServiceTypeReference'
+> = createRule({
   name: ruleId,
   meta: {
     type: 'suggestion',
@@ -23,29 +29,83 @@ const rule: ESLintUtils.RuleModule<'updateServicesImportFrom'> = createRule({
       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.',
+      updateServicesImportSpecifier:
+        'Update service typing import specifiers to be from the corresponding service version namespace.',
+      updateServicesImportSource: 'Update service typing imports to be from the fixed "src/services" path.',
+      renameServiceTypeReference: 'Rename service type reference using the corresponding service version namespace.',
     },
     fixable: 'code',
     schema: [],
   },
   defaultOptions: [],
   create(context) {
+    const importedServiceTypeMapping = new Map<string, string>();
+
     return {
-      ImportDeclaration(node) {
-        const moduleName = node.source.value;
-        if (SERVICE_TYPINGS_IMPORT_PATH_PREFIX.test(moduleName)) {
+      ImportDeclaration(importDeclaration) {
+        const moduleName = importDeclaration.source.value;
+        if (SERVICE_TYPINGS_IMPORT_PATH.test(moduleName)) {
+          const match = SERVICE_TYPINGS_IMPORT_PATH_WITH_VERSION.exec(moduleName);
+          if (match?.groups) {
+            // need to import the service typings from the fixed path, and also apply the namespace to the referenced types
+            const { service, version } = match.groups; /*?*/
+            assert.ok(service !== undefined && version !== undefined);
+
+            // remember the type name and the corresponding service, which will be used to rename the references
+            for (const specifier of importDeclaration.specifiers) {
+              if (
+                specifier.type === AST_NODE_TYPES.ImportSpecifier &&
+                specifier.imported.type === AST_NODE_TYPES.Identifier
+              ) {
+                importedServiceTypeMapping.set(specifier.imported.name, service);
+              }
+            }
+
+            const rangeStart = importDeclaration.specifiers[0]?.range[0];
+            assert.ok(rangeStart !== undefined);
+            const rangeEnd = importDeclaration.specifiers.at(-1)?.range[1];
+            assert.ok(rangeEnd !== undefined);
+            // import the service typings using our naming convension
+            context.report({
+              messageId: 'updateServicesImportSpecifier',
+              node: importDeclaration.source,
+              *fix(fixer) {
+                yield fixer.replaceTextRange([rangeStart, rangeEnd], `${service}V${version.slice(1)} as ${service}`);
+              },
+            });
+          }
+
+          // update the imported source to be the fixed path
           context.report({
-            messageId: 'updateServicesImportFrom',
-            node: node.source,
+            messageId: 'updateServicesImportSource',
+            node: importDeclaration.source,
             *fix(fixer) {
               yield fixer.replaceText(
-                node.source,
-                `'${moduleName.slice(0, moduleName.indexOf('../services') + '../services'.length)}'`,
+                importDeclaration.source,
+                `'${moduleName.slice(0, moduleName.indexOf('../services'))}../services/index.ts'`,
               );
             },
           });
         }
       },
+
+      TSTypeReference(typeReference: TSESTree.TSTypeReference) {
+        if (
+          typeReference.typeName.type === AST_NODE_TYPES.Identifier &&
+          importedServiceTypeMapping.has(typeReference.typeName.name)
+        ) {
+          const referencedTypeName = typeReference.typeName.name;
+          const serviceNamespace = importedServiceTypeMapping.get(referencedTypeName);
+          assert.ok(serviceNamespace !== undefined);
+          context.report({
+            messageId: 'renameServiceTypeReference',
+            node: typeReference.typeName,
+            fix(fixer) {
+              return fixer.replaceText(typeReference.typeName, `${serviceNamespace}.${referencedTypeName}`);
+            },
+          });
+        }
+      },
     };
   },
 });