mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 09:41:46 +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>
247 lines
7.1 KiB
TypeScript
247 lines
7.1 KiB
TypeScript
import { isNonEmptyStringAndNotWhitespace, isString } from '@sindresorhus/is';
|
|
import type { XmlElement } from 'xmldoc';
|
|
import { XmlDocument } from 'xmldoc';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { getSiblingFileName, localPathExists } from '../../../util/fs/index.ts';
|
|
import { coerceObject } from '../../../util/object.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { NugetDatasource } from '../../datasource/nuget/index.ts';
|
|
import * as semver from '../../versioning/semver/index.ts';
|
|
import { getDep } from '../dockerfile/extract.ts';
|
|
import type {
|
|
ExtractConfig,
|
|
PackageDependency,
|
|
PackageFileContent,
|
|
} from '../types.ts';
|
|
import { extractMsbuildGlobalManifest } from './extract/global-manifest.ts';
|
|
import { extractPackagesFromSingleCsharpFile } from './extract/single-csharp-file.ts';
|
|
import type { DotnetToolsManifest, NugetPackageDependency } from './types.ts';
|
|
import {
|
|
applyRegistries,
|
|
findVersion,
|
|
getConfiguredRegistries,
|
|
isXmlElement,
|
|
} from './util.ts';
|
|
|
|
/**
|
|
* https://learn.microsoft.com/nuget/concepts/package-versioning
|
|
* This article mentions that Nuget 3.x and later tries to restore the lowest possible version
|
|
* regarding to given version range.
|
|
* 1.3.4 equals [1.3.4,)
|
|
*/
|
|
const elemNames = new Set([
|
|
'PackageReference',
|
|
'PackageVersion',
|
|
'DotNetCliToolReference',
|
|
'GlobalPackageReference',
|
|
]);
|
|
|
|
function extractDepsFromXml(xmlNode: XmlDocument): NugetPackageDependency[] {
|
|
const results: NugetPackageDependency[] = [];
|
|
const vars = new Map<string, string>();
|
|
const todo: XmlElement[] = [xmlNode];
|
|
while (todo.length) {
|
|
const child = todo.pop()!;
|
|
const { name, attr } = child;
|
|
|
|
if (name === 'ContainerBaseImage') {
|
|
const { depName, ...dep } = getDep(child.val, true);
|
|
|
|
if (isNonEmptyStringAndNotWhitespace(depName)) {
|
|
results.push({ ...dep, depName, depType: 'docker' });
|
|
}
|
|
} else if (elemNames.has(name)) {
|
|
const depName = attr?.Include || attr?.Update;
|
|
|
|
if (!depName) {
|
|
continue;
|
|
}
|
|
|
|
const dep: NugetPackageDependency = {
|
|
datasource: NugetDatasource.id,
|
|
depType: 'nuget',
|
|
depName,
|
|
};
|
|
|
|
let currentValue: string | undefined =
|
|
attr?.Version ??
|
|
attr?.version ??
|
|
child.valueWithPath('Version') ??
|
|
attr?.VersionOverride ??
|
|
child.valueWithPath('VersionOverride');
|
|
|
|
if (!isNonEmptyStringAndNotWhitespace(currentValue)) {
|
|
dep.skipReason = 'invalid-version';
|
|
}
|
|
|
|
let sharedVariableName: string | undefined;
|
|
|
|
currentValue = currentValue
|
|
?.trim()
|
|
?.replace(regEx(/^\$\((?<key>\w+)\)$/), (match, key) => {
|
|
sharedVariableName = key;
|
|
const val = vars.get(key);
|
|
if (val) {
|
|
return val;
|
|
}
|
|
return match;
|
|
});
|
|
|
|
if (sharedVariableName) {
|
|
if (currentValue === `$(${sharedVariableName})`) {
|
|
// this means that be failed to find/replace the variable
|
|
dep.skipReason = 'contains-variable';
|
|
} else {
|
|
dep.sharedVariableName = sharedVariableName;
|
|
}
|
|
}
|
|
|
|
dep.currentValue = currentValue;
|
|
results.push(dep);
|
|
} else if (name === 'Sdk') {
|
|
const depName = attr?.Name;
|
|
const version = attr?.Version;
|
|
// if sdk element is present it will always have the Name field but the Version is an optional field
|
|
if (depName && version) {
|
|
results.push({
|
|
depName,
|
|
currentValue: version,
|
|
depType: 'msbuild-sdk',
|
|
datasource: NugetDatasource.id,
|
|
});
|
|
}
|
|
} else if (name === 'Import') {
|
|
const depName = attr?.Sdk;
|
|
const version = attr?.Version;
|
|
if (depName && version) {
|
|
results.push({
|
|
depName,
|
|
currentValue: version,
|
|
depType: 'msbuild-sdk',
|
|
datasource: NugetDatasource.id,
|
|
});
|
|
}
|
|
} else {
|
|
if (name === 'Project') {
|
|
if (attr?.Sdk) {
|
|
const str = attr?.Sdk;
|
|
const [name, version] = str.split('/');
|
|
if (name && version) {
|
|
results.push({
|
|
depName: name,
|
|
depType: 'msbuild-sdk',
|
|
currentValue: version,
|
|
datasource: NugetDatasource.id,
|
|
});
|
|
}
|
|
}
|
|
|
|
const propertyGroup = child.childNamed('PropertyGroup');
|
|
if (propertyGroup) {
|
|
for (const propChild of propertyGroup.children) {
|
|
if (isXmlElement(propChild)) {
|
|
const { name, val } = propChild;
|
|
if (!['Version', 'TargetFramework'].includes(name)) {
|
|
vars.set(name, val);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
todo.push(...child.children.filter(isXmlElement));
|
|
}
|
|
}
|
|
return results;
|
|
}
|
|
|
|
export async function extractPackageFile(
|
|
content: string,
|
|
packageFile: string,
|
|
_config: ExtractConfig,
|
|
): Promise<PackageFileContent | null> {
|
|
logger.trace(`nuget.extractPackageFile(${packageFile})`);
|
|
|
|
const registries = await getConfiguredRegistries(packageFile);
|
|
|
|
if (packageFile.endsWith('dotnet-tools.json')) {
|
|
const deps: PackageDependency[] = [];
|
|
let manifest: DotnetToolsManifest;
|
|
|
|
try {
|
|
manifest = JSON.parse(content);
|
|
} catch {
|
|
logger.debug({ packageFile }, `Invalid JSON`);
|
|
return null;
|
|
}
|
|
|
|
if (manifest.version !== 1) {
|
|
logger.debug({ packageFile }, 'Unsupported dotnet tools version');
|
|
return null;
|
|
}
|
|
|
|
for (const depName of Object.keys(coerceObject(manifest.tools))) {
|
|
const tool = manifest.tools[depName];
|
|
const currentValue = tool.version;
|
|
const dep: NugetPackageDependency = {
|
|
depType: 'nuget',
|
|
depName,
|
|
currentValue,
|
|
datasource: NugetDatasource.id,
|
|
};
|
|
if (isString(currentValue) && semver.isVersion(currentValue)) {
|
|
// This is to avoid nuget versioning pinning to [1.2.3]
|
|
dep.versioning = 'semver';
|
|
}
|
|
|
|
applyRegistries(dep, registries);
|
|
|
|
deps.push(dep);
|
|
}
|
|
|
|
return deps.length ? { deps } : null;
|
|
}
|
|
|
|
if (packageFile.endsWith('global.json')) {
|
|
return extractMsbuildGlobalManifest(content, packageFile, registries);
|
|
}
|
|
|
|
if (packageFile.endsWith('.cs')) {
|
|
return extractPackagesFromSingleCsharpFile(
|
|
content,
|
|
packageFile,
|
|
registries,
|
|
);
|
|
}
|
|
|
|
// Simple xml validation.
|
|
// Should start with `<` and end with `>` after trimming all whitespace
|
|
if (!regEx(/^\s*<.+>$/m).test(content.trim())) {
|
|
logger.debug(`NuGet: Skipping ${packageFile} as it is not XML`);
|
|
return null;
|
|
}
|
|
|
|
let deps: PackageDependency[] = [];
|
|
let packageFileVersion: string | undefined;
|
|
try {
|
|
const parsedXml = new XmlDocument(content);
|
|
deps = extractDepsFromXml(parsedXml).map((dep) =>
|
|
applyRegistries(dep, registries),
|
|
);
|
|
packageFileVersion = findVersion(parsedXml)?.val;
|
|
} catch (err) {
|
|
logger.debug({ err, packageFile }, `Failed to parse XML`);
|
|
}
|
|
|
|
if (!deps.length) {
|
|
return null;
|
|
}
|
|
|
|
const res: PackageFileContent = { deps, packageFileVersion };
|
|
const lockFileName = getSiblingFileName(packageFile, 'packages.lock.json');
|
|
if (await localPathExists(lockFileName)) {
|
|
res.lockFiles = [lockFileName];
|
|
}
|
|
return res;
|
|
}
|