mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-25 23:11:31 +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>
245 lines
6.2 KiB
TypeScript
245 lines
6.2 KiB
TypeScript
import is from '@sindresorhus/is';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import type {
|
|
ActionReference,
|
|
CommentData,
|
|
DockerReference,
|
|
ParsedUsesLine,
|
|
RepositoryReference,
|
|
} from './types.ts';
|
|
|
|
function splitFirstFrom(
|
|
str: string,
|
|
sep: string,
|
|
start: number,
|
|
): [string, string] | null {
|
|
const idx = str.indexOf(sep, start);
|
|
if (idx === -1) {
|
|
return null;
|
|
}
|
|
return [str.slice(0, idx), str.slice(idx + sep.length)];
|
|
}
|
|
|
|
function splitFirst(str: string, sep: string): [string, string] | null {
|
|
return splitFirstFrom(str, sep, 0);
|
|
}
|
|
|
|
interface QuotedValue {
|
|
value: string;
|
|
quote: string;
|
|
}
|
|
|
|
export function parseQuote(input: string): QuotedValue {
|
|
const trimmed = input.trim();
|
|
const first = trimmed[0];
|
|
const last = trimmed.at(-1);
|
|
|
|
if (
|
|
trimmed.length >= 2 &&
|
|
first === last &&
|
|
(first === '"' || first === "'")
|
|
) {
|
|
return { value: trimmed.slice(1, -1), quote: first };
|
|
}
|
|
|
|
return { value: trimmed, quote: '' };
|
|
}
|
|
|
|
const shaRe = regEx(/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/);
|
|
const shaShortRe = regEx(/^[a-f0-9]{6,7}$/);
|
|
|
|
export function isSha(str: string): boolean {
|
|
return shaRe.test(str);
|
|
}
|
|
|
|
export function isShortSha(str: string): boolean {
|
|
return shaShortRe.test(str);
|
|
}
|
|
|
|
const DOCKER_PREFIX = 'docker://';
|
|
|
|
function parseDockerReference(input: string): DockerReference | null {
|
|
const originalRef = input.slice(DOCKER_PREFIX.length);
|
|
if (!originalRef) {
|
|
return null;
|
|
}
|
|
|
|
const digestParts = splitFirst(originalRef, '@');
|
|
if (digestParts) {
|
|
const [image, digest] = digestParts;
|
|
return { kind: 'docker', image, digest, originalRef };
|
|
}
|
|
|
|
// Find tag: look for first colon after last slash (to avoid matching port in registry)
|
|
const lastSlashIndex = originalRef.lastIndexOf('/');
|
|
const searchStart = lastSlashIndex === -1 ? 0 : lastSlashIndex + 1;
|
|
const tagParts = splitFirstFrom(originalRef, ':', searchStart);
|
|
|
|
if (tagParts) {
|
|
const [image, tag] = tagParts;
|
|
return { kind: 'docker', image, tag, originalRef };
|
|
}
|
|
|
|
return { kind: 'docker', image: originalRef, originalRef };
|
|
}
|
|
|
|
const repositoryActionRegex = regEx(
|
|
/^(?:https:\/\/(?<hostname>[^/]+)\/)?(?<owner>[^/]+)\/(?<repo>[^/]+)(?:\/(?<path>.+?))?@(?<ref>.+)$/,
|
|
);
|
|
|
|
function parseRepositoryReference(input: string): RepositoryReference | null {
|
|
const match = repositoryActionRegex.exec(input);
|
|
if (!match?.groups) {
|
|
return null;
|
|
}
|
|
|
|
const { owner, repo, path, ref } = match.groups;
|
|
|
|
let { hostname } = match.groups;
|
|
let isExplicitHostname = true;
|
|
if (is.undefined(hostname)) {
|
|
hostname = 'github.com';
|
|
isExplicitHostname = false;
|
|
}
|
|
|
|
return {
|
|
kind: 'repository',
|
|
hostname,
|
|
isExplicitHostname,
|
|
owner,
|
|
repo,
|
|
path,
|
|
ref,
|
|
};
|
|
}
|
|
|
|
export function parseActionReference(uses: string): ActionReference | null {
|
|
if (!uses) {
|
|
return null;
|
|
}
|
|
|
|
if (uses.startsWith(DOCKER_PREFIX)) {
|
|
return parseDockerReference(uses);
|
|
}
|
|
|
|
if (uses.startsWith('./') || uses.startsWith('../')) {
|
|
return { kind: 'local', path: uses };
|
|
}
|
|
|
|
return parseRepositoryReference(uses);
|
|
}
|
|
|
|
const pinTokenRe = regEx(
|
|
/^\s*(?:(?:renovate\s*:\s*)?(?:pin\s+|tag\s*=\s*)?|(?:ratchet:[\w-]+\/[.\w-]+(?:\/[.\w-]+)*))?@?(?<version>(?:[\w-]*[-/])?v?\d+(?:\.\d+(?:\.\d+)?)?(?:-[a-zA-Z0-9.]+)?)/,
|
|
);
|
|
|
|
export const versionLikeRe = regEx(/^v?\d+/);
|
|
|
|
const bareTokenRe = regEx(/^\s*(?<token>\S+)\s*$/);
|
|
|
|
export function parseComment(commentBody: string): CommentData {
|
|
const trimmed = commentBody.trim();
|
|
if (trimmed === 'ratchet:exclude') {
|
|
return { ratchetExclude: true };
|
|
}
|
|
|
|
// We use commentBody (with leading spaces) to get the correct index relative to the comment start
|
|
const match = pinTokenRe.exec(commentBody);
|
|
if (match?.groups?.version) {
|
|
return {
|
|
pinnedVersion: match.groups.version,
|
|
matchedString: match[0],
|
|
index: match.index,
|
|
};
|
|
}
|
|
|
|
const bareMatch = bareTokenRe.exec(commentBody);
|
|
if (bareMatch?.groups?.token) {
|
|
return {
|
|
ref: bareMatch.groups.token,
|
|
matchedString: bareMatch[0],
|
|
index: bareMatch.index,
|
|
};
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
const usesLineRegex = regEx(
|
|
/^(?<prefix>\s+(?:-\s+)?uses\s*:\s*)(?<remainder>.+)$/,
|
|
);
|
|
|
|
/**
|
|
* Parses a GitHub Actions `uses:` line into its components.
|
|
*
|
|
* Expected line format:
|
|
* ```
|
|
* <indentation>[- ]uses: [quote]<action-reference>[quote][ # <comment>]
|
|
* ```
|
|
*
|
|
* Examples:
|
|
* - ` uses: actions/checkout@v4`
|
|
* - ` - uses: "owner/repo@abc123" # v1.0.0`
|
|
* - ` uses: docker://alpine:3.18`
|
|
*
|
|
* @returns Parsed components or `null` if the line doesn't match `uses:` pattern
|
|
*/
|
|
export function parseUsesLine(line: string): ParsedUsesLine | null {
|
|
const match = usesLineRegex.exec(line);
|
|
if (!match?.groups) {
|
|
return null;
|
|
}
|
|
|
|
const { prefix, remainder } = match.groups;
|
|
|
|
if (remainder.startsWith('#')) {
|
|
return null;
|
|
}
|
|
|
|
const indentation = prefix.slice(0, prefix.indexOf('uses'));
|
|
|
|
// We look for ' #' to determine where the comment starts.
|
|
// This is a safe heuristic for valid "uses" values which cannot contain spaces.
|
|
const commentIndex = remainder.indexOf(' #');
|
|
|
|
// No comment case
|
|
if (commentIndex === -1) {
|
|
const { value, quote } = parseQuote(remainder);
|
|
return {
|
|
indentation,
|
|
usesPrefix: prefix,
|
|
replaceString: remainder.trim(),
|
|
commentPrecedingWhitespace: '',
|
|
commentString: '',
|
|
actionRef: parseActionReference(value),
|
|
commentData: {},
|
|
quote,
|
|
};
|
|
}
|
|
|
|
// Has comment: split value and comment
|
|
const rawValuePart = remainder.slice(0, commentIndex);
|
|
const commentPart = remainder.slice(commentIndex + 1); // starts at #
|
|
|
|
// Calculate whitespace between value and #
|
|
const partBeforeHash = remainder.slice(0, commentIndex + 1);
|
|
const commentPrecedingWhitespace = partBeforeHash.slice(
|
|
partBeforeHash.trimEnd().length,
|
|
);
|
|
|
|
const { value, quote } = parseQuote(rawValuePart);
|
|
// commentPart always starts with '#' (see commentIndex search above)
|
|
const cleanCommentBody = commentPart.slice(1);
|
|
|
|
return {
|
|
indentation,
|
|
usesPrefix: prefix,
|
|
replaceString: rawValuePart.trim(),
|
|
commentPrecedingWhitespace,
|
|
commentString: commentPart,
|
|
actionRef: parseActionReference(value),
|
|
commentData: parseComment(cleanCommentBody),
|
|
quote,
|
|
};
|
|
}
|