mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 01:37:24 +00:00
a1971afa78
* ci(linter): add renovate/require-regex-util rule Adds a custom oxlint rule that flags raw RegExp usage in lib/ production code: any `new RegExp(...)` call and any regex literal that is not the direct first argument of `regEx(...)`. The regEx() helper from lib/util/regex.ts uses the RE2 engine for ReDoS-safe matching and caches compiled patterns. lib/util/regex.ts itself is exempt. The rule is disabled for **/*.spec.ts, test/**, and tools/** via config overrides, because vitest APIs such as expect.stringMatching need bare RegExp instances (a past commit reverted regEx() there). Severity is set to "warn" instead of "error": the repo currently has 197 pre-existing violations (above the agreed mechanical-fix threshold of 80), and a number of them are deliberately RE2-incompatible patterns (lookahead/lookbehind/named backreferences, see TODO #12872/#12875 markers in e.g. lib/modules/versioning/rez/ pattern.ts and lib/modules/manager/dockerfile/extract.ts) that need per-site judgment before they can be wrapped in regEx() or suppressed with a justified disable comment. No violation fixes are included in this commit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci(linter): enforce renovate/require-regex-util at error Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: use regEx() for regex literals and RegExp construction in lib Burn down all renovate/require-regex-util violations (197): - wrap RE2-compatible regex literals and RegExp constructions in regEx() - rewrite lookaround patterns where behavior is provably preserved: goproxy separator split, sbt-package link extraction, leiningen comment stripping and keyword search, npm GitHub owner validation (unit-count bound replaced by an explicit length check) - keep native RegExp with disable comments where RE2 cannot be used: moo / good-enough-parser lexer patterns (moo rejects RE2 instances), MigrationsService propertyName (matched via isRegExp, which RE2 instances fail), rez named backreferences and lookaheads, GitHub markdown link negative lookbehind, emoji astral-plane matching - drop stale TODO #12875 comments for patterns current re2 handles Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: reduce require-regex-util disable comments Rewrite the github massage-markdown-links URL regex to capture an optional `api.` prefix in a named group (skipped in code) instead of relying on a negative lookbehind, so both the base and global variants can use regEx()/RE2 and their two disable comments are removed. Add spec cases for api-prefixed URLs that match the URL shape. Consolidate the four related line disables in rez/pattern.ts (bound and range patterns emulating Python conditional patterns via named backreferences and lookaheads, which RE2 cannot express) into a single block disable/enable pair, matching the treatment of the lexer files. Disable comment count drops from 13 to 8. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(datasource/sbt-package): use named capture group in link regex Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(manager/cake): restore original multiLineComment regex spelling The [^] -> [\\s\\S] rewrite was only needed for an RE2 wrap that was later reverted; keep the diff minimal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(datasource/go): skip empty GOPROXY segments The switch from a lookahead split to a capture-group split (needed because RE2 has no lookahead support) changed how empty GOPROXY segments parse: `a|,b` yielded `{ url: ',', fallback: '|' }` before and `{ url: '', fallback: ',' }` after. The comma fallback only continues on 404/410, so a failing proxy ahead of an empty segment silently stopped the lookup instead of falling through to the remaining proxies. Empty segments carry no url to query, so drop them. * refactor(datasource/go): use isTruthy for empty segment filter * fix(datasource/go): filter empty segments before mapping Filtering after the map broke the contextual typing from the GoproxyItem[] annotation, widening fallback to string. * refactor(platform/github): use regEx() for merge queue query stripping --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
195 lines
5.2 KiB
TypeScript
195 lines
5.2 KiB
TypeScript
import { isPlainObject } from '@sindresorhus/is';
|
|
import moo from 'moo';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import type {
|
|
EdnMetadata,
|
|
ParsedEdnArray,
|
|
ParsedEdnMetadata,
|
|
ParsedEdnRecord,
|
|
ParsedEdnResult,
|
|
ParserState,
|
|
TokenTypes,
|
|
} from './types.ts';
|
|
|
|
/* oxlint-disable renovate/require-regex-util -- moo lexer patterns must be native RegExp: moo recompiles their source with the native engine and rejects RE2 instances (TODO #12870) */
|
|
const lexerStates = {
|
|
main: {
|
|
comma: { match: ',' },
|
|
lineComment: { match: /;.*?$/ },
|
|
leftParen: { match: '(' },
|
|
rightParen: { match: ')' },
|
|
leftSquare: { match: '[' },
|
|
rightSquare: { match: ']' },
|
|
leftFigure: { match: '{' },
|
|
rightFigure: { match: '}' },
|
|
longDoubleQuoted: {
|
|
match: '"""',
|
|
push: 'longDoubleQuoted',
|
|
},
|
|
doubleQuoted: {
|
|
match: '"',
|
|
push: 'doubleQuoted',
|
|
},
|
|
// https://clojure.org/reference/reader#_reader_forms
|
|
keyword: {
|
|
match:
|
|
/:(?:[a-zA-Z*+!_'?<>=.-][a-zA-Z0-9*+!_'?<>=.-]*)(?:\/(?:[a-zA-Z*+!_'?<>=.-][a-zA-Z0-9*+!_'?<>=.-]*))?/,
|
|
value: (x: string) => x.slice(1),
|
|
},
|
|
symbol: {
|
|
match:
|
|
/(?:[a-zA-Z*+!_'?<>=.-][a-zA-Z0-9*+!_'?<>=.-]*)(?:\/(?:[a-zA-Z*+!_'?<>=.-][a-zA-Z0-9*+!_'?<>=.-]*))?/,
|
|
},
|
|
double: {
|
|
match:
|
|
/(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?|(?:[0-9]+[eE][+-]?[0-9]+)/,
|
|
},
|
|
rational: { match: /[0-9]+\/[0-9]+/ },
|
|
integer: { match: /(?:0x[0-9a-fA-F]+|[0-9]+r[0-9a-zA-Z]+|[0-9]+)/ },
|
|
unknown: moo.fallback,
|
|
},
|
|
longDoubleQuoted: {
|
|
stringFinish: { match: '"""', pop: 1 },
|
|
stringContent: moo.fallback,
|
|
},
|
|
doubleQuoted: {
|
|
stringFinish: { match: '"', pop: 1 },
|
|
stringContent: moo.fallback,
|
|
},
|
|
};
|
|
/* oxlint-enable renovate/require-regex-util */
|
|
|
|
type TokenType = TokenTypes<typeof lexerStates>;
|
|
|
|
const lexer = moo.states(lexerStates);
|
|
|
|
export function parseDepsEdnFile(content: string): ParsedEdnResult | null {
|
|
lexer.reset(content);
|
|
const tokens = [...lexer];
|
|
lexer.reset();
|
|
|
|
const stack: ParserState[] = [];
|
|
let state: ParserState = { type: 'root', data: null };
|
|
|
|
const metadata: ParsedEdnMetadata = new WeakMap<
|
|
ParsedEdnRecord | ParsedEdnArray,
|
|
EdnMetadata
|
|
>();
|
|
|
|
function popState(): boolean {
|
|
const savedState = stack.pop();
|
|
if (!savedState) {
|
|
return false;
|
|
}
|
|
|
|
if (savedState.type === 'root') {
|
|
savedState.data = state.data;
|
|
state = savedState;
|
|
return false;
|
|
}
|
|
|
|
if (savedState.type === 'record') {
|
|
if (savedState.skipKey) {
|
|
savedState.currentKey = null;
|
|
savedState.skipKey = false;
|
|
} else if (savedState.currentKey) {
|
|
savedState.data[savedState.currentKey] = state.data;
|
|
savedState.currentKey = null;
|
|
} else {
|
|
savedState.skipKey = true;
|
|
}
|
|
}
|
|
|
|
if (savedState.type === 'array') {
|
|
savedState.data.push(state.data);
|
|
}
|
|
|
|
state = savedState;
|
|
return true;
|
|
}
|
|
|
|
for (const token of tokens) {
|
|
const tokenType = token.type as TokenType;
|
|
const stateType = state.type;
|
|
|
|
// istanbul ignore else: token type comprehension
|
|
if (
|
|
tokenType === 'lineComment' ||
|
|
tokenType === 'unknown' ||
|
|
tokenType === 'doubleQuoted' ||
|
|
tokenType === 'longDoubleQuoted' ||
|
|
tokenType === 'stringFinish' ||
|
|
tokenType === 'comma'
|
|
) {
|
|
continue;
|
|
} else if (
|
|
tokenType === 'rightParen' ||
|
|
tokenType === 'rightSquare' ||
|
|
tokenType === 'rightFigure'
|
|
) {
|
|
if (state.type === 'record' || state.type === 'array') {
|
|
const { startIndex } = state;
|
|
const endIndex = token.offset + token.value.length;
|
|
const replaceString = content.slice(startIndex, endIndex);
|
|
metadata.set(state.data, { replaceString });
|
|
}
|
|
|
|
if (!popState()) {
|
|
break;
|
|
}
|
|
} else if (tokenType === 'leftParen' || tokenType === 'leftSquare') {
|
|
stack.push(state);
|
|
state = {
|
|
type: 'array',
|
|
startIndex: token.offset,
|
|
data: [],
|
|
};
|
|
} else if (tokenType === 'leftFigure') {
|
|
stack.push(state);
|
|
state = {
|
|
type: 'record',
|
|
startIndex: token.offset,
|
|
data: {},
|
|
skipKey: false,
|
|
currentKey: null,
|
|
};
|
|
} else if (
|
|
tokenType === 'symbol' ||
|
|
tokenType === 'keyword' ||
|
|
tokenType === 'stringContent' ||
|
|
tokenType === 'double' ||
|
|
tokenType === 'rational' ||
|
|
tokenType === 'integer'
|
|
) {
|
|
if (stateType === 'record') {
|
|
if (state.skipKey) {
|
|
state.currentKey = null;
|
|
state.skipKey = false;
|
|
} else if (state.currentKey) {
|
|
state.data[state.currentKey] = token.value;
|
|
state.currentKey = null;
|
|
} else {
|
|
state.currentKey = token.value;
|
|
}
|
|
} else if (stateType === 'array') {
|
|
state.data.push(token.value);
|
|
} else if (stateType === 'root') {
|
|
state.data = token.value;
|
|
}
|
|
} else {
|
|
const unknownType: never = tokenType;
|
|
logger.debug({ unknownType }, `Unknown token type for "deps.edn"`);
|
|
}
|
|
}
|
|
|
|
while (stack.length) {
|
|
popState();
|
|
}
|
|
|
|
if (isPlainObject(state.data)) {
|
|
return { data: state.data, metadata };
|
|
}
|
|
|
|
return null;
|
|
}
|