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>
416 lines
12 KiB
TypeScript
416 lines
12 KiB
TypeScript
import { detectPlatform } from '../../../util/common.ts';
|
|
import { getHttpUrl } from '../../../util/git/url.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { parseUrl } from '../../../util/url.ts';
|
|
import { GitTagsDatasource } from '../../datasource/git-tags/index.ts';
|
|
import { GithubTagsDatasource } from '../../datasource/github-tags/index.ts';
|
|
import { GitlabTagsDatasource } from '../../datasource/gitlab-tags/index.ts';
|
|
import type { PackageDependency, PackageFileContent } from '../types.ts';
|
|
import type { MatchResult } from './types.ts';
|
|
|
|
const regExps = {
|
|
wildcard: regEx(/^.*?/),
|
|
space: regEx(/(?:\s+|\/\/[^\n]*|\/\*.*\*\/)+/s),
|
|
depsKeyword: regEx(/dependencies/),
|
|
colon: regEx(/:/),
|
|
beginSection: regEx(/\[/),
|
|
endSection: regEx(/],?/),
|
|
package: regEx(/\s*.\s*package\s*\(\s*/),
|
|
urlKey: regEx(/url/),
|
|
stringLiteral: regEx(/"[^"]+"/),
|
|
comma: regEx(/,/),
|
|
from: regEx(/from/),
|
|
rangeOp: regEx(/\.\.[.<]/),
|
|
exactVersion: regEx(/\.\s*exact\s*\(\s*/),
|
|
exactVersionLabel: regEx(/\s*exact:/),
|
|
traitsLabel: regEx(/\s*traits\s*:/),
|
|
// This pattern consumes any `traits` content until the next package declaration,
|
|
// as the traits syntax can be quite complex and does not need to be parsed in detail for package extraction.
|
|
traitsConsumeToNextPackage: regEx(/.*\.\s*package\s*\(\s*/),
|
|
};
|
|
|
|
const WILDCARD = 'wildcard';
|
|
const SPACE = 'space';
|
|
const DEPS = 'depsKeyword';
|
|
const COLON = 'colon';
|
|
const BEGIN_SECTION = 'beginSection';
|
|
const END_SECTION = 'endSection';
|
|
const PACKAGE = 'package';
|
|
const URL_KEY = 'urlKey';
|
|
const STRING_LITERAL = 'stringLiteral';
|
|
const COMMA = 'comma';
|
|
const FROM = 'from';
|
|
const RANGE_OP = 'rangeOp';
|
|
const EXACT_VERSION = 'exactVersion';
|
|
const EXACT_VERSION_LABEL = 'exactVersionLabel';
|
|
const TRAITS_LABEL = 'traitsLabel';
|
|
const TRAITS_CONSUME_TO_NEXT_PACKAGE = 'traitsConsumeToNextPackage';
|
|
|
|
const searchLabels = {
|
|
wildcard: WILDCARD,
|
|
space: SPACE,
|
|
depsKeyword: DEPS,
|
|
colon: COLON,
|
|
beginSection: BEGIN_SECTION,
|
|
endSection: END_SECTION,
|
|
package: PACKAGE,
|
|
urlKey: URL_KEY,
|
|
stringLiteral: STRING_LITERAL,
|
|
comma: COMMA,
|
|
from: FROM,
|
|
rangeOp: RANGE_OP,
|
|
exactVersion: EXACT_VERSION,
|
|
exactVersionLabel: EXACT_VERSION_LABEL,
|
|
traitsLabel: TRAITS_LABEL,
|
|
traitsConsumeToNextPackage: TRAITS_CONSUME_TO_NEXT_PACKAGE,
|
|
};
|
|
|
|
function searchKeysForState(state: string | null): (keyof typeof regExps)[] {
|
|
switch (state) {
|
|
case 'dependencies':
|
|
return [SPACE, COLON, WILDCARD];
|
|
case 'dependencies:':
|
|
return [SPACE, BEGIN_SECTION, WILDCARD];
|
|
case 'dependencies: [':
|
|
return [SPACE, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(':
|
|
return [SPACE, URL_KEY, PACKAGE, END_SECTION];
|
|
case '.package(url':
|
|
return [SPACE, COLON, PACKAGE, END_SECTION];
|
|
case '.package(url:':
|
|
return [SPACE, STRING_LITERAL, PACKAGE, END_SECTION];
|
|
case '.package(url: [depName]':
|
|
return [SPACE, COMMA, PACKAGE, END_SECTION];
|
|
case '.package(url: [depName],':
|
|
return [
|
|
SPACE,
|
|
FROM,
|
|
STRING_LITERAL,
|
|
RANGE_OP,
|
|
EXACT_VERSION,
|
|
EXACT_VERSION_LABEL,
|
|
PACKAGE,
|
|
END_SECTION,
|
|
];
|
|
case '.package(url: [depName], .exact(':
|
|
return [SPACE, STRING_LITERAL, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(url: [depName], exact:':
|
|
return [SPACE, STRING_LITERAL, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(url: [depName], from':
|
|
return [SPACE, COLON, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(url: [depName], from:':
|
|
return [SPACE, STRING_LITERAL, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(url: [depName], [value]':
|
|
return [SPACE, RANGE_OP, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case '.package(url: [depName], [rangeFrom][rangeOp]':
|
|
return [SPACE, STRING_LITERAL, PACKAGE, COMMA, TRAITS_LABEL, END_SECTION];
|
|
case 'traits:':
|
|
return [SPACE, TRAITS_CONSUME_TO_NEXT_PACKAGE];
|
|
default:
|
|
return [DEPS];
|
|
}
|
|
}
|
|
function getMatch(str: string, state: string | null): MatchResult | null {
|
|
const keys = searchKeysForState(state);
|
|
let result: MatchResult | null = null;
|
|
for (const key of keys) {
|
|
const regex = regExps[key];
|
|
const label = searchLabels[key];
|
|
const match = regex.exec(str);
|
|
if (match) {
|
|
const idx = match.index;
|
|
const substr = match[0];
|
|
const len = substr.length;
|
|
if (idx === 0) {
|
|
return { idx, len, label, substr };
|
|
}
|
|
if (!result || idx < result.idx) {
|
|
result = { idx, len, label, substr };
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function parseDependencyUrl(
|
|
url: string | null,
|
|
): { depName: string; datasource: string; registryUrls?: string[] } | null {
|
|
// istanbul ignore if
|
|
if (!url) {
|
|
return null;
|
|
}
|
|
|
|
let normalizedUrl: string;
|
|
try {
|
|
normalizedUrl = getHttpUrl(url);
|
|
} catch {
|
|
return null;
|
|
}
|
|
|
|
const parsedUrl = parseUrl(normalizedUrl);
|
|
// v8 ignore if -- getHttpUrl always returns a parseable URL
|
|
if (!parsedUrl) {
|
|
return null;
|
|
}
|
|
const { host, pathname, protocol } = parsedUrl;
|
|
const platform = detectPlatform(normalizedUrl);
|
|
if (platform === 'github' || platform === 'gitlab') {
|
|
const depName = pathname
|
|
.replace(regEx(/^\//), '')
|
|
.replace(regEx(/\.git$/), '')
|
|
.replace(regEx(/\/$/), '');
|
|
const datasource =
|
|
platform === 'github' ? GithubTagsDatasource.id : GitlabTagsDatasource.id;
|
|
|
|
const isGitHubPublic = host === 'github.com';
|
|
const isGitLabPublic = host === 'gitlab.com';
|
|
|
|
if (!isGitHubPublic && !isGitLabPublic) {
|
|
const baseUrl = `${protocol}//${host}`;
|
|
return { depName, datasource, registryUrls: [baseUrl] };
|
|
}
|
|
|
|
return { depName, datasource };
|
|
}
|
|
return { depName: url, datasource: GitTagsDatasource.id };
|
|
}
|
|
|
|
export function extractPackageFile(content: string): PackageFileContent | null {
|
|
if (!content) {
|
|
return null;
|
|
}
|
|
|
|
const deps: PackageDependency[] = [];
|
|
const result: PackageFileContent = {
|
|
deps,
|
|
};
|
|
|
|
let restStr = content;
|
|
let state: string | null = null;
|
|
let match = getMatch(restStr, state);
|
|
|
|
let packageName: string | null = null;
|
|
let currentValue: string | null = null;
|
|
|
|
function yieldDep(): void {
|
|
// istanbul ignore if
|
|
if (!packageName) {
|
|
return;
|
|
}
|
|
const parsedUrl = parseDependencyUrl(packageName);
|
|
if (parsedUrl && currentValue) {
|
|
const { depName, datasource, registryUrls } = parsedUrl;
|
|
|
|
const dep: PackageDependency = {
|
|
datasource,
|
|
depName,
|
|
currentValue,
|
|
...(registryUrls?.length && { registryUrls }),
|
|
};
|
|
|
|
deps.push(dep);
|
|
}
|
|
packageName = null;
|
|
currentValue = null;
|
|
}
|
|
|
|
while (match) {
|
|
const { idx, len, label, substr } = match;
|
|
|
|
switch (state) {
|
|
case null:
|
|
if (deps.length) {
|
|
break;
|
|
}
|
|
if (label === DEPS) {
|
|
state = 'dependencies';
|
|
}
|
|
break;
|
|
case 'dependencies':
|
|
if (label === COLON) {
|
|
state = 'dependencies:';
|
|
} else if (label !== SPACE) {
|
|
state = null;
|
|
}
|
|
break;
|
|
case 'dependencies:':
|
|
if (label === BEGIN_SECTION) {
|
|
state = 'dependencies: [';
|
|
} else if (label !== SPACE) {
|
|
state = null;
|
|
}
|
|
break;
|
|
case 'dependencies: [':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
} else if (label === TRAITS_LABEL) {
|
|
state = 'traits:';
|
|
}
|
|
break;
|
|
case '.package(':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === URL_KEY) {
|
|
state = '.package(url';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
}
|
|
break;
|
|
case '.package(url':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === COLON) {
|
|
state = '.package(url:';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url:':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === STRING_LITERAL) {
|
|
packageName = substr
|
|
.replace(regEx(/^"/), '')
|
|
.replace(regEx(/"$/), '');
|
|
state = '.package(url: [depName]';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName]':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === COMMA) {
|
|
state = '.package(url: [depName],';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName],':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === FROM) {
|
|
currentValue = substr;
|
|
state = '.package(url: [depName], from';
|
|
} else if (label === STRING_LITERAL) {
|
|
currentValue = substr;
|
|
state = '.package(url: [depName], [value]';
|
|
} else if (label === RANGE_OP) {
|
|
currentValue = substr;
|
|
state = '.package(url: [depName], [rangeFrom][rangeOp]';
|
|
} else if (label === EXACT_VERSION) {
|
|
state = '.package(url: [depName], .exact(';
|
|
} else if (label === EXACT_VERSION_LABEL) {
|
|
state = '.package(url: [depName], exact:';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], .exact(':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === STRING_LITERAL) {
|
|
currentValue = substr.slice(1, substr.length - 1);
|
|
yieldDep();
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], exact:':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === STRING_LITERAL) {
|
|
currentValue = substr.slice(1, substr.length - 1);
|
|
yieldDep();
|
|
state = 'dependencies: [';
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], from':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === COLON) {
|
|
currentValue += substr;
|
|
state = '.package(url: [depName], from:';
|
|
} else if (label === SPACE) {
|
|
currentValue += substr;
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], from:':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === STRING_LITERAL) {
|
|
currentValue += substr;
|
|
yieldDep();
|
|
state = 'dependencies: [';
|
|
} else if (label === SPACE) {
|
|
currentValue += substr;
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], [value]':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === RANGE_OP) {
|
|
currentValue += substr;
|
|
state = '.package(url: [depName], [rangeFrom][rangeOp]';
|
|
} else if (label === SPACE) {
|
|
currentValue += substr;
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case '.package(url: [depName], [rangeFrom][rangeOp]':
|
|
if (label === END_SECTION) {
|
|
yieldDep();
|
|
state = null;
|
|
} else if (label === STRING_LITERAL) {
|
|
currentValue += substr;
|
|
state = 'dependencies: [';
|
|
} else if (label === SPACE) {
|
|
currentValue += substr;
|
|
} else if (label === PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
case 'traits:':
|
|
if (label === TRAITS_CONSUME_TO_NEXT_PACKAGE) {
|
|
yieldDep();
|
|
state = '.package(';
|
|
}
|
|
break;
|
|
}
|
|
restStr = restStr.slice(idx + len);
|
|
match = getMatch(restStr, state);
|
|
}
|
|
return deps.length ? result : null;
|
|
}
|