Add post-process fn to evaluation

5c90c8b1f67c23fef041f20be21f2a6932afa732

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+6 -4 Viewed

  * Substitutes {{macro}} parameters in a string.
  * @param {string} content - The string to substitute parameters in.
  * @param {Record<string,any>} additionalMacro - Additional environment variables for substitution.
+ * @param {(x: string) => string} [postProcessFn] - Post-processing function for each substituted macro.
  * @returns {string} The string with substituted parameters.
  */
-export function substituteParamsExtended(content, additionalMacro = {}) {
+export function substituteParamsExtended(content, additionalMacro = {}, postProcessFn = (x) => x) {
-    return substituteParams(content, undefined, undefined, undefined, undefined, true, additionalMacro);
+    return substituteParams(content, undefined, undefined, undefined, undefined, true, additionalMacro, postProcessFn);
+}
 /**

  * @param {string} [_group] - The group members list for {{group}} substitution.
  * @param {boolean} [_replaceCharacterCard] - Whether to replace character card macros.
  * @param {Record<string,any>} [additionalMacro] - Additional environment variables for substitution.
+ * @param {(x: string) => string} [postProcessFn] - Post-processing function for each substituted macro.
  * @returns {string} The string with substituted parameters.
  */
-export function substituteParams(content, _name1, _name2, _original, _group, _replaceCharacterCard = true, additionalMacro = {}) {
+export function substituteParams(content, _name1, _name2, _original, _group, _replaceCharacterCard = true, additionalMacro = {}, postProcessFn = (x) => x) {
     if (!content) {
         return '';
+    }

@@ -2597,7 +2599,7 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
2597	Object.assign(environment, additionalMacro);	2599	Object.assign(environment, additionalMacro);
2598	}	2600	}
2599		2601
2600	return evaluateMacros(content, environment);	2602	return evaluateMacros(content, environment, postProcessFn);
2601	}	2603	}
2602		2604
2603		2605

public/scripts/macros.js+4 -2 Viewed

  * @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) {
514	break;	516	break;
515	}	517	}
516		518
517	content = content.replace(macro.regex, macro.replace);	519	content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));
518	}	520	}
519		521
520	return content;	522	return content;