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 post-process fn to evaluation

Browse Source
This commit is contained in:
Cohee
2024-11-02 00:44:12 +02:00
parent 8f373cf1dc
commit 5c90c8b1f6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/macros.js
View File

@ -424,13 +424,15 @@ function getTimeDiffMacro() {
* @param {string} content - The string to substitute parameters in.
* @param {EnvObject} env - Map of macro names to the values they'll be substituted with. If the param
* values are functions, those functions will be called and their return values are used.
* @param {function(string): string} postProcessFn - Function to run on the macro value before replacing it.
* @returns {string} The string with substituted parameters.
*/
export function evaluateMacros(content, env) {
export function evaluateMacros(content, env, postProcessFn) {
if (!content) {
return '';
}
postProcessFn = typeof postProcessFn === 'function' ? postProcessFn : (x => x);
const rawContent = content;
/**
@ -514,7 +516,7 @@ export function evaluateMacros(content, env) {
break;
}
content = content.replace(macro.regex, macro.replace);
content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));
}
return content;