diff --git a/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js b/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js index 8c565f3b..02f263c3 100644 --- a/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js +++ b/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js @@ -1,8 +1,10 @@ +import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js'; + export default function embedInlineCalculations(string, calculations){ if (!string) return ''; if (!calculations) return string; let index = 0; - return string.replace(/\{([^{}]*)\}/g, () => { + return string.replace(INLINE_CALCULATION_REGEX, () => { let comp = calculations && calculations[index++]; return comp && comp.result ? comp.result : string; }); diff --git a/app/imports/api/creature/computation/engine/computeInlineCalculations.js b/app/imports/api/creature/computation/engine/computeInlineCalculations.js index bb08e475..eb54d998 100644 --- a/app/imports/api/creature/computation/engine/computeInlineCalculations.js +++ b/app/imports/api/creature/computation/engine/computeInlineCalculations.js @@ -1,4 +1,5 @@ import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js'; +import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js'; import ErrorNode from '/imports/parser/parseTree/ErrorNode.js'; import { union } from 'lodash'; @@ -14,7 +15,7 @@ export default function computeInlineCalculations(prop, memo){ function computeInlineCalcsForField(prop, memo, field){ let string = prop[field]; let inlineComputations = []; - let matches = string.matchAll(/\{([^{}]*)\}/g); + let matches = string.matchAll(INLINE_CALCULATION_REGEX); for (let match of matches){ let calculation = match[1]; let { diff --git a/app/imports/constants/INLINE_CALCULTION_REGEX.js b/app/imports/constants/INLINE_CALCULTION_REGEX.js new file mode 100644 index 00000000..cb9edec7 --- /dev/null +++ b/app/imports/constants/INLINE_CALCULTION_REGEX.js @@ -0,0 +1,3 @@ +const INLINE_CALCULATION_REGEX = /\{([^{}]*)\}/g; + +export default INLINE_CALCULATION_REGEX;