mirror of
https://github.com/renovatebot/renovate.git
synced 2026-11-01 10:09:50 +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>
262 lines
8.4 KiB
TypeScript
262 lines
8.4 KiB
TypeScript
import { isString } from '@sindresorhus/is';
|
|
import validateNpmPackageName from 'validate-npm-package-name';
|
|
import { logger } from '../../../../../logger/index.ts';
|
|
import { coerceArray } from '../../../../../util/array.ts';
|
|
import type { ConstraintName } from '../../../../../util/exec/types.ts';
|
|
import { isConstraintName } from '../../../../../util/exec/types.ts';
|
|
import { regEx } from '../../../../../util/regex.ts';
|
|
import { GithubTagsDatasource } from '../../../../datasource/github-tags/index.ts';
|
|
import { NodeVersionDatasource } from '../../../../datasource/node-version/index.ts';
|
|
import { NpmDatasource } from '../../../../datasource/npm/index.ts';
|
|
import {
|
|
api,
|
|
isValid,
|
|
isVersion,
|
|
id as npmVersioningId,
|
|
} from '../../../../versioning/npm/index.ts';
|
|
import type { PackageDependency } from '../../../types.ts';
|
|
|
|
const RE_REPOSITORY_GITHUB_SSH_FORMAT = regEx(
|
|
/(?:git@)github.com:(?<owner>[^/]+)\/(?<repo>[^/]+?)(?:\.git)?$/,
|
|
);
|
|
|
|
export function parseDepName(depType: string, key: string): string {
|
|
if (depType !== 'resolutions') {
|
|
return key;
|
|
}
|
|
|
|
// Yarn selective dependency resolutions may nest a path of parent
|
|
// packages before the target package, e.g. `parent/child` or
|
|
// `@scope/parent/child`, and any segment (including the last) may carry
|
|
// a `@range` suffix used to disambiguate which version of that package
|
|
// to match, e.g. `@cypress/request/qs@~6.14.1`.
|
|
const parts = key.split('/');
|
|
const segments: string[] = [];
|
|
for (let i = 0; i < parts.length; i += 1) {
|
|
const part = parts[i];
|
|
if (part.startsWith('@') && i + 1 < parts.length) {
|
|
i += 1;
|
|
segments.push(`${part}/${parts[i]}`);
|
|
} else {
|
|
segments.push(part);
|
|
}
|
|
}
|
|
|
|
const lastSegment = segments.at(-1);
|
|
const [, depName] = coerceArray(
|
|
regEx(/^(?<depName>(?:@[^/]+\/)?[^@]+)/).exec(lastSegment ?? ''),
|
|
);
|
|
return depName;
|
|
}
|
|
|
|
export function extractDependency(
|
|
depType: string,
|
|
depName: string,
|
|
input: string,
|
|
): PackageDependency {
|
|
const dep: PackageDependency = {};
|
|
if (!validateNpmPackageName(depName).validForOldPackages) {
|
|
dep.skipReason = 'invalid-name';
|
|
return dep;
|
|
}
|
|
if (!isString(input)) {
|
|
dep.skipReason = 'invalid-value';
|
|
return dep;
|
|
}
|
|
dep.currentValue = input.trim();
|
|
if (depType === 'engines' || depType === 'packageManager') {
|
|
if (depName === 'node') {
|
|
dep.datasource = NodeVersionDatasource.id;
|
|
} else if (depName === 'yarn') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'Yarn';
|
|
const major =
|
|
isVersion(dep.currentValue) && api.getMajor(dep.currentValue);
|
|
if (major && major > 1) {
|
|
dep.packageName = '@yarnpkg/cli';
|
|
}
|
|
} else if (depName === 'npm') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'npm';
|
|
} else if (depName === 'pnpm') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'pnpm';
|
|
} else if (depName === 'vscode') {
|
|
dep.datasource = GithubTagsDatasource.id;
|
|
dep.packageName = 'microsoft/vscode';
|
|
dep.versioning = npmVersioningId;
|
|
} else if (depName === 'bun') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'Bun';
|
|
} else {
|
|
dep.skipReason = 'unknown-engines';
|
|
}
|
|
if (!isValid(dep.currentValue)) {
|
|
dep.skipReason = 'unspecified-version';
|
|
}
|
|
return dep;
|
|
}
|
|
|
|
// support for volta
|
|
if (depType === 'volta') {
|
|
if (depName === 'node') {
|
|
dep.datasource = NodeVersionDatasource.id;
|
|
} else if (depName === 'yarn') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'Yarn';
|
|
const major =
|
|
isVersion(dep.currentValue) && api.getMajor(dep.currentValue);
|
|
if (major && major > 1) {
|
|
dep.packageName = '@yarnpkg/cli';
|
|
}
|
|
} else if (depName === 'npm') {
|
|
dep.datasource = NpmDatasource.id;
|
|
} else if (depName === 'pnpm') {
|
|
dep.datasource = NpmDatasource.id;
|
|
dep.commitMessageTopic = 'pnpm';
|
|
} else {
|
|
dep.skipReason = 'unknown-volta';
|
|
}
|
|
if (!isValid(dep.currentValue)) {
|
|
dep.skipReason = 'unspecified-version';
|
|
}
|
|
return dep;
|
|
}
|
|
|
|
if (dep.currentValue.startsWith('npm:')) {
|
|
dep.npmPackageAlias = true;
|
|
const valSplit = dep.currentValue.replace('npm:', '').split('@');
|
|
if (valSplit.length === 1) {
|
|
dep.packageName = depName;
|
|
dep.currentValue = valSplit[0];
|
|
} else if (valSplit.length === 2) {
|
|
dep.packageName = valSplit[0];
|
|
dep.currentValue = valSplit[1];
|
|
} else if (valSplit.length === 3) {
|
|
dep.packageName = `${valSplit[0]}@${valSplit[1]}`;
|
|
dep.currentValue = valSplit[2];
|
|
} else {
|
|
logger.debug(
|
|
`Invalid npm package alias for dependency: "${depName}":"${dep.currentValue}"`,
|
|
);
|
|
}
|
|
}
|
|
if (dep.currentValue.startsWith('file:')) {
|
|
dep.skipReason = 'file';
|
|
return dep;
|
|
}
|
|
|
|
if (isValid(dep.currentValue)) {
|
|
dep.datasource = NpmDatasource.id;
|
|
if (dep.currentValue === '') {
|
|
dep.skipReason = 'empty';
|
|
}
|
|
return dep;
|
|
}
|
|
const hashSplit = dep.currentValue.split('#');
|
|
if (hashSplit.length !== 2) {
|
|
dep.skipReason = 'unspecified-version';
|
|
return dep;
|
|
}
|
|
const [depNamePart, depRefPart] = hashSplit;
|
|
|
|
let githubOwnerRepo: string;
|
|
let githubOwner: string;
|
|
let githubRepo: string;
|
|
const matchUrlSshFormat = RE_REPOSITORY_GITHUB_SSH_FORMAT.exec(depNamePart);
|
|
if (matchUrlSshFormat === null) {
|
|
githubOwnerRepo = depNamePart
|
|
.replace(regEx(/^github:/), '')
|
|
.replace(regEx(/^git\+/), '')
|
|
.replace(regEx(/^https:\/\/github\.com\//), '')
|
|
.replace(regEx(/\.git$/), '');
|
|
const githubRepoSplit = githubOwnerRepo.split('/');
|
|
if (githubRepoSplit.length !== 2) {
|
|
dep.skipReason = 'unspecified-version';
|
|
return dep;
|
|
}
|
|
[githubOwner, githubRepo] = githubRepoSplit;
|
|
} else {
|
|
githubOwner = matchUrlSshFormat.groups!.owner;
|
|
githubRepo = matchUrlSshFormat.groups!.repo;
|
|
githubOwnerRepo = `${githubOwner}/${githubRepo}`;
|
|
}
|
|
// combined with the length check below, this is equivalent to
|
|
// /^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$/i without the lookahead
|
|
const githubOwnerRegex = regEx(/^[a-z\d](?:-?[a-z\d]){0,38}$/i);
|
|
const githubRepoRegex = regEx(/^[a-zA-Z0-9._-]{1,100}$/);
|
|
if (
|
|
githubOwner.length > 39 ||
|
|
!githubOwnerRegex.test(githubOwner) ||
|
|
!githubRepoRegex.test(githubRepo)
|
|
) {
|
|
dep.skipReason = 'unspecified-version';
|
|
return dep;
|
|
}
|
|
if (isVersion(depRefPart)) {
|
|
dep.currentRawValue = dep.currentValue;
|
|
dep.currentValue = depRefPart;
|
|
dep.datasource = GithubTagsDatasource.id;
|
|
dep.versioning = npmVersioningId;
|
|
dep.packageName = githubOwnerRepo;
|
|
dep.pinDigests = false;
|
|
} else if (
|
|
regEx(/^[0-9a-f]{7}$/).test(depRefPart) ||
|
|
regEx(/^[0-9a-f]{40}$/).test(depRefPart)
|
|
) {
|
|
dep.currentRawValue = dep.currentValue;
|
|
dep.currentValue = null;
|
|
dep.currentDigest = depRefPart;
|
|
dep.datasource = GithubTagsDatasource.id;
|
|
dep.versioning = npmVersioningId;
|
|
dep.packageName = githubOwnerRepo;
|
|
} else {
|
|
// <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:][/]<path>[#<commit-ish> | #semver:<semver>]
|
|
// https://docs.npmjs.com/cli/v10/configuring-npm/package-json#git-urls-as-dependencies
|
|
const len = 7; // length of 'semver:'
|
|
const maybeVersion = depRefPart.substring(len);
|
|
|
|
if (depRefPart.startsWith('semver:') && isValid(maybeVersion)) {
|
|
dep.currentRawValue = dep.currentValue;
|
|
dep.currentValue = maybeVersion;
|
|
dep.datasource = GithubTagsDatasource.id;
|
|
dep.versioning = npmVersioningId;
|
|
dep.packageName = githubOwnerRepo;
|
|
dep.pinDigests = false;
|
|
} else {
|
|
dep.skipReason = 'unversioned-reference';
|
|
return dep;
|
|
}
|
|
}
|
|
dep.sourceUrl = `https://github.com/${githubOwnerRepo}`;
|
|
dep.gitRef = true;
|
|
return dep;
|
|
}
|
|
|
|
export function getExtractedConstraints(
|
|
deps: PackageDependency[],
|
|
): Partial<Record<ConstraintName, string>> {
|
|
const extractedConstraints: Partial<Record<ConstraintName, string>> = {};
|
|
const constraints: ConstraintName[] = [
|
|
'bun',
|
|
'node',
|
|
'yarn',
|
|
'npm',
|
|
'pnpm',
|
|
'vscode',
|
|
];
|
|
for (const dep of deps) {
|
|
if (
|
|
!dep.skipReason &&
|
|
(dep.depType === 'engines' || dep.depType === 'packageManager') &&
|
|
dep.depName &&
|
|
isConstraintName(dep.depName) &&
|
|
constraints.includes(dep.depName) &&
|
|
isString(dep.currentValue)
|
|
) {
|
|
extractedConstraints[dep.depName] = dep.currentValue;
|
|
}
|
|
}
|
|
return extractedConstraints;
|
|
}
|