Files
renovate/lib/modules/manager/ant/properties.ts
Sebastian Poxhofer 3412de84ce refactor(linters): enable oxlint rule prefer-named-capture-group (#44714)
* 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>
2026-09-03 09:54:40 +00:00

190 lines
5.4 KiB
TypeScript

import type { XmlElement } from 'xmldoc';
import { regEx } from '../../../util/regex.ts';
import type { PackageDependency } from '../types.ts';
import type { AntProp } from './types.ts';
const fullPlaceholderRegex = regEx(/^\$\{(?<key>[^}]+)}$/);
const placeholderTestRegex = regEx(/\$\{[^}]+}/);
const propertySeparatorRegex = regEx(
/^(?<key>[^=:\s]+)\s*[=:\s]\s*(?<value>.*)$/,
);
export function containsPlaceholder(str: string | null | undefined): boolean {
return !!str && placeholderTestRegex.test(str);
}
/**
* Find the byte offset of an attribute's value in raw XML content.
* Returns the offset of the first character of the value (after the opening quote).
*/
export function findAttrValuePosition(
content: string,
node: XmlElement,
attrName: string,
): number {
const startTag = node.startTagPosition!;
const tagEnd = content.indexOf('>', startTag);
const tagContent = content.slice(startTag, tagEnd + 1);
const attrPattern = regEx(
`${RegExp.escape(attrName)}\\s*=\\s*(?:"(?<dq>[^"]*)"|'(?<sq>[^']*)')`,
);
const match = attrPattern.exec(tagContent)!;
const valueInMatch = match.groups!.dq ?? match.groups!.sq;
const valueOffset = match[0].indexOf(valueInMatch);
return startTag + match.index + valueOffset;
}
/**
* Parse a .properties file into a map of property names to AntProp.
* Implements first-definition-wins: if a key already exists in the map, it is not overwritten.
*/
export function parsePropertiesFile(
content: string,
packageFile: string,
props: Record<string, AntProp>,
): void {
let offset = 0;
for (const rawLine of content.split('\n')) {
const line = rawLine.trim();
// Skip comments and blank lines
if (line.startsWith('#') || line.startsWith('!') || line === '') {
offset += rawLine.length + 1; // +1 for newline
continue;
}
// Match key=value, key:value, or key value (first separator wins)
const separatorMatch = propertySeparatorRegex.exec(line);
if (separatorMatch) {
const key = separatorMatch.groups!.key;
const val = separatorMatch.groups!.value.trim();
// First-definition-wins
if (!(key in props)) {
// fileReplacePosition points to the start of the value in the raw content
const lineStart = offset + rawLine.indexOf(line);
const keyEnd = line.indexOf(separatorMatch.groups!.value);
const fileReplacePosition = lineStart + keyEnd;
props[key] = { val, fileReplacePosition, packageFile };
}
}
offset += rawLine.length + 1;
}
}
/**
* Apply property resolution to a dependency.
* Handles chained references with circular detection.
*/
export function applyProps(
dep: PackageDependency,
depPackageFile: string,
props: Record<string, AntProp>,
): PackageDependency {
const currentValue = dep.currentValue;
if (!currentValue || !containsPlaceholder(currentValue)) {
return dep;
}
// Check if the entire version is a single property reference
const fullMatch = fullPlaceholderRegex.exec(currentValue);
if (!fullMatch) {
// Partial placeholder in version string - not supported for updates
dep.skipReason = 'version-placeholder';
return dep;
}
const propKey = fullMatch.groups!.key;
const prop = props[propKey];
if (!prop) {
dep.skipReason = 'version-placeholder';
return dep;
}
// After resolveChainedProps, prop.val is either fully resolved or still contains
// placeholders (meaning circular or unresolvable)
if (containsPlaceholder(prop.val)) {
dep.skipReason = 'recursive-placeholder';
return dep;
}
dep.currentValue = prop.val;
dep.sharedVariableName = propKey;
dep.fileReplacePosition = prop.fileReplacePosition;
if (prop.packageFile !== depPackageFile) {
dep.editFile = prop.packageFile;
}
// propSource is used to route deps to the correct PackageFile
dep.propSource = prop.packageFile;
return dep;
}
/**
* Resolve a single property key, following chained references.
* Returns the resolved value or null if circular/unresolvable.
*/
function resolveKey(
key: string,
props: Record<string, AntProp>,
resolved: Map<string, string | null>,
chain: Set<string>,
): string | null {
if (resolved.has(key)) {
return resolved.get(key)!;
}
if (chain.has(key)) {
// Circular reference detected
resolved.set(key, null);
return null;
}
const prop = props[key];
if (!prop) {
return null;
}
if (!containsPlaceholder(prop.val)) {
resolved.set(key, prop.val);
return prop.val;
}
chain.add(key);
let isCircular = false;
const val = prop.val.replace(
regEx(/\$\{(?<key>[^}]+)}/g),
(match: string, refKey: string) => {
const refResult = resolveKey(refKey, props, resolved, chain);
if (refResult === null) {
isCircular = true;
return match;
}
return refResult;
},
);
chain.delete(key);
if (isCircular) {
resolved.set(key, null);
return null;
}
resolved.set(key, val);
prop.val = val;
return val;
}
/**
* Resolve chained property references within the property map itself.
* E.g., if prop A = "${B}" and prop B = "1.0", resolve A to "1.0".
* Marks circular properties by setting val to a placeholder that will be caught later.
*/
export function resolveChainedProps(props: Record<string, AntProp>): void {
const resolved = new Map<string, string | null>(); // null = circular
for (const key of Object.keys(props)) {
resolveKey(key, props, resolved, new Set());
}
}