mirror of
https://github.com/renovatebot/renovate.git
synced 2026-11-02 10:33:39 +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>
253 lines
7.3 KiB
TypeScript
253 lines
7.3 KiB
TypeScript
import { isNumericString } from '@sindresorhus/is';
|
|
import { coerceArray } from '../../../util/array.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { GenericVersioningApi } from '../generic.ts';
|
|
import type { VersioningApi } from '../types.ts';
|
|
import type { RpmVersion } from './types.ts';
|
|
|
|
export const id = 'rpm';
|
|
export const displayName = 'RPM version';
|
|
export const urls = [
|
|
'[Fedora packaging guidelines - Versioning](https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/)',
|
|
'[Fedora package versioning examples](https://fedoraproject.org/wiki/Package_Versioning_Examples)',
|
|
'[Fedora tilde and caret versioning](https://fedoraproject.org/wiki/User:Tibbs/TildeCaretVersioning)',
|
|
];
|
|
export const supportsRanges = false;
|
|
|
|
const alphaNumPattern = regEx(/(?:[a-zA-Z]+)|(?:\d+)|(?:~)/g);
|
|
const epochPattern = regEx(/^\d+$/);
|
|
|
|
class RpmVersioningApi extends GenericVersioningApi {
|
|
/**
|
|
* https://github.com/rpm-software-management/rpm/blob/e3c11a790367016aed7ea48cfcc78751a71ce862/rpmio/rpmvercmp.c#L16
|
|
*/
|
|
protected _parse(version: string): RpmVersion | null {
|
|
let remainingVersion = version;
|
|
|
|
let epoch = 0;
|
|
const epochIndex = remainingVersion.indexOf(':');
|
|
if (epochIndex !== -1) {
|
|
const epochStr = remainingVersion.slice(0, epochIndex);
|
|
if (epochPattern.test(epochStr)) {
|
|
epoch = parseInt(epochStr, 10);
|
|
} else {
|
|
return null;
|
|
}
|
|
|
|
remainingVersion = remainingVersion.slice(epochIndex + 1);
|
|
}
|
|
|
|
let upstreamVersion: string;
|
|
let rpmRelease = '';
|
|
let rpmPreRelease = '';
|
|
let snapshot = '';
|
|
const releaseIndex = remainingVersion.indexOf('-');
|
|
const prereleaseIndex = remainingVersion.indexOf('~');
|
|
|
|
// Note: There can be a snapshot if there is no prerelease. Snapshot always beat no snapshot,
|
|
// so if there is 3.12.0-1 vs 3.12.0-1^20231110, the snapshot wins.
|
|
// The logic below only creates snapshot IF there is a prerleease version. This logic is NOT
|
|
// correct, but the result is still correct due to the caret being ignored in release, and
|
|
// release continue comparing
|
|
//
|
|
// Note: If there IS a tilde preceding the caret, then snapshot DOES NOT win
|
|
// Example: 3.12.0-1~^20231001 LOSES to 3.12.0-1 and
|
|
// 3.12.0-1~^20231001 LOSES to 3.12.0-1^20231001
|
|
const snapshotIndex = remainingVersion.indexOf('^');
|
|
|
|
if (releaseIndex >= 0) {
|
|
upstreamVersion = remainingVersion.slice(0, releaseIndex);
|
|
|
|
// Do NOT splice out prerelease, we need to distinguish if the flag is set or not, regardless if there is a version.
|
|
// The tilde will get filtered out during regex
|
|
if (prereleaseIndex >= 0) {
|
|
rpmRelease = remainingVersion.slice(releaseIndex, prereleaseIndex);
|
|
if (snapshotIndex >= 0) {
|
|
rpmPreRelease = remainingVersion.slice(
|
|
prereleaseIndex,
|
|
snapshotIndex,
|
|
);
|
|
snapshot = remainingVersion.slice(snapshotIndex + 1);
|
|
} else {
|
|
rpmPreRelease = remainingVersion.slice(prereleaseIndex);
|
|
}
|
|
} else {
|
|
rpmRelease = remainingVersion.slice(releaseIndex + 1);
|
|
}
|
|
} else {
|
|
upstreamVersion = remainingVersion;
|
|
}
|
|
|
|
const release = [...remainingVersion.matchAll(regEx(/\d+/g))].map((m) =>
|
|
parseInt(m[0], 10),
|
|
);
|
|
|
|
return {
|
|
epoch,
|
|
upstreamVersion,
|
|
rpmRelease,
|
|
release,
|
|
rpmPreRelease,
|
|
snapshot,
|
|
};
|
|
}
|
|
|
|
protected _compare_string(s1: string, s2: string): number {
|
|
if (s1 === s2) {
|
|
return 0;
|
|
}
|
|
|
|
const minLength = Math.min(s1.length, s2.length);
|
|
|
|
for (let i = 0; i < minLength; i++) {
|
|
const c1 = s1[i];
|
|
const c2 = s2[i];
|
|
|
|
if (c1 === c2) {
|
|
continue;
|
|
}
|
|
|
|
if (c1 > c2) {
|
|
return 1;
|
|
}
|
|
if (c1 < c2) {
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
// Okay, they've been the exact same up until now, so return the longer one
|
|
return s1.length > s2.length ? 1 : -1;
|
|
}
|
|
|
|
/**
|
|
* Taken from https://github.com/rpm-software-management/rpm/blob/master/rpmio/rpmvercmp.c
|
|
*/
|
|
protected _compare_glob(v1: string, v2: string): number {
|
|
if (v1 === v2) {
|
|
return 0;
|
|
}
|
|
|
|
const matchesv1 = coerceArray(v1.match(alphaNumPattern));
|
|
const matchesv2 = coerceArray(v2.match(alphaNumPattern));
|
|
const matches = Math.min(matchesv1.length, matchesv2.length);
|
|
|
|
for (let i = 0; i < matches; i++) {
|
|
const matchv1 = matchesv1[i];
|
|
const matchv2 = matchesv2[i];
|
|
|
|
// compare tildes
|
|
if (matchv1?.startsWith('~') || matchv2?.startsWith('~')) {
|
|
if (!matchv1?.startsWith('~')) {
|
|
return 1;
|
|
}
|
|
|
|
if (!matchv2?.startsWith('~')) {
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if (isNumericString(matchv1?.[0])) {
|
|
// numbers are greater than letters
|
|
if (!isNumericString(matchv2?.[0])) {
|
|
return 1;
|
|
}
|
|
|
|
//We clearly have a number here, so return which is greater
|
|
const result = matchv1.localeCompare(matchv2, undefined, {
|
|
numeric: true,
|
|
});
|
|
|
|
if (result === 0) {
|
|
continue;
|
|
}
|
|
|
|
return Math.sign(result);
|
|
}
|
|
if (isNumericString(matchv2?.[0])) {
|
|
return -1;
|
|
}
|
|
|
|
// We have two string globs, compare them
|
|
const compared_value = this._compare_string(matchv1, matchv2);
|
|
if (compared_value !== 0) {
|
|
return compared_value;
|
|
}
|
|
}
|
|
|
|
// segments were all the same, but separators were different
|
|
if (matchesv1.length === matchesv2.length) {
|
|
return 0;
|
|
}
|
|
|
|
// If there is a tilde in a segment past the minimum number of segments, find it
|
|
if (matchesv1.length > matches && matchesv1[matches].startsWith('~')) {
|
|
return -1;
|
|
}
|
|
|
|
if (matchesv2.length > matches && matchesv2[matches].startsWith('~')) {
|
|
return 1;
|
|
}
|
|
|
|
// whichever has the most segments wins
|
|
return matchesv1.length > matchesv2.length ? 1 : -1;
|
|
}
|
|
|
|
protected override _compare(version: string, other: string): number {
|
|
const parsed1 = this._parse(version);
|
|
const parsed2 = this._parse(other);
|
|
|
|
if (!(parsed1 && parsed2)) {
|
|
return 1;
|
|
}
|
|
|
|
// Greater epoch wins
|
|
if (parsed1.epoch !== parsed2.epoch) {
|
|
return Math.sign(parsed1.epoch - parsed2.epoch);
|
|
}
|
|
|
|
// Greater upstream version wins
|
|
const upstreamVersionDifference = this._compare_glob(
|
|
parsed1.upstreamVersion,
|
|
parsed2.upstreamVersion,
|
|
);
|
|
|
|
if (upstreamVersionDifference !== 0) {
|
|
return upstreamVersionDifference;
|
|
}
|
|
|
|
// Greater release version wins
|
|
const releaseVersionDifference = this._compare_glob(
|
|
parsed1.rpmRelease,
|
|
parsed2.rpmRelease,
|
|
);
|
|
|
|
if (releaseVersionDifference !== 0) {
|
|
return releaseVersionDifference;
|
|
}
|
|
|
|
// No Prerelease wins
|
|
if (parsed1.rpmPreRelease === '' && parsed2.rpmPreRelease !== '') {
|
|
return 1;
|
|
}
|
|
if (parsed1.rpmPreRelease !== '' && parsed2.rpmPreRelease === '') {
|
|
return -1;
|
|
}
|
|
|
|
const preReleaseDifference = this._compare_glob(
|
|
parsed1.rpmPreRelease,
|
|
parsed2.rpmPreRelease,
|
|
);
|
|
|
|
if (preReleaseDifference !== 0) {
|
|
return releaseVersionDifference;
|
|
}
|
|
|
|
// Greater Snapshot wins
|
|
return this._compare_glob(parsed1.snapshot, parsed2.snapshot);
|
|
}
|
|
}
|
|
|
|
export const api: VersioningApi = new RpmVersioningApi();
|
|
|
|
export default api;
|