mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 01:37:24 +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>
218 lines
8.0 KiB
TypeScript
218 lines
8.0 KiB
TypeScript
import { readFile, readdir } from 'node:fs/promises';
|
|
import { join } from 'node:path';
|
|
import { isNullOrUndefined } from '@sindresorhus/is';
|
|
import * as manager from '../../modules/manager/index.ts';
|
|
import * as platform from '../../modules/platform/index.ts';
|
|
import { migrateConfig } from '../migration.ts';
|
|
import { getOptions } from './index.ts';
|
|
|
|
vi.unmock('../../modules/platform/index.ts');
|
|
|
|
async function collectTsFiles(dir: string): Promise<string[]> {
|
|
const results: string[] = [];
|
|
for (const entry of await readdir(dir, { withFileTypes: true })) {
|
|
const fullPath = join(dir, entry.name);
|
|
if (entry.isDirectory()) {
|
|
results.push(...(await collectTsFiles(fullPath)));
|
|
} else if (
|
|
entry.name.endsWith('.ts') &&
|
|
!entry.name.includes('.spec.') &&
|
|
!entry.name.includes('.test.')
|
|
) {
|
|
results.push(fullPath);
|
|
}
|
|
}
|
|
return results;
|
|
}
|
|
|
|
describe('config/options/index', () => {
|
|
it('test manager should have no defaultConfig', () => {
|
|
vi.doMock('../../modules/manager/index.ts', () => ({
|
|
getManagers: vi.fn(() => new Map().set('testManager', {})),
|
|
}));
|
|
|
|
const opts = getOptions();
|
|
expect(opts.filter((o) => o.name === 'testManager')).toEqual([]);
|
|
});
|
|
|
|
it('supportedManagers should have valid names', () => {
|
|
const opts = getOptions();
|
|
const managerList = Array.from(manager.getManagers().keys());
|
|
|
|
opts
|
|
.filter((option) => option.supportedManagers)
|
|
.forEach((option) => {
|
|
expect(option.supportedManagers).toBeNonEmptyArray();
|
|
for (const item of option.supportedManagers!) {
|
|
expect(managerList).toContain(item);
|
|
}
|
|
});
|
|
});
|
|
|
|
it('supportedPlatforms should have valid names', () => {
|
|
const opts = getOptions();
|
|
const platformList = Array.from(platform.getPlatformList());
|
|
|
|
opts
|
|
.filter((option) => option.supportedPlatforms)
|
|
.forEach((option) => {
|
|
expect(option.supportedPlatforms).toBeNonEmptyArray();
|
|
for (const item of option.supportedPlatforms!) {
|
|
expect(platformList).toContain(item);
|
|
}
|
|
});
|
|
});
|
|
|
|
it('should not contain duplicate option names', () => {
|
|
const optsNames = getOptions().map((option) => option.name);
|
|
const optsNameSet = new Set(optsNames);
|
|
expect(optsNames).toHaveLength(optsNameSet.size);
|
|
});
|
|
|
|
describe('every option with allowedValues and a default must have the default in allowedValues', () => {
|
|
const opts = getOptions();
|
|
for (const option of opts.filter(
|
|
(o) => o.allowedValues && !isNullOrUndefined(o.default),
|
|
)) {
|
|
it(`${option.name}: \`${option.default}\` is in ${JSON.stringify(option.allowedValues)}`, () => {
|
|
expect(option.allowedValues).toBeDefined();
|
|
|
|
const defaults = Array.isArray(option.default)
|
|
? option.default
|
|
: [option.default];
|
|
for (const defVal of defaults) {
|
|
expect(option.allowedValues).toContain(defVal);
|
|
}
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('supportsTemplating options', () => {
|
|
const opts = getOptions().filter((option) => option.supportsTemplating);
|
|
|
|
for (const option of opts) {
|
|
it(`${option.name} should be of type string or array of strings`, () => {
|
|
const valid =
|
|
option.type === 'string' ||
|
|
(option.type === 'array' && option.subType === 'string');
|
|
expect(valid).toBeTrue();
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('template.compile usage must have supportsTemplating', async () => {
|
|
const allOptions = getOptions();
|
|
const supportsTemplating = new Set(
|
|
allOptions.filter((o) => o.supportsTemplating).map((o) => o.name),
|
|
);
|
|
|
|
// Scan source files for template.compile(config.xxx, ...) and compile(config.xxx, ...) patterns
|
|
const sourceDir = join(__dirname, '..', '..');
|
|
const sourceFiles = (
|
|
await Promise.all([
|
|
collectTsFiles(join(sourceDir, 'workers')),
|
|
collectTsFiles(join(sourceDir, 'modules', 'datasource', 'custom')),
|
|
collectTsFiles(join(sourceDir, 'modules', 'manager', 'custom')),
|
|
collectTsFiles(join(sourceDir, 'util', 'package-rules')),
|
|
])
|
|
).flat();
|
|
|
|
const directPattern =
|
|
/(?<![.\w])(?:template\.)?compile\(\s*(?:config|update|upgrade|upg|toApply)\??\.(?<name>\w+)/g;
|
|
const detectedOptions = new Set<string>();
|
|
|
|
for (const file of sourceFiles) {
|
|
const content = await readFile(file, 'utf-8');
|
|
let match;
|
|
while ((match = directPattern.exec(content)) !== null) {
|
|
const name = match.groups!.name;
|
|
const option = allOptions.find((o) => o.name === name);
|
|
// Only include string or array-of-string options (not objects like userStrings)
|
|
if (
|
|
option &&
|
|
(option.type === 'string' ||
|
|
(option.type === 'array' && option.subType === 'string'))
|
|
) {
|
|
detectedOptions.add(name);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Options compiled via array iteration or intermediate variables
|
|
// that cannot be detected by regex. Keep this list in sync manually.
|
|
const indirectlyCompiled = [
|
|
'labels', // labels.map(label => template.compile(label, ...))
|
|
'addLabels', // same pattern as labels
|
|
'prBodyNotes', // prBodyNotes.map(note => template.compile(note, ...))
|
|
'commands', // postUpgradeTasks.commands iterated and compiled
|
|
'filePatterns', // bumpVersions.filePatterns iterated and compiled
|
|
'changelogUrl', // compiled via local var: template.compile(changelogUrl, ...)
|
|
'bumpType', // compiled via intermediate var rawBumpType
|
|
'matchStrings', // bumpVersions.matchStrings iterated and compiled
|
|
'transformTemplates', // customDatasources.transformTemplates iterated and compiled
|
|
];
|
|
for (const name of indirectlyCompiled) {
|
|
detectedOptions.add(name);
|
|
}
|
|
|
|
for (const name of detectedOptions) {
|
|
it(`${name} should have supportsTemplating: true`, () => {
|
|
expect(supportsTemplating).toContain(name);
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('every option with a siblingProperties has a `property` that matches a known option', () => {
|
|
const opts = getOptions();
|
|
const optionNames = new Set(opts.map((o) => o.name));
|
|
|
|
for (const option of opts.filter((o) => o.requiredIf)) {
|
|
for (const req of option.requiredIf!) {
|
|
for (const prop of req.siblingProperties) {
|
|
it(`${option.name}'s reference to ${prop.property} is valid`, () => {
|
|
expect(optionNames).toContain(prop.property);
|
|
});
|
|
|
|
const foundOption = opts.filter((o) => o.name === prop.property);
|
|
// oxlint-disable-next-line vitest/no-conditional-tests -- TODO: fix me
|
|
if (foundOption?.length && foundOption[0].allowedValues) {
|
|
it(`${option.name}'s value for ${prop.property} is valid, according to allowedValues`, () => {
|
|
expect(foundOption[0].allowedValues).toContain(prop.value);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
describe('every option with a default must not need migrating', () => {
|
|
const opts = getOptions();
|
|
|
|
for (const option of opts.filter((o) => o.default)) {
|
|
const defaultConfig = {
|
|
[option.name]: option.default,
|
|
};
|
|
const { isMigrated, migratedConfig } = migrateConfig(defaultConfig);
|
|
it(`${option.name}'s default config should not need any migrations`, () => {
|
|
expect(defaultConfig).toEqual(migratedConfig);
|
|
expect(isMigrated).toBeFalse();
|
|
// expect(isMigrated,
|
|
// `${option.name}'s default config needs to be migrated: \n${JSON.stringify(migratedConfig, null, 2)}`
|
|
// ).toBeFalse()
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('every option with requiresCheckAtTrustBoundary', () => {
|
|
it('has remembered to implement their checks', () => {
|
|
// if this test fails after you've added `requiresCheckAtTrustBoundary` to a config option, make sure you've implemented the checks, and then update the list below:
|
|
const enforced = ['env', 'hostRules'];
|
|
const flagged = getOptions()
|
|
.filter((option) => option.requiresCheckAtTrustBoundary)
|
|
.map((option) => option.name)
|
|
.sort();
|
|
expect(flagged).toEqual([...enforced].sort());
|
|
});
|
|
});
|
|
});
|