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>
109 lines
3.0 KiB
TypeScript
109 lines
3.0 KiB
TypeScript
import { coerceArray } from '../../../util/array.ts';
|
|
import { newlineRegex, regEx } from '../../../util/regex.ts';
|
|
import type { PuppetfileModule } from './types.ts';
|
|
|
|
const forgeRegex = regEx(/^forge\s+['"](?<forge>[^'"]+)['"]/);
|
|
const commentRegex = regEx(/#.*$/);
|
|
|
|
/**
|
|
* For us a Puppetfile is build up of forges that have Modules.
|
|
*
|
|
* Modules are the updatable parts.
|
|
*
|
|
*/
|
|
export class Puppetfile {
|
|
private readonly forgeModules = new Map<string | null, PuppetfileModule[]>();
|
|
|
|
public add(currentForge: string | null, module: PuppetfileModule): void {
|
|
if (Object.keys(module).length === 0) {
|
|
return;
|
|
}
|
|
|
|
if (!this.forgeModules.has(currentForge)) {
|
|
this.forgeModules.set(currentForge, []);
|
|
}
|
|
|
|
this.forgeModules.get(currentForge)?.push(module);
|
|
}
|
|
|
|
public getForges(): (string | null)[] {
|
|
return Array.from(this.forgeModules.keys());
|
|
}
|
|
|
|
public getModulesOfForge(
|
|
forgeUrl: string | null | undefined,
|
|
): PuppetfileModule[] {
|
|
const modules = this.forgeModules.get(forgeUrl ?? null);
|
|
|
|
return coerceArray(modules);
|
|
}
|
|
}
|
|
|
|
export function parsePuppetfile(content: string): Puppetfile {
|
|
const puppetfile: Puppetfile = new Puppetfile();
|
|
|
|
let currentForge: string | null = null;
|
|
let currentPuppetfileModule: PuppetfileModule = {};
|
|
|
|
for (const rawLine of content.split(newlineRegex)) {
|
|
// remove comments
|
|
const line = rawLine.replace(commentRegex, '');
|
|
|
|
const forgeResult = forgeRegex.exec(line);
|
|
if (forgeResult) {
|
|
puppetfile.add(currentForge, currentPuppetfileModule);
|
|
|
|
currentPuppetfileModule = {};
|
|
|
|
currentForge = forgeResult.groups!.forge;
|
|
continue;
|
|
}
|
|
|
|
const moduleStart = line.startsWith('mod');
|
|
|
|
if (moduleStart) {
|
|
puppetfile.add(currentForge, currentPuppetfileModule);
|
|
currentPuppetfileModule = {};
|
|
}
|
|
|
|
const moduleValueRegex = regEx(
|
|
/(?:\s*:(?<key>\w+)\s+=>\s+)?['"](?<value>[^'"]+)['"]/g,
|
|
);
|
|
let moduleValue: RegExpExecArray | null;
|
|
|
|
while ((moduleValue = moduleValueRegex.exec(line)) !== null) {
|
|
const key = moduleValue.groups!.key;
|
|
const value = moduleValue.groups!.value;
|
|
|
|
if (key) {
|
|
currentPuppetfileModule.tags =
|
|
currentPuppetfileModule.tags ?? new Map();
|
|
currentPuppetfileModule.tags.set(key, value);
|
|
} else {
|
|
fillPuppetfileModule(currentPuppetfileModule, value);
|
|
}
|
|
}
|
|
}
|
|
|
|
puppetfile.add(currentForge, currentPuppetfileModule);
|
|
|
|
return puppetfile;
|
|
}
|
|
|
|
function fillPuppetfileModule(
|
|
currentPuppetfileModule: PuppetfileModule,
|
|
value: string,
|
|
): void {
|
|
// "positional" module values
|
|
if (currentPuppetfileModule.name === undefined) {
|
|
// moduleName
|
|
currentPuppetfileModule.name = value;
|
|
} else if (currentPuppetfileModule.version === undefined) {
|
|
// second value without a key is the version
|
|
currentPuppetfileModule.version = value;
|
|
} else {
|
|
// 3+ value without a key is not supported
|
|
currentPuppetfileModule.skipReason = 'invalid-config';
|
|
}
|
|
}
|