rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

anchor wildcard lookup

Browse Source
This commit is contained in:
LenAnderson
2024-07-28 08:33:33 -04:00
parent 039c27e201
commit 98a1b99b14
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/slash-commands/SlashCommandClosure.js
View File

@ -59,9 +59,15 @@ export class SlashCommandClosure {
let isList = false; let isList = false;
let listValues = []; let listValues = [];
scope = scope ?? this.scope; scope = scope ?? this.scope;
const escapeMacro = (it)=>escapeRegex(it.key.replace(/\*/g, '~~~WILDCARD~~~')) const escapeMacro = (it, isAnchored = false)=>{
.replaceAll('~~~WILDCARD~~~', '(?:(?:(?!(?:::|}})).)*)') const regexText = escapeRegex(it.key.replace(/\*/g, '~~~WILDCARD~~~'))
; .replaceAll('~~~WILDCARD~~~', '(?:(?:(?!(?:::|}})).)*)')
;
if (isAnchored) {
return `^${regexText}$`;
}
return regexText;
};
const macroList = scope.macroList.toSorted((a,b)=>{ const macroList = scope.macroList.toSorted((a,b)=>{
if (a.key.includes('*') && !b.key.includes('*')) return 1; if (a.key.includes('*') && !b.key.includes('*')) return 1;
if (!a.key.includes('*') && b.key.includes('*')) return -1; if (!a.key.includes('*') && b.key.includes('*')) return -1;
@ -76,7 +82,7 @@ export class SlashCommandClosure {
const match = re.exec(remaining); const match = re.exec(remaining);
const before = substituteParams(remaining.slice(0, match.index)); const before = substituteParams(remaining.slice(0, match.index));
const after = remaining.slice(match.index + match[0].length); const after = remaining.slice(match.index + match[0].length);
const replacer = match.groups.pipe ? scope.pipe : match.groups.var ? scope.getVariable(match.groups.var, match.groups.index) : macroList.find(it=>it.key == match.groups.macro || new RegExp(escapeMacro(it)).test(match.groups.macro))?.value; const replacer = match.groups.pipe ? scope.pipe : match.groups.var ? scope.getVariable(match.groups.var, match.groups.index) : macroList.find(it=>it.key == match.groups.macro || new RegExp(escapeMacro(it, true)).test(match.groups.macro))?.value;
if (replacer instanceof SlashCommandClosure) { if (replacer instanceof SlashCommandClosure) {
replacer.abortController = this.abortController; replacer.abortController = this.abortController;
replacer.breakController = this.breakController; replacer.breakController = this.breakController;