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>
162 lines
3.6 KiB
TypeScript
162 lines
3.6 KiB
TypeScript
/**
|
|
* Inspired by https://github.com/alexdutton/www-authenticate
|
|
*/
|
|
import { regEx } from '../regex.ts';
|
|
|
|
interface Tokenizer {
|
|
type?: 'token' | 'equals' | 'comma';
|
|
matcher: RegExp;
|
|
}
|
|
interface ValueToken {
|
|
type: 'token' | 'equals' | 'comma';
|
|
value: string;
|
|
}
|
|
|
|
interface PairToken {
|
|
type: 'pair';
|
|
key: string;
|
|
value: string;
|
|
}
|
|
|
|
type Token = ValueToken | PairToken;
|
|
|
|
interface ChallengeToken {
|
|
scheme: string;
|
|
tokens: Token[];
|
|
}
|
|
|
|
export const BearerScheme = 'bearer' as const;
|
|
|
|
export interface SimpleChallenge {
|
|
scheme: 'basic';
|
|
params?: string;
|
|
}
|
|
export interface ParamsChallenge {
|
|
scheme: 'bearer' | 'digest';
|
|
params?: Record<string, string>;
|
|
}
|
|
|
|
export interface UnknownChallenge {
|
|
scheme: string;
|
|
params?: unknown;
|
|
}
|
|
|
|
export type Challenge = SimpleChallenge | ParamsChallenge | UnknownChallenge;
|
|
|
|
const tokenizer: Tokenizer[] = [
|
|
{ type: 'token', matcher: regEx(/^(?<value>[a-zA-Z0-9!#$%&'*+.^_`|~-]+)/) }, // token
|
|
{ type: 'token', matcher: regEx(/^"(?<value>(?:[^"\\]|\\\\|\\")*)"/) }, // quoted-string
|
|
{ matcher: regEx(/^\s+/) }, // whitespace (ignored)
|
|
{ type: 'equals', matcher: regEx(/^(?<value>=)/) }, // equals
|
|
{ type: 'comma', matcher: regEx(/^(?<value>,)/) }, // comma
|
|
];
|
|
|
|
function tokenize(input: string): Token[] {
|
|
const result: Token[] = [];
|
|
let remaining = input;
|
|
|
|
while (remaining.length > 0) {
|
|
let matched = false;
|
|
for (const t of tokenizer) {
|
|
const match = t.matcher.exec(remaining);
|
|
if (match) {
|
|
matched = true;
|
|
remaining = remaining.slice(match[0].length);
|
|
if (t.type) {
|
|
result.push({ type: t.type, value: match[1] });
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
if (!matched) {
|
|
throw new Error(`Failed to parse value`);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
function groupPairs(tokens: Token[]): Token[] {
|
|
for (let i = 0; i < tokens.length - 2; i++) {
|
|
if (
|
|
tokens[i].type === 'token' &&
|
|
tokens[i + 1].type === 'equals' &&
|
|
tokens[i + 2].type === 'token'
|
|
) {
|
|
tokens[i] = {
|
|
type: 'pair',
|
|
key: tokens[i].value,
|
|
value: tokens[i + 2].value,
|
|
};
|
|
tokens.splice(i + 1, 2);
|
|
}
|
|
}
|
|
|
|
return tokens;
|
|
}
|
|
|
|
function groupChallenges(tokens: Token[]): ChallengeToken[] {
|
|
const result: ChallengeToken[] = [];
|
|
while (tokens.length > 0) {
|
|
let j = 1;
|
|
if (tokens.length === 1) {
|
|
// pass
|
|
} else if (tokens[1].type === 'comma') {
|
|
// pass
|
|
} else if (tokens[1].type === 'token') {
|
|
j = 2;
|
|
} else {
|
|
while (j < tokens.length && tokens[j].type === 'pair') {
|
|
j += 2;
|
|
}
|
|
j--;
|
|
}
|
|
result.push({
|
|
scheme: tokens[0].value,
|
|
tokens: tokens.slice(1, j),
|
|
});
|
|
tokens.splice(0, j + 1);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
export function parse(header: string | string[]): Challenge[] {
|
|
const result: Challenge[] = [];
|
|
for (const h of Array.isArray(header) ? header : [header]) {
|
|
let tokens = tokenize(h);
|
|
|
|
if (!tokens.length) {
|
|
continue;
|
|
}
|
|
|
|
tokens = groupPairs(tokens);
|
|
|
|
for (const c of groupChallenges(tokens)) {
|
|
const args: string[] = [];
|
|
const params: Record<string, string> = {};
|
|
|
|
for (const t of c.tokens) {
|
|
switch (t.type) {
|
|
case 'token':
|
|
args.push(t.value);
|
|
break;
|
|
case 'pair':
|
|
params[t.key] = t.value;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (args.length) {
|
|
result.push({ scheme: c.scheme.toLowerCase(), params: args[0] });
|
|
} else if (Object.keys(params).length) {
|
|
result.push({ scheme: c.scheme.toLowerCase(), params });
|
|
} else {
|
|
result.push({ scheme: c.scheme.toLowerCase() });
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|