mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 01:37:24 +00:00
3412de84ce
* refactor(lint): enable oxlint prefer-named-capture-group at error Numbered capture groups (m[1], $1) break silently when a regex is edited and group order shifts. Named groups (?<name>...) make intent explicit and accesses (m.groups.name) resilient to reordering. This enables the built-in eslint rule prefer-named-capture-group, surfacing 321 pre-existing unnamed-group violations across ~121 files to be burned down incrementally in follow-up commits. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(versioning): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations in lib/modules/versioning/. Unused capture groups (only reachable via .test() or whole-match) become non-capturing (?:...); groups whose value is read become named (?<name>...), with accesses rewritten to match.groups!.<name> (or destructured from .groups!) instead of positional match[n]/$n so a future edit that reorders groups cannot silently break the reader. Two cases needed extra care to preserve behavior: - semver/common.ts and poetry/patterns.ts split() on a regex whose capture group is relied upon by String.prototype.split to keep the separator in the output array; the group is kept capturing and named, not converted to non-capturing. - hashicorp/convertor.ts's semverRegex is only ever embedded via .source into a named `(?<version>...)` group elsewhere and never matched directly, so its internal groups are safe to make non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(datasource): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations under lib/modules/datasource/. Same treatment as the versioning module: unused groups become non-capturing, used groups get names, and positional match[n] reads move to match.groups!.<name>. docker/ecr.ts and pypi/common.ts keep their positional destructuring (`const [, region] = ...`, `!!m &&`) working unchanged since a named capture group is still addressable by its numeric index in JavaScript — only pypi/common.ts's access was rewritten to m.groups!.owner for clarity since it read a single group directly. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(platform): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations under lib/modules/platform/. Uses the repo's established idiom of `match.groups?.<name>` after an optional-chained exec()/match() (see bitbucket/index.ts hostnameWithoutApiPrefix, gerrit/utils.ts extractSourceBranch) and `$<name>` in String.replace replacement strings. Unused groups (markdown/HTML massaging regexes matched only to be stripped) become non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups in ansible-galaxy for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/modules/manager/ansible-galaxy/. newBlockRegEx and blockLineRegEx dropped their unused outer wrapping group (only the inner key/value groups were ever read) and named the key/value groups; nameMatchRegex's remaining unused groups (protocol/user-info/port alternatives) become non-capturing since only source/hostname/depName/version are read via .groups. Accesses in collections.ts and roles.ts move from lineMatch[2]/lineMatch[3] to lineMatch.groups!.key/value. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups for prefer-named-capture-group (batch 1) Burns down prefer-named-capture-group violations across the first alphabetical slice of lib/modules/manager/ (ansible through mix). Used groups get names with accesses rewritten to match.groups!.<name> (or $<name> in replacement strings); groups whose value is never read become non-capturing (?:...). Two String.split() call sites (git-submodules/extract.ts, meteor/extract.ts) keep the established "named group still readable positionally from the split() result array" idiom instead of restructuring the destructuring. bazel/rules/go.ts and buildpacks/extract.ts dockerRef verified byte-for-byte equivalent before/after via a quick node script since several nested groups collapsed to non-capturing at once. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups for prefer-named-capture-group (batch 2) Burns down prefer-named-capture-group violations across the remaining alphabetical slice of lib/modules/manager/ (npm through terragrunt). Same treatment as batch 1: used groups get names with accesses moved to match.groups!.<name> or $<name> replacement strings; unused groups (wrapping alternations, quantifier repetition groups only consumed via .test(), or values never read from a match) become non-capturing. terraform/extractors/others/modules.ts and terragrunt/modules.ts share near-identical URL-parsing regexes (github/bitbucket/git/azure-devops ref matchers) — the same set of always-unused `depth=`/`&depth=` query-string groups is converted to non-capturing in both files. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(config): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/config/. Used groups get names with replacement strings switched from $1/$2 to $<name>; the unused separator group in schedule-migration.ts's afterBeforeRegex becomes non-capturing. presets/parse.ts keeps assigning through the already-declared `repo` variable rather than array-destructuring the exec() result, matching this file's existing style for the other named-group regexes just above it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(util): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations across lib/util/ and lib/logger/. Same treatment as previous batches: named groups for values that are read (via $<name> replacement strings, .groups!.<name>, or destructured from .groups), non-capturing groups where nothing reads the captured value (e.g. semantic.ts's angular-commit .test()-only regex). www-authenticate.ts's tokenizer entries each get their own named group but keep accessing the match generically via match[1], since a positionally-indexed named group is still readable by index. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(workers): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/workers/. Used groups get names with $<name> replacement strings; unused wrapper/alternation groups (e.g. semantic-commit-message.ts's optional scope/issue wrappers, release-notes.ts's date-heading and horizontal-rule matchers that are only probed with .search()/replaced wholesale) become non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(test,tools): name capture groups for prefer-named-capture-group Finishes the prefer-named-capture-group burndown: test/, tools/, and vitest.config.mts. Groups whose value is read get names ($<name> replacement strings or .groups.<name> access); groups only used via .test()/.search() or that feed a .match(/…/g) call (whose return value is the array of whole matches, not captured groups) become non-capturing. This is the last remaining slice of pre-existing violations, so the rule (already enabled at error repo-wide) now passes with zero findings across the whole codebase. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * fix prettier failure * refactor(lint): use a named capture group in `v8-ignore-no-count` New rule from main trips the newly enabled `prefer-named-capture-group` oxlint rule. --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
339 lines
11 KiB
TypeScript
339 lines
11 KiB
TypeScript
import { isString } from '@sindresorhus/is';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { readLocalFile } from '../../../util/fs/index.ts';
|
|
import { newlineRegex, regEx } from '../../../util/regex.ts';
|
|
import { isHttpUrl } from '../../../util/url.ts';
|
|
import { GitRefsDatasource } from '../../datasource/git-refs/index.ts';
|
|
import { RubyVersionDatasource } from '../../datasource/ruby-version/index.ts';
|
|
import { RubygemsDatasource } from '../../datasource/rubygems/index.ts';
|
|
import type { PackageDependency, PackageFileContent } from '../types.ts';
|
|
import { delimiters, extractRubyVersion, getLockFilePath } from './common.ts';
|
|
import { extractLockFileEntries } from './locked-version.ts';
|
|
|
|
function formatContent(input: string): string {
|
|
return `${input.replace(regEx(/^ {2}/), '')}\n`; //remove leading whitespace and add a new line at the end
|
|
}
|
|
|
|
const variableMatchRegex = regEx(
|
|
`^(?<key>\\w+)\\s*=\\s*['"](?<value>[^'"]+)['"]`,
|
|
);
|
|
const gemMatchRegex = regEx(
|
|
`^\\s*gem\\s+(['"])(?<depName>[^'"]+)(['"])(\\s*,\\s*(?<currentValue>(['"])[^'"]+['"](\\s*,\\s*['"][^'"]+['"])?))?`,
|
|
);
|
|
const sourceMatchRegex = regEx(
|
|
`source:\\s*((?:['"](?<registryUrl>[^'"]+)['"])|(?<sourceName>\\w+))?`,
|
|
);
|
|
const gitRefsMatchRegex = regEx(
|
|
`((git:\\s*['"](?<gitUrl>[^'"]+)['"])|(\\s*,\\s*github:\\s*['"](?<repoName>[^'"]+)['"]))(\\s*,\\s*branch:\\s*['"](?<branchName>[^'"]+)['"])?(\\s*,\\s*ref:\\s*['"](?<refName>[^'"]+)['"])?(\\s*,\\s*tag:\\s*['"](?<tagName>[^'"]+)['"])?`,
|
|
);
|
|
const pathMatchRegex = regEx(`path:\\s*['"](?<path>[^'"]+)['"]`);
|
|
|
|
export async function extractPackageFile(
|
|
content: string,
|
|
packageFile?: string,
|
|
): Promise<PackageFileContent | null> {
|
|
let lineNumber: number;
|
|
async function processGroupBlock(
|
|
line: string,
|
|
repositoryUrl?: string,
|
|
trimGroupLine = false,
|
|
): Promise<void> {
|
|
const groupMatch = regEx(/^group\s+(?<groups>.*?)\s+do/).exec(line);
|
|
if (groupMatch) {
|
|
const depTypes = groupMatch
|
|
.groups!.groups.split(',')
|
|
.map((group) => group.trim())
|
|
.map((group) => group.replace(regEx(/^:/), ''));
|
|
|
|
const groupLineNumber = lineNumber;
|
|
let groupContent = '';
|
|
let groupLine = '';
|
|
|
|
while (
|
|
lineNumber < lines.length &&
|
|
(trimGroupLine ? groupLine.trim() !== 'end' : groupLine !== 'end')
|
|
) {
|
|
lineNumber += 1;
|
|
groupLine = lines[lineNumber];
|
|
|
|
// istanbul ignore if
|
|
if (!isString(groupLine)) {
|
|
logger.debug(
|
|
{ content, packageFile, type: 'groupLine' },
|
|
'Bundler parsing error',
|
|
);
|
|
groupLine = 'end';
|
|
}
|
|
if (trimGroupLine ? groupLine.trim() !== 'end' : groupLine !== 'end') {
|
|
groupContent += formatContent(groupLine);
|
|
}
|
|
}
|
|
|
|
const groupRes = await extractPackageFile(groupContent);
|
|
if (groupRes) {
|
|
res.deps = res.deps.concat(
|
|
groupRes.deps.map((dep) => {
|
|
const depObject = {
|
|
...dep,
|
|
depTypes,
|
|
managerData: {
|
|
lineNumber:
|
|
(dep.managerData?.lineNumber ?? NaN) + groupLineNumber + 1,
|
|
},
|
|
};
|
|
if (repositoryUrl) {
|
|
depObject.registryUrls = [repositoryUrl];
|
|
}
|
|
return depObject;
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
const res: PackageFileContent = {
|
|
registryUrls: [],
|
|
deps: [],
|
|
};
|
|
|
|
const variables: Record<string, string> = {};
|
|
|
|
const lines = content.split(newlineRegex);
|
|
for (lineNumber = 0; lineNumber < lines.length; lineNumber += 1) {
|
|
const line = lines[lineNumber];
|
|
let sourceMatch: RegExpMatchArray | null = null;
|
|
for (const delimiter of delimiters) {
|
|
sourceMatch =
|
|
sourceMatch ??
|
|
regEx(
|
|
`^source ((${delimiter}(?<registryUrl>[^${delimiter}]+)${delimiter})|(?<sourceName>\\w+))\\s*$`,
|
|
).exec(line);
|
|
}
|
|
if (sourceMatch) {
|
|
if (sourceMatch.groups?.registryUrl) {
|
|
res.registryUrls?.push(sourceMatch.groups.registryUrl);
|
|
}
|
|
if (sourceMatch.groups?.sourceName) {
|
|
const registryUrl = variables[sourceMatch.groups.sourceName];
|
|
if (registryUrl) {
|
|
res.registryUrls?.push(registryUrl);
|
|
}
|
|
}
|
|
}
|
|
|
|
const rubyMatch = extractRubyVersion(line);
|
|
if (rubyMatch) {
|
|
res.deps.push({
|
|
depName: 'ruby',
|
|
currentValue: rubyMatch,
|
|
datasource: RubyVersionDatasource.id,
|
|
registryUrls: null,
|
|
});
|
|
}
|
|
|
|
const variableMatch = variableMatchRegex.exec(line);
|
|
if (variableMatch?.groups?.key) {
|
|
variables[variableMatch.groups?.key] = variableMatch.groups?.value;
|
|
}
|
|
|
|
const gemMatch = gemMatchRegex.exec(line)?.groups;
|
|
|
|
if (gemMatch) {
|
|
const dep: PackageDependency = {
|
|
depName: gemMatch.depName,
|
|
managerData: { lineNumber },
|
|
datasource: RubygemsDatasource.id,
|
|
};
|
|
|
|
if (gemMatch.currentValue) {
|
|
const currentValue = gemMatch.currentValue;
|
|
dep.currentValue = currentValue;
|
|
}
|
|
|
|
const pathMatch = pathMatchRegex.exec(line)?.groups;
|
|
if (pathMatch) {
|
|
dep.skipReason = 'internal-package';
|
|
}
|
|
|
|
const sourceMatch = sourceMatchRegex.exec(line)?.groups;
|
|
if (sourceMatch) {
|
|
if (sourceMatch.registryUrl) {
|
|
dep.registryUrls = [sourceMatch.registryUrl];
|
|
} else if (sourceMatch.sourceName) {
|
|
dep.registryUrls = [variables[sourceMatch.sourceName]];
|
|
}
|
|
}
|
|
|
|
const gitRefsMatch = gitRefsMatchRegex.exec(line)?.groups;
|
|
if (gitRefsMatch) {
|
|
if (gitRefsMatch.gitUrl) {
|
|
const gitUrl = gitRefsMatch.gitUrl;
|
|
dep.packageName = gitUrl;
|
|
|
|
if (isHttpUrl(gitUrl)) {
|
|
dep.sourceUrl = gitUrl.replace(regEx(/\.git$/), '');
|
|
}
|
|
} else {
|
|
// we always have repoName, as `gitRefsMatchRegex`'s first group requires either `gitUrl` or `repoName`
|
|
dep.packageName = `https://github.com/${gitRefsMatch.repoName}`;
|
|
dep.sourceUrl = dep.packageName;
|
|
}
|
|
if (gitRefsMatch.refName) {
|
|
dep.currentDigest = gitRefsMatch.refName;
|
|
} else if (gitRefsMatch.branchName) {
|
|
dep.currentValue = gitRefsMatch.branchName;
|
|
} else if (gitRefsMatch.tagName) {
|
|
dep.currentValue = gitRefsMatch.tagName;
|
|
}
|
|
dep.datasource = GitRefsDatasource.id;
|
|
}
|
|
res.deps.push(dep);
|
|
}
|
|
|
|
await processGroupBlock(line);
|
|
|
|
for (const delimiter of delimiters) {
|
|
const sourceBlockMatch = regEx(
|
|
`^source\\s+((${delimiter}(?<registryUrl>[^${delimiter}]+)${delimiter})|(?<sourceName>\\w+))\\s+do`,
|
|
).exec(line);
|
|
if (sourceBlockMatch) {
|
|
let repositoryUrl = '';
|
|
if (sourceBlockMatch.groups?.registryUrl) {
|
|
repositoryUrl = sourceBlockMatch.groups.registryUrl;
|
|
}
|
|
if (
|
|
sourceBlockMatch.groups?.sourceName &&
|
|
variables[sourceBlockMatch.groups.sourceName]
|
|
) {
|
|
repositoryUrl = variables[sourceBlockMatch.groups.sourceName];
|
|
}
|
|
const sourceLineNumber = lineNumber;
|
|
let sourceContent = '';
|
|
let sourceLine = '';
|
|
|
|
while (lineNumber < lines.length && sourceLine.trim() !== 'end') {
|
|
lineNumber += 1;
|
|
sourceLine = lines[lineNumber];
|
|
// istanbul ignore if
|
|
if (!isString(sourceLine)) {
|
|
logger.debug(
|
|
{ content, packageFile, type: 'sourceLine' },
|
|
'Bundler parsing error',
|
|
);
|
|
sourceLine = 'end';
|
|
}
|
|
|
|
await processGroupBlock(sourceLine.trim(), repositoryUrl, true);
|
|
|
|
if (sourceLine.trim() !== 'end') {
|
|
sourceContent += formatContent(sourceLine);
|
|
}
|
|
}
|
|
|
|
const sourceRes = await extractPackageFile(sourceContent);
|
|
|
|
if (sourceRes) {
|
|
res.deps = res.deps.concat(
|
|
sourceRes.deps.map((dep) => ({
|
|
...dep,
|
|
registryUrls: [repositoryUrl],
|
|
managerData: {
|
|
lineNumber:
|
|
(dep.managerData?.lineNumber ?? NaN) + sourceLineNumber + 1,
|
|
},
|
|
})),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
const platformsMatch = regEx(/^platforms\s+(?:.*?)\s+do/).test(line);
|
|
if (platformsMatch) {
|
|
const platformsLineNumber = lineNumber;
|
|
let platformsContent = '';
|
|
let platformsLine = '';
|
|
while (lineNumber < lines.length && platformsLine !== 'end') {
|
|
lineNumber += 1;
|
|
platformsLine = lines[lineNumber];
|
|
// istanbul ignore if
|
|
if (!isString(platformsLine)) {
|
|
logger.debug(
|
|
{ content, packageFile, type: 'platformsLine' },
|
|
'Bundler parsing error',
|
|
);
|
|
platformsLine = 'end';
|
|
}
|
|
if (platformsLine !== 'end') {
|
|
platformsContent += formatContent(platformsLine);
|
|
}
|
|
}
|
|
const platformsRes = await extractPackageFile(platformsContent);
|
|
if (platformsRes) {
|
|
res.deps = res.deps.concat(
|
|
platformsRes.deps.map((dep) => ({
|
|
...dep,
|
|
managerData: {
|
|
lineNumber:
|
|
(dep.managerData?.lineNumber ?? NaN) + platformsLineNumber + 1,
|
|
},
|
|
})),
|
|
);
|
|
}
|
|
}
|
|
const ifMatch = regEx(/^if\s+(?:.*?)/).test(line);
|
|
if (ifMatch) {
|
|
const ifLineNumber = lineNumber;
|
|
let ifContent = '';
|
|
let ifLine = '';
|
|
while (lineNumber < lines.length && ifLine !== 'end') {
|
|
lineNumber += 1;
|
|
ifLine = lines[lineNumber];
|
|
// istanbul ignore if
|
|
if (!isString(ifLine)) {
|
|
logger.debug(
|
|
{ content, packageFile, type: 'ifLine' },
|
|
'Bundler parsing error',
|
|
);
|
|
ifLine = 'end';
|
|
}
|
|
if (ifLine !== 'end') {
|
|
ifContent += formatContent(ifLine);
|
|
}
|
|
}
|
|
const ifRes = await extractPackageFile(ifContent);
|
|
if (ifRes) {
|
|
res.deps = res.deps.concat(
|
|
ifRes.deps.map((dep) => ({
|
|
...dep,
|
|
managerData: {
|
|
lineNumber:
|
|
(dep.managerData?.lineNumber ?? NaN) + ifLineNumber + 1,
|
|
},
|
|
})),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
if (!res.deps.length && !res.registryUrls?.length) {
|
|
return null;
|
|
}
|
|
|
|
if (packageFile) {
|
|
const gemfileLockPath = await getLockFilePath(packageFile);
|
|
const lockContent = await readLocalFile(gemfileLockPath, 'utf8');
|
|
if (lockContent) {
|
|
logger.debug(
|
|
`Found lock file ${gemfileLockPath} for packageFile: ${packageFile}`,
|
|
);
|
|
res.lockFiles = [gemfileLockPath];
|
|
const lockedEntries = extractLockFileEntries(lockContent);
|
|
for (const dep of res.deps) {
|
|
// TODO: types (#22198)
|
|
const lockedDepValue = lockedEntries.get(`${dep.depName!}`);
|
|
if (lockedDepValue) {
|
|
dep.lockedVersion = lockedDepValue;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return res;
|
|
}
|