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>
239 lines
6.5 KiB
TypeScript
239 lines
6.5 KiB
TypeScript
import { coerceArray } from '../../../util/array.ts';
|
|
import { newlineRegex, regEx } from '../../../util/regex.ts';
|
|
import { ClojureDatasource } from '../../datasource/clojure/index.ts';
|
|
import type { PackageDependency, PackageFileContent } from '../types.ts';
|
|
import type { ExtractContext, ExtractedVariables } from './types.ts';
|
|
|
|
export function trimAtKey(str: string, kwName: string): string | null {
|
|
// matching the whitespace instead of a lookahead is equivalent here,
|
|
// as only the match offset is used
|
|
const regex = regEx(`:${kwName}\\s`);
|
|
const keyOffset = str.search(regex);
|
|
if (keyOffset < 0) {
|
|
return null;
|
|
}
|
|
const withSpaces = str.slice(keyOffset + kwName.length + 1);
|
|
const valueOffset = withSpaces.search(regEx(/[^\s]/));
|
|
if (valueOffset < 0) {
|
|
return null;
|
|
}
|
|
return withSpaces.slice(valueOffset);
|
|
}
|
|
|
|
export function expandDepName(name: string): string {
|
|
return name.includes('/') ? name.replace('/', ':') : `${name}:${name}`;
|
|
}
|
|
|
|
export function extractFromVectors(
|
|
str: string,
|
|
ctx: ExtractContext = {},
|
|
vars: ExtractedVariables = {},
|
|
dimensions: 1 | 2 = 2,
|
|
): PackageDependency[] {
|
|
if (!str.startsWith('[')) {
|
|
return [];
|
|
}
|
|
let balance = 0;
|
|
const result: PackageDependency[] = [];
|
|
let idx = 0;
|
|
let vecPos = 0;
|
|
let artifactId = '';
|
|
let version = '';
|
|
// Are we currently parsing a comment? If so, at what depth?
|
|
let commentLevel: number | null = null;
|
|
|
|
function isSpace(ch: string | null): boolean {
|
|
return !!ch && regEx(/[\s,]/).test(ch);
|
|
}
|
|
|
|
function cleanStrLiteral(s: string): string {
|
|
return s.replace(regEx(/^"/), '').replace(regEx(/"$/), '');
|
|
}
|
|
|
|
function yieldDep(): void {
|
|
if (!commentLevel && artifactId && version) {
|
|
const depName = expandDepName(cleanStrLiteral(artifactId));
|
|
if (version.startsWith('~')) {
|
|
const varName = version.replace(regEx(/^~\s*/), '');
|
|
const currentValue = vars[varName];
|
|
if (currentValue) {
|
|
result.push({
|
|
...ctx,
|
|
datasource: ClojureDatasource.id,
|
|
depName,
|
|
currentValue,
|
|
sharedVariableName: varName,
|
|
});
|
|
}
|
|
} else {
|
|
result.push({
|
|
...ctx,
|
|
datasource: ClojureDatasource.id,
|
|
depName,
|
|
currentValue: cleanStrLiteral(version),
|
|
});
|
|
}
|
|
}
|
|
artifactId = '';
|
|
version = '';
|
|
}
|
|
|
|
let prevChar: string | null = null;
|
|
while (idx < str.length) {
|
|
const char = str.charAt(idx);
|
|
|
|
if (str.substring(idx).startsWith('#_[')) {
|
|
commentLevel = balance;
|
|
}
|
|
|
|
if (char === '[') {
|
|
balance += 1;
|
|
if (balance === dimensions) {
|
|
vecPos = 0;
|
|
}
|
|
} else if (char === ']') {
|
|
balance -= 1;
|
|
|
|
if (commentLevel === balance) {
|
|
artifactId = '';
|
|
version = '';
|
|
commentLevel = null;
|
|
}
|
|
|
|
if (balance === dimensions - 1) {
|
|
yieldDep();
|
|
}
|
|
|
|
if (balance === 0) {
|
|
break;
|
|
}
|
|
} else if (balance === dimensions) {
|
|
if (isSpace(char)) {
|
|
if (!isSpace(prevChar)) {
|
|
vecPos += 1;
|
|
}
|
|
} else if (vecPos === 0) {
|
|
artifactId += char;
|
|
} else if (vecPos === 1) {
|
|
version += char;
|
|
}
|
|
}
|
|
prevChar = char;
|
|
idx += 1;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function extractLeinRepos(content: string): string[] {
|
|
const result: string[] = [];
|
|
|
|
const repoContent = trimAtKey(
|
|
content.replace(regEx(/;;.*(?<newline>[\r\n])/g), '$<newline>'), // get rid of comments
|
|
'repositories',
|
|
);
|
|
|
|
if (repoContent) {
|
|
let balance = 0;
|
|
let endIdx = 0;
|
|
for (let idx = 0; idx < repoContent.length; idx += 1) {
|
|
const char = repoContent.charAt(idx);
|
|
if (char === '[') {
|
|
balance += 1;
|
|
} else if (char === ']') {
|
|
balance -= 1;
|
|
if (balance <= 0) {
|
|
endIdx = idx;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
const repoSectionContent = repoContent.slice(0, endIdx);
|
|
const matches = coerceArray(
|
|
repoSectionContent.match(regEx(/"https?:\/\/[^"]*"/g)),
|
|
);
|
|
const urls = matches.map((x) =>
|
|
x.replace(regEx(/^"/), '').replace(regEx(/"$/), ''),
|
|
);
|
|
urls.forEach((url) => result.push(url));
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
const defRegex = regEx(
|
|
/^[\s,]*\([\s,]*def[\s,]+(?<varName>[-+*=<>.!?#$%&_|a-zA-Z][-+*=<>.!?#$%&_|a-zA-Z0-9']+)[\s,]*"(?<stringValue>[^"]*)"[\s,]*\)[\s,]*$/,
|
|
);
|
|
|
|
export function extractVariables(content: string): ExtractedVariables {
|
|
const result: ExtractedVariables = {};
|
|
const lines = content.split(newlineRegex);
|
|
for (const line of lines) {
|
|
const match = defRegex.exec(line);
|
|
if (match?.groups) {
|
|
const { varName: key, stringValue: val } = match.groups;
|
|
result[key] = val;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
interface CollectDepsOptions {
|
|
nested: boolean;
|
|
depType?: string;
|
|
}
|
|
|
|
function collectDeps(
|
|
content: string,
|
|
key: string,
|
|
registryUrls: string[],
|
|
vars: ExtractedVariables,
|
|
options: CollectDepsOptions = {
|
|
nested: true,
|
|
},
|
|
): PackageDependency[] {
|
|
const ctx = {
|
|
depType: options.depType ?? key,
|
|
registryUrls,
|
|
};
|
|
// A vector like [["dep-1" "1.0.0"] ["dep-2" "0.0.0"]] is nested
|
|
// A vector like ["dep-1" "1.0.0"] is not
|
|
const dimensions = options.nested ? 2 : 1;
|
|
let result: PackageDependency[] = [];
|
|
let restContent = trimAtKey(content, key);
|
|
while (restContent) {
|
|
result = [
|
|
...result,
|
|
...extractFromVectors(restContent, ctx, vars, dimensions),
|
|
];
|
|
restContent = trimAtKey(restContent, key);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
export function extractPackageFile(content: string): PackageFileContent {
|
|
const registryUrls = extractLeinRepos(content);
|
|
const vars = extractVariables(content);
|
|
|
|
const deps: PackageDependency[] = [
|
|
...collectDeps(content, 'dependencies', registryUrls, vars),
|
|
...collectDeps(content, 'managed-dependencies', registryUrls, vars),
|
|
...collectDeps(content, 'plugins', registryUrls, vars),
|
|
...collectDeps(content, 'pom-plugins', registryUrls, vars),
|
|
// 'coords' is used in lein parent, and specifies zero or one
|
|
// dependencies. These are not wrapped in a vector in the way other
|
|
// dependencies are. The project.clj fragment looks like
|
|
//
|
|
// :parent-project {... :coords ["parent" "version"] ...}
|
|
//
|
|
// - https://github.com/achin/lein-parent
|
|
...collectDeps(content, 'coords', registryUrls, vars, {
|
|
nested: false,
|
|
// The top-level key is 'parent-project', but we skip directly to 'coords'.
|
|
// So fix the dep type label
|
|
depType: 'parent-project',
|
|
}),
|
|
];
|
|
|
|
return { deps };
|
|
}
|