mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 09:41:46 +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>
164 lines
4.9 KiB
TypeScript
164 lines
4.9 KiB
TypeScript
import semver from 'semver';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { RANGE_COMPARATOR_PATTERN, VERSION_PATTERN } from './patterns.ts';
|
|
|
|
interface LetterTag {
|
|
letter: string;
|
|
number: string;
|
|
}
|
|
|
|
function parseLetterTag(letter?: string, number?: string): LetterTag | null {
|
|
if (letter !== undefined) {
|
|
// apply the same normalizations as poetry
|
|
const spellings: Record<string, string> = {
|
|
alpha: 'a',
|
|
beta: 'b',
|
|
c: 'rc',
|
|
pre: 'rc',
|
|
preview: 'rc',
|
|
r: 'post',
|
|
rev: 'post',
|
|
};
|
|
return {
|
|
letter: spellings[letter] || letter,
|
|
number: number ?? '0',
|
|
};
|
|
}
|
|
if (letter === undefined && number !== undefined) {
|
|
return { letter: 'post', number };
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function notEmpty(s: string): boolean {
|
|
return s !== '';
|
|
}
|
|
|
|
/**
|
|
* Parse versions like poetry.core.masonry.version.Version does (union of SemVer
|
|
* and PEP440, with normalization of certain prerelease tags), and emit in SemVer
|
|
* format. NOTE: this silently discards the epoch field in PEP440 versions, as
|
|
* it has no equivalent in SemVer.
|
|
*/
|
|
export function poetry2semver(
|
|
poetry_version: string,
|
|
padRelease = true,
|
|
): string | null {
|
|
const matchGroups = VERSION_PATTERN.exec(poetry_version)?.groups;
|
|
if (!matchGroups) {
|
|
return null;
|
|
}
|
|
// trim leading zeros from valid numbers
|
|
const releaseParts = matchGroups.release
|
|
.split('.')
|
|
.map((segment) => parseInt(segment, 10));
|
|
while (padRelease && releaseParts.length < 3) {
|
|
releaseParts.push(0);
|
|
}
|
|
const pre = parseLetterTag(matchGroups.pre_l, matchGroups.pre_n);
|
|
const post = matchGroups.post_n1
|
|
? parseLetterTag(undefined, matchGroups.post_n1)
|
|
: parseLetterTag(matchGroups.post_l, matchGroups.post_n);
|
|
const dev = parseLetterTag(matchGroups.dev_l, matchGroups.dev_n);
|
|
|
|
const parts = [releaseParts.map((num) => num.toString()).join('.')];
|
|
if (pre !== null) {
|
|
// trim leading zeros from valid numbers
|
|
pre.number = pre.number.replace(regEx(/^0+(?<digits>\d+)/), '$<digits>');
|
|
parts.push(`-${pre.letter}.${pre.number}`);
|
|
}
|
|
if (post !== null) {
|
|
// trim leading zeros from valid numbers
|
|
post.number = post.number.replace(regEx(/^0+(?<digits>\d+)/), '$<digits>');
|
|
parts.push(`-${post.letter}.${post.number}`);
|
|
}
|
|
if (dev !== null) {
|
|
// trim leading zeros from valid numbers
|
|
dev.number = dev.number.replace(regEx(/^0+(?<digits>\d+)/), '$<digits>');
|
|
parts.push(`-${dev.letter}.${dev.number}`);
|
|
}
|
|
|
|
return semver.valid(parts.join(''));
|
|
}
|
|
|
|
/** Reverse normalizations applied by poetry2semver */
|
|
export function semver2poetry(version?: string): string | null {
|
|
if (!version) {
|
|
return null;
|
|
}
|
|
const s = semver.parse(version);
|
|
if (!s) {
|
|
return null;
|
|
}
|
|
const spellings: Record<string, string> = {
|
|
a: 'alpha',
|
|
b: 'beta',
|
|
c: 'rc',
|
|
dev: 'alpha',
|
|
};
|
|
s.prerelease = s.prerelease.map((letter) => spellings[letter] ?? letter);
|
|
return s.format();
|
|
}
|
|
|
|
/**
|
|
* Translate a poetry-style version range to npm format
|
|
*
|
|
* This function works like cargo2npm, but it doesn't
|
|
* add a '^', because poetry treats versions without operators as
|
|
* exact versions.
|
|
*/
|
|
export function poetry2npm(input: string, throwOnUnsupported = false): string {
|
|
// replace commas with spaces, then split at valid semver comparators
|
|
const chunks = input
|
|
.split(',')
|
|
.map((str) => str.trim())
|
|
.filter(notEmpty)
|
|
.join(' ')
|
|
.split(RANGE_COMPARATOR_PATTERN);
|
|
// do not pad versions with zeros in a range
|
|
const transformed = chunks
|
|
.map((chunk) => poetry2semver(chunk, false) ?? chunk)
|
|
.join('')
|
|
.replace(regEx(/===/), '=');
|
|
if (throwOnUnsupported) {
|
|
const isUnsupported = transformed
|
|
.split(regEx(/\s+/))
|
|
.some((part) => part.startsWith('!=')); // Patterns like `!=1.2.3` can't be easily translated between poetry/npm
|
|
if (isUnsupported) {
|
|
throw new Error('Unsupported by Poetry versioning implementation');
|
|
}
|
|
}
|
|
return transformed;
|
|
}
|
|
|
|
/**
|
|
* Translate an npm-style version range to poetry format
|
|
*
|
|
* NOTE: This function is largely copied from cargo versioning code.
|
|
* Poetry uses commas (like in cargo) instead of spaces (like in npm)
|
|
* for AND operation.
|
|
*/
|
|
export function npm2poetry(range: string): string {
|
|
// apply poetry-style normalizations to versions embedded in range string
|
|
// (i.e. anything that is not a range operator, potentially surrounded by whitespace)
|
|
const transformedRange = range
|
|
.split(RANGE_COMPARATOR_PATTERN)
|
|
.map((chunk) => semver2poetry(chunk) ?? chunk)
|
|
.join('');
|
|
|
|
// Note: this doesn't remove the ^
|
|
const res = transformedRange
|
|
.split(' ')
|
|
.map((str) => str.trim())
|
|
.filter(notEmpty);
|
|
|
|
const operators = ['^', '~', '=', '>', '<', '<=', '>='];
|
|
for (let i = 0; i < res.length - 1; i += 1) {
|
|
if (operators.includes(res[i])) {
|
|
const newValue = `${res[i]} ${res[i + 1]}`;
|
|
res.splice(i, 2, newValue);
|
|
}
|
|
}
|
|
return res.join(', ').replace(regEx(/\s*,?\s*\|\|\s*,?\s*/g), ' || ');
|
|
}
|