mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-27 07:50:47 +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>
219 lines
6.4 KiB
TypeScript
219 lines
6.4 KiB
TypeScript
import { isNonEmptyString, isString } from '@sindresorhus/is';
|
|
import { regEx } from '../../util/regex.ts';
|
|
import { isHttpUrl } from '../../util/url.ts';
|
|
import type { ParsedPreset } from './types.ts';
|
|
import { PRESET_INVALID, PRESET_PROHIBITED_SUBPRESET } from './util.ts';
|
|
|
|
const nonScopedPresetWithSubdirRegex = regEx(
|
|
/^(?<repo>~?[\w\-. /%]+?)\/\/(?:(?<presetPath>[\w\-./]+)\/)?(?<presetName>[\w\-.]+)(?:#(?<tag>[\w\-./]+?))?$/,
|
|
);
|
|
const gitPresetRegex = regEx(
|
|
/^(?<repo>~?[\w\-. /%]+)(?::(?<presetName>[\w\-.+/]+))?(?:#(?<tag>[\w\-./]+?))?$/,
|
|
);
|
|
const relativePresetRegex = regEx(
|
|
/^(?:\/|(?:\.\.?\/)+)[\w\-.]+(?:\/[\w\-.]+)*$/,
|
|
);
|
|
|
|
/**
|
|
* Returns true if the given `extends` entry is a relative preset reference,
|
|
* e.g. `./foo`, `../foo` or `/foo`.
|
|
*/
|
|
export function isRelativePresetReference(input: string): boolean {
|
|
return (
|
|
input.startsWith('./') || input.startsWith('../') || input.startsWith('/')
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Splits the trailing `(...)` parameter list off the given preset reference.
|
|
*
|
|
* The parameters are opaque, so they may contain any character and are split
|
|
* off before the reference itself is validated.
|
|
*/
|
|
function splitPresetParams(input: string): {
|
|
str: string;
|
|
params: string[] | undefined;
|
|
rawParams: string | undefined;
|
|
} {
|
|
if (!input.includes('(')) {
|
|
return { str: input, params: undefined, rawParams: undefined };
|
|
}
|
|
|
|
const rawParams = input.slice(input.indexOf('(') + 1, -1);
|
|
return {
|
|
str: input.slice(0, input.indexOf('(')),
|
|
params: rawParams.split(',').map((elem) => elem.trim()),
|
|
rawParams,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Returns true if every parenthesis in the given preset parameters is closed in
|
|
* order, which allows Handlebars sub-expressions like `{{ lower (env.TEAM) }}`
|
|
* while still rejecting malformed parameter lists.
|
|
*/
|
|
function hasBalancedParens(rawParams: string): boolean {
|
|
let depth = 0;
|
|
for (const char of rawParams) {
|
|
if (char === '(') {
|
|
depth += 1;
|
|
} else if (char === ')') {
|
|
depth -= 1;
|
|
if (depth < 0) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return depth === 0;
|
|
}
|
|
|
|
export function parsePreset(input: string): ParsedPreset {
|
|
let str = input;
|
|
let presetSource: string | undefined;
|
|
let presetPath: string | undefined;
|
|
let repo: string;
|
|
let presetName: string;
|
|
let tag: string | undefined;
|
|
let rawParams: string | undefined;
|
|
let params: string[] | undefined;
|
|
if (str.startsWith('github>')) {
|
|
presetSource = 'github';
|
|
str = str.substring('github>'.length);
|
|
} else if (str.startsWith('gitlab>')) {
|
|
presetSource = 'gitlab';
|
|
str = str.substring('gitlab>'.length);
|
|
} else if (str.startsWith('gitea>')) {
|
|
presetSource = 'gitea';
|
|
str = str.substring('gitea>'.length);
|
|
} else if (str.startsWith('forgejo>')) {
|
|
presetSource = 'forgejo';
|
|
str = str.substring('forgejo>'.length);
|
|
} else if (str.startsWith('local>')) {
|
|
presetSource = 'local';
|
|
str = str.substring('local>'.length);
|
|
} else if (str.startsWith('npm>@')) {
|
|
// only scoped packages are unambiguous, all other `npm>` references are
|
|
// handled by the legacy strip below to stay backwards compatible
|
|
presetSource = 'npm';
|
|
str = str.substring('npm>'.length);
|
|
} else if (isRelativePresetReference(str)) {
|
|
presetSource = 'relative';
|
|
} else if (isHttpUrl(str)) {
|
|
presetSource = 'http';
|
|
} else if (
|
|
!str.startsWith('@') &&
|
|
!str.startsWith(':') &&
|
|
str.includes('/')
|
|
) {
|
|
presetSource = 'local';
|
|
}
|
|
str = str.replace(regEx(/^npm>/), '');
|
|
if (
|
|
presetSource &&
|
|
presetSource !== 'relative' &&
|
|
isRelativePresetReference(str)
|
|
) {
|
|
// relative references must not carry a source prefix, because they always
|
|
// inherit the source of the preset which references them
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
presetSource = presetSource ?? 'npm';
|
|
if (presetSource === 'relative') {
|
|
if (str.includes('(') && !str.endsWith(')')) {
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
({ str, params, rawParams } = splitPresetParams(str));
|
|
if (isString(rawParams) && !hasBalancedParens(rawParams)) {
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
if (!relativePresetRegex.test(str)) {
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
const finalSegment = str.split('/').pop();
|
|
if (finalSegment === '.' || finalSegment === '..') {
|
|
// references like `./.`, `./..` or `../a/..` name a directory instead of
|
|
// a preset file
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
return { presetSource, repo: '', presetName: str, params, rawParams };
|
|
}
|
|
({ str, params, rawParams } = splitPresetParams(str));
|
|
if (presetSource === 'http') {
|
|
return { presetSource, repo: str, presetName: '', params, rawParams };
|
|
}
|
|
const presetsPackages = [
|
|
'abandonments',
|
|
'compatibility',
|
|
'config',
|
|
'customManagers',
|
|
'default',
|
|
'docker',
|
|
'global',
|
|
'group',
|
|
'helpers',
|
|
'mergeConfidence',
|
|
'monorepo',
|
|
'npm',
|
|
'packages',
|
|
'preview',
|
|
'replacements',
|
|
'schedule',
|
|
'security',
|
|
'workarounds',
|
|
];
|
|
if (
|
|
presetsPackages.some((presetPackage) => str.startsWith(`${presetPackage}:`))
|
|
) {
|
|
presetSource = 'internal';
|
|
[repo, presetName] = str.split(':');
|
|
} else if (str.startsWith(':')) {
|
|
// default namespace
|
|
presetSource = 'internal';
|
|
repo = 'default';
|
|
presetName = str.slice(1);
|
|
} else if (str.startsWith('@')) {
|
|
// scoped namespace
|
|
repo = regEx(/(?<scope>@.*?)(?::|$)/).exec(str)!.groups!.scope;
|
|
str = str.slice(repo.length);
|
|
if (!repo.includes('/')) {
|
|
repo += '/renovate-config';
|
|
}
|
|
if (str === '') {
|
|
presetName = 'default';
|
|
} else {
|
|
presetName = str.slice(1);
|
|
}
|
|
} else if (str.includes('//')) {
|
|
// non-scoped namespace with a subdirectory preset
|
|
|
|
// Validation
|
|
if (str.includes(':')) {
|
|
throw new Error(PRESET_PROHIBITED_SUBPRESET);
|
|
}
|
|
if (!nonScopedPresetWithSubdirRegex.test(str)) {
|
|
throw new Error(PRESET_INVALID);
|
|
}
|
|
({ repo, presetPath, presetName, tag } =
|
|
nonScopedPresetWithSubdirRegex.exec(str)!.groups!);
|
|
} else {
|
|
({ repo, presetName, tag } = gitPresetRegex.exec(str)!.groups!);
|
|
|
|
if (presetSource === 'npm' && !repo.startsWith('renovate-config-')) {
|
|
repo = `renovate-config-${repo}`;
|
|
}
|
|
if (!isNonEmptyString(presetName)) {
|
|
presetName = 'default';
|
|
}
|
|
}
|
|
|
|
return {
|
|
presetSource,
|
|
presetPath,
|
|
repo,
|
|
presetName,
|
|
tag,
|
|
params,
|
|
rawParams,
|
|
};
|
|
}
|