mirror of
https://github.com/renovatebot/renovate.git
synced 2026-11-02 02:29:51 +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>
291 lines
9.1 KiB
TypeScript
291 lines
9.1 KiB
TypeScript
import {
|
|
isNonEmptyArray,
|
|
isNonEmptyObject,
|
|
isNumber,
|
|
isString,
|
|
} from '@sindresorhus/is';
|
|
import { Duration } from 'luxon';
|
|
import { quote } from 'shlex';
|
|
import { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import type { HostRule } from '../../../types/index.ts';
|
|
import { coerceArray } from '../../../util/array.ts';
|
|
import type { ExecOptions } from '../../../util/exec/types.ts';
|
|
import {
|
|
deleteLocalFile,
|
|
ensureCacheDir,
|
|
getSiblingFileName,
|
|
readLocalFile,
|
|
writeLocalFile,
|
|
} from '../../../util/fs/index.ts';
|
|
import { withGitEnvironment } from '../../../util/git/exec.ts';
|
|
import { find } from '../../../util/host-rules.ts';
|
|
import { toMs } from '../../../util/pretty-time.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { Result } from '../../../util/result.ts';
|
|
import {
|
|
massage as massageToml,
|
|
parse as parseToml,
|
|
} from '../../../util/toml.ts';
|
|
import { parseUrl } from '../../../util/url.ts';
|
|
import { PypiDatasource } from '../../datasource/pypi/index.ts';
|
|
import { getGoogleAuthHostRule } from '../../datasource/util.ts';
|
|
import type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';
|
|
import { Lockfile, PoetryPyProject } from './schema.ts';
|
|
import type { PoetryFile, PoetrySource } from './types.ts';
|
|
|
|
const gitExec = withGitEnvironment(['poetry']);
|
|
|
|
export function getPythonConstraint(
|
|
pyProjectContent: string,
|
|
existingLockFileContent: string,
|
|
): string | null {
|
|
// Read Python version from `pyproject.toml` first as it could have been updated
|
|
const pyprojectPythonConstraint = Result.parse(
|
|
massageToml(pyProjectContent),
|
|
PoetryPyProject.transform(
|
|
({ packageFileContent }) =>
|
|
packageFileContent.deps.find((dep) => dep.depName === 'python')
|
|
?.currentValue,
|
|
),
|
|
).unwrapOrNull();
|
|
if (pyprojectPythonConstraint) {
|
|
logger.debug('Using python version from pyproject.toml');
|
|
return pyprojectPythonConstraint;
|
|
}
|
|
|
|
const lockfilePythonConstraint = Result.parse(
|
|
existingLockFileContent,
|
|
Lockfile.transform(({ pythonVersions }) => pythonVersions),
|
|
).unwrapOrNull();
|
|
if (lockfilePythonConstraint) {
|
|
logger.debug('Using python version from poetry.lock');
|
|
return lockfilePythonConstraint;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
export function getPoetryRequirement(
|
|
pyProjectContent: string,
|
|
existingLockFileContent: string,
|
|
): undefined | string | null {
|
|
// Read Poetry version from first line of poetry.lock
|
|
const firstLine = existingLockFileContent.split('\n')[0];
|
|
const poetryVersionMatch = regEx(/by Poetry (?<version>[\d\\.]+)/).exec(
|
|
firstLine,
|
|
);
|
|
if (poetryVersionMatch?.groups?.version) {
|
|
const poetryVersion = poetryVersionMatch.groups.version;
|
|
logger.debug(
|
|
`Using poetry version ${poetryVersion} from poetry.lock header`,
|
|
);
|
|
return poetryVersion;
|
|
}
|
|
|
|
const { val: lockfilePoetryConstraint } = Result.parse(
|
|
existingLockFileContent,
|
|
Lockfile.transform(({ poetryConstraint }) => poetryConstraint),
|
|
).unwrap();
|
|
if (lockfilePoetryConstraint) {
|
|
logger.debug(
|
|
`Using poetry version ${lockfilePoetryConstraint} from poetry.lock metadata`,
|
|
);
|
|
return lockfilePoetryConstraint;
|
|
}
|
|
|
|
const { val: pyprojectPoetryConstraint } = Result.parse(
|
|
massageToml(pyProjectContent),
|
|
PoetryPyProject.transform(({ poetryRequirement }) => poetryRequirement),
|
|
).unwrap();
|
|
if (pyprojectPoetryConstraint) {
|
|
logger.debug(
|
|
`Using poetry version ${pyprojectPoetryConstraint} from pyproject.toml`,
|
|
);
|
|
return pyprojectPoetryConstraint;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
function getPoetrySources(content: string, fileName: string): PoetrySource[] {
|
|
let pyprojectFile: PoetryFile;
|
|
try {
|
|
pyprojectFile = parseToml(massageToml(content)) as PoetryFile;
|
|
} catch (err) {
|
|
logger.debug({ err }, 'Error parsing pyproject.toml file');
|
|
return [];
|
|
}
|
|
if (!pyprojectFile.tool?.poetry) {
|
|
logger.debug(`${fileName} contains no poetry section`);
|
|
return [];
|
|
}
|
|
|
|
const sources = coerceArray(pyprojectFile.tool?.poetry?.source);
|
|
const sourceArray: PoetrySource[] = [];
|
|
for (const source of sources) {
|
|
if (source.name && source.url) {
|
|
sourceArray.push({ name: source.name, url: source.url });
|
|
}
|
|
}
|
|
return sourceArray;
|
|
}
|
|
|
|
async function getMatchingHostRule(url: string | undefined): Promise<HostRule> {
|
|
const scopedMatch = find({ hostType: PypiDatasource.id, url });
|
|
const hostRule = isNonEmptyObject(scopedMatch) ? scopedMatch : find({ url });
|
|
if (hostRule && Object.keys(hostRule).length !== 0) {
|
|
return hostRule;
|
|
}
|
|
|
|
const parsedUrl = parseUrl(url);
|
|
if (!parsedUrl) {
|
|
logger.once.debug(`Failed to parse URL ${url}`);
|
|
return {};
|
|
}
|
|
|
|
if (parsedUrl.hostname.endsWith('.pkg.dev')) {
|
|
const hostRule = await getGoogleAuthHostRule();
|
|
if (hostRule && Object.keys(hostRule).length !== 0) {
|
|
return hostRule;
|
|
}
|
|
logger.once.debug(`Could not get Google access token (url=${url})`);
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
async function getSourceCredentialVars(
|
|
pyprojectContent: string,
|
|
packageFileName: string,
|
|
): Promise<NodeJS.ProcessEnv> {
|
|
const poetrySources = getPoetrySources(pyprojectContent, packageFileName);
|
|
const envVars: NodeJS.ProcessEnv = {};
|
|
|
|
for (const source of poetrySources) {
|
|
const matchingHostRule = await getMatchingHostRule(source.url);
|
|
const formattedSourceName = source.name
|
|
.replace(regEx(/(?:\.|-)+/g), '_')
|
|
.toUpperCase();
|
|
if (matchingHostRule.username) {
|
|
envVars[`POETRY_HTTP_BASIC_${formattedSourceName}_USERNAME`] =
|
|
matchingHostRule.username;
|
|
}
|
|
if (matchingHostRule.password) {
|
|
envVars[`POETRY_HTTP_BASIC_${formattedSourceName}_PASSWORD`] =
|
|
matchingHostRule.password;
|
|
}
|
|
}
|
|
return envVars;
|
|
}
|
|
|
|
export async function updateArtifacts({
|
|
packageFileName,
|
|
updatedDeps,
|
|
newPackageFileContent,
|
|
config,
|
|
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
|
|
logger.debug(`poetry.updateArtifacts(${packageFileName})`);
|
|
const { isLockFileMaintenance } = config;
|
|
|
|
if (!isNonEmptyArray(updatedDeps) && !isLockFileMaintenance) {
|
|
logger.debug('No updated poetry deps - returning null');
|
|
return null;
|
|
}
|
|
// Try poetry.lock first
|
|
let lockFileName = getSiblingFileName(packageFileName, 'poetry.lock');
|
|
let existingLockFileContent = await readLocalFile(lockFileName, 'utf8');
|
|
if (!existingLockFileContent) {
|
|
// Try pyproject.lock next
|
|
lockFileName = getSiblingFileName(packageFileName, 'pyproject.lock');
|
|
existingLockFileContent = await readLocalFile(lockFileName, 'utf8');
|
|
if (!existingLockFileContent) {
|
|
logger.debug(`No lock file found`);
|
|
return null;
|
|
}
|
|
}
|
|
logger.debug(`Updating ${lockFileName}`);
|
|
try {
|
|
await writeLocalFile(packageFileName, newPackageFileContent);
|
|
const cmd: string[] = [];
|
|
if (isLockFileMaintenance) {
|
|
await deleteLocalFile(lockFileName);
|
|
cmd.push('poetry update --lock --no-interaction');
|
|
} else {
|
|
cmd.push(
|
|
`poetry update --lock --no-interaction ${updatedDeps
|
|
.map((dep) => dep.depName)
|
|
.filter(isString)
|
|
.map((dep) => quote(dep))
|
|
.join(' ')}`,
|
|
);
|
|
}
|
|
const pythonConstraint =
|
|
config?.constraints?.python ??
|
|
getPythonConstraint(newPackageFileContent, existingLockFileContent);
|
|
const poetryConstraint =
|
|
config.constraints?.poetry ??
|
|
getPoetryRequirement(newPackageFileContent, existingLockFileContent);
|
|
const extraEnv: NodeJS.ProcessEnv = {
|
|
...(await getSourceCredentialVars(
|
|
newPackageFileContent,
|
|
packageFileName,
|
|
)),
|
|
PIP_CACHE_DIR: await ensureCacheDir('pip'),
|
|
};
|
|
|
|
if (config.minimumReleaseAge) {
|
|
const ageMs = toMs(config.minimumReleaseAge);
|
|
if (isNumber(ageMs)) {
|
|
const days = Math.ceil(Duration.fromMillis(ageMs).as('days'));
|
|
extraEnv.POETRY_SOLVER_MIN_RELEASE_AGE = days.toString();
|
|
} else {
|
|
logger.debug(
|
|
{ minimumReleaseAge: config.minimumReleaseAge },
|
|
'Invalid minimumReleaseAge, skipping POETRY_SOLVER_MIN_RELEASE_AGE',
|
|
);
|
|
}
|
|
}
|
|
|
|
const execOptions: ExecOptions = {
|
|
cwdFile: packageFileName,
|
|
extraEnv,
|
|
docker: {},
|
|
toolConstraints: [
|
|
{ toolName: 'python', constraint: pythonConstraint },
|
|
{ toolName: 'poetry', constraint: poetryConstraint },
|
|
],
|
|
};
|
|
await gitExec(cmd, execOptions);
|
|
const newPoetryLockContent = await readLocalFile(lockFileName, 'utf8');
|
|
if (existingLockFileContent === newPoetryLockContent) {
|
|
logger.debug(`${lockFileName} is unchanged`);
|
|
return null;
|
|
}
|
|
logger.debug(`Returning updated ${lockFileName}`);
|
|
return [
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: lockFileName,
|
|
contents: newPoetryLockContent,
|
|
},
|
|
},
|
|
];
|
|
} catch (err) {
|
|
// istanbul ignore if
|
|
if (err.message === TEMPORARY_ERROR) {
|
|
throw err;
|
|
}
|
|
logger.debug({ err }, `Failed to update ${lockFileName} file`);
|
|
return [
|
|
{
|
|
artifactError: {
|
|
fileName: lockFileName,
|
|
stderr: `${String(err.stdout)}\n${String(err.stderr)}`,
|
|
},
|
|
},
|
|
];
|
|
}
|
|
}
|