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

add simple wildcards to scope macros

Browse Source
This commit is contained in:
LenAnderson
2024-07-05 19:13:37 -04:00
parent 8785a0a5a3
commit 83b4df9cd3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,15 +51,23 @@ export class SlashCommandClosure {
let isList = false; let isList = false;
let listValues = []; let listValues = [];
scope = scope ?? this.scope; scope = scope ?? this.scope;
const macros = scope.macroList.map(it=>escapeRegex(it.key)).join('|'); const escapeMacro = (it)=>escapeRegex(it.key.replace(/\*/g, '~~~WILDCARD~~~'))
const re = new RegExp(`({{pipe}})|(?:{{var::([^\\s]+?)(?:::((?!}}).+))?}})|(?:{{(${macros})}})`); .replaceAll('~~~WILDCARD~~~', '(?:(?:(?!(?:::|}})).)*)')
;
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;
return 0;
});
const macros = macroList.map(it=>escapeMacro(it)).join('|');
const re = new RegExp(`(?<pipe>{{pipe}})|(?:{{var::(?<var>[^\\s]+?)(?:::(?<varIndex>(?!}}).+))?}})|(?:{{(?<macro>${macros})}})`);
let done = ''; let done = '';
let remaining = text; let remaining = text;
while (re.test(remaining)) { while (re.test(remaining)) {
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[1] ? scope.pipe : match[2] ? scope.getVariable(match[2], match[3]) : scope.macroList.find(it=>it.key == match[4])?.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)).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;