chore: eslint to enforce for typed imports (#30844)

.eslintrc.js

@@ -90,6 +90,10 @@ module.exports = {
       'error',
       { assertionStyle: 'as', objectLiteralTypeAssertions: 'allow' },
     ],
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      { disallowTypeAnnotations: false },
+    ],
 
     // Makes no sense to allow type inference for expression parameters, but require typing the response
     '@typescript-eslint/explicit-function-return-type': [

lib/config/presets/internal/replacements.ts

@@ -1,10 +1,7 @@
 import replacementGroups from '../../../data/replacements.json';
 import type { Preset } from '../types';
-import {
-  PresetTemplate,
-  Replacement,
-  addPresets,
-} from './auto-generate-replacements';
+import type { PresetTemplate, Replacement } from './auto-generate-replacements';
+import { addPresets } from './auto-generate-replacements';
 
 /* eslint sort-keys: ["error", "asc", {"caseSensitive": false, "natural": true}] */
 export const presets: Record<string, Preset> = replacementGroups;

lib/config/validation.ts

@@ -7,7 +7,7 @@ import type {
   RegexManagerTemplates,
 } from '../modules/manager/custom/regex/types';
 import type { CustomManager } from '../modules/manager/custom/types';
-import type { HostRule } from '../types/host-rules';
+import type { HostRule } from '../types';
 import { regEx } from '../util/regex';
 import {
   getRegexPredicate,
@@ -26,15 +26,15 @@ import { migrateConfig } from './migration';
 import { getOptions } from './options';
 import { resolveConfigPresets } from './presets';
 import { supportedDatasources } from './presets/internal/merge-confidence';
-import {
+import type {
   AllowedParents,
-  type RenovateConfig,
-  type RenovateOptions,
-  type StatusCheckKey,
-  type ValidationMessage,
-  type ValidationResult,
-  allowedStatusCheckStrings,
+  RenovateConfig,
+  RenovateOptions,
+  StatusCheckKey,
+  ValidationMessage,
+  ValidationResult,
 } from './types';
+import { allowedStatusCheckStrings } from './types';
 import * as managerValidator from './validation-helpers/managers';
 import * as matchBaseBranchesValidator from './validation-helpers/match-base-branches';
 import * as regexOrGlobValidator from './validation-helpers/regex-glob-matchers';

lib/instrumentation/decorator.ts

@@ -1,5 +1,6 @@
 import { SpanKind } from '@opentelemetry/api';
-import { Decorator, decorate } from '../util/decorator';
+import type { Decorator } from '../util/decorator';
+import { decorate } from '../util/decorator';
 import type { SpanParameters } from './types';
 import { instrument as instrumentFunc } from '.';
 

lib/instrumentation/index.ts

@@ -10,10 +10,8 @@ import * as api from '@opentelemetry/api';
 import { ProxyTracerProvider, SpanStatusCode } from '@opentelemetry/api';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import {
-  Instrumentation,
-  registerInstrumentations,
-} from '@opentelemetry/instrumentation';
+import type { Instrumentation } from '@opentelemetry/instrumentation';
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { BunyanInstrumentation } from '@opentelemetry/instrumentation-bunyan';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { Resource } from '@opentelemetry/resources';

lib/instrumentation/reporting.ts

@@ -1,4 +1,5 @@
-import { PutObjectCommand, PutObjectCommandInput } from '@aws-sdk/client-s3';
+import type { PutObjectCommandInput } from '@aws-sdk/client-s3';
+import { PutObjectCommand } from '@aws-sdk/client-s3';
 import is from '@sindresorhus/is';
 import type { RenovateConfig } from '../config/types';
 import { getProblems, logger } from '../logger';

lib/logger/remap.ts

@@ -1,8 +1,6 @@
 import type { LogLevelString } from 'bunyan';
-import {
-  StringMatchPredicate,
-  getRegexOrGlobPredicate,
-} from '../util/string-match';
+import type { StringMatchPredicate } from '../util/string-match';
+import { getRegexOrGlobPredicate } from '../util/string-match';
 import type { LogLevelRemap } from './types';
 
 let globalRemaps: LogLevelRemap[] | undefined;

lib/modules/datasource/aws-machine-image/index.spec.ts

@@ -1,9 +1,5 @@
-import {
-  DescribeImagesCommand,
-  DescribeImagesResult,
-  EC2Client,
-  Image,
-} from '@aws-sdk/client-ec2';
+import type { DescribeImagesResult, Image } from '@aws-sdk/client-ec2';
+import { DescribeImagesCommand, EC2Client } from '@aws-sdk/client-ec2';
 import { mockClient } from 'aws-sdk-client-mock';
 import { getDigest, getPkgReleases } from '..';
 import { AwsMachineImageDatasource } from '.';

lib/modules/datasource/aws-machine-image/index.ts

@@ -1,9 +1,5 @@
-import {
-  DescribeImagesCommand,
-  EC2Client,
-  Filter,
-  Image,
-} from '@aws-sdk/client-ec2';
+import type { Filter, Image } from '@aws-sdk/client-ec2';
+import { DescribeImagesCommand, EC2Client } from '@aws-sdk/client-ec2';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 import { cache } from '../../../util/cache/package/decorator';
 import * as amazonMachineImageVersioning from '../../versioning/aws-machine-image';

lib/modules/datasource/aws-rds/index.spec.ts

@@ -1,7 +1,9 @@
-import {
+import type {
   DBEngineVersion,
-  DescribeDBEngineVersionsCommand,
   DescribeDBEngineVersionsCommandOutput,
+} from '@aws-sdk/client-rds';
+import {
+  DescribeDBEngineVersionsCommand,
   RDSClient,
 } from '@aws-sdk/client-rds';
 import { mockClient } from 'aws-sdk-client-mock';

lib/modules/datasource/clojure/index.spec.ts

@@ -1,5 +1,6 @@
 import upath from 'upath';
-import { ReleaseResult, getPkgReleases } from '..';
+import type { ReleaseResult } from '..';
+import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import * as httpMock from '../../../../test/http-mock';
 import * as hostRules from '../../../util/host-rules';

lib/modules/datasource/crate/index.spec.ts

@@ -1,7 +1,9 @@
 import { setTimeout } from 'timers/promises';
 import fs from 'fs-extra';
-import _simpleGit, { SimpleGit } from 'simple-git';
-import { DirectoryResult, dir } from 'tmp-promise';
+import type { SimpleGit } from 'simple-git';
+import _simpleGit from 'simple-git';
+import type { DirectoryResult } from 'tmp-promise';
+import { dir } from 'tmp-promise';
 import { dirname, join } from 'upath';
 import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';

lib/modules/datasource/docker/dockerhub-cache.spec.ts

@@ -1,6 +1,7 @@
 import { mocked } from '../../../../test/util';
 import * as _packageCache from '../../../util/cache/package';
-import { DockerHubCache, DockerHubCacheData } from './dockerhub-cache';
+import type { DockerHubCacheData } from './dockerhub-cache';
+import { DockerHubCache } from './dockerhub-cache';
 import type { DockerHubTag } from './schema';
 
 jest.mock('../../../util/cache/package');

lib/modules/datasource/docker/ecr.ts

@@ -1,4 +1,5 @@
-import { ECR, ECRClientConfig } from '@aws-sdk/client-ecr';
+import type { ECRClientConfig } from '@aws-sdk/client-ecr';
+import { ECR } from '@aws-sdk/client-ecr';
 import { logger } from '../../../logger';
 import type { HostRule } from '../../../types';
 import type { HttpError } from '../../../util/http';

lib/modules/datasource/docker/index.spec.ts

@@ -1,8 +1,5 @@
-import {
-  ECRClient,
-  GetAuthorizationTokenCommand,
-  GetAuthorizationTokenCommandOutput,
-} from '@aws-sdk/client-ecr';
+import type { GetAuthorizationTokenCommandOutput } from '@aws-sdk/client-ecr';
+import { ECRClient, GetAuthorizationTokenCommand } from '@aws-sdk/client-ecr';
 import { mockClient } from 'aws-sdk-client-mock';
 import * as _googleAuth from 'google-auth-library';
 import { mockDeep } from 'jest-mock-extended';

lib/modules/datasource/docker/index.ts

@@ -39,13 +39,12 @@ import {
 } from './common';
 import { DockerHubCache } from './dockerhub-cache';
 import { ecrPublicRegex, ecrRegex, isECRMaxResultsError } from './ecr';
+import type { DistributionManifest, OciImageManifest } from './schema';
 import {
-  DistributionManifest,
   DockerHubTagsPage,
   ManifestJson,
   OciHelmConfig,
   OciImageConfig,
-  OciImageManifest,
 } from './schema';
 
 const defaultConfig = {

lib/modules/datasource/git-refs/index.spec.ts

@@ -1,4 +1,5 @@
-import { SimpleGit, simpleGit } from 'simple-git';
+import type { SimpleGit } from 'simple-git';
+import { simpleGit } from 'simple-git';
 import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import { add, clear } from '../../../util/host-rules';

lib/modules/datasource/git-tags/index.spec.ts

@@ -1,4 +1,5 @@
-import { SimpleGit, simpleGit } from 'simple-git';
+import type { SimpleGit } from 'simple-git';
+import { simpleGit } from 'simple-git';
 import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import { add, clear } from '../../../util/host-rules';

lib/modules/datasource/glasskube-packages/index.ts

@@ -3,9 +3,9 @@ import { joinUrlParts } from '../../../util/url';
 import * as glasskubeVersioning from '../../versioning/glasskube';
 import { Datasource } from '../datasource';
 import type { GetReleasesConfig, ReleaseResult } from '../types';
+import type { GlasskubePackageVersions } from './schema';
 import {
   GlasskubePackageManifestYaml,
-  GlasskubePackageVersions,
   GlasskubePackageVersionsYaml,
 } from './schema';
 

lib/modules/datasource/gradle-version/index.spec.ts

@@ -1,4 +1,5 @@
-import { GetPkgReleasesConfig, GetReleasesConfig, getPkgReleases } from '..';
+import type { GetPkgReleasesConfig, GetReleasesConfig } from '..';
+import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import * as httpMock from '../../../../test/http-mock';
 import { partial } from '../../../../test/util';

lib/modules/datasource/maven/index.spec.ts

@@ -1,5 +1,6 @@
 import { GoogleAuth as _googleAuth } from 'google-auth-library';
-import { ReleaseResult, getPkgReleases } from '..';
+import type { ReleaseResult } from '..';
+import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import * as httpMock from '../../../../test/http-mock';
 import { mocked } from '../../../../test/util';

lib/modules/datasource/maven/s3.spec.ts

@@ -6,7 +6,8 @@ import {
 } from '@aws-sdk/client-s3';
 import { mockClient } from 'aws-sdk-client-mock';
 import { DateTime } from 'luxon';
-import { ReleaseResult, getPkgReleases } from '..';
+import type { ReleaseResult } from '..';
+import { getPkgReleases } from '..';
 import { Fixtures } from '../../../../test/fixtures';
 import { logger } from '../../../logger';
 import * as hostRules from '../../../util/host-rules';

lib/modules/datasource/nuget/v2.ts

@@ -1,4 +1,5 @@
-import { XmlDocument, XmlElement } from 'xmldoc';
+import type { XmlElement } from 'xmldoc';
+import { XmlDocument } from 'xmldoc';
 import { logger } from '../../../logger';
 import type { Http } from '../../../util/http';
 import { regEx } from '../../../util/regex';

lib/modules/datasource/nuget/v3.ts

@@ -9,7 +9,8 @@ import * as packageCache from '../../../util/cache/package';
 import { cache } from '../../../util/cache/package/decorator';
 import * as fs from '../../../util/fs';
 import { ensureCacheDir } from '../../../util/fs';
-import { Http, HttpError } from '../../../util/http';
+import type { Http } from '../../../util/http';
+import { HttpError } from '../../../util/http';
 import * as p from '../../../util/promises';
 import { regEx } from '../../../util/regex';
 import { ensureTrailingSlash } from '../../../util/url';

lib/modules/datasource/packagist/index.ts

@@ -10,10 +10,10 @@ import { replaceUrlPath, resolveBaseUrl } from '../../../util/url';
 import * as composerVersioning from '../../versioning/composer';
 import { Datasource } from '../datasource';
 import type { GetReleasesConfig, ReleaseResult } from '../types';
+import type { RegistryFile } from './schema';
 import {
   PackagesResponse,
   PackagistFile,
-  RegistryFile,
   RegistryMeta,
   extractDepReleases,
   parsePackagesResponses,

lib/modules/datasource/rubygems/metadata-cache.ts

@@ -2,7 +2,8 @@ import { logger } from '../../../logger';
 import * as packageCache from '../../../util/cache/package';
 import { toSha256 } from '../../../util/hash';
 import type { Http } from '../../../util/http';
-import { AsyncResult, Result } from '../../../util/result';
+import type { AsyncResult } from '../../../util/result';
+import { Result } from '../../../util/result';
 import { parseUrl } from '../../../util/url';
 import type { ReleaseResult } from '../types';
 import { getV1Releases } from './common';

lib/modules/datasource/rubygems/versions-endpoint-cache.ts

@@ -1,7 +1,8 @@
 import { z } from 'zod';
 import { logger } from '../../../logger';
 import { getElapsedMinutes } from '../../../util/date';
-import { Http, HttpError } from '../../../util/http';
+import type { Http } from '../../../util/http';
+import { HttpError } from '../../../util/http';
 import type { HttpOptions } from '../../../util/http/types';
 import { newlineRegex } from '../../../util/regex';
 import { Result } from '../../../util/result';

lib/modules/datasource/unity3d/index.ts

@@ -1,4 +1,5 @@
-import { XmlDocument, XmlElement } from 'xmldoc';
+import type { XmlElement } from 'xmldoc';
+import { XmlDocument } from 'xmldoc';
 import { logger } from '../../../logger';
 import { cache } from '../../../util/cache/package/decorator';
 import * as Unity3dVersioning from '../../versioning/unity3d';

lib/modules/manager/asdf/index.spec.ts

@@ -1,4 +1,5 @@
-import { StaticTooling, upgradeableTooling } from './upgradeable-tooling';
+import type { StaticTooling } from './upgradeable-tooling';
+import { upgradeableTooling } from './upgradeable-tooling';
 import { extractPackageFile, supportedDatasources } from '.';
 
 describe('modules/manager/asdf/index', () => {

lib/modules/manager/azure-pipelines/extract.ts

@@ -11,9 +11,8 @@ import type {
   PackageDependency,
   PackageFileContent,
 } from '../types';
-import {
+import type {
   AzurePipelines,
-  AzurePipelinesYaml,
   Container,
   Deploy,
   Deployment,
@@ -22,6 +21,7 @@ import {
   Repository,
   Step,
 } from './schema';
+import { AzurePipelinesYaml } from './schema';
 
 const AzurePipelinesTaskRegex = regEx(/^(?<name>[^@]+)@(?<version>.*)$/);
 

lib/modules/manager/bazel-module/rules.spec.ts

@@ -3,11 +3,13 @@ import { BazelDatasource } from '../../datasource/bazel';
 import { GithubTagsDatasource } from '../../datasource/github-tags';
 import type { PackageDependency } from '../types';
 import * as fragments from './fragments';
-import {
+import type {
   BasePackageDep,
   BazelModulePackageDep,
   MergePackageDep,
   OverridePackageDep,
+} from './rules';
+import {
   RuleToBazelModulePackageDep,
   bazelModulePackageDepToPackageDependency,
   processModulePkgDeps,

lib/modules/manager/bazel/parser.ts

@@ -1,4 +1,5 @@
-import { lang, lexer, parser, query as q } from 'good-enough-parser';
+import type { lexer, parser } from 'good-enough-parser';
+import { lang, query as q } from 'good-enough-parser';
 import { logger } from '../../../logger';
 import * as memCache from '../../../util/cache/memory';
 import { hash } from '../../../util/hash';

lib/modules/manager/cargo/locked-version.ts

@@ -1,7 +1,8 @@
 import { logger } from '../../../logger';
 import { coerceArray } from '../../../util/array';
 import { readLocalFile } from '../../../util/fs';
-import { CargoLockSchema, CargoLockSchemaToml } from './schema';
+import type { CargoLockSchema } from './schema';
+import { CargoLockSchemaToml } from './schema';
 
 export async function extractLockFileVersions(
   lockFilePath: string,

lib/modules/manager/cargo/update.ts

@@ -1,4 +1,5 @@
-import semver, { ReleaseType } from 'semver';
+import type { ReleaseType } from 'semver';
+import semver from 'semver';
 import { logger } from '../../../logger';
 import { regEx } from '../../../util/regex';
 import type { BumpPackageVersionResult } from '../types';

lib/modules/manager/cpanfile/language.ts

@@ -1,4 +1,5 @@
-import { lexer as l, lang, parser as p } from 'good-enough-parser';
+import type { lexer as l, parser as p } from 'good-enough-parser';
+import { lang } from 'good-enough-parser';
 
 /**
  * @see https://perldoc.perl.org/perldata#Scalar-value-constructors

lib/modules/manager/git-submodules/extract.spec.ts

@@ -1,6 +1,7 @@
 import is from '@sindresorhus/is';
 import { mock } from 'jest-mock-extended';
-import { Response, SimpleGit, SimpleGitFactory, simpleGit } from 'simple-git';
+import type { Response, SimpleGit, SimpleGitFactory } from 'simple-git';
+import { simpleGit } from 'simple-git';
 import { GlobalConfig } from '../../../config/global';
 import * as hostRules from '../../../util/host-rules';
 import { extractPackageFile } from '.';

lib/modules/manager/git-submodules/extract.ts

@@ -1,5 +1,6 @@
 import URL from 'node:url';
-import Git, { SimpleGit } from 'simple-git';
+import type { SimpleGit } from 'simple-git';
+import Git from 'simple-git';
 import upath from 'upath';
 import { GlobalConfig } from '../../../config/global';
 import { logger } from '../../../logger';

lib/modules/manager/git-submodules/update.spec.ts

@@ -1,6 +1,8 @@
 import { mock } from 'jest-mock-extended';
-import { SimpleGit, simpleGit } from 'simple-git';
-import { DirectoryResult, dir } from 'tmp-promise';
+import type { SimpleGit } from 'simple-git';
+import { simpleGit } from 'simple-git';
+import type { DirectoryResult } from 'tmp-promise';
+import { dir } from 'tmp-promise';
 import { join } from 'upath';
 import { fs } from '../../../../test/util';
 import { GlobalConfig } from '../../../config/global';