mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-27 07:50:47 +00:00
a1971afa78
* ci(linter): add renovate/require-regex-util rule Adds a custom oxlint rule that flags raw RegExp usage in lib/ production code: any `new RegExp(...)` call and any regex literal that is not the direct first argument of `regEx(...)`. The regEx() helper from lib/util/regex.ts uses the RE2 engine for ReDoS-safe matching and caches compiled patterns. lib/util/regex.ts itself is exempt. The rule is disabled for **/*.spec.ts, test/**, and tools/** via config overrides, because vitest APIs such as expect.stringMatching need bare RegExp instances (a past commit reverted regEx() there). Severity is set to "warn" instead of "error": the repo currently has 197 pre-existing violations (above the agreed mechanical-fix threshold of 80), and a number of them are deliberately RE2-incompatible patterns (lookahead/lookbehind/named backreferences, see TODO #12872/#12875 markers in e.g. lib/modules/versioning/rez/ pattern.ts and lib/modules/manager/dockerfile/extract.ts) that need per-site judgment before they can be wrapped in regEx() or suppressed with a justified disable comment. No violation fixes are included in this commit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci(linter): enforce renovate/require-regex-util at error Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: use regEx() for regex literals and RegExp construction in lib Burn down all renovate/require-regex-util violations (197): - wrap RE2-compatible regex literals and RegExp constructions in regEx() - rewrite lookaround patterns where behavior is provably preserved: goproxy separator split, sbt-package link extraction, leiningen comment stripping and keyword search, npm GitHub owner validation (unit-count bound replaced by an explicit length check) - keep native RegExp with disable comments where RE2 cannot be used: moo / good-enough-parser lexer patterns (moo rejects RE2 instances), MigrationsService propertyName (matched via isRegExp, which RE2 instances fail), rez named backreferences and lookaheads, GitHub markdown link negative lookbehind, emoji astral-plane matching - drop stale TODO #12875 comments for patterns current re2 handles Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: reduce require-regex-util disable comments Rewrite the github massage-markdown-links URL regex to capture an optional `api.` prefix in a named group (skipped in code) instead of relying on a negative lookbehind, so both the base and global variants can use regEx()/RE2 and their two disable comments are removed. Add spec cases for api-prefixed URLs that match the URL shape. Consolidate the four related line disables in rez/pattern.ts (bound and range patterns emulating Python conditional patterns via named backreferences and lookaheads, which RE2 cannot express) into a single block disable/enable pair, matching the treatment of the lexer files. Disable comment count drops from 13 to 8. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(datasource/sbt-package): use named capture group in link regex Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(manager/cake): restore original multiLineComment regex spelling The [^] -> [\\s\\S] rewrite was only needed for an RE2 wrap that was later reverted; keep the diff minimal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(datasource/go): skip empty GOPROXY segments The switch from a lookahead split to a capture-group split (needed because RE2 has no lookahead support) changed how empty GOPROXY segments parse: `a|,b` yielded `{ url: ',', fallback: '|' }` before and `{ url: '', fallback: ',' }` after. The comma fallback only continues on 404/410, so a failing proxy ahead of an empty segment silently stopped the lookup instead of falling through to the remaining proxies. Empty segments carry no url to query, so drop them. * refactor(datasource/go): use isTruthy for empty segment filter * fix(datasource/go): filter empty segments before mapping Filtering after the map broke the contextual typing from the GoproxyItem[] annotation, widening fallback to string. * refactor(platform/github): use regEx() for merge queue query stripping --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
146 lines
3.8 KiB
TypeScript
146 lines
3.8 KiB
TypeScript
import { regEx } from '../../../util/regex.ts';
|
|
import type { NugetFloatingRange, NugetRange, NugetVersion } from './types.ts';
|
|
import { compare, versionToString } from './version.ts';
|
|
|
|
export function getFloatingRangeLowerBound(
|
|
range: NugetFloatingRange,
|
|
): NugetVersion {
|
|
const { major, minor = 0, patch = 0, revision = 0, prerelease } = range;
|
|
const res: NugetVersion = {
|
|
type: 'nuget-version',
|
|
major,
|
|
minor,
|
|
patch,
|
|
revision,
|
|
};
|
|
|
|
if (prerelease) {
|
|
const parts = prerelease.split('.');
|
|
const lastIdx = parts.length - 1;
|
|
const last = parts[lastIdx];
|
|
if (last === '*') {
|
|
parts[lastIdx] = '0';
|
|
} else {
|
|
parts[lastIdx] = last.replace(regEx(/\*$/), '');
|
|
}
|
|
res.prerelease = parts.join('.');
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
export function matches(v: NugetVersion, r: NugetRange): boolean {
|
|
if (r.type === 'nuget-exact-range') {
|
|
return compare(v, r.version) === 0;
|
|
}
|
|
|
|
if (r.type === 'nuget-floating-range') {
|
|
if (!r.prerelease && v.prerelease) {
|
|
return false;
|
|
}
|
|
|
|
const lowerBound = getFloatingRangeLowerBound(r);
|
|
return compare(v, lowerBound) >= 0;
|
|
}
|
|
|
|
let minBoundMatches = false;
|
|
let maxBoundMatches = false;
|
|
|
|
const { min, minInclusive, max, maxInclusive } = r;
|
|
|
|
if (min) {
|
|
const minBound =
|
|
min.type === 'nuget-version' ? min : getFloatingRangeLowerBound(min);
|
|
const cmp = compare(v, minBound);
|
|
minBoundMatches = minInclusive ? cmp >= 0 : cmp > 0;
|
|
} else {
|
|
minBoundMatches = true;
|
|
}
|
|
|
|
if (max) {
|
|
if (!(v.prerelease && !max.prerelease)) {
|
|
const cmp = compare(v, max);
|
|
maxBoundMatches = maxInclusive ? cmp <= 0 : cmp < 0;
|
|
}
|
|
} else {
|
|
maxBoundMatches = true;
|
|
}
|
|
|
|
return minBoundMatches && maxBoundMatches;
|
|
}
|
|
|
|
function floatingComponentToString(component: number): string {
|
|
const int = component / 10;
|
|
return int === 0 ? '*' : `${int}*`;
|
|
}
|
|
|
|
export function coerceFloatingComponent(component: number | undefined): number {
|
|
return component ? Math.floor(component / 10) * 10 : 0;
|
|
}
|
|
|
|
export function rangeToString(range: NugetRange): string {
|
|
if (range.type === 'nuget-exact-range') {
|
|
return `[${versionToString(range.version)}]`;
|
|
}
|
|
|
|
if (range.type === 'nuget-floating-range') {
|
|
const { major, minor, patch, revision, floating, prerelease } = range;
|
|
let res = '';
|
|
|
|
if (prerelease) {
|
|
res = `-${prerelease}`;
|
|
}
|
|
|
|
if (revision !== undefined) {
|
|
const revisionPart =
|
|
floating === 'revision'
|
|
? floatingComponentToString(revision)
|
|
: `${revision}`;
|
|
res = `.${revisionPart}${res}`;
|
|
}
|
|
|
|
if (patch !== undefined) {
|
|
const patchPart =
|
|
floating === 'patch' ? floatingComponentToString(patch) : `${patch}`;
|
|
res = `.${patchPart}${res}`;
|
|
}
|
|
|
|
if (minor !== undefined) {
|
|
const minorPart =
|
|
floating === 'minor' ? floatingComponentToString(minor) : `${minor}`;
|
|
res = `.${minorPart}${res}`;
|
|
}
|
|
|
|
if (major !== undefined) {
|
|
const majorPart =
|
|
floating === 'major' ? floatingComponentToString(major) : `${major}`;
|
|
res = `${majorPart}${res}`;
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
const { min, max, minInclusive, maxInclusive } = range;
|
|
const leftBracket = minInclusive ? '[' : '(';
|
|
const rightBracket = maxInclusive ? ']' : ')';
|
|
if (min && max) {
|
|
const minStr =
|
|
min.type === 'nuget-version' ? versionToString(min) : rangeToString(min);
|
|
const maxStr = versionToString(max);
|
|
return `${leftBracket}${minStr},${maxStr}${rightBracket}`;
|
|
}
|
|
|
|
if (min) {
|
|
const minStr =
|
|
min.type === 'nuget-version' ? versionToString(min) : rangeToString(min);
|
|
return `${leftBracket}${minStr},${rightBracket}`;
|
|
}
|
|
|
|
const maxStr = versionToString(max);
|
|
return `${leftBracket},${maxStr}${rightBracket}`;
|
|
}
|
|
|
|
export function tryBump(r: NugetRange, v: NugetVersion, x: string): string {
|
|
return matches(v, r) ? rangeToString(r) : x;
|
|
}
|