rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Regex: Update to capture group logic 

Currently doesn't support the overlay method for regex scripts. That
will have to be added in a future commit.

People can refer to capture groups using $1, $2, etc. {{match}} gets
aliased to $1.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-01-06 00:30:25 -05:00
parent 2bea90a264
commit a0a69e357d
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/scripts/extensions/regex/engine.js
View File

@ -109,19 +109,22 @@ function runRegexScript(regexScript, rawString, { characterOverride } = {}) {
return newString;
}
newString = rawString.replace(findRegex, (fencedMatch) => {
let trimFencedMatch = filterString(fencedMatch, regexScript.trimStrings, { characterOverride });
// Run replacement. Currently does not support the Overlay strategy
newString = rawString.replace(findRegex, function(match) {
const args = [...arguments];
const replaceString = regexScript.replaceString.replace('{{match}}', '$1');
const replaceWithGroups = replaceString.replaceAll(/\$(\d)+/g, (_, num) => {
// match is found here
const match = args[Number(num)];
const filteredMatch = filterString(match, regexScript.trimStrings, { characterOverride });
const subReplaceString = substituteRegexParams(
regexScript.replaceString,
trimFencedMatch,
{
characterOverride,
replaceStrategy: regexScript.replaceStrategy ?? regex_replace_strategy.REPLACE,
},
);
// TODO: Handle overlay here
return subReplaceString;
return filteredMatch;
});
// Substitute at the end
return substituteParams(replaceWithGroups);
});
return newString;
@ -136,10 +139,10 @@ function runRegexScript(regexScript, rawString, { characterOverride } = {}) {
*/
function filterString(rawString, trimStrings, { characterOverride } = {}) {
let finalString = rawString;
trimStrings.forEach((trimString) => {
for (const trimString of trimStrings) {
const subTrimString = substituteParams(trimString, undefined, characterOverride);
finalString = finalString.replaceAll(subTrimString, '');
});
}
return finalString;
}