diff --git a/lib/modules/manager/ansible-galaxy/extract.ts b/lib/modules/manager/ansible-galaxy/extract.ts
index 86977f1c18325dd32eca717dea2318b45d3db83a..6ef90271a3cd2a5eee67abcbb1fe93db9c2e6ee2 100644
--- a/lib/modules/manager/ansible-galaxy/extract.ts
+++ b/lib/modules/manager/ansible-galaxy/extract.ts
@@ -1,6 +1,6 @@
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { extractCollections } from './collections';
import { extractCollectionsMetaDataFile } from './collections-metadata';
import { extractRoles } from './roles';
@@ -25,7 +25,7 @@ export function getSliceEndNumber(
export function extractPackageFile(
content: string,
fileName: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('ansible-galaxy.extractPackageFile()');
const galaxyFileNameRegEx = regEx(/galaxy\.ya?ml$/);
const deps: PackageDependency[] = [];
diff --git a/lib/modules/manager/ansible/extract.ts b/lib/modules/manager/ansible/extract.ts
index cc87b949c01902c3d0842353481a7dc716a9fca2..3b8124f900314b8ca681495532f3e0fcabb9c6e1 100644
--- a/lib/modules/manager/ansible/extract.ts
+++ b/lib/modules/manager/ansible/extract.ts
@@ -2,13 +2,17 @@ import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import * as dockerVersioning from '../../versioning/docker';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
export function extractPackageFile(
content: string,
_filename: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('ansible.extractPackageFile()');
let deps: PackageDependency[] = [];
const re = regEx(/^\s*image:\s*'?"?([^\s'"]+)'?"?\s*$/);
diff --git a/lib/modules/manager/argocd/extract.ts b/lib/modules/manager/argocd/extract.ts
index 210a4d65a26f83e068829b80f9859b4dc335b017..eed4b535357c835fb90a489b3bf40ed4eb9a4524 100644
--- a/lib/modules/manager/argocd/extract.ts
+++ b/lib/modules/manager/argocd/extract.ts
@@ -5,7 +5,11 @@ import { trimTrailingSlash } from '../../../util/url';
import { DockerDatasource } from '../../datasource/docker';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { HelmDatasource } from '../../datasource/helm';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { ApplicationDefinition, ApplicationSource } from './types';
import { fileTestRegex } from './util';
@@ -66,7 +70,7 @@ export function extractPackageFile(
content: string,
fileName: string,
_config?: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
// check for argo reference. API version for the kind attribute is used
if (fileTestRegex.test(content) === false) {
return null;
diff --git a/lib/modules/manager/asdf/extract.ts b/lib/modules/manager/asdf/extract.ts
index f2a9756814c5f9484124ba74a2bc3bfbf04c8853..2094e55864edb6f3d25d5e5694ed17cde6119f2e 100644
--- a/lib/modules/manager/asdf/extract.ts
+++ b/lib/modules/manager/asdf/extract.ts
@@ -2,10 +2,10 @@ import is from '@sindresorhus/is';
import { logger } from '../../../logger';
import { isSkipComment } from '../../../util/ignore';
import { regEx } from '../../../util/regex';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { upgradeableTooling } from './upgradeable-tooling';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace('asdf.extractPackageFile()');
const regex = regEx(
diff --git a/lib/modules/manager/azure-pipelines/extract.ts b/lib/modules/manager/azure-pipelines/extract.ts
index 512ca41124519c3229074da90a988a61e684f05a..c2504b55045bee196940bc32fd768e3e30c51fd9 100644
--- a/lib/modules/manager/azure-pipelines/extract.ts
+++ b/lib/modules/manager/azure-pipelines/extract.ts
@@ -7,7 +7,7 @@ import { joinUrlParts } from '../../../util/url';
import { AzurePipelinesTasksDatasource } from '../../datasource/azure-pipelines-tasks';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { AzurePipelines, Container, Repository } from './types';
const AzurePipelinesTaskRegex = regEx(/^(?<name>[^@]+)@(?<version>.*)$/);
@@ -117,7 +117,7 @@ export function parseAzurePipelines(
export function extractPackageFile(
content: string,
filename: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace(`azurePipelines.extractPackageFile(${filename})`);
const deps: PackageDependency[] = [];
diff --git a/lib/modules/manager/batect-wrapper/extract.ts b/lib/modules/manager/batect-wrapper/extract.ts
index 9835a6f4f1fe30de7bfb86e77abeeca61c722e76..6dac56cdad473bdfe3f7ff1934afe09360b9e87b 100644
--- a/lib/modules/manager/batect-wrapper/extract.ts
+++ b/lib/modules/manager/batect-wrapper/extract.ts
@@ -2,11 +2,13 @@ import { logger } from '../../../logger';
import { regEx } from '../../../util/regex';
import { GithubReleasesDatasource } from '../../datasource/github-releases';
import { id as semverVersioning } from '../../versioning/semver';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const VERSION_REGEX = regEx(/^\s+VERSION="(.*)"$/m);
-export function extractPackageFile(fileContent: string): PackageFile | null {
+export function extractPackageFile(
+ fileContent: string
+): PackageFileContent | null {
logger.trace('batect.extractPackageFile()');
const match = VERSION_REGEX.exec(fileContent);
diff --git a/lib/modules/manager/batect/extract.ts b/lib/modules/manager/batect/extract.ts
index 81d668729fe87d3496e11ccbda8150ed43462114..0aaf155894d38b640da1548e08a3da2a6614f4aa 100644
--- a/lib/modules/manager/batect/extract.ts
+++ b/lib/modules/manager/batect/extract.ts
@@ -7,7 +7,11 @@ import { GitTagsDatasource } from '../../datasource/git-tags';
import { id as dockerVersioning } from '../../versioning/docker';
import { id as semverVersioning } from '../../versioning/semver';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type {
BatectConfig,
BatectFileInclude,
@@ -149,10 +153,10 @@ export function extractPackageFile(
export async function extractAllPackageFiles(
config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile[] | null> {
+): Promise<PackageFileContent[] | null> {
const filesToExamine = new Set<string>(packageFiles);
const filesAlreadyExamined = new Set<string>();
- const results: PackageFile[] = [];
+ const results: PackageFileContent[] = [];
while (filesToExamine.size > 0) {
const packageFile = filesToExamine.values().next().value;
diff --git a/lib/modules/manager/bazel/extract.ts b/lib/modules/manager/bazel/extract.ts
index b00bc7cbb70e7030eff7e695cdf5d718317de279..89dc71fa6c4f10985551741579ec7bd7d9a76c18 100644
--- a/lib/modules/manager/bazel/extract.ts
+++ b/lib/modules/manager/bazel/extract.ts
@@ -1,4 +1,4 @@
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { parse } from './parser';
import { extractDepsFromFragment } from './rules';
import type { RecordFragment } from './types';
@@ -6,7 +6,7 @@ import type { RecordFragment } from './types';
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
const deps: PackageDependency[] = [];
const fragments: RecordFragment[] | null = parse(content, packageFile);
diff --git a/lib/modules/manager/bazelisk/extract.ts b/lib/modules/manager/bazelisk/extract.ts
index a4376a57694e867a14641744efeb5c62e1091610..3b38781e3d527cbb5eb28919c8ad87431b41c080 100644
--- a/lib/modules/manager/bazelisk/extract.ts
+++ b/lib/modules/manager/bazelisk/extract.ts
@@ -1,7 +1,7 @@
import { GithubReleasesDatasource } from '../../datasource/github-releases';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const dep: PackageDependency = {
depName: 'bazel',
currentValue: content.split('\n', 2)[0].trim(),
diff --git a/lib/modules/manager/bitbucket-pipelines/extract.ts b/lib/modules/manager/bitbucket-pipelines/extract.ts
index 92fc4d3597361dad592a5084d47ca73bce55fc05..1b3f67d363dfadcc36dc83b6f366e42216b0c341 100644
--- a/lib/modules/manager/bitbucket-pipelines/extract.ts
+++ b/lib/modules/manager/bitbucket-pipelines/extract.ts
@@ -1,12 +1,12 @@
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const pipeRegex = regEx(`^\\s*-\\s?pipe:\\s*'?"?([^\\s'"]+)'?"?\\s*$`);
const dockerImageRegex = regEx(`^\\s*-?\\s?image:\\s*'?"?([^\\s'"]+)'?"?\\s*$`);
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
try {
diff --git a/lib/modules/manager/buildkite/extract.ts b/lib/modules/manager/buildkite/extract.ts
index 76d35ca78c1763b78d402e1f837c8963f1a57d7c..2ead47f2367a7798c8e0fac937d4047136ac8aca 100644
--- a/lib/modules/manager/buildkite/extract.ts
+++ b/lib/modules/manager/buildkite/extract.ts
@@ -3,9 +3,9 @@ import type { SkipReason } from '../../../types';
import { newlineRegex, regEx } from '../../../util/regex';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { isVersion } from '../../versioning/semver';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
try {
const lines = content.split(newlineRegex);
diff --git a/lib/modules/manager/bundler/extract.ts b/lib/modules/manager/bundler/extract.ts
index 62107de8570271d92a3639ea1f6c0251616c4077..22acefbebadba49a46734e2aa8448dae6fc19e78 100644
--- a/lib/modules/manager/bundler/extract.ts
+++ b/lib/modules/manager/bundler/extract.ts
@@ -4,7 +4,7 @@ import { readLocalFile } from '../../../util/fs';
import { newlineRegex, regEx } from '../../../util/regex';
import { RubyVersionDatasource } from '../../datasource/ruby-version';
import { RubyGemsDatasource } from '../../datasource/rubygems';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { delimiters, extractRubyVersion } from './common';
import { extractLockFileEntries } from './locked-version';
@@ -15,8 +15,8 @@ function formatContent(input: string): string {
export async function extractPackageFile(
content: string,
fileName?: string
-): Promise<PackageFile | null> {
- const res: PackageFile = {
+): Promise<PackageFileContent | null> {
+ const res: PackageFileContent = {
registryUrls: [],
deps: [],
};
diff --git a/lib/modules/manager/cake/index.ts b/lib/modules/manager/cake/index.ts
index 10b22ec435e66b98721ee2b9313aa0a09d71491d..15de141e3568e6e6647b8f36cdf0433544ffb665 100644
--- a/lib/modules/manager/cake/index.ts
+++ b/lib/modules/manager/cake/index.ts
@@ -2,7 +2,7 @@ import moo from 'moo';
import type { ProgrammingLanguage } from '../../../constants';
import { regEx } from '../../../util/regex';
import { NugetDatasource } from '../../datasource/nuget';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
export const language: ProgrammingLanguage = 'dotnet';
@@ -56,7 +56,7 @@ function parseDependencyLine(line: string): PackageDependency | null {
}
}
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const deps: PackageDependency[] = [];
lexer.reset(content);
let token = lexer.next();
diff --git a/lib/modules/manager/cargo/extract.ts b/lib/modules/manager/cargo/extract.ts
index 87a334aa53a7908a52cbb370e5018831616189a9..4da8fa5e4939ae2ffbedb21217f6ad04108b25b1 100644
--- a/lib/modules/manager/cargo/extract.ts
+++ b/lib/modules/manager/cargo/extract.ts
@@ -3,7 +3,11 @@ import { logger } from '../../../logger';
import type { SkipReason } from '../../../types';
import { findLocalSiblingOrParent, readLocalFile } from '../../../util/fs';
import { CrateDatasource } from '../../datasource/crate';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type {
CargoConfig,
CargoManifest,
@@ -141,7 +145,7 @@ export async function extractPackageFile(
content: string,
fileName: string,
_config?: ExtractConfig
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace(`cargo.extractPackageFile(${fileName})`);
const cargoConfig = await readCargoConfig();
@@ -217,7 +221,7 @@ export async function extractPackageFile(
return null;
}
const lockFileName = await findLocalSiblingOrParent(fileName, 'Cargo.lock');
- const res: PackageFile = { deps };
+ const res: PackageFileContent = { deps };
// istanbul ignore if
if (lockFileName) {
res.lockFiles = [lockFileName];
diff --git a/lib/modules/manager/cdnurl/extract.ts b/lib/modules/manager/cdnurl/extract.ts
index 30c90fa874b00fc4c1a5b2dcbc9128e8fa469fed..45cb2dea7a8f4263906bf9564886f73e72b9d620 100644
--- a/lib/modules/manager/cdnurl/extract.ts
+++ b/lib/modules/manager/cdnurl/extract.ts
@@ -1,12 +1,12 @@
import { regEx } from '../../../util/regex';
import { CdnJsDatasource } from '../../datasource/cdnjs';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
export const cloudflareUrlRegex = regEx(
/\/\/cdnjs\.cloudflare\.com\/ajax\/libs\/(?<depName>[^/]+?)\/(?<currentValue>[^/]+?)\/(?<asset>[-/_.a-zA-Z0-9]+)/
);
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const deps: PackageDependency[] = [];
let rest = content;
diff --git a/lib/modules/manager/circleci/extract.ts b/lib/modules/manager/circleci/extract.ts
index 6c03b1e69b786024b140b15e45014872debff727..4f3bc24ab9c4aed9fae0f63312f95d004ea65341 100644
--- a/lib/modules/manager/circleci/extract.ts
+++ b/lib/modules/manager/circleci/extract.ts
@@ -3,9 +3,9 @@ import { newlineRegex, regEx } from '../../../util/regex';
import { OrbDatasource } from '../../datasource/orb';
import * as npmVersioning from '../../versioning/npm';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
try {
const lines = content.split(newlineRegex);
diff --git a/lib/modules/manager/cloudbuild/extract.ts b/lib/modules/manager/cloudbuild/extract.ts
index 8abf6e82ca7c2e6350b5dfae42ab01fe8f95bce3..c4ad138a1f48a1622daf7a3e91fbd6c96b332640 100644
--- a/lib/modules/manager/cloudbuild/extract.ts
+++ b/lib/modules/manager/cloudbuild/extract.ts
@@ -2,9 +2,9 @@ import is from '@sindresorhus/is';
import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
try {
// TODO: fix types
diff --git a/lib/modules/manager/cocoapods/extract.ts b/lib/modules/manager/cocoapods/extract.ts
index d392d7ede1dd2d79cafa60c28f9c6862fbf5c675..e251df745da8ab9ddf96deb109a919312c695abb 100644
--- a/lib/modules/manager/cocoapods/extract.ts
+++ b/lib/modules/manager/cocoapods/extract.ts
@@ -5,7 +5,7 @@ import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { GitlabTagsDatasource } from '../../datasource/gitlab-tags';
import { PodDatasource } from '../../datasource/pod';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { ParsedLine } from './types';
const regexMappings = [
@@ -83,7 +83,7 @@ export function gitDep(parsedLine: ParsedLine): PackageDependency | null {
export async function extractPackageFile(
content: string,
fileName: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace('cocoapods.extractPackageFile()');
const deps: PackageDependency[] = [];
const lines: string[] = content.split(newlineRegex);
@@ -145,7 +145,7 @@ export async function extractPackageFile(
deps.push(dep);
}
}
- const res: PackageFile = { deps };
+ const res: PackageFileContent = { deps };
const lockFile = getSiblingFileName(fileName, 'Podfile.lock');
// istanbul ignore if
if (await localPathExists(lockFile)) {
diff --git a/lib/modules/manager/composer/extract.ts b/lib/modules/manager/composer/extract.ts
index 7cb7999c8a72e840e7955410d92175b1c3244cff..2b8588b7bb57164af8774523828f1bd66ccc86a8 100644
--- a/lib/modules/manager/composer/extract.ts
+++ b/lib/modules/manager/composer/extract.ts
@@ -6,7 +6,7 @@ import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { PackagistDatasource } from '../../datasource/packagist';
import { api as semverComposer } from '../../versioning/composer';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type {
ComposerConfig,
ComposerLock,
@@ -81,7 +81,7 @@ function parseRepositories(
export async function extractPackageFile(
content: string,
fileName: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace(`composer.extractPackageFile(${fileName})`);
let composerJson: ComposerConfig;
try {
@@ -92,7 +92,7 @@ export async function extractPackageFile(
}
const repositories: Record<string, Repo> = {};
const registryUrls: string[] = [];
- const res: PackageFile = { deps: [] };
+ const res: PackageFileContent = { deps: [] };
// handle lockfile
const lockfilePath = fileName.replace(regEx(/\.json$/), '.lock');
diff --git a/lib/modules/manager/conan/extract.ts b/lib/modules/manager/conan/extract.ts
index 9d545cca300ccb8b2faa6e7c9471a9ac3be640f9..2c8d274525995d589d548352d6bc0447aa5c3d81 100644
--- a/lib/modules/manager/conan/extract.ts
+++ b/lib/modules/manager/conan/extract.ts
@@ -1,6 +1,6 @@
import is from '@sindresorhus/is';
import { regEx } from '../../../util/regex';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { isComment } from './common';
const regex = regEx(
@@ -19,7 +19,7 @@ function setDepType(content: string, originalType: string): string {
return depType;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
// only process sections where requirements are defined
const sections = content.split(/def |\n\[/).filter(
(part) =>
diff --git a/lib/modules/manager/deps-edn/extract.ts b/lib/modules/manager/deps-edn/extract.ts
index cfb29701945aaa96daecd98d4a140414fcf7dbf9..e3ddc9df7ac2d681b98ef379d5d8c8eb031e14e9 100644
--- a/lib/modules/manager/deps-edn/extract.ts
+++ b/lib/modules/manager/deps-edn/extract.ts
@@ -7,7 +7,7 @@ import { GitRefsDatasource } from '../../datasource/git-refs';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { GitlabTagsDatasource } from '../../datasource/gitlab-tags';
import { MAVEN_REPO } from '../../datasource/maven/common';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { parseDepsEdnFile } from './parser';
import type {
ParsedEdnData,
@@ -205,7 +205,7 @@ function extractSection(
return deps;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const parsed = parseDepsEdnFile(content);
if (!parsed) {
return null;
diff --git a/lib/modules/manager/docker-compose/extract.ts b/lib/modules/manager/docker-compose/extract.ts
index 812ac63be3fb140e31846c64a7795e4e7d8a3f8a..808372ce7440371c0701c4dbd8f45d616d3ff988 100644
--- a/lib/modules/manager/docker-compose/extract.ts
+++ b/lib/modules/manager/docker-compose/extract.ts
@@ -3,7 +3,7 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageFile } from '../types';
+import type { ExtractConfig, PackageFileContent } from '../types';
import type { DockerComposeConfig } from './types';
class LineMapper {
@@ -32,7 +32,7 @@ export function extractPackageFile(
content: string,
fileName: string,
extractConfig: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
logger.debug('docker-compose.extractPackageFile()');
let config: DockerComposeConfig;
try {
diff --git a/lib/modules/manager/dockerfile/extract.ts b/lib/modules/manager/dockerfile/extract.ts
index c13f4fd93a72b35ed1dcfaed5c5d8721bbcfc232..45a6fc56cf4e510e5b04fa117a7b971c0038d3cb 100644
--- a/lib/modules/manager/dockerfile/extract.ts
+++ b/lib/modules/manager/dockerfile/extract.ts
@@ -4,7 +4,11 @@ import { escapeRegExp, newlineRegex, regEx } from '../../../util/regex';
import { DockerDatasource } from '../../datasource/docker';
import * as debianVersioning from '../../versioning/debian';
import * as ubuntuVersioning from '../../versioning/ubuntu';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
const variableMarker = '$';
@@ -237,7 +241,7 @@ export function extractPackageFile(
content: string,
_filename: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
const deps: PackageDependency[] = [];
const stageNames: string[] = [];
const args: Record<string, string> = {};
diff --git a/lib/modules/manager/droneci/extract.ts b/lib/modules/manager/droneci/extract.ts
index 1b4fde40d811be4841bf1eb1fcd1a9d7e52820a3..526c22cfcbefb7e72ac5509087980cea6978bc51 100644
--- a/lib/modules/manager/droneci/extract.ts
+++ b/lib/modules/manager/droneci/extract.ts
@@ -1,13 +1,17 @@
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
export function extractPackageFile(
content: string,
_filename: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
const deps: PackageDependency[] = [];
try {
const lines = content.split(newlineRegex);
diff --git a/lib/modules/manager/fleet/extract.ts b/lib/modules/manager/fleet/extract.ts
index 82fd64491bb0ea16fd783b07b2097f258a458f43..b02f2669d8f264b325428e1ea415e6193897a15e 100644
--- a/lib/modules/manager/fleet/extract.ts
+++ b/lib/modules/manager/fleet/extract.ts
@@ -5,7 +5,7 @@ import { regEx } from '../../../util/regex';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { HelmDatasource } from '../../datasource/helm';
import { checkIfStringIsPath } from '../terraform/util';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { FleetFile, FleetHelmBlock, GitRepo } from './types';
function extractGitRepo(doc: GitRepo): PackageDependency {
@@ -111,7 +111,7 @@ function extractFleetFile(doc: FleetFile): PackageDependency[] {
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
if (!content) {
return null;
}
diff --git a/lib/modules/manager/flux/extract.ts b/lib/modules/manager/flux/extract.ts
index 6d6f4ae11b5a11066ca5285bf1ee4db9db1543b8..974920b9a568097543596c0c659e746b561ff045 100644
--- a/lib/modules/manager/flux/extract.ts
+++ b/lib/modules/manager/flux/extract.ts
@@ -10,7 +10,11 @@ import { GithubTagsDatasource } from '../../datasource/github-tags';
import { GitlabTagsDatasource } from '../../datasource/gitlab-tags';
import { HelmDatasource } from '../../datasource/helm';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { isSystemManifest } from './common';
import type {
FluxManagerData,
@@ -235,7 +239,7 @@ function resolveResourceManifest(
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile<FluxManagerData> | null {
+): PackageFileContent<FluxManagerData> | null {
const manifest = readManifest(content, packageFile);
if (!manifest) {
return null;
@@ -264,9 +268,9 @@ export function extractPackageFile(
export async function extractAllPackageFiles(
_config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile<FluxManagerData>[] | null> {
+): Promise<PackageFileContent<FluxManagerData>[] | null> {
const manifests: FluxManifest[] = [];
- const results: PackageFile<FluxManagerData>[] = [];
+ const results: PackageFileContent<FluxManagerData>[] = [];
for (const file of packageFiles) {
const content = await readLocalFile(file, 'utf8');
diff --git a/lib/modules/manager/fvm/extract.ts b/lib/modules/manager/fvm/extract.ts
index 39a7cf025de49e6f6b800f9b4a1401a09e953630..8d79aab8b28a29a1c3e3a7adeb766c8540067fa4 100644
--- a/lib/modules/manager/fvm/extract.ts
+++ b/lib/modules/manager/fvm/extract.ts
@@ -1,7 +1,7 @@
import is from '@sindresorhus/is';
import { logger } from '../../../logger';
import { FlutterVersionDatasource } from '../../datasource/flutter-version';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
interface FvmConfig {
flutterSdkVersion: string;
@@ -10,7 +10,7 @@ interface FvmConfig {
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
let fvmConfig: FvmConfig;
try {
fvmConfig = JSON.parse(content);
diff --git a/lib/modules/manager/git-submodules/extract.spec.ts b/lib/modules/manager/git-submodules/extract.spec.ts
index 8bff71aa876526271baea0db9fb4a1ec9fca2db5..8ea9e76d32ceb0f081714b41bdbc731823bf5900 100644
--- a/lib/modules/manager/git-submodules/extract.spec.ts
+++ b/lib/modules/manager/git-submodules/extract.spec.ts
@@ -8,7 +8,7 @@ import _simpleGit, {
} from 'simple-git';
import { GlobalConfig } from '../../../config/global';
import * as hostRules from '../../../util/host-rules';
-import type { PackageFile } from '../types';
+import type { PackageFileContent } from '../types';
import { extractPackageFile } from '.';
jest.mock('simple-git');
@@ -54,7 +54,7 @@ describe('modules/manager/git-submodules/extract', () => {
it('extracts submodules', async () => {
GlobalConfig.set({ localDir: `${__dirname}/__fixtures__` });
hostRules.add({ matchHost: 'github.com', token: '123test' });
- let res: PackageFile | null;
+ let res: PackageFileContent | null;
expect(await extractPackageFile('', '.gitmodules.1', {})).toBeNull();
res = await extractPackageFile('', '.gitmodules.2', {});
expect(res?.deps).toHaveLength(1);
diff --git a/lib/modules/manager/git-submodules/extract.ts b/lib/modules/manager/git-submodules/extract.ts
index 404b9656f95c7427272731ce17bcd24188c30413..2e6a3da83e9fcb05bb3f56eded864c4d9420413f 100644
--- a/lib/modules/manager/git-submodules/extract.ts
+++ b/lib/modules/manager/git-submodules/extract.ts
@@ -7,7 +7,7 @@ import { simpleGitConfig } from '../../../util/git/config';
import { getHttpUrl, getRemoteUrlWithToken } from '../../../util/git/url';
import { regEx } from '../../../util/regex';
import { GitRefsDatasource } from '../../datasource/git-refs';
-import type { ExtractConfig, PackageFile } from '../types';
+import type { ExtractConfig, PackageFileContent } from '../types';
import type { GitModule } from './types';
async function getUrl(
@@ -93,7 +93,7 @@ export default async function extractPackageFile(
_content: string,
fileName: string,
config: ExtractConfig
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
const { localDir } = GlobalConfig.get();
const git = Git(localDir, simpleGitConfig());
const gitModulesPath = upath.join(localDir, fileName);
diff --git a/lib/modules/manager/github-actions/extract.ts b/lib/modules/manager/github-actions/extract.ts
index 10d58e89ba6c02ddd76e3083804c43a6e6b1bd5e..90ff7ce93cfd13c76d17538ab8c44e12ba8383db 100644
--- a/lib/modules/manager/github-actions/extract.ts
+++ b/lib/modules/manager/github-actions/extract.ts
@@ -5,7 +5,7 @@ import { newlineRegex, regEx } from '../../../util/regex';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import * as dockerVersioning from '../../versioning/docker';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { Workflow } from './types';
const dockerActionRe = regEx(/^\s+uses: ['"]?docker:\/\/([^'"]+)\s*$/);
@@ -126,7 +126,7 @@ function extractWithYAMLParser(
export function extractPackageFile(
content: string,
filename: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('github-actions.extractPackageFile()');
const deps = [
...extractWithRegex(content),
diff --git a/lib/modules/manager/gitlabci-include/extract.ts b/lib/modules/manager/gitlabci-include/extract.ts
index 1fa8c9d6e7f56e2eab88b173a0b503bbe4b5b873..a677d8f5b70da7c58eb28c2ebe09fcc665d84345 100644
--- a/lib/modules/manager/gitlabci-include/extract.ts
+++ b/lib/modules/manager/gitlabci-include/extract.ts
@@ -10,7 +10,7 @@ import type {
GitlabPipeline,
} from '../gitlabci/types';
import { replaceReferenceTags } from '../gitlabci/utils';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import {
filterIncludeFromGitlabPipeline,
isGitlabIncludeProject,
@@ -63,7 +63,7 @@ function getAllIncludeProjects(data: GitlabPipeline): GitlabIncludeProject[] {
return childrenData;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
const { platform, endpoint } = GlobalConfig.get();
try {
diff --git a/lib/modules/manager/gitlabci/extract.ts b/lib/modules/manager/gitlabci/extract.ts
index d60a7a4cc3b341dd9f5967d5a550548633861d50..f108472d06699123105d3030ec36ea466cef8d3d 100644
--- a/lib/modules/manager/gitlabci/extract.ts
+++ b/lib/modules/manager/gitlabci/extract.ts
@@ -3,7 +3,11 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { readLocalFile } from '../../../util/fs';
import { trimLeadingSlash } from '../../../util/url';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { isGitlabIncludeLocal } from './common';
import type { GitlabPipeline, Image, Job, Services } from './types';
import { getGitlabDep, replaceReferenceTags } from './utils';
@@ -75,7 +79,7 @@ export function extractPackageFile(
content: string,
_fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
let deps: PackageDependency[] = [];
try {
const doc = load(replaceReferenceTags(content), {
@@ -119,10 +123,10 @@ export function extractPackageFile(
export async function extractAllPackageFiles(
config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile[] | null> {
+): Promise<PackageFileContent[] | null> {
const filesToExamine = [...packageFiles];
const seen = new Set<string>(packageFiles);
- const results: PackageFile[] = [];
+ const results: PackageFileContent[] = [];
// extract all includes from the files
while (filesToExamine.length > 0) {
diff --git a/lib/modules/manager/gomod/extract.ts b/lib/modules/manager/gomod/extract.ts
index 47ea1f1c5c46fe7287e7936f7597f1ce30772e17..2d99d83f48ab5a4298ae353a3258ad741b6c2732 100644
--- a/lib/modules/manager/gomod/extract.ts
+++ b/lib/modules/manager/gomod/extract.ts
@@ -4,7 +4,7 @@ import { newlineRegex, regEx } from '../../../util/regex';
import { GoDatasource } from '../../datasource/go';
import { GolangVersionDatasource } from '../../datasource/golang-version';
import { isVersion } from '../../versioning/semver';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { MultiLineParseResult } from './types';
function getDep(
@@ -50,7 +50,7 @@ function getGoDep(lineNumber: number, goVer: string): PackageDependency {
};
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace({ content }, 'gomod.extractPackageFile()');
const deps: PackageDependency[] = [];
try {
diff --git a/lib/modules/manager/gradle-wrapper/extract.ts b/lib/modules/manager/gradle-wrapper/extract.ts
index 5ec9dcd79902bff972bf54d7ee4d4e2913cad242..98fa96ab0db3798d1de25f43b4f4a9be8940a207 100644
--- a/lib/modules/manager/gradle-wrapper/extract.ts
+++ b/lib/modules/manager/gradle-wrapper/extract.ts
@@ -1,10 +1,12 @@
import { logger } from '../../../logger';
import { GradleVersionDatasource } from '../../datasource/gradle-version';
import { id as versioning } from '../../versioning/gradle';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { extractGradleVersion } from './utils';
-export function extractPackageFile(fileContent: string): PackageFile | null {
+export function extractPackageFile(
+ fileContent: string
+): PackageFileContent | null {
logger.trace('gradle-wrapper.extractPackageFile()');
const extractResult = extractGradleVersion(fileContent);
if (extractResult) {
diff --git a/lib/modules/manager/gradle/extract.ts b/lib/modules/manager/gradle/extract.ts
index 31d3355426d21194f502b22e1cfb97a02ad8dd1d..68937dad0c64848e8a97d193d90dc6dbe7e5f35b 100644
--- a/lib/modules/manager/gradle/extract.ts
+++ b/lib/modules/manager/gradle/extract.ts
@@ -2,7 +2,11 @@ import upath from 'upath';
import { logger } from '../../../logger';
import { getLocalFiles } from '../../../util/fs';
import { MavenDatasource } from '../../datasource/maven';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { parseCatalog } from './extract/catalog';
import {
isGcvPropsFile,
@@ -48,10 +52,10 @@ function getRegistryUrlsForDep(
export async function extractAllPackageFiles(
config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile[] | null> {
+): Promise<PackageFileContent[] | null> {
const extractedDeps: PackageDependency<GradleManagerData>[] = [];
const varRegistry: VariableRegistry = {};
- const packageFilesByName: Record<string, PackageFile> = {};
+ const packageFilesByName: Record<string, PackageFileContent> = {};
const packageRegistries: PackageRegistry[] = [];
const reorderedFiles = reorderFiles(packageFiles);
const fileContents = await getLocalFiles(packageFiles);
@@ -127,7 +131,7 @@ export async function extractAllPackageFiles(
const key = dep.managerData?.packageFile;
// istanbul ignore else
if (key) {
- let pkgFile: PackageFile = packageFilesByName[key];
+ let pkgFile: PackageFileContent = packageFilesByName[key];
// istanbul ignore if: won't happen if "apply from" processes only initially known files
if (!pkgFile) {
pkgFile = {
diff --git a/lib/modules/manager/helm-requirements/extract.ts b/lib/modules/manager/helm-requirements/extract.ts
index f53f0485e43cf81c123ea7f06ff0f14982c10352..ba4bf7264797b5da805708d2217babb88e895b18 100644
--- a/lib/modules/manager/helm-requirements/extract.ts
+++ b/lib/modules/manager/helm-requirements/extract.ts
@@ -2,13 +2,17 @@ import is from '@sindresorhus/is';
import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { HelmDatasource } from '../../datasource/helm';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
let deps = [];
// TODO: fix type
let doc: any;
diff --git a/lib/modules/manager/helm-values/extract.ts b/lib/modules/manager/helm-values/extract.ts
index ba58044b151ef05e3e7c44faa76bc3adac96a3f5..6df6e372fe739310cb968587702d0928d635410f 100644
--- a/lib/modules/manager/helm-values/extract.ts
+++ b/lib/modules/manager/helm-values/extract.ts
@@ -2,7 +2,7 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { id as dockerVersioning } from '../../versioning/docker';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { HelmDockerImageDependency } from './types';
import {
matchesHelmValuesDockerHeuristic,
@@ -57,7 +57,7 @@ function findDependencies(
return packageDependencies;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
let parsedContent: Record<string, unknown> | HelmDockerImageDependency;
try {
// a parser that allows extracting line numbers would be preferable, with
diff --git a/lib/modules/manager/helmfile/extract.ts b/lib/modules/manager/helmfile/extract.ts
index ed866a28801869518011f7d8f42002ce9d337128..5477a52dc4aff3e694bd066d19a0c75d1182ae2f 100644
--- a/lib/modules/manager/helmfile/extract.ts
+++ b/lib/modules/manager/helmfile/extract.ts
@@ -4,7 +4,11 @@ import { logger } from '../../../logger';
import { regEx } from '../../../util/regex';
import { DockerDatasource } from '../../datasource/docker';
import { HelmDatasource } from '../../datasource/helm';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { Doc } from './types';
const isValidChartName = (name: string | undefined): boolean =>
@@ -21,7 +25,7 @@ export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
let deps: PackageDependency[] = [];
let docs: Doc[];
const registryAliases: Record<string, string> = {};
diff --git a/lib/modules/manager/helmsman/extract.ts b/lib/modules/manager/helmsman/extract.ts
index 77e4c4140569db394660d7c822fa268d1539f60d..9e0d1493b78e1075b12de56b28c49ad657d4196f 100644
--- a/lib/modules/manager/helmsman/extract.ts
+++ b/lib/modules/manager/helmsman/extract.ts
@@ -3,7 +3,11 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { regEx } from '../../../util/regex';
import { HelmDatasource } from '../../datasource/helm';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { HelmsmanDocument } from './types';
const chartRegex = regEx('^(?<registryRef>[^/]*)/(?<packageName>[^/]*)$');
@@ -53,7 +57,7 @@ export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
try {
// TODO: fix me (#9610)
const doc = load(content, {
diff --git a/lib/modules/manager/helmv3/extract.ts b/lib/modules/manager/helmv3/extract.ts
index fe59cda8e3d1de3f0c5d66ef5d7aa2c781f81c5f..642ceba06a0dd7600d2fbcbc846554d0d9a7116e 100644
--- a/lib/modules/manager/helmv3/extract.ts
+++ b/lib/modules/manager/helmv3/extract.ts
@@ -3,14 +3,18 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { getSiblingFileName, localPathExists } from '../../../util/fs';
import { HelmDatasource } from '../../datasource/helm';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { parseRepository, resolveAlias } from './utils';
export async function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
let chart: {
apiVersion: string;
name: string;
@@ -73,7 +77,7 @@ export async function extractPackageFile(
};
return result;
});
- const res: PackageFile = {
+ const res: PackageFileContent = {
deps,
datasource: HelmDatasource.id,
packageFileVersion,
diff --git a/lib/modules/manager/hermit/extract.ts b/lib/modules/manager/hermit/extract.ts
index d53806ea9789535627dc3c59889d677dc9a21e77..d279676e428fd673333346f12cbc27a1574e53e1 100644
--- a/lib/modules/manager/hermit/extract.ts
+++ b/lib/modules/manager/hermit/extract.ts
@@ -4,7 +4,7 @@ import { logger } from '../../../logger';
import { readLocalDirectory } from '../../../util/fs';
import { regEx } from '../../../util/regex';
import { HermitDatasource } from '../../datasource/hermit';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { HermitListItem } from './types';
const pkgReferenceRegex = regEx(`(?<packageName>.*?)-(?<version>[0-9]{1}.*)`);
@@ -16,7 +16,7 @@ const pkgReferenceRegex = regEx(`(?<packageName>.*?)-(?<version>[0-9]{1}.*)`);
export async function extractPackageFile(
content: string,
filename: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace('hermit.extractPackageFile()');
const dependencies = [] as PackageDependency[];
const packages = await listHermitPackages(filename);
diff --git a/lib/modules/manager/homebrew/extract.ts b/lib/modules/manager/homebrew/extract.ts
index c2d20d9e6f67834914731487a2b669730d9b8ce3..2487058913a9fb55bec884965ff21816d9e2fea5 100644
--- a/lib/modules/manager/homebrew/extract.ts
+++ b/lib/modules/manager/homebrew/extract.ts
@@ -2,7 +2,7 @@ import { logger } from '../../../logger';
import type { SkipReason } from '../../../types';
import { regEx } from '../../../util/regex';
import { GithubTagsDatasource } from '../../datasource/github-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { UrlPathParsedResult } from './types';
import { isSpace, removeComments, skip } from './util';
@@ -129,7 +129,7 @@ function extractClassName(content: string): string | null {
}
// TODO: Maybe check if quotes/double-quotes are balanced (#9591)
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace('extractPackageFile()');
/*
1. match "class className < Formula"
diff --git a/lib/modules/manager/html/extract.ts b/lib/modules/manager/html/extract.ts
index 4eef6d53de869dae246e5033ffd9e7c4ae9b3c4e..e8581147c8df23757739b12802d9536a97a967bb 100644
--- a/lib/modules/manager/html/extract.ts
+++ b/lib/modules/manager/html/extract.ts
@@ -1,7 +1,7 @@
import { regEx } from '../../../util/regex';
import { CdnJsDatasource } from '../../datasource/cdnjs';
import { cloudflareUrlRegex } from '../cdnurl/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const regex = regEx(/<\s*(script|link)\s+[^>]*?\/?>/i);
@@ -29,7 +29,7 @@ export function extractDep(tag: string): PackageDependency | null {
return dep;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
let rest = content;
let match = regex.exec(rest);
diff --git a/lib/modules/manager/index.ts b/lib/modules/manager/index.ts
index b4e833abce8ac0eb10de35b97c006e8a708bc699..f51df899c3c91d5477726b448f93f4e84328c3bd 100644
--- a/lib/modules/manager/index.ts
+++ b/lib/modules/manager/index.ts
@@ -5,7 +5,7 @@ import type {
ExtractConfig,
GlobalManagerConfig,
ManagerApi,
- PackageFile,
+ PackageFileContent,
RangeConfig,
Result,
} from './types';
@@ -40,7 +40,7 @@ export async function extractAllPackageFiles(
manager: string,
config: ExtractConfig,
files: string[]
-): Promise<PackageFile[] | null> {
+): Promise<PackageFileContent[] | null> {
if (!managers.has(manager)) {
return null;
}
@@ -61,7 +61,7 @@ export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): Result<PackageFile | null> {
+): Result<PackageFileContent | null> {
if (!managers.has(manager)) {
return null;
}
diff --git a/lib/modules/manager/jenkins/extract.ts b/lib/modules/manager/jenkins/extract.ts
index 95b780c2e3d277399b3a962957c1d0caa772698e..7ae1983e6c311647c980e2ce71f8cb63f0f52360 100644
--- a/lib/modules/manager/jenkins/extract.ts
+++ b/lib/modules/manager/jenkins/extract.ts
@@ -5,7 +5,7 @@ import { isSkipComment } from '../../../util/ignore';
import { newlineRegex, regEx } from '../../../util/regex';
import { JenkinsPluginsDatasource } from '../../datasource/jenkins-plugins';
import * as mavenVersioning from '../../versioning/maven';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { JenkinsPlugin, JenkinsPlugins } from './types';
const YamlExtension = regEx(/\.ya?ml$/);
@@ -98,7 +98,7 @@ function extractText(content: string): PackageDependency[] {
export function extractPackageFile(
content: string,
fileName: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('jenkins.extractPackageFile()');
const deps: PackageDependency[] = [];
diff --git a/lib/modules/manager/jsonnet-bundler/extract.ts b/lib/modules/manager/jsonnet-bundler/extract.ts
index 080b5512d61cd46bb4929482ea610593a49cb15b..224b37f825ba43bf955d90ed7c4b3ada5165d625 100644
--- a/lib/modules/manager/jsonnet-bundler/extract.ts
+++ b/lib/modules/manager/jsonnet-bundler/extract.ts
@@ -2,13 +2,13 @@ import { join } from 'upath';
import { logger } from '../../../logger';
import { coerceArray } from '../../../util/array';
import { parseUrl } from '../../../util/url';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { Dependency, JsonnetFile } from './types';
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace({ packageFile }, 'jsonnet-bundler.extractPackageFile()');
if (packageFile.match(/vendor\//)) {
diff --git a/lib/modules/manager/kotlin-script/extract.ts b/lib/modules/manager/kotlin-script/extract.ts
index 62125c3c3f8ccfa559484a6261c2c579403647a5..80753900fe57782d0d76677f3f8062b6a04e72a5 100644
--- a/lib/modules/manager/kotlin-script/extract.ts
+++ b/lib/modules/manager/kotlin-script/extract.ts
@@ -1,7 +1,7 @@
import is from '@sindresorhus/is';
import { regEx } from '../../../util/regex';
import { MavenDatasource } from '../../datasource/maven';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const dependsOnRegex = regEx(
/@file\s*:\s*DependsOn\s*\(\s*(?<replaceString>"(?<groupId>.+):(?<artifactId>.+):(?<version>.+)")\s*\)/g
@@ -10,7 +10,9 @@ const repositoryRegex = regEx(
/@file\s*:\s*Repository\s*\(\s*"(?<repositoryName>.+)"\s*\)/g
);
-export function extractPackageFile(fileContent: string): PackageFile | null {
+export function extractPackageFile(
+ fileContent: string
+): PackageFileContent | null {
const registryUrls: string[] = [...fileContent.matchAll(repositoryRegex)]
.map((match) => match.groups?.repositoryName)
.filter(is.string);
diff --git a/lib/modules/manager/kubernetes/extract.ts b/lib/modules/manager/kubernetes/extract.ts
index 1e385871f902ee4ad3139e045bc8e6b6f1db2448..633268f6a696f1189ed1d8bce2b4c611554f3cd4 100644
--- a/lib/modules/manager/kubernetes/extract.ts
+++ b/lib/modules/manager/kubernetes/extract.ts
@@ -8,14 +8,18 @@ import {
} from '../../datasource/kubernetes-api';
import * as kubernetesApiVersioning from '../../versioning/kubernetes-api';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { KubernetesConfiguration } from './types';
export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('kubernetes.extractPackageFile()');
const isKubernetesManifest =
diff --git a/lib/modules/manager/kustomize/extract.ts b/lib/modules/manager/kustomize/extract.ts
index 5eaf35dadca67bc56585cac71cc8d66fb679341b..a4b4216f6ed72de1b71abbac25249387f96bc928 100644
--- a/lib/modules/manager/kustomize/extract.ts
+++ b/lib/modules/manager/kustomize/extract.ts
@@ -8,7 +8,7 @@ import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { HelmDatasource } from '../../datasource/helm';
import { splitImageParts } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { HelmChart, Image, Kustomize } from './types';
// URL specifications should follow the hashicorp URL format
@@ -167,7 +167,7 @@ export function parseKustomize(content: string): Kustomize | null {
return pkg;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace('kustomize.extractPackageFile()');
const deps: PackageDependency[] = [];
diff --git a/lib/modules/manager/leiningen/extract.ts b/lib/modules/manager/leiningen/extract.ts
index 1b1e2572535c1d511cd121758aba9cabb4cc5987..f3eaab6e23d548b1babc45c24cf95867bdfff88e 100644
--- a/lib/modules/manager/leiningen/extract.ts
+++ b/lib/modules/manager/leiningen/extract.ts
@@ -1,6 +1,6 @@
import { newlineRegex, regEx } from '../../../util/regex';
import { ClojureDatasource } from '../../datasource/clojure';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { ExtractContext, ExtractedVariables } from './types';
export function trimAtKey(str: string, kwName: string): string | null {
@@ -187,7 +187,7 @@ function collectDeps(
return result;
}
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const registryUrls = extractLeinRepos(content);
const vars = extractVariables(content);
diff --git a/lib/modules/manager/maven-wrapper/extract.ts b/lib/modules/manager/maven-wrapper/extract.ts
index ad052e870fee1e9accdbee9fdff040709e613eea..12d91fe2440bec900fe35f619dc16ba01a4f09bc 100644
--- a/lib/modules/manager/maven-wrapper/extract.ts
+++ b/lib/modules/manager/maven-wrapper/extract.ts
@@ -2,7 +2,7 @@ import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import { MavenDatasource } from '../../datasource/maven';
import { id as versioning } from '../../versioning/maven';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { MavenVersionExtract, Version } from './types';
// https://regex101.com/r/IcOs7P/1
@@ -36,7 +36,9 @@ function extractLineInfo(lines: string[], regex: RegExp): Version | null {
return null;
}
-export function extractPackageFile(fileContent: string): PackageFile | null {
+export function extractPackageFile(
+ fileContent: string
+): PackageFileContent | null {
logger.trace('maven-wrapper.extractPackageFile()');
const extractResult = extractVersions(fileContent);
const deps = [];
diff --git a/lib/modules/manager/maven/extract.ts b/lib/modules/manager/maven/extract.ts
index c43c88d25bd21525e866d354b3732acd36ad73c4..54d7427ff127e998556079448ff60bc2bf76bf28 100644
--- a/lib/modules/manager/maven/extract.ts
+++ b/lib/modules/manager/maven/extract.ts
@@ -6,7 +6,11 @@ import { readLocalFile } from '../../../util/fs';
import { regEx } from '../../../util/regex';
import { MavenDatasource } from '../../datasource/maven';
import { MAVEN_REPO } from '../../datasource/maven/common';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { MavenProp } from './types';
export function parsePom(raw: string): XmlDocument | null {
@@ -245,7 +249,7 @@ function resolveParentFile(packageFile: string, parentPath: string): string {
return upath.normalize(upath.join(dir, parentDir, parentFile));
}
-interface MavenInterimPackageFile extends PackageFile {
+interface MavenInterimPackageFile extends PackageFileContent {
mavenProps?: Record<string, any>;
parent?: string;
}
@@ -253,7 +257,7 @@ interface MavenInterimPackageFile extends PackageFile {
export function extractPackage(
rawContent: string,
packageFile: string | null = null
-): PackageFile<Record<string, any>> | null {
+): PackageFileContent<Record<string, any>> | null {
if (!rawContent) {
return null;
}
@@ -369,7 +373,9 @@ export function parseSettings(raw: string): XmlDocument | null {
return null;
}
-export function resolveParents(packages: PackageFile[]): PackageFile[] {
+export function resolveParents(
+ packages: PackageFileContent[]
+): PackageFileContent[] {
const packageFileNames: string[] = [];
const extractedPackages: Record<string, MavenInterimPackageFile> = {};
const extractedDeps: Record<string, PackageDependency[]> = {};
@@ -456,7 +462,7 @@ export function resolveParents(packages: PackageFile[]): PackageFile[] {
function cleanResult(
packageFiles: MavenInterimPackageFile[]
-): PackageFile<Record<string, any>>[] {
+): PackageFileContent<Record<string, any>>[] {
packageFiles.forEach((packageFile) => {
delete packageFile.mavenProps;
delete packageFile.parent;
@@ -470,8 +476,8 @@ function cleanResult(
export async function extractAllPackageFiles(
_config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile[]> {
- const packages: PackageFile[] = [];
+): Promise<PackageFileContent[]> {
+ const packages: PackageFileContent[] = [];
const additionalRegistryUrls: string[] = [];
for (const packageFile of packageFiles) {
diff --git a/lib/modules/manager/maven/index.spec.ts b/lib/modules/manager/maven/index.spec.ts
index d03c0b169d0fcba3ba76b9723bfadc6da58595c7..f515099c90f0e26253eb3554a4522940b7b989e1 100644
--- a/lib/modules/manager/maven/index.spec.ts
+++ b/lib/modules/manager/maven/index.spec.ts
@@ -1,7 +1,7 @@
// TODO #7154
import { Fixtures } from '../../../../test/fixtures';
import { fs } from '../../../../test/util';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { extractPackage, resolveParents } from './extract';
import { extractAllPackageFiles, updateDependency } from '.';
@@ -401,7 +401,7 @@ describe('modules/manager/maven/index', () => {
it('should update ranges', () => {
const newValue = '[1.2.3]';
- const select = (depSet: PackageFile) =>
+ const select = (depSet: PackageFileContent) =>
selectDep(depSet.deps, 'org.example:hard-range');
const oldContent = extractPackage(pomContent);
const dep = select(oldContent!);
@@ -415,7 +415,7 @@ describe('modules/manager/maven/index', () => {
it('should preserve ranges', () => {
const newValue = '[1.0.0]';
- const select = (depSet: PackageFile) =>
+ const select = (depSet: PackageFileContent) =>
depSet?.deps ? selectDep(depSet.deps, 'org.example:hard-range') : null;
const oldContent = extractPackage(pomContent);
const dep = select(oldContent!);
diff --git a/lib/modules/manager/meteor/extract.ts b/lib/modules/manager/meteor/extract.ts
index a0d63fbec0948ee3813d1bb3036f7257af740cb1..59190b47f5374bb92b1ef759508852d6b8be54eb 100644
--- a/lib/modules/manager/meteor/extract.ts
+++ b/lib/modules/manager/meteor/extract.ts
@@ -1,9 +1,9 @@
import { logger } from '../../../logger';
import { regEx } from '../../../util/regex';
import { NpmDatasource } from '../../datasource/npm';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
let deps: PackageDependency[] = [];
const npmDepends = regEx(/\nNpm\.depends\({([\s\S]*?)}\);/).exec(content);
if (!npmDepends) {
diff --git a/lib/modules/manager/mint/extract.ts b/lib/modules/manager/mint/extract.ts
index 7be27c7b27eb71d42008db096e0a64416feede41..e2ecbc0c82fba9bc525f8912df21426f1fc0a947 100644
--- a/lib/modules/manager/mint/extract.ts
+++ b/lib/modules/manager/mint/extract.ts
@@ -1,8 +1,8 @@
import { newlineRegex } from '../../../util/regex';
import { GitTagsDatasource } from '../../datasource/git-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
for (const line of content.split(newlineRegex).map((s) => s.trim())) {
diff --git a/lib/modules/manager/mix/extract.ts b/lib/modules/manager/mix/extract.ts
index 3d4f58f8a93d50ce77fe7e6e40240426a4d6b277..faf8b57b9d08dd9a1c8ea6c42bcf84f3e625974a 100644
--- a/lib/modules/manager/mix/extract.ts
+++ b/lib/modules/manager/mix/extract.ts
@@ -4,7 +4,7 @@ import { newlineRegex, regEx } from '../../../util/regex';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { HexDatasource } from '../../datasource/hex';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const depSectionRegExp = regEx(/defp\s+deps.*do/g);
const depMatchRegExp = regEx(
@@ -20,7 +20,7 @@ const commentMatchRegExp = regEx(/#.*$/);
export async function extractPackageFile(
content: string,
fileName: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace('mix.extractPackageFile()');
const deps: PackageDependency[] = [];
const contentArr = content
@@ -69,7 +69,7 @@ export async function extractPackageFile(
}
}
}
- const res: PackageFile = { deps };
+ const res: PackageFileContent = { deps };
const lockFileName =
(await findLocalSiblingOrParent(fileName, 'mix.lock')) ?? 'mix.lock';
// istanbul ignore if
diff --git a/lib/modules/manager/nix/extract.ts b/lib/modules/manager/nix/extract.ts
index 52fc0a354e87e08ed1f257ff38696109c231f5fd..d883e5b9ba49ca728129f11c6facd1c30b8a7e84 100644
--- a/lib/modules/manager/nix/extract.ts
+++ b/lib/modules/manager/nix/extract.ts
@@ -1,11 +1,11 @@
import { regEx } from '../../../util/regex';
import { GitRefsDatasource } from '../../datasource/git-refs';
import { id as nixpkgsVersioning } from '../../versioning/nixpkgs';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
const nixpkgsRegex = regEx(/"github:nixos\/nixpkgs\/(?<ref>[a-z0-9-.]+)"/i);
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
const deps: PackageDependency[] = [];
const match = nixpkgsRegex.exec(content);
diff --git a/lib/modules/manager/nodenv/extract.ts b/lib/modules/manager/nodenv/extract.ts
index 3b737fbb6f6a1ea012ef5fa54ecc3a9bf9ca365b..a5f6a50f9164c8a46080b371c6d3962c6c65e130 100644
--- a/lib/modules/manager/nodenv/extract.ts
+++ b/lib/modules/manager/nodenv/extract.ts
@@ -1,7 +1,7 @@
import { GithubTagsDatasource } from '../../datasource/github-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const dep: PackageDependency = {
depName: 'node',
currentValue: content.trim(),
diff --git a/lib/modules/manager/npm/extract/index.ts b/lib/modules/manager/npm/extract/index.ts
index bf894685c710ac718c7835e109bb97e3e001a4d1..25c8f3317b8de1b49df77b9169bfaacea854ef18 100644
--- a/lib/modules/manager/npm/extract/index.ts
+++ b/lib/modules/manager/npm/extract/index.ts
@@ -12,7 +12,7 @@ import { api, isValid, isVersion } from '../../../versioning/npm';
import type {
ExtractConfig,
PackageDependency,
- PackageFile,
+ PackageFileContent,
} from '../../types';
import type { NpmLockFiles, NpmManagerData } from '../types';
import { getLockedVersions } from './locked-versions';
@@ -43,7 +43,7 @@ export async function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): Promise<PackageFile<NpmManagerData> | null> {
+): Promise<PackageFileContent<NpmManagerData> | null> {
logger.trace(`npm.extractPackageFile(${fileName})`);
logger.trace({ content });
const deps: PackageDependency[] = [];
@@ -502,7 +502,7 @@ export async function extractPackageFile(
}
export async function postExtract(
- packageFiles: PackageFile<NpmManagerData>[]
+ packageFiles: PackageFileContent<NpmManagerData>[]
): Promise<void> {
await detectMonorepos(packageFiles);
await getLockedVersions(packageFiles);
@@ -511,8 +511,8 @@ export async function postExtract(
export async function extractAllPackageFiles(
config: ExtractConfig,
packageFiles: string[]
-): Promise<PackageFile<NpmManagerData>[]> {
- const npmFiles: PackageFile<NpmManagerData>[] = [];
+): Promise<PackageFileContent<NpmManagerData>[]> {
+ const npmFiles: PackageFileContent<NpmManagerData>[] = [];
for (const packageFile of packageFiles) {
const content = await readLocalFile(packageFile, 'utf8');
// istanbul ignore else
diff --git a/lib/modules/manager/npm/extract/locked-versions.spec.ts b/lib/modules/manager/npm/extract/locked-versions.spec.ts
index 095a0f6d5f43cf36bf21f55ef910e98e24a63ec8..d812d13b5b66c6097c0a712913f04630a1214d1d 100644
--- a/lib/modules/manager/npm/extract/locked-versions.spec.ts
+++ b/lib/modules/manager/npm/extract/locked-versions.spec.ts
@@ -1,4 +1,4 @@
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import type { NpmManagerData } from '../types';
import { getLockedVersions } from './locked-versions';
@@ -14,7 +14,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
describe('.getLockedVersions()', () => {
function getPackageFiles(
yarnVersion: string
- ): PackageFile<NpmManagerData>[] {
+ ): PackageFileContent<NpmManagerData>[] {
return [
{
managerData: { npmLock: 'package-lock.json', yarnLock: 'yarn.lock' },
diff --git a/lib/modules/manager/npm/extract/locked-versions.ts b/lib/modules/manager/npm/extract/locked-versions.ts
index 8c23d1779a30d00a12f8a3d34fdc0ccae927f207..ea79021ac40f03e651c5100f3aac806329836cec 100644
--- a/lib/modules/manager/npm/extract/locked-versions.ts
+++ b/lib/modules/manager/npm/extract/locked-versions.ts
@@ -1,13 +1,13 @@
import semver from 'semver';
import { logger } from '../../../../logger';
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import type { NpmManagerData } from '../types';
import { getNpmLock } from './npm';
import type { LockFile } from './types';
import { getYarnLock } from './yarn';
export async function getLockedVersions(
- packageFiles: PackageFile<NpmManagerData>[]
+ packageFiles: PackageFileContent<NpmManagerData>[]
): Promise<void> {
const lockFileCache: Record<string, LockFile> = {};
logger.debug('Finding locked versions');
diff --git a/lib/modules/manager/npm/extract/monorepo.spec.ts b/lib/modules/manager/npm/extract/monorepo.spec.ts
index 974906f52c1a2f7a99980a9bb13a99200e594853..8ee61557e289fbcf145dd6ad80c1c29539e8cce8 100644
--- a/lib/modules/manager/npm/extract/monorepo.spec.ts
+++ b/lib/modules/manager/npm/extract/monorepo.spec.ts
@@ -1,4 +1,4 @@
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import { detectMonorepos } from './monorepo';
jest.mock('./pnpm');
@@ -6,7 +6,7 @@ jest.mock('./pnpm');
describe('modules/manager/npm/extract/monorepo', () => {
describe('.extractPackageFile()', () => {
it('handles no monorepo', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
deps: [],
@@ -17,7 +17,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('uses lerna package settings', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
managerData: {
@@ -70,7 +70,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('updates internal packages', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
managerData: {
@@ -123,7 +123,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('uses yarn workspaces package settings with lerna', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
managerData: {
@@ -148,7 +148,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('uses yarn workspaces package settings without lerna', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
npmrc: '@org:registry=//registry.some.org\n',
@@ -172,7 +172,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('uses yarn workspaces package settings with extractedConstraints', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
skipInstalls: true, // coverage
@@ -216,7 +216,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
});
it('uses yarnZeroInstall and skipInstalls from yarn workspaces package settings', async () => {
- const packageFiles: Partial<PackageFile>[] = [
+ const packageFiles: Partial<PackageFileContent>[] = [
{
packageFile: 'package.json',
managerData: {
diff --git a/lib/modules/manager/npm/extract/monorepo.ts b/lib/modules/manager/npm/extract/monorepo.ts
index ea5db558a15e7c3070cb4df33b688b647c7c39b0..e30e65096b2fef3586cc1fdb7bdebea864e2ce4a 100644
--- a/lib/modules/manager/npm/extract/monorepo.ts
+++ b/lib/modules/manager/npm/extract/monorepo.ts
@@ -1,13 +1,13 @@
import is from '@sindresorhus/is';
import { logger } from '../../../../logger';
import { getParentDir, getSiblingFileName } from '../../../../util/fs';
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import type { NpmManagerData } from '../types';
import { detectPnpmWorkspaces } from './pnpm';
import { matchesAnyPattern } from './utils';
export async function detectMonorepos(
- packageFiles: Partial<PackageFile<NpmManagerData>>[]
+ packageFiles: Partial<PackageFileContent<NpmManagerData>>[]
): Promise<void> {
await detectPnpmWorkspaces(packageFiles);
logger.debug('Detecting Lerna and Yarn Workspaces');
diff --git a/lib/modules/manager/npm/extract/pnpm.ts b/lib/modules/manager/npm/extract/pnpm.ts
index 1f566d1e8bb99f5a79dd840a5fc470d908ef4ee4..fb681e4977e70c9180ea27f8c5a1b50f0928e92a 100644
--- a/lib/modules/manager/npm/extract/pnpm.ts
+++ b/lib/modules/manager/npm/extract/pnpm.ts
@@ -10,7 +10,7 @@ import {
localPathExists,
readLocalFile,
} from '../../../../util/fs';
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import type { NpmManagerData } from '../types';
import type { PnpmWorkspaceFile } from './types';
@@ -75,7 +75,7 @@ export async function findPnpmWorkspace(
}
export async function detectPnpmWorkspaces(
- packageFiles: Partial<PackageFile<NpmManagerData>>[]
+ packageFiles: Partial<PackageFileContent<NpmManagerData>>[]
): Promise<void> {
logger.debug(`Detecting pnpm Workspaces`);
const packagePathCache = new Map<string, string[] | null>();
diff --git a/lib/modules/manager/npm/post-update/index.ts b/lib/modules/manager/npm/post-update/index.ts
index 0e065f7b169a6282e251cbaaa6f69dea60c0467a..868caca3982bc1dd86753d236b7d80d97ab096e2 100644
--- a/lib/modules/manager/npm/post-update/index.ts
+++ b/lib/modules/manager/npm/post-update/index.ts
@@ -23,7 +23,11 @@ import * as hostRules from '../../../../util/host-rules';
import { newlineRegex, regEx } from '../../../../util/regex';
import { ensureTrailingSlash } from '../../../../util/url';
import { NpmDatasource } from '../../../datasource/npm';
-import type { PackageFile, PostUpdateConfig, Upgrade } from '../../types';
+import type {
+ PackageFileContent,
+ PostUpdateConfig,
+ Upgrade,
+} from '../../types';
import { getZeroInstallPaths } from '../extract/yarn';
import type { NpmDepType, NpmManagerData } from '../types';
import { composeLockFile, parseLockFile } from '../utils';
@@ -87,7 +91,7 @@ export function determineLockFileDirs(
function getPackageFile(
fileName: string
- ): Partial<PackageFile<NpmManagerData>> {
+ ): Partial<PackageFileContent<NpmManagerData>> {
logger.trace('Looking for packageFile: ' + fileName);
for (const packageFile of packageFiles.npm!) {
diff --git a/lib/modules/manager/npm/post-update/lerna.spec.ts b/lib/modules/manager/npm/post-update/lerna.spec.ts
index 3b05f9c6178794f1afa444c039bd810a75a8e7ee..40a219bd9bbde7da43ab16114f581ded22a8f3f5 100644
--- a/lib/modules/manager/npm/post-update/lerna.spec.ts
+++ b/lib/modules/manager/npm/post-update/lerna.spec.ts
@@ -2,7 +2,7 @@ import { envMock, mockExecAll } from '../../../../../test/exec-util';
import { env, mockedFunction, partial } from '../../../../../test/util';
import { GlobalConfig } from '../../../../config/global';
import type { RepoGlobalConfig } from '../../../../config/types';
-import type { PackageFile, PostUpdateConfig } from '../../types';
+import type { PackageFileContent, PostUpdateConfig } from '../../types';
import * as lernaHelper from './lerna';
import { getNodeToolConstraint } from './node-version';
@@ -12,7 +12,7 @@ jest.mock('../../../datasource');
process.env.BUILDPACK = 'true';
-function lernaPkgFile(lernaClient: string): Partial<PackageFile> {
+function lernaPkgFile(lernaClient: string): Partial<PackageFileContent> {
return {
deps: [{ depName: 'lerna', currentValue: '2.0.0' }],
managerData: { lernaClient },
@@ -21,7 +21,7 @@ function lernaPkgFile(lernaClient: string): Partial<PackageFile> {
function lernaPkgFileWithoutLernaDep(
lernaClient: string
-): Partial<PackageFile> {
+): Partial<PackageFileContent> {
return {
managerData: { lernaClient },
};
diff --git a/lib/modules/manager/npm/post-update/lerna.ts b/lib/modules/manager/npm/post-update/lerna.ts
index a6504816ad53f726fb9f0150ef1d4c7a9c9be3f7..35ea5cfbf0453661ba2a2659d6daa61461c2306c 100644
--- a/lib/modules/manager/npm/post-update/lerna.ts
+++ b/lib/modules/manager/npm/post-update/lerna.ts
@@ -10,14 +10,14 @@ import type {
ExtraEnv,
ToolConstraint,
} from '../../../../util/exec/types';
-import type { PackageFile, PostUpdateConfig } from '../../types';
+import type { PackageFileContent, PostUpdateConfig } from '../../types';
import type { NpmManagerData } from '../types';
import { getNodeToolConstraint } from './node-version';
import type { GenerateLockFileResult } from './types';
// Exported for testability
export function getLernaVersion(
- lernaPackageFile: Partial<PackageFile<NpmManagerData>>
+ lernaPackageFile: Partial<PackageFileContent<NpmManagerData>>
): string | null {
const lernaDep = lernaPackageFile.deps?.find((d) => d.depName === 'lerna');
if (!lernaDep?.currentValue || !semver.validRange(lernaDep.currentValue)) {
@@ -32,7 +32,7 @@ export function getLernaVersion(
}
export async function generateLockFiles(
- lernaPackageFile: Partial<PackageFile<NpmManagerData>>,
+ lernaPackageFile: Partial<PackageFileContent<NpmManagerData>>,
lockFileDir: string,
config: PostUpdateConfig,
env: NodeJS.ProcessEnv,
diff --git a/lib/modules/manager/npm/post-update/types.ts b/lib/modules/manager/npm/post-update/types.ts
index 56b50b78cc9ae75906ae72444a6f534a999ad745..e988fd0708eb5be4c774e1bb682c6e8a2378e1ac 100644
--- a/lib/modules/manager/npm/post-update/types.ts
+++ b/lib/modules/manager/npm/post-update/types.ts
@@ -1,5 +1,5 @@
import type { FileChange } from '../../../../util/git/types';
-import type { PackageFile } from '../../types';
+import type { PackageFileContent } from '../../types';
import type { NpmManagerData } from '../types';
export interface DetermineLockFileDirsResult {
@@ -10,7 +10,7 @@ export interface DetermineLockFileDirsResult {
}
export interface AdditionalPackageFiles {
- npm?: Partial<PackageFile<NpmManagerData>>[];
+ npm?: Partial<PackageFileContent<NpmManagerData>>[];
}
export interface ArtifactError {
diff --git a/lib/modules/manager/nuget/extract.ts b/lib/modules/manager/nuget/extract.ts
index 6f1c1bc7a012765ddcdba90de551d395cc05c1d3..5fafd4c6598f576fb4346a4a50ac29f7e41ed187 100644
--- a/lib/modules/manager/nuget/extract.ts
+++ b/lib/modules/manager/nuget/extract.ts
@@ -5,7 +5,11 @@ import { getSiblingFileName, localPathExists } from '../../../util/fs';
import { hasKey } from '../../../util/object';
import { regEx } from '../../../util/regex';
import { NugetDatasource } from '../../datasource/nuget';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { extractMsbuildGlobalManifest } from './extract/global-manifest';
import type { DotnetToolsManifest } from './types';
import { getConfiguredRegistries } from './util';
@@ -71,7 +75,7 @@ export async function extractPackageFile(
content: string,
packageFile: string,
config: ExtractConfig
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace({ packageFile }, 'nuget.extractPackageFile()');
const registries = await getConfiguredRegistries(packageFile);
@@ -130,7 +134,7 @@ export async function extractPackageFile(
} catch (err) {
logger.debug({ err }, `Failed to parse ${packageFile}`);
}
- const res: PackageFile = { deps, packageFileVersion };
+ const res: PackageFileContent = { deps, packageFileVersion };
const lockFileName = getSiblingFileName(packageFile, 'packages.lock.json');
// istanbul ignore if
if (await localPathExists(lockFileName)) {
diff --git a/lib/modules/manager/nuget/extract/global-manifest.ts b/lib/modules/manager/nuget/extract/global-manifest.ts
index 9995fffe0bf3f6801ca3a0c0d361f3e42909739c..c686e570ebdcbbc23fb0545f8eb6c8de8d02e7ce 100644
--- a/lib/modules/manager/nuget/extract/global-manifest.ts
+++ b/lib/modules/manager/nuget/extract/global-manifest.ts
@@ -1,13 +1,13 @@
import { logger } from '../../../../logger';
import { DotnetVersionDatasource } from '../../../datasource/dotnet-version';
import { NugetDatasource } from '../../../datasource/nuget';
-import type { PackageDependency, PackageFile } from '../../types';
+import type { PackageDependency, PackageFileContent } from '../../types';
import type { MsbuildGlobalManifest } from '../types';
export function extractMsbuildGlobalManifest(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
const deps: PackageDependency[] = [];
let manifest: MsbuildGlobalManifest;
diff --git a/lib/modules/manager/nvm/extract.ts b/lib/modules/manager/nvm/extract.ts
index 3b737fbb6f6a1ea012ef5fa54ecc3a9bf9ca365b..a5f6a50f9164c8a46080b371c6d3962c6c65e130 100644
--- a/lib/modules/manager/nvm/extract.ts
+++ b/lib/modules/manager/nvm/extract.ts
@@ -1,7 +1,7 @@
import { GithubTagsDatasource } from '../../datasource/github-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const dep: PackageDependency = {
depName: 'node',
currentValue: content.trim(),
diff --git a/lib/modules/manager/osgi/extract.ts b/lib/modules/manager/osgi/extract.ts
index b38670b7cae5f69526c99deedc174c27134c13e4..07a42680479f8a6dce4d72c8d69249c66b37d907 100644
--- a/lib/modules/manager/osgi/extract.ts
+++ b/lib/modules/manager/osgi/extract.ts
@@ -3,14 +3,18 @@ import * as json5 from 'json5';
import { coerce, satisfies } from 'semver';
import { logger } from '../../../logger';
import { MavenDatasource } from '../../datasource/maven';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import type { Bundle, FeatureModel } from './types';
export function extractPackageFile(
content: string,
fileName: string,
config?: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
// References:
// - OSGi compendium release 8 ( https://docs.osgi.org/specification/osgi.cmpn/8.0.0/service.feature.html )
// - The Sling implementation of the feature model ( https://sling.apache.org/documentation/development/feature-model.html )
diff --git a/lib/modules/manager/pip_requirements/extract.ts b/lib/modules/manager/pip_requirements/extract.ts
index f699b375cf4d99581166691ab63dfacb581b7c95..fa3c9c7b9232acbaa5645f50bcf4775b3034f00a 100644
--- a/lib/modules/manager/pip_requirements/extract.ts
+++ b/lib/modules/manager/pip_requirements/extract.ts
@@ -7,7 +7,7 @@ import { isSkipComment } from '../../../util/ignore';
import { newlineRegex, regEx } from '../../../util/regex';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { PypiDatasource } from '../../datasource/pypi';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
export const packagePattern =
'[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9]';
@@ -46,7 +46,7 @@ export function cleanRegistryUrls(registryUrls: string[]): string[] {
});
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace('pip_requirements.extractPackageFile()');
let registryUrls: string[] = [];
@@ -126,7 +126,7 @@ export function extractPackageFile(content: string): PackageFile | null {
if (!deps.length) {
return null;
}
- const res: PackageFile = { deps };
+ const res: PackageFileContent = { deps };
if (registryUrls.length > 0) {
res.registryUrls = cleanRegistryUrls(registryUrls);
}
diff --git a/lib/modules/manager/pip_setup/extract.ts b/lib/modules/manager/pip_setup/extract.ts
index f94558ee2c8314c938f99395b16484d989d0063b..d27a391f401e0ca0ea5097f5a95750915a852159 100644
--- a/lib/modules/manager/pip_setup/extract.ts
+++ b/lib/modules/manager/pip_setup/extract.ts
@@ -2,13 +2,17 @@ import { RANGE_PATTERN } from '@renovatebot/pep440';
import { lang, lexer, parser, query as q } from 'good-enough-parser';
import { regEx } from '../../../util/regex';
import { PypiDatasource } from '../../datasource/pypi';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
interface ManagerData {
lineNumber: number;
}
-type Context = PackageFile<ManagerData>;
+type Context = PackageFileContent<ManagerData>;
const python = lang.createLang('python');
@@ -78,7 +82,7 @@ export function extractPackageFile(
content: string,
_packageFile: string,
_config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
const res = python.query<Context, parser.Node>(content, query, { deps: [] });
return res?.deps?.length ? res : null;
}
diff --git a/lib/modules/manager/pipenv/extract.ts b/lib/modules/manager/pipenv/extract.ts
index 3a1664228aedac28b755f3ef61048ed384c9f3a9..891622edd677dc1f2ccebedca80af4ef33baff56 100644
--- a/lib/modules/manager/pipenv/extract.ts
+++ b/lib/modules/manager/pipenv/extract.ts
@@ -6,7 +6,7 @@ import type { SkipReason } from '../../../types';
import { localPathExists } from '../../../util/fs';
import { regEx } from '../../../util/regex';
import { PypiDatasource } from '../../datasource/pypi';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { PipFile } from './types';
// based on https://www.python.org/dev/peps/pep-0508/#names
@@ -104,7 +104,7 @@ function extractFromSection(
export async function extractPackageFile(
content: string,
fileName: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.debug('pipenv.extractPackageFile()');
let pipfile: PipFile;
@@ -115,7 +115,7 @@ export async function extractPackageFile(
logger.debug({ err }, 'Error parsing Pipfile');
return null;
}
- const res: PackageFile = { deps: [] };
+ const res: PackageFileContent = { deps: [] };
if (pipfile.source) {
res.registryUrls = pipfile.source.map((source) => source.url);
}
diff --git a/lib/modules/manager/poetry/extract.ts b/lib/modules/manager/poetry/extract.ts
index 535dc0208057a124dbb7daba60009f4a6a626bae..ae9810dbc0e2fdef604ab303a20c729c5fe415fb 100644
--- a/lib/modules/manager/poetry/extract.ts
+++ b/lib/modules/manager/poetry/extract.ts
@@ -11,7 +11,7 @@ import { regEx } from '../../../util/regex';
import { PypiDatasource } from '../../datasource/pypi';
import * as pep440Versioning from '../../versioning/pep440';
import * as poetryVersioning from '../../versioning/poetry';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { extractLockFileEntries } from './locked-version';
import type { PoetryDependency, PoetryFile, PoetrySection } from './types';
@@ -131,7 +131,7 @@ function extractRegistries(pyprojectfile: PoetryFile): string[] | undefined {
export async function extractPackageFile(
content: string,
fileName: string
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace(`poetry.extractPackageFile(${fileName})`);
let pyprojectfile: PoetryFile;
try {
@@ -180,7 +180,7 @@ export async function extractPackageFile(
pyprojectfile.tool?.poetry?.dependencies?.python;
}
- const res: PackageFile = {
+ const res: PackageFileContent = {
deps,
registryUrls: extractRegistries(pyprojectfile),
extractedConstraints,
diff --git a/lib/modules/manager/pre-commit/extract.ts b/lib/modules/manager/pre-commit/extract.ts
index fa0ecb6a6162afad0b48a5366f71c8101949ef54..f7450cf713e9a86ad2125924d59a6c8600883e77 100644
--- a/lib/modules/manager/pre-commit/extract.ts
+++ b/lib/modules/manager/pre-commit/extract.ts
@@ -6,7 +6,7 @@ import { find } from '../../../util/host-rules';
import { regEx } from '../../../util/regex';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { GitlabTagsDatasource } from '../../datasource/gitlab-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import {
matchesPrecommitConfigHeuristic,
matchesPrecommitDependencyHeuristic,
@@ -147,7 +147,7 @@ function findDependencies(precommitFile: PreCommitConfig): PackageDependency[] {
export function extractPackageFile(
content: string,
filename: string
-): PackageFile | null {
+): PackageFileContent | null {
type ParsedContent = Record<string, unknown> | PreCommitConfig;
let parsedContent: ParsedContent;
try {
diff --git a/lib/modules/manager/pub/extract.ts b/lib/modules/manager/pub/extract.ts
index 2a406e9032e35bdbada9dabe2a9bc4ac53b14da6..108704a755a31e63a794a5deb2f950c13bfd18d7 100644
--- a/lib/modules/manager/pub/extract.ts
+++ b/lib/modules/manager/pub/extract.ts
@@ -1,7 +1,7 @@
import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { DartDatasource } from '../../datasource/dart';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
function getDeps(
depsObj: { [x: string]: any },
@@ -38,7 +38,7 @@ function getDeps(
export function extractPackageFile(
content: string,
packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
try {
// TODO: fix me (#9610)
const doc = load(content, { json: true }) as any;
diff --git a/lib/modules/manager/puppet/extract.ts b/lib/modules/manager/puppet/extract.ts
index efa5ab610ad85e22cf05c6b9f1be8d49d3016708..547b70ffa90fcfbd17c704b6b18def276ba08bd6 100644
--- a/lib/modules/manager/puppet/extract.ts
+++ b/lib/modules/manager/puppet/extract.ts
@@ -3,7 +3,7 @@ import { parseUrl } from '../../../util/url';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubTagsDatasource } from '../../datasource/github-tags';
import { PuppetForgeDatasource } from '../../datasource/puppet-forge';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { isGithubUrl, parseGitOwnerRepo } from './common';
import { parsePuppetfile } from './puppetfile-parser';
import type { PuppetfileModule } from './types';
@@ -85,7 +85,7 @@ function isGitModule(module: PuppetfileModule): boolean {
return module.tags?.has('git') ?? false;
}
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace('puppet.extractPackageFile()');
const puppetFile = parsePuppetfile(content);
diff --git a/lib/modules/manager/pyenv/extract.ts b/lib/modules/manager/pyenv/extract.ts
index a402da093160f40800d16391943fbbc9fa20a686..d395b4c8808c837d5929e174b9e006dd731c9ab7 100644
--- a/lib/modules/manager/pyenv/extract.ts
+++ b/lib/modules/manager/pyenv/extract.ts
@@ -1,7 +1,7 @@
import { DockerDatasource } from '../../datasource/docker';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
const dep: PackageDependency = {
depName: 'python',
currentValue: content.trim(),
diff --git a/lib/modules/manager/regex/index.ts b/lib/modules/manager/regex/index.ts
index ac4c5323c75b8ab650d082ac94859e8f7c879286..cbb2cb572ddc3f575e4f66022ad9fcc42b1a9de2 100644
--- a/lib/modules/manager/regex/index.ts
+++ b/lib/modules/manager/regex/index.ts
@@ -3,7 +3,7 @@ import type { RegexManagerTemplates } from '../../../config/types';
import type {
ExtractConfig,
PackageDependency,
- PackageFile,
+ PackageFileContent,
Result,
} from '../types';
import { handleAny, handleCombination, handleRecursive } from './strategies';
@@ -19,7 +19,7 @@ export function extractPackageFile(
content: string,
packageFile: string,
config: ExtractConfig
-): Result<PackageFile | null> {
+): Result<PackageFileContent | null> {
let deps: PackageDependency[];
switch (config.matchStringsStrategy) {
default:
@@ -45,7 +45,7 @@ export function extractPackageFile(
// filter all null values
deps = deps.filter(is.truthy);
if (deps.length) {
- const res: PackageFile & RegexManagerTemplates = {
+ const res: PackageFileContent & RegexManagerTemplates = {
deps,
matchStrings: config.matchStrings,
};
diff --git a/lib/modules/manager/ruby-version/extract.ts b/lib/modules/manager/ruby-version/extract.ts
index a25e2a8e0ba0e1f16e39112f4d535c4e24752c5a..0375286a82f5bb2be4d613ccdb37ff97ec5532e9 100644
--- a/lib/modules/manager/ruby-version/extract.ts
+++ b/lib/modules/manager/ruby-version/extract.ts
@@ -1,8 +1,8 @@
import { logger } from '../../../logger';
import { RubyVersionDatasource } from '../../datasource/ruby-version';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
logger.trace('ruby-version.extractPackageFile()');
const dep: PackageDependency = {
depName: 'ruby',
diff --git a/lib/modules/manager/sbt/extract.ts b/lib/modules/manager/sbt/extract.ts
index 3f588424b9375e983d242662df1de12d756e69fd..7ad6d298bb3b8a5e9e518f60a2a2bba615b3a397 100644
--- a/lib/modules/manager/sbt/extract.ts
+++ b/lib/modules/manager/sbt/extract.ts
@@ -11,7 +11,7 @@ import {
import { get } from '../../versioning';
import * as mavenVersioning from '../../versioning/maven';
import { REGISTRY_URLS } from '../gradle/parser/common';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { normalizeScalaVersion } from './util';
type Vars = Record<string, string>;
@@ -286,7 +286,7 @@ const query = q.tree<Ctx>({
export function extractPackageFile(
content: string,
_packageFile: string
-): PackageFile | null {
+): PackageFileContent | null {
let parsedResult: Ctx | null = null;
try {
diff --git a/lib/modules/manager/setup-cfg/extract.ts b/lib/modules/manager/setup-cfg/extract.ts
index 1e432948b9aba2cc44365ac5d5f76dc568141bd8..f006ef70ba6378b3e4338536e5ea9814bf535bf5 100644
--- a/lib/modules/manager/setup-cfg/extract.ts
+++ b/lib/modules/manager/setup-cfg/extract.ts
@@ -3,7 +3,7 @@ import { RANGE_PATTERN } from '@renovatebot/pep440';
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
import { PypiDatasource } from '../../datasource/pypi';
-import type { PackageDependency, PackageFile, Result } from '../types';
+import type { PackageDependency, PackageFileContent, Result } from '../types';
function getSectionName(str: string): string {
const [, sectionName] = regEx(/^\[\s*([^\s]+)\s*]\s*$/).exec(str) ?? [];
@@ -87,7 +87,7 @@ function parseDep(
export function extractPackageFile(
content: string
-): Result<PackageFile | null> {
+): Result<PackageFileContent | null> {
logger.trace('setup-cfg.extractPackageFile()');
let sectionName: string | null = null;
diff --git a/lib/modules/manager/swift/extract.ts b/lib/modules/manager/swift/extract.ts
index a2a62d61fa3ba0fd3480a85b5ca9308c327a4266..d6bb1c23841445551c8836ef59d1fa99b31c2bfc 100644
--- a/lib/modules/manager/swift/extract.ts
+++ b/lib/modules/manager/swift/extract.ts
@@ -1,6 +1,6 @@
import { regEx } from '../../../util/regex';
import { GitTagsDatasource } from '../../datasource/git-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { MatchResult } from './types';
const regExps = {
@@ -139,13 +139,13 @@ function getDepName(url: string | null): string | null {
export function extractPackageFile(
content: string,
packageFile: string | null = null
-): PackageFile | null {
+): PackageFileContent | null {
if (!content) {
return null;
}
const deps: PackageDependency[] = [];
- const result: PackageFile = {
+ const result: PackageFileContent = {
packageFile,
deps,
};
diff --git a/lib/modules/manager/tekton/extract.ts b/lib/modules/manager/tekton/extract.ts
index ed89fadeb66e60af78b67ed2f9e45652f048de33..831bc8f553b86b5fdb34749688fbbbc0bd2532b4 100644
--- a/lib/modules/manager/tekton/extract.ts
+++ b/lib/modules/manager/tekton/extract.ts
@@ -3,7 +3,7 @@ import { loadAll } from 'js-yaml';
import { logger } from '../../../logger';
import { coerceArray } from '../../../util/array';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type {
TektonBundle,
TektonResolverParamsField,
@@ -14,7 +14,7 @@ import type {
export function extractPackageFile(
content: string,
fileName: string
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace('tekton.extractPackageFile()');
const deps: PackageDependency[] = [];
let docs: TektonResource[];
diff --git a/lib/modules/manager/terraform-version/extract.ts b/lib/modules/manager/terraform-version/extract.ts
index 875efc26eafb7d76d81336d7cd348d97244e763f..39516375449218558da74c05f541066af68d171c 100644
--- a/lib/modules/manager/terraform-version/extract.ts
+++ b/lib/modules/manager/terraform-version/extract.ts
@@ -1,8 +1,8 @@
import { logger } from '../../../logger';
import { GithubReleasesDatasource } from '../../datasource/github-releases';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
logger.trace('terraform-version.extractPackageFile()');
const dep: PackageDependency = {
depName: 'hashicorp/terraform',
diff --git a/lib/modules/manager/terraform/extract.ts b/lib/modules/manager/terraform/extract.ts
index 9c9d003c43df92f36bc2d2e6867692de4c4811f9..605f4d364b41ba4628793dee571987098d218c40 100644
--- a/lib/modules/manager/terraform/extract.ts
+++ b/lib/modules/manager/terraform/extract.ts
@@ -1,6 +1,6 @@
import is from '@sindresorhus/is';
import { logger } from '../../../logger';
-import type { ExtractConfig, PackageFile } from '../types';
+import type { ExtractConfig, PackageFileContent } from '../types';
import { resourceExtractors } from './extractors';
import * as hcl from './hcl';
import {
@@ -12,7 +12,7 @@ export async function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): Promise<PackageFile | null> {
+): Promise<PackageFileContent | null> {
logger.trace({ content }, 'terraform.extractPackageFile()');
const passedExtractors = [];
diff --git a/lib/modules/manager/terragrunt-version/extract.ts b/lib/modules/manager/terragrunt-version/extract.ts
index 7023658563f9e1a016efb9eeb4340bcf0f2d015e..9f7ba7658a2947f5c1faa9d442fe4c90d92931a9 100644
--- a/lib/modules/manager/terragrunt-version/extract.ts
+++ b/lib/modules/manager/terragrunt-version/extract.ts
@@ -1,8 +1,8 @@
import { logger } from '../../../logger';
import { GithubReleasesDatasource } from '../../datasource/github-releases';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
-export function extractPackageFile(content: string): PackageFile {
+export function extractPackageFile(content: string): PackageFileContent {
logger.trace('terragrunt-version.extractPackageFile()');
const dep: PackageDependency = {
depName: 'gruntwork-io/terragrunt',
diff --git a/lib/modules/manager/terragrunt/extract.ts b/lib/modules/manager/terragrunt/extract.ts
index e6b389e3b6569e0aad6d212e8e24932f919e6fb9..db5c18b4d651cb12ff474d7e1afa034766d6d553 100644
--- a/lib/modules/manager/terragrunt/extract.ts
+++ b/lib/modules/manager/terragrunt/extract.ts
@@ -1,6 +1,6 @@
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import { analyseTerragruntModule, extractTerragruntModule } from './modules';
import type { ExtractionResult, TerraformManagerData } from './types';
import {
@@ -11,7 +11,7 @@ import {
const dependencyBlockExtractionRegex = regEx(/^\s*(?<type>[a-z_]+)\s+{\s*$/);
const contentCheckList = ['terraform {'];
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
logger.trace({ content }, 'terragrunt.extractPackageFile()');
if (!checkFileContainsDependency(content, contentCheckList)) {
return null;
diff --git a/lib/modules/manager/tflint-plugin/extract.ts b/lib/modules/manager/tflint-plugin/extract.ts
index 566d7c0ede2616d292e16962606d3577cf39152f..bbdd9cdf3da1ac968ce782746ee27f0296f0015c 100644
--- a/lib/modules/manager/tflint-plugin/extract.ts
+++ b/lib/modules/manager/tflint-plugin/extract.ts
@@ -1,6 +1,10 @@
import { logger } from '../../../logger';
import { newlineRegex, regEx } from '../../../util/regex';
-import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
+import type {
+ ExtractConfig,
+ PackageDependency,
+ PackageFileContent,
+} from '../types';
import { extractTFLintPlugin } from './plugins';
import type { ExtractionResult } from './types';
import { checkFileContainsPlugins } from './util';
@@ -13,7 +17,7 @@ export function extractPackageFile(
content: string,
fileName: string,
config: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
logger.trace({ content }, 'tflint.extractPackageFile()');
if (!checkFileContainsPlugins(content)) {
logger.trace(
diff --git a/lib/modules/manager/travis/extract.ts b/lib/modules/manager/travis/extract.ts
index 0a5ab82abefe47f7217cd85ce9438e20b552dbfe..fac260995511eff10f272269570584f899c84fd6 100644
--- a/lib/modules/manager/travis/extract.ts
+++ b/lib/modules/manager/travis/extract.ts
@@ -2,10 +2,10 @@ import is from '@sindresorhus/is';
import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { GithubTagsDatasource } from '../../datasource/github-tags';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { TravisMatrixItem, TravisYaml } from './types';
-export function extractPackageFile(content: string): PackageFile | null {
+export function extractPackageFile(content: string): PackageFileContent | null {
let doc: TravisYaml;
try {
doc = load(content, {
diff --git a/lib/modules/manager/types.ts b/lib/modules/manager/types.ts
index c805a71a5341234105fcd030eeec16930b95c9b5..daa5c9321f4ef9b77e53c10b10c8a358bd947af6 100644
--- a/lib/modules/manager/types.ts
+++ b/lib/modules/manager/types.ts
@@ -51,7 +51,8 @@ export interface RangeConfig<T = Record<string, any>> extends ManagerData<T> {
rangeStrategy: RangeStrategy;
}
-export interface PackageFile<T = Record<string, any>> extends ManagerData<T> {
+export interface PackageFileContent<T = Record<string, any>>
+ extends ManagerData<T> {
autoReplaceStringTemplate?: string;
extractedConstraints?: Record<string, string>;
datasource?: string;
@@ -239,13 +240,13 @@ export interface ManagerApi extends ModuleApi {
extractAllPackageFiles?(
config: ExtractConfig,
files: string[]
- ): Result<PackageFile[] | null>;
+ ): Result<PackageFileContent[] | null>;
extractPackageFile?(
content: string,
packageFile?: string,
config?: ExtractConfig
- ): Result<PackageFile | null>;
+ ): Result<PackageFileContent | null>;
getRangeStrategy?(config: RangeConfig): RangeStrategy;
diff --git a/lib/modules/manager/velaci/extract.ts b/lib/modules/manager/velaci/extract.ts
index 04c4087773802da6fab093ccb602ba622cacc220..00815bd450f080d60ca244015d1c4054b1b919fd 100644
--- a/lib/modules/manager/velaci/extract.ts
+++ b/lib/modules/manager/velaci/extract.ts
@@ -2,10 +2,10 @@ import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { coerceArray } from '../../../util/array';
import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFile } from '../types';
+import type { PackageDependency, PackageFileContent } from '../types';
import type { VelaPipelineConfiguration } from './types';
-export function extractPackageFile(file: string): PackageFile | null {
+export function extractPackageFile(file: string): PackageFileContent | null {
let doc: VelaPipelineConfiguration | undefined;
try {
diff --git a/lib/modules/manager/woodpecker/extract.ts b/lib/modules/manager/woodpecker/extract.ts
index f41691ff736a68cf3153d02f01bf52c155343fc4..c3804336357b05d52270da61d52f99a101addb62 100644
--- a/lib/modules/manager/woodpecker/extract.ts
+++ b/lib/modules/manager/woodpecker/extract.ts
@@ -2,14 +2,14 @@ import is from '@sindresorhus/is';
import { load } from 'js-yaml';
import { logger } from '../../../logger';
import { getDep } from '../dockerfile/extract';
-import type { ExtractConfig, PackageFile } from '../types';
+import type { ExtractConfig, PackageFileContent } from '../types';
import type { WoodpeckerConfig } from './types';
export function extractPackageFile(
content: string,
fileName: string,
extractConfig: ExtractConfig
-): PackageFile | null {
+): PackageFileContent | null {
logger.debug('woodpecker.extractPackageFile()');
let config: WoodpeckerConfig;
try {
diff --git a/lib/util/cache/repository/types.ts b/lib/util/cache/repository/types.ts
index de6af74256607b4ffe9c0249163b12847b899e23..221b9bc9abb7796016248d37e2351c77f9fcf143 100644
--- a/lib/util/cache/repository/types.ts
+++ b/lib/util/cache/repository/types.ts
@@ -2,14 +2,14 @@ import type {
RepositoryCacheConfig,
RepositoryCacheType,
} from '../../../config/types';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import type { RepoInitConfig } from '../../../workers/repository/init/types';
export interface BaseBranchCache {
sha: string; // branch commit sha
configHash: string; // object hash of config
extractionFingerprints: Record<string, string | undefined>; // matching manager fingerprints
- packageFiles: Record<string, PackageFile[]>; // extract result
+ packageFiles: Record<string, PackageFileContent[]>; // extract result
}
export interface BranchUpgradeCache {
diff --git a/lib/util/check-token.spec.ts b/lib/util/check-token.spec.ts
index c1d8b9077f566482a4a48299fa529a0c5003db64..ffba0aa8555bd36d67422b825c5bac81bbe25109 100644
--- a/lib/util/check-token.spec.ts
+++ b/lib/util/check-token.spec.ts
@@ -2,7 +2,7 @@ import { hostRules, logger } from '../../test/util';
import { GlobalConfig } from '../config/global';
import { GithubReleasesDatasource } from '../modules/datasource/github-releases';
import { GithubTagsDatasource } from '../modules/datasource/github-tags';
-import type { PackageFile } from '../modules/manager/types';
+import type { PackageFileContent } from '../modules/manager/types';
import * as memCache from '../util/cache/memory';
import { checkGithubToken } from './check-token';
@@ -91,7 +91,7 @@ describe('util/check-token', () => {
it('logs warning once', () => {
hostRules.find.mockReturnValueOnce({});
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
diff --git a/lib/util/check-token.ts b/lib/util/check-token.ts
index f92a7b658b70f8efda6d8b9c7d0e338503415e36..fedca0aa8bd66e86a3f36d420c1745213ca0e5cc 100644
--- a/lib/util/check-token.ts
+++ b/lib/util/check-token.ts
@@ -2,12 +2,12 @@ import { GlobalConfig } from '../config/global';
import { logger } from '../logger';
import { GithubReleasesDatasource } from '../modules/datasource/github-releases';
import { GithubTagsDatasource } from '../modules/datasource/github-tags';
-import type { PackageFile } from '../modules/manager/types';
+import type { PackageFileContent } from '../modules/manager/types';
import * as memCache from '../util/cache/memory';
import * as hostRules from './host-rules';
export function checkGithubToken(
- packageFiles: Record<string, PackageFile[]> | undefined
+ packageFiles: Record<string, PackageFileContent[]> | undefined
): void {
const { token } = hostRules.find({
hostType: 'github',
diff --git a/lib/workers/repository/dependency-dashboard.spec.ts b/lib/workers/repository/dependency-dashboard.spec.ts
index 6170c3dcdc4e68a939bf95aa254d3de6abbeada9..8d4aa8698914cd95511fb1e4ab6996a5b24c1340 100644
--- a/lib/workers/repository/dependency-dashboard.spec.ts
+++ b/lib/workers/repository/dependency-dashboard.spec.ts
@@ -11,7 +11,7 @@ import {
import { GlobalConfig } from '../../config/global';
import type {
PackageDependency,
- PackageFile,
+ PackageFileContent,
} from '../../modules/manager/types';
import type { Platform } from '../../modules/platform';
import {
@@ -51,7 +51,7 @@ function genRandString(length: number): string {
function genRandPackageFile(
depsNum: number,
depNameLen: number
-): Record<string, PackageFile[]> {
+): Record<string, PackageFileContent[]> {
const deps: PackageDependency[] = [];
for (let i = 0; i < depsNum; i++) {
deps.push({
@@ -906,7 +906,7 @@ describe('workers/repository/dependency-dashboard', () => {
warnings: [{ message: 'dependency-2', topic: '' }],
},
];
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [{ packageFile: 'package.json', deps: dep }],
};
await dependencyDashboard.ensureDependencyDashboard(
diff --git a/lib/workers/repository/dependency-dashboard.ts b/lib/workers/repository/dependency-dashboard.ts
index ac00cdd0fe527e1b41c4d5b4957dd0700b37c60d..910dfc8b8006d444fb63339e9e291e5404548985 100644
--- a/lib/workers/repository/dependency-dashboard.ts
+++ b/lib/workers/repository/dependency-dashboard.ts
@@ -3,7 +3,7 @@ import { nameFromLevel } from 'bunyan';
import { GlobalConfig } from '../../config/global';
import type { RenovateConfig } from '../../config/types';
import { getProblems, logger } from '../../logger';
-import type { PackageFile } from '../../modules/manager/types';
+import type { PackageFileContent } from '../../modules/manager/types';
import { platform } from '../../modules/platform';
import { GitHubMaxPrBodyLen } from '../../modules/platform/github';
import { regEx } from '../../util/regex';
@@ -165,7 +165,7 @@ function appendRepoProblems(config: RenovateConfig, issueBody: string): string {
export async function ensureDependencyDashboard(
config: SelectAllConfig,
allBranches: BranchConfig[],
- packageFiles: Record<string, PackageFile[]> = {}
+ packageFiles: Record<string, PackageFileContent[]> = {}
): Promise<void> {
// legacy/migrated issue
const reuseTitle = 'Update Dependencies (Renovate Bot)';
diff --git a/lib/workers/repository/errors-warnings.spec.ts b/lib/workers/repository/errors-warnings.spec.ts
index 8fbb5ba7843f9eb2c4cab35899d74d329eee0437..a342baa80593313dcac19c3a3a9ccb0f52e618d3 100644
--- a/lib/workers/repository/errors-warnings.spec.ts
+++ b/lib/workers/repository/errors-warnings.spec.ts
@@ -1,5 +1,5 @@
import { RenovateConfig, getConfig } from '../../../test/util';
-import type { PackageFile } from '../../modules/manager/types';
+import type { PackageFileContent } from '../../modules/manager/types';
import {
getDepWarningsDashboard,
getDepWarningsOnboardingPR,
@@ -52,7 +52,7 @@ describe('workers/repository/errors-warnings', () => {
it('returns 2 pr warnings text dependencyDashboard true', () => {
const dependencyDashboard = true;
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
@@ -99,7 +99,7 @@ describe('workers/repository/errors-warnings', () => {
it('returns 2 pr warnings text dependencyDashboard false', () => {
const dependencyDashboard = false;
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
@@ -145,7 +145,7 @@ describe('workers/repository/errors-warnings', () => {
});
it('PR warning returns empty string', () => {
- const packageFiles: Record<string, PackageFile[]> = {};
+ const packageFiles: Record<string, PackageFileContent[]> = {};
const res = getDepWarningsPR(packageFiles);
expect(res).toBe('');
});
@@ -157,7 +157,7 @@ describe('workers/repository/errors-warnings', () => {
});
it('returns dependency dashboard warning text', () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
@@ -206,7 +206,7 @@ describe('workers/repository/errors-warnings', () => {
});
it('dependency dashboard warning returns empty string', () => {
- const packageFiles: Record<string, PackageFile[]> = {};
+ const packageFiles: Record<string, PackageFileContent[]> = {};
const res = getDepWarningsDashboard(packageFiles);
expect(res).toBe('');
});
@@ -250,7 +250,7 @@ describe('workers/repository/errors-warnings', () => {
describe('getDepWarningsOnboardingPR()', () => {
it('returns onboarding warning text', () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
diff --git a/lib/workers/repository/errors-warnings.ts b/lib/workers/repository/errors-warnings.ts
index 306cf9a939e667f4b51fcb29f8b0f305a01b820a..2c8a6c1ff56a06d27f72b2b9497d8d47c68d2218 100644
--- a/lib/workers/repository/errors-warnings.ts
+++ b/lib/workers/repository/errors-warnings.ts
@@ -1,7 +1,7 @@
// TODO #7154
import type { RenovateConfig } from '../../config/types';
import { logger } from '../../logger';
-import type { PackageFile } from '../../modules/manager/types';
+import type { PackageFileContent } from '../../modules/manager/types';
import { emojify } from '../../util/emoji';
import { regEx } from '../../util/regex';
import type { DepWarnings } from '../types';
@@ -33,7 +33,7 @@ export function getErrors(config: RenovateConfig): string {
}
function getDepWarnings(
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): DepWarnings {
const warnings: string[] = [];
const warningFiles: string[] = [];
@@ -59,7 +59,7 @@ function getDepWarnings(
}
export function getDepWarningsOnboardingPR(
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): string {
const { warnings, warningFiles } = getDepWarnings(packageFiles);
let warningText = '';
@@ -82,7 +82,7 @@ export function getDepWarningsOnboardingPR(
}
export function getDepWarningsPR(
- packageFiles: Record<string, PackageFile[]>,
+ packageFiles: Record<string, PackageFileContent[]>,
dependencyDashboard?: boolean
): string {
const { warnings, warningFiles } = getDepWarnings(packageFiles);
@@ -104,7 +104,7 @@ export function getDepWarningsPR(
}
export function getDepWarningsDashboard(
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): string {
const { warnings, warningFiles } = getDepWarnings(packageFiles);
if (!warnings.length) {
diff --git a/lib/workers/repository/extract/manager-files.ts b/lib/workers/repository/extract/manager-files.ts
index 20f597677309702aac4b530e2c3819b2080db1f8..01ec48f4d6e2196c52ad8611ab483fd83c372ea3 100644
--- a/lib/workers/repository/extract/manager-files.ts
+++ b/lib/workers/repository/extract/manager-files.ts
@@ -5,13 +5,13 @@ import {
extractPackageFile,
get,
} from '../../../modules/manager';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { readLocalFile } from '../../../util/fs';
import type { WorkerExtractConfig } from '../../types';
export async function getManagerPackageFiles(
config: WorkerExtractConfig
-): Promise<PackageFile[] | null> {
+): Promise<PackageFileContent[] | null> {
const { enabled, manager, fileList } = config;
logger.trace(`getPackageFiles(${manager})`);
if (!enabled) {
@@ -44,7 +44,7 @@ export async function getManagerPackageFiles(
}
return allPackageFiles;
}
- const packageFiles: PackageFile[] = [];
+ const packageFiles: PackageFileContent[] = [];
for (const packageFile of fileList) {
const content = await readLocalFile(packageFile, 'utf8');
// istanbul ignore else
diff --git a/lib/workers/repository/onboarding/pr/config-description.spec.ts b/lib/workers/repository/onboarding/pr/config-description.spec.ts
index 39c3a4f8b14ce5c5182b80826838ce8c5f1e2521..e5efd760356235b75828844ca82d4db02fafd7d2 100644
--- a/lib/workers/repository/onboarding/pr/config-description.spec.ts
+++ b/lib/workers/repository/onboarding/pr/config-description.spec.ts
@@ -1,5 +1,5 @@
import { RenovateConfig, getConfig } from '../../../../../test/util';
-import type { PackageFile } from '../../../../modules/manager/types';
+import type { PackageFileContent } from '../../../../modules/manager/types';
import { getConfigDesc } from './config-description';
describe('workers/repository/onboarding/pr/config-description', () => {
@@ -18,7 +18,7 @@ describe('workers/repository/onboarding/pr/config-description', () => {
});
it('returns a full list', () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [],
dockerfile: [],
};
diff --git a/lib/workers/repository/onboarding/pr/config-description.ts b/lib/workers/repository/onboarding/pr/config-description.ts
index 6babae29a9c5a570fac6017e8038a630f830e83e..48f6ece51bb8a5bc914322222050e5f01bae2fb5 100644
--- a/lib/workers/repository/onboarding/pr/config-description.ts
+++ b/lib/workers/repository/onboarding/pr/config-description.ts
@@ -2,7 +2,7 @@ import is from '@sindresorhus/is';
import { configFileNames } from '../../../../config/app-strings';
import type { RenovateConfig } from '../../../../config/types';
import { logger } from '../../../../logger';
-import type { PackageFile } from '../../../../modules/manager/types';
+import type { PackageFileContent } from '../../../../modules/manager/types';
import { emojify } from '../../../../util/emoji';
const defaultConfigFile = configFileNames[0];
@@ -31,7 +31,7 @@ function getDescriptionArray(config: RenovateConfig): string[] {
export function getConfigDesc(
config: RenovateConfig,
- packageFiles?: Record<string, PackageFile[]>
+ packageFiles?: Record<string, PackageFileContent[]>
): string {
// TODO: type (#7154)
const configFile = configFileNames.includes(config.onboardingConfigFileName!)
diff --git a/lib/workers/repository/onboarding/pr/index.spec.ts b/lib/workers/repository/onboarding/pr/index.spec.ts
index 8ba376a88003616124d1a2e041a68bff1d1d15e6..ff91b18dd8f0c02ec21c7ffd545791bc729647cc 100644
--- a/lib/workers/repository/onboarding/pr/index.spec.ts
+++ b/lib/workers/repository/onboarding/pr/index.spec.ts
@@ -8,7 +8,7 @@ import {
} from '../../../../../test/util';
import { GlobalConfig } from '../../../../config/global';
import { logger } from '../../../../logger';
-import type { PackageFile } from '../../../../modules/manager/types';
+import type { PackageFileContent } from '../../../../modules/manager/types';
import type { Pr } from '../../../../modules/platform';
import * as memCache from '../../../../util/cache/memory';
import type { BranchConfig } from '../../../types';
@@ -20,7 +20,7 @@ jest.mock('../../../../util/git');
describe('workers/repository/onboarding/pr/index', () => {
describe('ensureOnboardingPr()', () => {
let config: RenovateConfig;
- let packageFiles: Record<string, PackageFile[]>;
+ let packageFiles: Record<string, PackageFileContent[]>;
let branches: BranchConfig[];
const bodyStruct = {
diff --git a/lib/workers/repository/onboarding/pr/index.ts b/lib/workers/repository/onboarding/pr/index.ts
index c64afc84730ace811f3f7c15b9f121ff174e2298..d380166de1874e1c4d7e9e824c6e285a2b71f145 100644
--- a/lib/workers/repository/onboarding/pr/index.ts
+++ b/lib/workers/repository/onboarding/pr/index.ts
@@ -2,7 +2,7 @@ import is from '@sindresorhus/is';
import { GlobalConfig } from '../../../../config/global';
import type { RenovateConfig } from '../../../../config/types';
import { logger } from '../../../../logger';
-import type { PackageFile } from '../../../../modules/manager/types';
+import type { PackageFileContent } from '../../../../modules/manager/types';
import { platform } from '../../../../modules/platform';
import { hashBody } from '../../../../modules/platform/pr-body';
import { emojify } from '../../../../util/emoji';
@@ -30,7 +30,7 @@ import { getPrList } from './pr-list';
export async function ensureOnboardingPr(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]> | null,
+ packageFiles: Record<string, PackageFileContent[]> | null,
branches: BranchConfig[]
): Promise<void> {
if (
diff --git a/lib/workers/repository/package-files.ts b/lib/workers/repository/package-files.ts
index 59743a85771666e7376d15ced1e55a368de7466b..0761be3b635575ad12edd2b1d30328a6f7a04d3a 100644
--- a/lib/workers/repository/package-files.ts
+++ b/lib/workers/repository/package-files.ts
@@ -1,14 +1,17 @@
import is from '@sindresorhus/is';
import { logger } from '../../logger';
-import type { PackageFile } from '../../modules/manager/types';
+import type { PackageFileContent } from '../../modules/manager/types';
import { clone } from '../../util/clone';
export class PackageFiles {
- private static data = new Map<string, Record<string, PackageFile[]> | null>();
+ private static data = new Map<
+ string,
+ Record<string, PackageFileContent[]> | null
+ >();
static add(
baseBranch: string,
- packageFiles: Record<string, PackageFile[]> | null
+ packageFiles: Record<string, PackageFileContent[]> | null
): void {
logger.debug(
{ baseBranch },
@@ -79,7 +82,7 @@ export class PackageFiles {
* @param data
*/
private static getDashboardMarkdownInternal(
- data: Map<string, Record<string, PackageFile[]> | null>
+ data: Map<string, Record<string, PackageFileContent[]> | null>
): string {
const none = 'None detected\n\n';
const pad = data.size > 1; // padding condition for a multi base branch repo
@@ -133,7 +136,7 @@ export class PackageFiles {
* otherwise false is returned
*/
private static pop(
- data: Map<string, Record<string, PackageFile[]> | null>
+ data: Map<string, Record<string, PackageFileContent[]> | null>
): boolean {
// get detected managers list of the last listed base branch
const [branch, managers] = Array.from(data).pop() ?? [];
diff --git a/lib/workers/repository/process/deprecated.ts b/lib/workers/repository/process/deprecated.ts
index 642335326d0ad85d47d1483dad374fc2856e6843..40283a9b8b8513250fbfe40c82f2c6bdc80bda02 100644
--- a/lib/workers/repository/process/deprecated.ts
+++ b/lib/workers/repository/process/deprecated.ts
@@ -2,12 +2,12 @@
import { GlobalConfig } from '../../../config/global';
import type { RenovateConfig } from '../../../config/types';
import { logger } from '../../../logger';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { platform } from '../../../modules/platform';
export async function raiseDeprecationWarnings(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Promise<void> {
if (!config.repoIsOnboarded) {
return;
diff --git a/lib/workers/repository/process/extract-update.spec.ts b/lib/workers/repository/process/extract-update.spec.ts
index 08f8d09343d1df16cb10ca464207d810590ba7b9..d8c9e013eeead37c9a05592a100cbf60583b07c8 100644
--- a/lib/workers/repository/process/extract-update.spec.ts
+++ b/lib/workers/repository/process/extract-update.spec.ts
@@ -1,5 +1,5 @@
import { git, logger, mocked } from '../../../../test/util';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import * as _repositoryCache from '../../../util/cache/repository';
import type { BaseBranchCache } from '../../../util/cache/repository/types';
import { fingerprint } from '../../../util/fingerprint';
@@ -88,7 +88,7 @@ describe('workers/repository/process/extract-update', () => {
});
it('uses repository cache', async () => {
- const packageFiles: Record<string, PackageFile[]> = {};
+ const packageFiles: Record<string, PackageFileContent[]> = {};
const config = {
repoIsOnboarded: true,
suppressNotifications: ['deprecationWarningIssues'],
diff --git a/lib/workers/repository/process/extract-update.ts b/lib/workers/repository/process/extract-update.ts
index e806b545281090fec8348a4df3af0f31c9d590b0..9805cdcc6fecc0a8d6a4812bd578c9136cbd50bd 100644
--- a/lib/workers/repository/process/extract-update.ts
+++ b/lib/workers/repository/process/extract-update.ts
@@ -2,7 +2,7 @@ import is from '@sindresorhus/is';
import type { RenovateConfig } from '../../../config/types';
import { logger } from '../../../logger';
import { hashMap } from '../../../modules/manager';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { getCache } from '../../../util/cache/repository';
import type { BaseBranchCache } from '../../../util/cache/repository/types';
import { checkGithubToken as ensureGithubToken } from '../../../util/check-token';
@@ -21,7 +21,7 @@ import { WriteUpdateResult, writeUpdates } from './write';
export interface ExtractResult {
branches: BranchConfig[];
branchList: string[];
- packageFiles: Record<string, PackageFile[]>;
+ packageFiles: Record<string, PackageFileContent[]>;
}
export interface StatsResult {
@@ -36,7 +36,7 @@ export interface Stats {
// istanbul ignore next
function extractStats(
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Stats | null {
if (!packageFiles) {
return null;
@@ -111,11 +111,11 @@ export function isCacheExtractValid(
export async function extract(
config: RenovateConfig
-): Promise<Record<string, PackageFile[]>> {
+): Promise<Record<string, PackageFileContent[]>> {
logger.debug('extract()');
const { baseBranch } = config;
const baseBranchSha = getBranchCommit(baseBranch!);
- let packageFiles: Record<string, PackageFile[]>;
+ let packageFiles: Record<string, PackageFileContent[]>;
const cache = getCache();
cache.scan ||= {};
const cachedExtract = cache.scan[baseBranch!];
@@ -169,7 +169,7 @@ export async function extract(
async function fetchVulnerabilities(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Promise<void> {
if (config.osvVulnerabilityAlerts) {
try {
@@ -183,7 +183,7 @@ async function fetchVulnerabilities(
export async function lookup(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Promise<ExtractResult> {
await fetchVulnerabilities(config, packageFiles);
await fetchUpdates(config, packageFiles);
diff --git a/lib/workers/repository/process/fetch.spec.ts b/lib/workers/repository/process/fetch.spec.ts
index f641ea1a4f2d41356028fb0070c7a9e64cffac63..ac641e3b565e8bd6486ab638591d7976de454123 100644
--- a/lib/workers/repository/process/fetch.spec.ts
+++ b/lib/workers/repository/process/fetch.spec.ts
@@ -1,6 +1,6 @@
import { RenovateConfig, getConfig, mocked } from '../../../../test/util';
import { MavenDatasource } from '../../../modules/datasource/maven';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { ExternalHostError } from '../../../types/errors/external-host-error';
import { fetchUpdates } from './fetch';
import * as lookup from './lookup';
@@ -19,7 +19,7 @@ describe('workers/repository/process/fetch', () => {
});
it('handles empty deps', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [{ packageFile: 'package.json', deps: [] }],
};
await fetchUpdates(config, packageFiles);
@@ -36,7 +36,7 @@ describe('workers/repository/process/fetch', () => {
enabled: false,
},
];
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
@@ -72,7 +72,7 @@ describe('workers/repository/process/fetch', () => {
});
it('skips deps with empty names', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
docker: [
{
packageFile: 'values.yaml',
@@ -99,7 +99,7 @@ describe('workers/repository/process/fetch', () => {
});
it('skips internal deps by default', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
docker: [
{
packageFile: 'values.yaml',
diff --git a/lib/workers/repository/process/fetch.ts b/lib/workers/repository/process/fetch.ts
index d95394546545a652405732a5ff5dbda5014ad497..643d1439bb0eb52c9df2755a47e6d7a6999004c7 100644
--- a/lib/workers/repository/process/fetch.ts
+++ b/lib/workers/repository/process/fetch.ts
@@ -9,7 +9,7 @@ import {
} from '../../../modules/datasource';
import type {
PackageDependency,
- PackageFile,
+ PackageFileContent,
} from '../../../modules/manager/types';
import { ExternalHostError } from '../../../types/errors/external-host-error';
import { clone } from '../../../util/clone';
@@ -20,7 +20,7 @@ import { lookupUpdates } from './lookup';
import type { LookupUpdateConfig } from './lookup/types';
async function fetchDepUpdates(
- packageFileConfig: RenovateConfig & PackageFile,
+ packageFileConfig: RenovateConfig & PackageFileContent,
indep: PackageDependency
): Promise<PackageDependency> {
let dep = clone(indep);
@@ -83,7 +83,7 @@ async function fetchDepUpdates(
async function fetchManagerPackagerFileUpdates(
config: RenovateConfig,
managerConfig: RenovateConfig,
- pFile: PackageFile
+ pFile: PackageFileContent
): Promise<void> {
const { packageFile } = pFile;
const packageFileConfig = mergeChildConfig(managerConfig, pFile);
@@ -103,7 +103,7 @@ async function fetchManagerPackagerFileUpdates(
async function fetchManagerUpdates(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>,
+ packageFiles: Record<string, PackageFileContent[]>,
manager: string
): Promise<void> {
const managerConfig = getManagerConfig(config, manager);
@@ -121,7 +121,7 @@ async function fetchManagerUpdates(
export async function fetchUpdates(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Promise<void> {
const managers = Object.keys(packageFiles);
const allManagerJobs = managers.map((manager) =>
diff --git a/lib/workers/repository/process/index.ts b/lib/workers/repository/process/index.ts
index b1cd6d8ae4930491ddf2dd5296f8826c0e3e7044..b65a2d664648c683a741e487aee7b24a31fd6759 100644
--- a/lib/workers/repository/process/index.ts
+++ b/lib/workers/repository/process/index.ts
@@ -4,7 +4,7 @@ import { GlobalConfig } from '../../../config/global';
import type { RenovateConfig } from '../../../config/types';
import { CONFIG_VALIDATION } from '../../../constants/error-messages';
import { addMeta, logger, removeMeta } from '../../../logger';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { platform } from '../../../modules/platform';
import { getCache } from '../../../util/cache/repository';
import { clone } from '../../../util/clone';
@@ -92,7 +92,7 @@ export async function extractDependencies(
};
if (config.baseBranches?.length) {
logger.debug({ baseBranches: config.baseBranches }, 'baseBranches');
- const extracted: Record<string, Record<string, PackageFile[]>> = {};
+ const extracted: Record<string, Record<string, PackageFileContent[]>> = {};
for (const baseBranch of config.baseBranches) {
addMeta({ baseBranch });
if (branchExists(baseBranch)) {
diff --git a/lib/workers/repository/process/vulnerabilities.spec.ts b/lib/workers/repository/process/vulnerabilities.spec.ts
index dc3146ad5c0fb19bbadfe33f3a2f5bbc13113aa0..f182547149dc72e430418a768ee08ab5c99a8486 100644
--- a/lib/workers/repository/process/vulnerabilities.spec.ts
+++ b/lib/workers/repository/process/vulnerabilities.spec.ts
@@ -2,7 +2,7 @@ import type { Osv, OsvOffline } from '@renovatebot/osv-offline';
import { codeBlock } from 'common-tags';
import { mockFn } from 'jest-mock-extended';
import { RenovateConfig, getConfig, logger } from '../../../../test/util';
-import type { PackageFile } from '../../../modules/manager/types';
+import type { PackageFileContent } from '../../../modules/manager/types';
import { Vulnerabilities } from './vulnerabilities';
const getVulnerabilitiesMock =
@@ -71,7 +71,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('unsupported datasource', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
dockerfile: [{ deps: [{ depName: 'node', datasource: 'docker' }] }],
};
@@ -82,7 +82,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('package found but no vulnerabilities', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [{ deps: [{ depName: 'lodash', datasource: 'npm' }] }],
};
getVulnerabilitiesMock.mockResolvedValueOnce([]);
@@ -94,7 +94,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('vulnerability without affected field', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -115,7 +115,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('invalid dep version', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -138,7 +138,7 @@ describe('workers/repository/process/vulnerabilities', () => {
it('exception due to invalid version upon comparison', async () => {
const err = new TypeError('Invalid Version: ^1.1.0');
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -181,7 +181,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('no version or range affected', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -207,7 +207,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('no fixed version available', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -236,7 +236,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('does not accidentally downgrade versions due to fixed version for other range', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -274,7 +274,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('vulnerability with multiple unsorted events', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
gomod: [
{
deps: [
@@ -332,7 +332,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('vulnerability with multiple affected entries and version ranges', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
poetry: [
{
deps: [
@@ -400,7 +400,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('filters not applicable vulnerability', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -416,7 +416,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('returns a single packageRule for regex manager', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
regex: [
{
deps: [
@@ -515,7 +515,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('returns multiple packageRules for different vulnerabilities', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -571,7 +571,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('filters not applicable vulnerability based on last_affected version', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
poetry: [
{
deps: [
@@ -610,7 +610,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('returns packageRule based on last_affected version', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -682,7 +682,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('handles invalid CVSS scores gracefully', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
poetry: [
{
deps: [
@@ -761,7 +761,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('show severity text in GHSA advisories without CVSS score', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
deps: [
@@ -818,7 +818,7 @@ describe('workers/repository/process/vulnerabilities', () => {
});
it('formats headings of vulnerability details', async () => {
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
regex: [
{
deps: [
diff --git a/lib/workers/repository/process/vulnerabilities.ts b/lib/workers/repository/process/vulnerabilities.ts
index 1b51870cdb1f5d6548aadf84540d445ec6f58379..c359f2344358720fa9c6ef08114430dc16ac0e7f 100644
--- a/lib/workers/repository/process/vulnerabilities.ts
+++ b/lib/workers/repository/process/vulnerabilities.ts
@@ -9,7 +9,7 @@ import { logger } from '../../../logger';
import { getDefaultVersioning } from '../../../modules/datasource';
import type {
PackageDependency,
- PackageFile,
+ PackageFileContent,
} from '../../../modules/manager/types';
import {
VersioningApi,
@@ -52,7 +52,7 @@ export class Vulnerabilities {
async fetchVulnerabilities(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>
+ packageFiles: Record<string, PackageFileContent[]>
): Promise<void> {
const managers = Object.keys(packageFiles);
const allManagerJobs = managers.map((manager) =>
@@ -63,7 +63,7 @@ export class Vulnerabilities {
private async fetchManagerVulnerabilities(
config: RenovateConfig,
- packageFiles: Record<string, PackageFile[]>,
+ packageFiles: Record<string, PackageFileContent[]>,
manager: string
): Promise<void> {
const managerConfig = getManagerConfig(config, manager);
@@ -86,7 +86,7 @@ export class Vulnerabilities {
private async fetchManagerPackageFileVulnerabilities(
config: RenovateConfig,
managerConfig: RenovateConfig,
- pFile: PackageFile
+ pFile: PackageFileContent
): Promise<void> {
const { packageFile } = pFile;
const packageFileConfig = mergeChildConfig(managerConfig, pFile);
@@ -108,7 +108,7 @@ export class Vulnerabilities {
}
private async fetchDependencyVulnerabilities(
- packageFileConfig: RenovateConfig & PackageFile,
+ packageFileConfig: RenovateConfig & PackageFileContent,
dep: PackageDependency
): Promise<PackageRule[]> {
const ecosystem = Vulnerabilities.datasourceEcosystemMap[dep.datasource!];
@@ -394,7 +394,7 @@ export class Vulnerabilities {
}
private convertToPackageRule(
- packageFileConfig: RenovateConfig & PackageFile,
+ packageFileConfig: RenovateConfig & PackageFileContent,
dep: PackageDependency,
packageName: string,
depVersion: string,
diff --git a/lib/workers/repository/update/pr/body/index.spec.ts b/lib/workers/repository/update/pr/body/index.spec.ts
index 46004205fe594e7dbd272ae9b8ecdd9264a85272..35d316c3b08903e06fdad9b9616795cc0c593a0d 100644
--- a/lib/workers/repository/update/pr/body/index.spec.ts
+++ b/lib/workers/repository/update/pr/body/index.spec.ts
@@ -1,5 +1,5 @@
import { mocked, platform } from '../../../../../../test/util';
-import type { PackageFile } from '../../../../../modules/manager/types';
+import type { PackageFileContent } from '../../../../../modules/manager/types';
import { prDebugDataRe } from '../../../../../modules/platform/pr-body';
import * as _template from '../../../../../util/template';
import * as _changelogs from './changelogs';
@@ -220,7 +220,7 @@ describe('workers/repository/update/pr/body/index', () => {
platform.massageMarkdown.mockImplementation((x) => massagedMarkDown);
template.compile.mockImplementation((x) => compiledContent);
- const packageFiles: Record<string, PackageFile[]> = {
+ const packageFiles: Record<string, PackageFileContent[]> = {
npm: [
{
packageFile: 'package.json',
diff --git a/lib/workers/types.ts b/lib/workers/types.ts
index 8236081cb5cd44cb3f7937b4df3daab277cdc11d..9f898a603ba4339884e0f2181415332273327eb8 100644
--- a/lib/workers/types.ts
+++ b/lib/workers/types.ts
@@ -12,7 +12,7 @@ import type {
ExtractConfig,
LookupUpdate,
PackageDependency,
- PackageFile,
+ PackageFileContent,
} from '../modules/manager/types';
import type { PlatformPrOptions } from '../modules/platform/types';
import type { FileChange } from '../util/git/types';
@@ -118,7 +118,7 @@ export interface BranchConfig
rebaseRequested?: boolean;
result?: BranchResult;
upgrades: BranchUpgradeConfig[];
- packageFiles?: Record<string, PackageFile[]>;
+ packageFiles?: Record<string, PackageFileContent[]>;
prBlockedBy?: PrBlockedBy;
prNo?: number;
stopUpdating?: boolean;
@@ -189,5 +189,5 @@ export interface UpgradeFingerprintConfig {
export interface ExtractResult {
extractionFingerprints: Record<string, string | undefined>;
- packageFiles: Record<string, PackageFile[]>;
+ packageFiles: Record<string, PackageFileContent[]>;
}