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>
254 lines
8.4 KiB
TypeScript
254 lines
8.4 KiB
TypeScript
import {
|
|
isArray,
|
|
isBoolean,
|
|
isNonEmptyArray,
|
|
isNonEmptyObject,
|
|
isObject,
|
|
isString,
|
|
} from '@sindresorhus/is';
|
|
import { dequal } from 'dequal';
|
|
import { logger } from '../logger/index.ts';
|
|
import { clone } from '../util/clone.ts';
|
|
import { coerceObject } from '../util/object.ts';
|
|
import { regEx } from '../util/regex.ts';
|
|
import { MigrationsService } from './migrations/index.ts';
|
|
import { getOptions } from './options/index.ts';
|
|
import type {
|
|
MigratedConfig,
|
|
MigratedRenovateConfig,
|
|
PackageRule,
|
|
RenovateConfig,
|
|
RenovateOptions,
|
|
} from './types.ts';
|
|
import { mergeChildConfig } from './utils.ts';
|
|
|
|
const options = getOptions();
|
|
export function fixShortHours(input: string): string {
|
|
return input.replace(
|
|
regEx(/(?<hours> \d?\d)(?<meridiem>(?:a|p)m)/g),
|
|
'$<hours>:00$<meridiem>',
|
|
);
|
|
}
|
|
|
|
let optionTypes: Record<string, RenovateOptions['type']>;
|
|
// Returns a migrated config
|
|
export function migrateConfig(
|
|
config: RenovateConfig,
|
|
parentKey?: string,
|
|
): MigratedConfig {
|
|
try {
|
|
if (!optionTypes) {
|
|
optionTypes = {};
|
|
options.forEach((option) => {
|
|
optionTypes[option.name] = option.type;
|
|
});
|
|
}
|
|
const newConfig = MigrationsService.run(config, parentKey);
|
|
const migratedConfig = clone(newConfig) as MigratedRenovateConfig;
|
|
|
|
for (const [key, val] of Object.entries(newConfig)) {
|
|
if (isString(val) && val.includes('{{baseDir}}')) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = val.replace(
|
|
regEx(/{{baseDir}}/g),
|
|
'{{packageFileDir}}',
|
|
);
|
|
} else if (isString(val) && val.includes('{{lookupName}}')) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = val.replace(
|
|
regEx(/{{lookupName}}/g),
|
|
'{{packageName}}',
|
|
);
|
|
} else if (isString(val) && val.includes('{{depNameShort}}')) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = val.replace(
|
|
regEx(/{{depNameShort}}/g),
|
|
'{{depName}}',
|
|
);
|
|
} else if (isString(val) && val.startsWith('{{semanticPrefix}}')) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = val.replace(
|
|
'{{semanticPrefix}}',
|
|
'{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}',
|
|
);
|
|
} else if (optionTypes[key] === 'object' && isBoolean(val)) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = { enabled: val };
|
|
} else if (optionTypes[key] === 'boolean') {
|
|
if (val === 'true') {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = true;
|
|
} else if (val === 'false') {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = false;
|
|
}
|
|
} else if (
|
|
optionTypes[key] === 'string' &&
|
|
isArray(val) &&
|
|
val.length === 1
|
|
) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = String(val[0]);
|
|
} else if (isArray(val)) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
// v8 ignore else -- TODO: add test #40625
|
|
if (isArray(migratedConfig?.[key])) {
|
|
const newArray = [];
|
|
// @ts-expect-error -- TODO: fix me
|
|
for (const item of migratedConfig[key]) {
|
|
if (isObject(item) && !isArray(item)) {
|
|
const arrMigrate = migrateConfig(item);
|
|
newArray.push(arrMigrate.migratedConfig);
|
|
} else {
|
|
newArray.push(item);
|
|
}
|
|
}
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = newArray;
|
|
}
|
|
} else if (isObject(val)) {
|
|
const subMigrate = migrateConfig(
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] as RenovateConfig,
|
|
key,
|
|
);
|
|
if (subMigrate.isMigrated) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = subMigrate.migratedConfig;
|
|
}
|
|
}
|
|
|
|
const migratedTemplates = {
|
|
fromVersion: 'currentVersion',
|
|
newValueMajor: 'newMajor',
|
|
newValueMinor: 'newMinor',
|
|
newVersionMajor: 'newMajor',
|
|
newVersionMinor: 'newMinor',
|
|
toVersion: 'newVersion',
|
|
};
|
|
// @ts-expect-error -- TODO: fix me
|
|
if (isString(migratedConfig[key])) {
|
|
for (const [from, to] of Object.entries(migratedTemplates)) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig[key] = (migratedConfig[key] as string).replace(
|
|
regEx(from, 'g'),
|
|
to,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
const languages = [
|
|
'docker',
|
|
'dotnet',
|
|
'golang',
|
|
'java',
|
|
'js',
|
|
'node',
|
|
'php',
|
|
'python',
|
|
'ruby',
|
|
'rust',
|
|
];
|
|
for (const language of languages) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
if (isNonEmptyObject(migratedConfig[language])) {
|
|
migratedConfig.packageRules ??= [];
|
|
// @ts-expect-error -- TODO: fix me
|
|
const currentContent = migratedConfig[language] as any;
|
|
const packageRule = {
|
|
matchCategories: [language],
|
|
...currentContent,
|
|
};
|
|
migratedConfig.packageRules.unshift(packageRule);
|
|
// @ts-expect-error -- TODO: fix me
|
|
delete migratedConfig[language];
|
|
}
|
|
}
|
|
// Migrate nested packageRules
|
|
if (isNonEmptyArray(migratedConfig.packageRules)) {
|
|
const existingRules = migratedConfig.packageRules;
|
|
migratedConfig.packageRules = [];
|
|
for (const packageRule of existingRules) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
if (isArray(packageRule.packageRules)) {
|
|
logger.debug('Flattening nested packageRules');
|
|
// merge each subrule and add to the parent list
|
|
// @ts-expect-error -- TODO: fix me
|
|
for (const subrule of packageRule.packageRules) {
|
|
// TODO: fix types #22198
|
|
const combinedRule = mergeChildConfig(
|
|
packageRule,
|
|
subrule as PackageRule,
|
|
);
|
|
// @ts-expect-error -- TODO: fix me
|
|
delete combinedRule.packageRules;
|
|
migratedConfig.packageRules.push(combinedRule);
|
|
}
|
|
} else {
|
|
migratedConfig.packageRules.push(packageRule);
|
|
}
|
|
}
|
|
}
|
|
if (
|
|
// @ts-expect-error -- TODO: fix me
|
|
isNonEmptyObject(migratedConfig['pip-compile']) &&
|
|
// @ts-expect-error -- TODO: fix me
|
|
isNonEmptyArray(migratedConfig['pip-compile'].managerFilePatterns)
|
|
) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig['pip-compile'].managerFilePatterns = migratedConfig[
|
|
'pip-compile'
|
|
].managerFilePatterns.map((filePattern) => {
|
|
const pattern = filePattern as string;
|
|
if (pattern.endsWith('.in')) {
|
|
return pattern.replace(regEx(/\.in$/), '.txt');
|
|
}
|
|
if (pattern.endsWith('.in/')) {
|
|
return pattern.replace(regEx(/\.in\/$/), '.txt/');
|
|
}
|
|
return pattern.replace(regEx(/\.in\$\/$/), '.txt$/');
|
|
});
|
|
}
|
|
if (
|
|
// @ts-expect-error -- TODO: fix me
|
|
isNonEmptyArray(migratedConfig.matchManagers) &&
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig.matchManagers.includes('gradle-lite')
|
|
) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
// v8 ignore else -- TODO: add test #40625
|
|
if (!migratedConfig.matchManagers.includes('gradle')) {
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig.matchManagers.push('gradle');
|
|
}
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig.matchManagers = migratedConfig.matchManagers.filter(
|
|
// @ts-expect-error -- TODO: fix me
|
|
(manager) => manager !== 'gradle-lite',
|
|
);
|
|
}
|
|
// @ts-expect-error -- TODO: fix me
|
|
if (isNonEmptyObject(migratedConfig['gradle-lite'])) {
|
|
migratedConfig.gradle = mergeChildConfig(
|
|
coerceObject(migratedConfig.gradle),
|
|
// @ts-expect-error -- TODO: fix me
|
|
migratedConfig['gradle-lite'],
|
|
);
|
|
}
|
|
// @ts-expect-error -- TODO: fix me
|
|
delete migratedConfig['gradle-lite'];
|
|
const isMigrated = !dequal(config, migratedConfig);
|
|
if (isMigrated) {
|
|
// recursive call in case any migrated configs need further migrating
|
|
return {
|
|
isMigrated,
|
|
migratedConfig: migrateConfig(migratedConfig).migratedConfig,
|
|
};
|
|
}
|
|
return { isMigrated, migratedConfig };
|
|
} catch (err) {
|
|
logger.debug({ config, err }, 'migrateConfig() error');
|
|
throw err;
|
|
}
|
|
}
|