refactor: update WorkerExtractConfig type definition (#16020)

* update WorkerExtractConfig types * update comment * move worker-extract * update CustomManager * move interface RegExManagerTemplates manager->config * fix import error * rename CustomManager -> RegExManager * fix lint error
renovatebot · Jun 16, 2022 · abe821a · abe821a
1 parent ffe8cfb
commit abe821a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 34 deletions.
diff --git a/lib/config/types.ts b/lib/config/types.ts
@@ -1,6 +1,5 @@
 import type { LogLevel } from 'bunyan';
 import type { Range } from 'semver';
-import type { ExtractConfig } from '../modules/manager/types';
 import type { HostRule } from '../types';
 import type { GitNoVerifyOption } from '../util/git/types';
 
@@ -161,15 +160,21 @@ export type RenovateRepository =
       repository: string;
       secrets?: Record<string, string>;
     };
-
-export interface CustomManager {
-  fileMatch: string[];
-  matchStrings: string[];
-  matchStringsStrategy?: string;
+export interface RegexManagerTemplates {
   depNameTemplate?: string;
-  datasourceTemplate?: string;
   packageNameTemplate?: string;
+  datasourceTemplate?: string;
   versioningTemplate?: string;
+  depTypeTemplate?: string;
+  currentValueTemplate?: string;
+  currentDigestTemplate?: string;
+  extractVersionTemplate?: string;
+  registryUrlTemplate?: string;
+}
+export interface RegExManager extends RegexManagerTemplates {
+  fileMatch: string[];
+  matchStrings: string[];
+  matchStringsStrategy?: string;
   autoReplaceStringTemplate?: string;
 }
 
@@ -228,7 +233,7 @@ export interface RenovateConfig
 
   warnings?: ValidationMessage[];
   vulnerabilityAlerts?: RenovateSharedConfig;
-  regexManagers?: CustomManager[];
+  regexManagers?: RegExManager[];
 
   fetchReleaseNotes?: boolean;
   secrets?: Record<string, string>;
@@ -446,12 +451,6 @@ export interface ManagerConfig extends RenovateConfig {
   language?: string | null;
 }
 
-export interface WorkerExtractConfig extends ExtractConfig {
-  manager: string;
-  enabled?: boolean;
-  fileList: string[];
-}
-
 export interface ValidationResult {
   errors: ValidationMessage[];
   warnings: ValidationMessage[];

diff --git a/lib/modules/manager/regex/index.ts b/lib/modules/manager/regex/index.ts
@@ -1,9 +1,9 @@
 import is from '@sindresorhus/is';
+import type { RegexManagerTemplates } from '../../../config/types';
 import type {
   CustomExtractConfig,
   PackageDependency,
   PackageFile,
-  RegexManagerTemplates,
   Result,
 } from '../types';
 import { handleAny, handleCombination, handleRecursive } from './strategies';

diff --git a/lib/modules/manager/regex/utils.ts b/lib/modules/manager/regex/utils.ts
@@ -1,11 +1,8 @@
 import { URL } from 'url';
+import type { RegexManagerTemplates } from '../../../config/types';
 import { logger } from '../../../logger';
 import * as template from '../../../util/template';
-import type {
-  CustomExtractConfig,
-  PackageDependency,
-  RegexManagerTemplates,
-} from '../types';
+import type { CustomExtractConfig, PackageDependency } from '../types';
 import type { ExtractionTemplate } from './types';
 
 export const validMatchFields = [

diff --git a/lib/modules/manager/types.ts b/lib/modules/manager/types.ts
@@ -1,6 +1,7 @@
 import type { ReleaseType } from 'semver';
 import type {
   MatchStringsStrategy,
+  RegexManagerTemplates,
   UpdateType,
   ValidationMessage,
 } from '../../config/types';
@@ -21,14 +22,6 @@ export interface ExtractConfig {
   skipInstalls?: boolean;
 }
 
-export interface RegexManagerTemplates {
-  depNameTemplate?: string;
-  packageNameTemplate?: string;
-  datasourceTemplate?: string;
-  versioningTemplate?: string;
-  depTypeTemplate?: string;
-}
-
 export interface CustomExtractConfig
   extends ExtractConfig,
     RegexManagerTemplates {

diff --git a/lib/workers/repository/extract/index.ts b/lib/workers/repository/extract/index.ts
@@ -1,14 +1,11 @@
 import is from '@sindresorhus/is';
 import { getManagerConfig, mergeChildConfig } from '../../../config';
-import type {
-  ManagerConfig,
-  RenovateConfig,
-  WorkerExtractConfig,
-} from '../../../config/types';
+import type { ManagerConfig, RenovateConfig } from '../../../config/types';
 import { logger } from '../../../logger';
 import { getManagerList } from '../../../modules/manager';
 import type { PackageFile } from '../../../modules/manager/types';
 import { getFileList } from '../../../util/git';
+import type { WorkerExtractConfig } from '../../types';
 import { getMatchingFiles } from './file-match';
 import { getManagerPackageFiles } from './manager-files';
 

diff --git a/lib/workers/repository/extract/manager-files.ts b/lib/workers/repository/extract/manager-files.ts
@@ -1,5 +1,4 @@
 import is from '@sindresorhus/is';
-import type { WorkerExtractConfig } from '../../../config/types';
 import { logger } from '../../../logger';
 import {
   extractAllPackageFiles,
@@ -8,6 +7,7 @@ import {
 } from '../../../modules/manager';
 import type { PackageFile } from '../../../modules/manager/types';
 import { readLocalFile } from '../../../util/fs';
+import type { WorkerExtractConfig } from '../../types';
 
 export async function getManagerPackageFiles(
   config: WorkerExtractConfig

diff --git a/lib/workers/types.ts b/lib/workers/types.ts
@@ -2,13 +2,16 @@ import type { Merge } from 'type-fest';
 import type {
   GroupConfig,
   LegacyAdminConfig,
+  RegExManager,
   RenovateConfig,
   RenovateSharedConfig,
   ValidationMessage,
 } from '../config/types';
 import type { Release } from '../modules/datasource/types';
 import type {
   ArtifactError,
+  CustomExtractConfig,
+  ExtractConfig,
   LookupUpdate,
   PackageDependency,
   PackageFile,
@@ -123,3 +126,17 @@ export interface BranchConfig
   stopUpdating?: boolean;
   isConflicted?: boolean;
 }
+
+export interface WorkerExtractConfig
+  extends ExtractConfig,
+    Partial<CustomExtractConfig> {
+  manager: string;
+  fileList: string[];
+  fileMatch?: string[];
+  updateInternalDeps?: boolean;
+  includePaths?: string[];
+  ignorePaths?: string[];
+  regexManagers?: RegExManager[];
+  enabledManagers?: string[];
+  enabled?: boolean;
+}