mirror of
https://github.com/renovatebot/renovate.git
synced 2026-11-01 02:00:10 +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>
157 lines
5.3 KiB
TypeScript
157 lines
5.3 KiB
TypeScript
// TODO #22198
|
|
import cleanGitRef from 'clean-git-ref';
|
|
import _slugify from 'slugify';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { hash } from '../../../util/hash.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import * as template from '../../../util/template/index.ts';
|
|
import type { BranchUpgradeConfig } from '../../types.ts';
|
|
|
|
const slugify = _slugify;
|
|
|
|
const MIN_HASH_LENGTH = 6;
|
|
|
|
const RE_MULTIPLE_DASH = regEx(/--+/g);
|
|
|
|
const RE_SPECIAL_CHARS_STRICT = regEx(/[`~!@#$%^&*()_=+[\]\\|{};':",.<>?/]/g);
|
|
|
|
/**
|
|
* Clean git branch name
|
|
*
|
|
* Remove what clean-git-ref fails to:
|
|
* - leading dot/leading dot after slash
|
|
* - trailing dot
|
|
* - whitespace
|
|
* - special characters
|
|
* - leading or trailing dashes
|
|
* - chained dashes(breaks markdown comments) are replaced by single dash
|
|
*/
|
|
function cleanBranchName(
|
|
branchName: string,
|
|
branchPrefix: string,
|
|
branchNameStrict?: boolean,
|
|
): string {
|
|
let cleanedBranchName = branchName;
|
|
|
|
let existingBranchPrefix = '';
|
|
if (branchNameStrict) {
|
|
if (cleanedBranchName.startsWith(branchPrefix)) {
|
|
existingBranchPrefix = branchPrefix;
|
|
cleanedBranchName = cleanedBranchName.slice(branchPrefix.length);
|
|
}
|
|
cleanedBranchName =
|
|
existingBranchPrefix +
|
|
cleanedBranchName.replace(RE_SPECIAL_CHARS_STRICT, '-'); // massage out all special characters that slip through slugify
|
|
}
|
|
|
|
return cleanGitRef
|
|
.clean(cleanedBranchName)
|
|
.replace(regEx(/^\.|\.$/), '') // leading or trailing dot
|
|
.replace(regEx(/\/\./g), '/') // leading dot after slash
|
|
.replace(regEx(/\s/g), '') // whitespace
|
|
.replace(regEx(/[[\]?:\\^~<>]/g), '-') // massage out all these characters: [ ] ? : \ ^ ~ < >
|
|
.replace(regEx(/(?<pre>^|\/)-+/g), '$<pre>') // leading dashes
|
|
.replace(regEx(/-+(?<post>\/|$)/g), '$<post>') // trailing dashes
|
|
.replace(RE_MULTIPLE_DASH, '-'); // chained dashes
|
|
}
|
|
|
|
export function generateBranchName(update: BranchUpgradeConfig): void {
|
|
// Check whether to use a group name
|
|
const newMajor = String(update.newMajor);
|
|
const newMinor = String(update.newMinor);
|
|
if (!update.groupName && update.sharedVariableName) {
|
|
logger.debug(
|
|
`Using sharedVariableName=${update.sharedVariableName} as groupName for depName=${update.depName}`,
|
|
);
|
|
update.groupName = update.sharedVariableName;
|
|
}
|
|
|
|
if (update.groupName) {
|
|
if (update.updateType === 'replacement') {
|
|
logger.debug(
|
|
{ depName: update.depName },
|
|
`Ignoring grouped branch name for ${update.updateType} update`,
|
|
);
|
|
} else {
|
|
update.groupName = template.compile(update.groupName, update);
|
|
logger.trace('Using group branchName template');
|
|
// TODO: types (#22198)
|
|
logger.trace(
|
|
`Dependency ${update.depName!} is part of group ${update.groupName}`,
|
|
);
|
|
if (update.groupSlug) {
|
|
update.groupSlug = template.compile(update.groupSlug, update);
|
|
} else {
|
|
update.groupSlug = update.groupName;
|
|
}
|
|
update.groupSlug = slugify(update.groupSlug, {
|
|
lower: true,
|
|
});
|
|
if (update.updateType === 'major' && update.separateMajorMinor) {
|
|
if (update.separateMultipleMajor) {
|
|
update.groupSlug = `major-${newMajor}-${update.groupSlug}`;
|
|
} else {
|
|
update.groupSlug = `major-${update.groupSlug}`;
|
|
}
|
|
}
|
|
if (update.updateType === 'minor' && update.separateMultipleMinor) {
|
|
update.groupSlug = `minor-${newMajor}.${newMinor}-${update.groupSlug}`;
|
|
}
|
|
if (update.updateType === 'patch' && update.separateMinorPatch) {
|
|
update.groupSlug = `patch-${update.groupSlug}`;
|
|
}
|
|
if (update.updateType === 'lockFileMaintenance') {
|
|
update.groupSlug = `lock-file-maintenance-${update.groupSlug}`;
|
|
}
|
|
update.branchTopic = update.group!.branchTopic ?? update.branchTopic;
|
|
update.branchName = update.group!.branchName ?? update.branchName;
|
|
}
|
|
}
|
|
|
|
if (update.hashedBranchLength) {
|
|
let hashLength = update.hashedBranchLength - update.branchPrefix!.length;
|
|
if (hashLength < MIN_HASH_LENGTH) {
|
|
logger.warn(
|
|
{ minHashLength: MIN_HASH_LENGTH },
|
|
'`hashedBranchLength` must allow for at least the minimum hash length in addition to `branchPrefix`. Using the minimum hash length instead.',
|
|
);
|
|
hashLength = MIN_HASH_LENGTH;
|
|
}
|
|
|
|
const additionalBranchPrefix = template.compile(
|
|
String(update.additionalBranchPrefix ?? ''),
|
|
update,
|
|
);
|
|
|
|
const branchTopic = template.compile(
|
|
String(update.branchTopic ?? ''),
|
|
update,
|
|
);
|
|
|
|
let hashInput = additionalBranchPrefix + branchTopic;
|
|
|
|
// Compile extra times in case of nested templates
|
|
hashInput = template.compile(hashInput, update);
|
|
hashInput = template.compile(hashInput, update);
|
|
|
|
const hashedInput = hash(hashInput);
|
|
|
|
// TODO: types (#22198)
|
|
update.branchName = `${update.branchPrefix!}${hashedInput.slice(
|
|
0,
|
|
hashLength,
|
|
)}`;
|
|
} else {
|
|
update.branchName = template.compile(update.branchName, update);
|
|
|
|
// Compile extra times in case of nested templates
|
|
update.branchName = template.compile(update.branchName, update);
|
|
update.branchName = template.compile(update.branchName, update);
|
|
}
|
|
update.branchName = cleanBranchName(
|
|
update.branchName,
|
|
update.branchPrefix!,
|
|
update.branchNameStrict,
|
|
);
|
|
}
|