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>
192 lines
6.7 KiB
TypeScript
192 lines
6.7 KiB
TypeScript
// TODO: types (#22198)
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { newlineRegex, regEx } from '../../../util/regex.ts';
|
|
import type { UpdateDependencyConfig } from '../types.ts';
|
|
|
|
function getNameWithNoVersion(name: string): string {
|
|
// remove version suffixes like /v1 or /v2
|
|
let nameNoVersion = name.replace(regEx(/\/v\d+$/), '');
|
|
// gopkg.in is a special case where the major version is added with a dot rather than a slash
|
|
if (nameNoVersion.startsWith('gopkg.in')) {
|
|
nameNoVersion = nameNoVersion.replace(regEx(/\.v\d+$/), '');
|
|
}
|
|
return nameNoVersion;
|
|
}
|
|
|
|
export function updateDependency({
|
|
fileContent,
|
|
upgrade,
|
|
}: UpdateDependencyConfig): string | null {
|
|
try {
|
|
logger.debug(`gomod.updateDependency: ${upgrade.newValue}`);
|
|
const { depType, updateType } = upgrade;
|
|
const currentName = upgrade.depName;
|
|
if (updateType === 'replacement') {
|
|
logger.warn('gomod manager does not support replacement updates yet');
|
|
return null;
|
|
}
|
|
/* v8 ignore next -- should never happen */
|
|
if (!currentName || !upgrade.managerData) {
|
|
return null;
|
|
}
|
|
const currentNameNoVersion = getNameWithNoVersion(currentName);
|
|
const lines = fileContent.split(newlineRegex);
|
|
/* v8 ignore next -- hard to test */
|
|
if (lines.length <= upgrade.managerData.lineNumber) {
|
|
logger.warn('go.mod current line no longer exists after update');
|
|
return null;
|
|
}
|
|
const lineToChange = lines[upgrade.managerData.lineNumber];
|
|
logger.trace({ upgrade, lineToChange }, 'go.mod current line');
|
|
if (
|
|
!lineToChange.includes(currentNameNoVersion) &&
|
|
!lineToChange.includes('rethinkdb/rethinkdb-go.v5')
|
|
) {
|
|
logger.debug(
|
|
{ lineToChange, depName: currentName },
|
|
"go.mod current line doesn't contain dependency",
|
|
);
|
|
return null;
|
|
}
|
|
let updateLineExp: RegExp | undefined;
|
|
|
|
if (depType === 'golang' || depType === 'toolchain') {
|
|
updateLineExp = regEx(
|
|
/(?<depPart>(?:toolchain )?go)(?<divider>\s*)(?:[^\s]+|[\w]+)/,
|
|
);
|
|
}
|
|
if (depType === 'replace') {
|
|
if (upgrade.managerData.multiLine) {
|
|
updateLineExp = regEx(
|
|
/^(?<depPart>\s+[^\s]+[\s]+[=][>]+\s+)(?<divider>[^\s]+\s+)[^\s]+/,
|
|
);
|
|
} else {
|
|
updateLineExp = regEx(
|
|
/^(?<depPart>replace\s+[^\s]+[\s]+[=][>]+\s+)(?<divider>[^\s]+\s+)[^\s]+/,
|
|
);
|
|
}
|
|
} else if (depType === 'require' || depType === 'indirect') {
|
|
if (upgrade.managerData.multiLine) {
|
|
updateLineExp = regEx(/^(?<depPart>\s+[^\s]+)(?<divider>\s+)[^\s]+/);
|
|
} else {
|
|
updateLineExp = regEx(
|
|
/^(?<depPart>require\s+[^\s]+)(?<divider>\s+)[^\s]+/,
|
|
);
|
|
}
|
|
}
|
|
if (updateLineExp && !updateLineExp.test(lineToChange)) {
|
|
logger.debug('No line found to update');
|
|
return null;
|
|
}
|
|
let newLine: string;
|
|
if (upgrade.updateType === 'digest') {
|
|
// Since the 2024 goproxy datasource changes, newValue and newDigest are
|
|
// both extracted from the same proxy version string and always reference
|
|
// the same commit, so newValue can be written directly for pseudo-versions.
|
|
// However, for private modules (GONOPROXY / direct datasource), the proxy
|
|
// has no data and newValue may equal currentValue. In that case, fall
|
|
// through to the bare hash path so that gomodTidy can resolve it.
|
|
if (
|
|
upgrade.newValue?.startsWith('v0.0.0-') &&
|
|
upgrade.newValue !== upgrade.currentValue
|
|
) {
|
|
logger.debug(
|
|
{ depName: currentName, lineToChange, newValue: upgrade.newValue },
|
|
'gomod: updating pseudo-version digest',
|
|
);
|
|
newLine = lineToChange.replace(
|
|
// TODO: can be undefined? (#22198)
|
|
updateLineExp!,
|
|
`$<depPart>$<divider>${upgrade.newValue}`,
|
|
);
|
|
} else {
|
|
// Fallback for private modules where the proxy could not resolve a new
|
|
// pseudo-version, or non-pseudo-version digest updates.
|
|
// Writes the bare hash so that postUpdateOptions like gomodTidy can
|
|
// normalize it into a valid pseudo-version via `go get`.
|
|
const newDigestRightSized = upgrade.newDigest!.substring(
|
|
0,
|
|
upgrade.currentDigest!.length,
|
|
);
|
|
if (lineToChange.includes(newDigestRightSized)) {
|
|
return fileContent;
|
|
}
|
|
logger.debug(
|
|
{ depName: currentName, lineToChange, newDigestRightSized },
|
|
'gomod: need to update digest',
|
|
);
|
|
newLine = lineToChange.replace(
|
|
// TODO: can be undefined? (#22198)
|
|
updateLineExp!,
|
|
`$<depPart>$<divider>${newDigestRightSized}`,
|
|
);
|
|
}
|
|
} else {
|
|
newLine = lineToChange.replace(
|
|
// TODO: can be undefined? (#22198)
|
|
updateLineExp!,
|
|
`$<depPart>$<divider>${upgrade.newValue}`,
|
|
);
|
|
}
|
|
if (upgrade.updateType === 'major') {
|
|
logger.debug(`gomod: major update for ${currentName}`);
|
|
if (currentName.startsWith('gopkg.in/')) {
|
|
const oldV = currentName.split('.').pop();
|
|
newLine = newLine.replace(`.${oldV}`, `.v${upgrade.newMajor}`);
|
|
// Package renames - I couldn't think of a better place to do this
|
|
newLine = newLine.replace(
|
|
'gorethink/gorethink.v5',
|
|
'rethinkdb/rethinkdb-go.v5',
|
|
);
|
|
} else if (
|
|
upgrade.newMajor! > 1 &&
|
|
!newLine.includes(`/v${upgrade.newMajor}`) &&
|
|
!upgrade.newValue!.endsWith('+incompatible')
|
|
) {
|
|
if (currentName === currentNameNoVersion) {
|
|
// If package currently has no version, pin to latest one.
|
|
newLine = newLine.replaceAll(
|
|
currentName,
|
|
`${currentName}/v${upgrade.newMajor}`,
|
|
);
|
|
} else {
|
|
// Replace version
|
|
const [oldV] = upgrade.currentValue!.split('.');
|
|
newLine = newLine.replace(
|
|
regEx(`/${oldV}(\\s+)`, undefined, false),
|
|
`/v${upgrade.newMajor}$1`,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
if (
|
|
lineToChange.endsWith('+incompatible') &&
|
|
!upgrade.newValue?.endsWith('+incompatible')
|
|
) {
|
|
let toAdd = '+incompatible';
|
|
|
|
if (upgrade.updateType === 'major' && upgrade.newMajor! >= 2) {
|
|
toAdd = '';
|
|
}
|
|
newLine += toAdd;
|
|
}
|
|
if (newLine === lineToChange) {
|
|
logger.debug('No changes necessary');
|
|
return fileContent;
|
|
}
|
|
|
|
if (depType === 'indirect') {
|
|
newLine = newLine.replace(
|
|
regEx(/\s*(?:\/\/\s*indirect(?:\s*;)?\s*)*$/),
|
|
' // indirect',
|
|
);
|
|
}
|
|
|
|
lines[upgrade.managerData.lineNumber] = newLine;
|
|
return lines.join('\n');
|
|
} catch (err) {
|
|
logger.debug({ err }, 'Error setting new go.mod version');
|
|
return null;
|
|
}
|
|
}
|