mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-21 01:23:40 +00:00
feat(filters): split pasted values without breaking regexes
Accept multiple values separated by commas or lines while retaining commas inside wrapped expressions and raw regex patterns. Pasting replaces the selected range and keeps rejected values as an explicit draft.
This commit is contained in:
1 parent
d693f70612
commit
00387c3afa
6 files changed
+152
-2
No files matched your search
@@ -1161,6 +1161,60 @@ function isWrappedRegex(value: string): boolean {
|
||||
return value.length >= 2 && value.startsWith("/") && value.endsWith("/");
|
||||
}
|
||||
|
||||
/**
|
||||
* Length of the `/regex/` that `text` starts with: up to the first closing
|
||||
* `/` followed by a comma or the end of the text, or -1 while it is still
|
||||
* open. Escaped slashes (`\/`) and slashes in a character class (`[/,]`)
|
||||
* never close it.
|
||||
*/
|
||||
function wrappedRegexLength(text: string): number {
|
||||
if (!text.startsWith("/")) return -1;
|
||||
let inClass = false;
|
||||
for (let i = 1; i < text.length; i++) {
|
||||
const char = text[i];
|
||||
if (char === "\\") i++;
|
||||
else if (inClass) inClass = char !== "]";
|
||||
else if (char === "[") inClass = true;
|
||||
else if (char === "/" && /^\s*(?:,|$)/.test(text.slice(i + 1))) return i + 1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Split typed or pasted text into match values: one per line and, unless
|
||||
* `commas` is off (the raw `regex` operator), one per comma. A `/regex/`
|
||||
* keeps its own commas (`/v{1,3}/`, `/[/,]/`).
|
||||
*/
|
||||
export function splitFilterValues(text: string, commas = true): string[] {
|
||||
const out: string[] = [];
|
||||
for (const line of text.split(/\r?\n/)) {
|
||||
if (!commas) {
|
||||
out.push(line);
|
||||
continue;
|
||||
}
|
||||
let rest = line.trimStart();
|
||||
while (rest) {
|
||||
const regexLength = wrappedRegexLength(rest);
|
||||
const token = regexLength > 0 ? rest.slice(0, regexLength) : rest.split(",", 1)[0]!;
|
||||
out.push(token);
|
||||
rest = rest.slice(token.length).replace(/^\s*,/, "").trimStart();
|
||||
}
|
||||
}
|
||||
return out.map((v) => v.trim()).filter(Boolean);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a comma typed over `text[start, end)` ends the value being typed —
|
||||
* only when typed at its end (no selection) and outside an open `/regex/`.
|
||||
* Anywhere else the comma is part of the text; raw patterns (`commas` off)
|
||||
* keep every comma.
|
||||
*/
|
||||
export function commaEndsValue(text: string, start: number, end: number, commas = true): boolean {
|
||||
if (!commas || start !== end || text.slice(end).trim()) return false;
|
||||
const value = text.slice(0, start).trim();
|
||||
return !value.startsWith("/") || wrappedRegexLength(value) === value.length;
|
||||
}
|
||||
|
||||
function isGlob(value: string): boolean {
|
||||
return value.includes("*") || value.includes("?");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user