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>
205 lines
6.5 KiB
JavaScript
205 lines
6.5 KiB
JavaScript
// Custom prettier plugin to preserve MkDocs/Material admonitions (!!! / ??? / ???+).
|
|
// Prettier 3.x does not understand this non-standard CommonMark extension
|
|
// and corrupts the indented body by reflowing it into preceding paragraphs.
|
|
//
|
|
// Strategy: before the built-in markdown parser runs, replace each admonition
|
|
// block with an HTML comment placeholder; after parsing, restore the original
|
|
// text in the resulting html AST nodes. Prettier prints html nodes verbatim.
|
|
//
|
|
// Known limitations:
|
|
// - Nested admonitions are preserved verbatim (outer block is masked as one unit).
|
|
import markdownPlugin from 'prettier/plugins/markdown';
|
|
|
|
const ADMONITION_HEADER =
|
|
/^(?:!!!|\?\?\?\+?)\s+[A-Za-z][\w-]*(?:\s+"[^"\n]*")?\s*$/;
|
|
const BODY_LINE = /^(?:$|\s{2,})/;
|
|
const PLACEHOLDER_RE = /^<!--mkdocs-admonition:(?<index>\d+)-->\s*$/;
|
|
const COLLISION_GUARD = 'mkdocs-admonition:';
|
|
// When <!-- prettier-ignore --> precedes an admonition, prettier will attempt
|
|
// to output the *next* AST node verbatim using original-text offsets that come
|
|
// from the masked text — causing a position mismatch and a runtime error.
|
|
// Fix: absorb <!-- prettier-ignore --> into the admonition placeholder so it
|
|
// never precedes a placeholder node in the masked text.
|
|
// Matches both spaced (<!-- prettier-ignore -->) and compact (<!--prettier-ignore-->) forms.
|
|
const PRETTIER_IGNORE_RE = /^<!--\s*prettier-ignore\s*-->$/;
|
|
|
|
/** @param {string[]} bodyLines */
|
|
function normalizeBodyIndent(bodyLines) {
|
|
let minIndent = Infinity;
|
|
for (const line of bodyLines) {
|
|
if (line.trim() === '') {
|
|
continue;
|
|
}
|
|
const m = /^(?<indent>\s*)/.exec(line);
|
|
if (m?.groups) {
|
|
minIndent = Math.min(minIndent, m.groups.indent.length);
|
|
}
|
|
}
|
|
if (minIndent === Infinity || minIndent === 2) {
|
|
return bodyLines;
|
|
}
|
|
return bodyLines.map((line) =>
|
|
line.trim() === '' ? '' : ` ${line.slice(minIndent)}`,
|
|
);
|
|
}
|
|
|
|
/** @param {string} text */
|
|
function maskAdmonitions(text) {
|
|
const lines = text.split('\n');
|
|
const placeholders = [];
|
|
const masked = [];
|
|
let inFence = false;
|
|
let fenceChar = '';
|
|
let fenceLen = 0;
|
|
|
|
let i = 0;
|
|
while (i < lines.length) {
|
|
const line = lines[i];
|
|
|
|
if (inFence) {
|
|
// Closing fence: same char, at least as many chars, no content after
|
|
const closeMatch = /^\s{0,3}(?<fence>`{3,}|~{3,})\s*$/.exec(line);
|
|
const closeFence = closeMatch?.groups?.fence;
|
|
if (closeFence?.[0] === fenceChar && closeFence.length >= fenceLen) {
|
|
inFence = false;
|
|
}
|
|
masked.push(line);
|
|
i++;
|
|
continue;
|
|
}
|
|
|
|
// Opening fence: 0-3 spaces then 3+ backticks or tildes
|
|
const fenceMatch = /^\s{0,3}(?<fence>`{3,}|~{3,})/.exec(line);
|
|
if (fenceMatch?.groups) {
|
|
inFence = true;
|
|
fenceChar = fenceMatch.groups.fence[0];
|
|
fenceLen = fenceMatch.groups.fence.length;
|
|
masked.push(line);
|
|
i++;
|
|
continue;
|
|
}
|
|
|
|
// When <!-- prettier-ignore --> precedes an admonition, absorb both into
|
|
// one placeholder so the ignore comment never precedes a placeholder node.
|
|
if (PRETTIER_IGNORE_RE.test(line)) {
|
|
let peekIdx = i + 1;
|
|
while (peekIdx < lines.length && lines[peekIdx] === '') {
|
|
peekIdx++;
|
|
}
|
|
if (peekIdx < lines.length && ADMONITION_HEADER.test(lines[peekIdx])) {
|
|
const prefixLines = [line]; // <!-- prettier-ignore -->
|
|
i++;
|
|
while (i < peekIdx) {
|
|
prefixLines.push(lines[i]); // blank lines between ignore and !!!
|
|
i++;
|
|
}
|
|
prefixLines.push(lines[i]); // !!! header
|
|
i++;
|
|
const bodyLines = [];
|
|
while (i < lines.length && BODY_LINE.test(lines[i])) {
|
|
bodyLines.push(lines[i]);
|
|
i++;
|
|
}
|
|
while (bodyLines.length > 0 && bodyLines.at(-1) === '') {
|
|
bodyLines.pop();
|
|
i--;
|
|
}
|
|
const blockLines = [...prefixLines, ...normalizeBodyIndent(bodyLines)];
|
|
const n = placeholders.length;
|
|
placeholders.push(blockLines.join('\n'));
|
|
masked.push(`<!--mkdocs-admonition:${n}-->`);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (ADMONITION_HEADER.test(line)) {
|
|
i++;
|
|
const bodyLines = [];
|
|
|
|
// Greedily consume body: blank lines and 2+-space-indented lines
|
|
while (i < lines.length && BODY_LINE.test(lines[i])) {
|
|
bodyLines.push(lines[i]);
|
|
i++;
|
|
}
|
|
|
|
// Strip trailing blank lines to avoid double-blank in prettier output;
|
|
// they will be re-emitted to the masked stream as normal blank lines.
|
|
while (bodyLines.length > 0 && bodyLines.at(-1) === '') {
|
|
bodyLines.pop();
|
|
i--;
|
|
}
|
|
|
|
const blockLines = [line, ...normalizeBodyIndent(bodyLines)];
|
|
const n = placeholders.length;
|
|
placeholders.push(blockLines.join('\n'));
|
|
masked.push(`<!--mkdocs-admonition:${n}-->`);
|
|
continue;
|
|
}
|
|
|
|
masked.push(line);
|
|
i++;
|
|
}
|
|
|
|
return { maskedText: masked.join('\n'), placeholders };
|
|
}
|
|
|
|
/**
|
|
* @param {import('mdast').Root} ast
|
|
* @param {string[]} placeholders
|
|
*/
|
|
function unmaskAdmonitions(ast, placeholders) {
|
|
/** @param {import('mdast').Nodes} node */
|
|
function walk(node) {
|
|
if (node.type === 'html') {
|
|
const match = PLACEHOLDER_RE.exec(node.value);
|
|
if (match?.groups) {
|
|
node.value = placeholders[parseInt(match.groups.index, 10)];
|
|
}
|
|
return;
|
|
}
|
|
|
|
if ('children' in node) {
|
|
for (const child of /** @type {import('mdast').Parent} */ (node)
|
|
.children) {
|
|
walk(child);
|
|
}
|
|
}
|
|
}
|
|
|
|
walk(ast);
|
|
return ast;
|
|
}
|
|
|
|
const builtinParser = markdownPlugin.parsers.markdown;
|
|
|
|
/**
|
|
* @param {string} text
|
|
* @param {import('prettier').ParserOptions<any> & { originalText: string }} options
|
|
*/
|
|
async function parse(text, options) {
|
|
if (text.includes(COLLISION_GUARD)) {
|
|
throw new Error(
|
|
`Source text contains "${COLLISION_GUARD}" which collides with plugin placeholders.`,
|
|
);
|
|
}
|
|
|
|
const { maskedText, placeholders } = maskAdmonitions(text);
|
|
// The built-in parser records character offsets into the text it parsed.
|
|
// Prettier's printer later slices `options.originalText` at those offsets
|
|
// (e.g. to read ordered-list markers). We must keep originalText in sync
|
|
// with the text we actually parsed, otherwise the printer crashes.
|
|
// prettier creates a fresh options object per format() call so mutating it
|
|
// here is safe within a single formatting run.
|
|
options.originalText = maskedText;
|
|
const ast = await builtinParser.parse(maskedText, options);
|
|
return unmaskAdmonitions(ast, placeholders);
|
|
}
|
|
|
|
export const parsers = {
|
|
markdown: {
|
|
...builtinParser,
|
|
parse,
|
|
astFormat: 'mdast',
|
|
},
|
|
};
|