@dicelette/core 1.28.4 → 1.29.0

package/dist/index.mjs

@@ -1,3 +1,72 @@
+// src/custom_formula.ts
+import { evaluate } from "mathjs";
+
+// src/interfaces/constant.ts
+var COMMENT_REGEX = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/gi;
+var SIGN_REGEX = /==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)(?<![<>])<|(?<!!)(?<![<>])=/;
+var SIGN_REGEX_SPACE = /(==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)(?<![<>])<|(?<!!)(?<![<>])=)(\S+)/;
+var SYMBOL_DICE = "&";
+var DETECT_CRITICAL = /\{\*?c[fs]:([<>=]|!=)+(.+?)}/gim;
+var OPTIONAL_COMMENT = /\s+(#|\/{2}|\[|\/\*)?(?<comment>.*)/gi;
+var MIN_THRESHOLD_MATCH = 0.5;
+
+// src/regex.ts
+var REGEX_CACHE_MAX = 500;
+var regexCache = /* @__PURE__ */ new Map();
+var NORMALIZE_SINGLE_DICE = (str) => str.replace(/\b1d(\d+)/gi, "d$1");
+var REMOVER_PATTERN = {
+  ASTERISK_ESCAPE: /\*/g,
+  CRITICAL_BLOCK: /\{\*?c[fs]:([<>=]|!=)+.+?\}/gim,
+  EXP_REMOVER: /\{exp(.*?)\}/g,
+  SIGN_REMOVER: /([><=]|!=)+.*$/,
+  STAT_COMMENTS_REMOVER: /%%.*%%/,
+  STAT_MATCHER: /\(?\$([\p{L}\p{M}_.][\p{L}\p{M}0-9_.]*)\)?/giu
+};
+function getCachedRegex(pattern, flags = "") {
+  const key = `${pattern}|${flags}`;
+  let regex = regexCache.get(key);
+  if (!regex) {
+    if (regexCache.size >= REGEX_CACHE_MAX) {
+      const oldest = regexCache.keys().next().value;
+      if (oldest !== void 0) regexCache.delete(oldest);
+    }
+    regex = new RegExp(pattern, flags);
+    regexCache.set(key, regex);
+  }
+  return regex;
+}
+function includeDiceType(dice, diceType, userStats) {
+  if (!diceType) return false;
+  diceType = NORMALIZE_SINGLE_DICE(diceType);
+  dice = NORMALIZE_SINGLE_DICE(dice);
+  if (userStats && diceType.includes("$")) {
+    diceType = diceType.replace("$", ".+?");
+  }
+  if (SIGN_REGEX.test(diceType)) {
+    diceType = diceType.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
+    dice = dice.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
+  }
+  if (diceType.includes("{exp")) {
+    diceType = diceType.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
+    dice = dice.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
+  }
+  const detectDiceType = getCachedRegex(`\\b${diceType}\\b`, "i");
+  return detectDiceType.test(dice);
+}
+
+// src/custom_formula.ts
+var DICE_NOTATION = /\b\d*d\d+\b/gi;
+function validateCustomFormula(formula) {
+  const expr = formula.replaceAll("$", "50").replace(REMOVER_PATTERN.CRITICAL_BLOCK, "").replace(REMOVER_PATTERN.EXP_REMOVER, "").replace(DICE_NOTATION, "3").trim();
+  if (!expr) return { ok: false, error: "Empty formula" };
+  try {
+    evaluate(expr);
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
+
 // src/engine.ts
 import { NumberGenerator } from "@dice-roller/rpg-dice-roller";
 function getEngineId(engine) {
@@ -92,15 +161,6 @@ var NoStatisticsError = class extends Error {
   }
 };
 
-// src/interfaces/constant.ts
-var COMMENT_REGEX = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/gi;
-var SIGN_REGEX = /==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)(?<![<>])<|(?<!!)(?<![<>])=/;
-var SIGN_REGEX_SPACE = /(==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)(?<![<>])<|(?<!!)(?<![<>])=)(\S+)/;
-var SYMBOL_DICE = "&";
-var DETECT_CRITICAL = /\{\*?c[fs]:([<>=]|!=)+(.+?)}/gim;
-var OPTIONAL_COMMENT = /\s+(#|\/{2}|\[|\/\*)?(?<comment>.*)/gi;
-var MIN_THRESHOLD_MATCH = 0.5;
-
 // src/interfaces/index.ts
 var SortOrder = /* @__PURE__ */ ((SortOrder2) => {
   SortOrder2["Ascending"] = "sa";
@@ -165,57 +225,13 @@ var templateSchema = z.object({
   damage: damageSchema
 });
 
-// src/regex.ts
-var REGEX_CACHE_MAX = 500;
-var regexCache = /* @__PURE__ */ new Map();
-var NORMALIZE_SINGLE_DICE = (str) => str.replace(/\b1d(\d+)/gi, "d$1");
-var REMOVER_PATTERN = {
-  ASTERISK_ESCAPE: /\*/g,
-  CRITICAL_BLOCK: /\{\*?c[fs]:([<>=]|!=)+.+?\}/gim,
-  EXP_REMOVER: /\{exp(.*?)\}/g,
-  SIGN_REMOVER: /([><=]|!=)+.*$/,
-  STAT_COMMENTS_REMOVER: /%%.*%%/,
-  STAT_MATCHER: /\(?\$([\p{L}\p{M}_.][\p{L}\p{M}0-9_.]*)\)?/giu
-};
-function getCachedRegex(pattern, flags = "") {
-  const key = `${pattern}|${flags}`;
-  let regex = regexCache.get(key);
-  if (!regex) {
-    if (regexCache.size >= REGEX_CACHE_MAX) {
-      const oldest = regexCache.keys().next().value;
-      if (oldest !== void 0) regexCache.delete(oldest);
-    }
-    regex = new RegExp(pattern, flags);
-    regexCache.set(key, regex);
-  }
-  return regex;
-}
-function includeDiceType(dice, diceType, userStats) {
-  if (!diceType) return false;
-  diceType = NORMALIZE_SINGLE_DICE(diceType);
-  dice = NORMALIZE_SINGLE_DICE(dice);
-  if (userStats && diceType.includes("$")) {
-    diceType = diceType.replace("$", ".+?");
-  }
-  if (SIGN_REGEX.test(diceType)) {
-    diceType = diceType.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
-    dice = dice.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
-  }
-  if (diceType.includes("{exp")) {
-    diceType = diceType.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
-    dice = dice.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
-  }
-  const detectDiceType = getCachedRegex(`\\b${diceType}\\b`, "i");
-  return detectDiceType.test(dice);
-}
-
 // src/roll.ts
 import { DiceRoller as DiceRoller3, NumberGenerator as NumberGenerator8 } from "@dice-roller/rpg-dice-roller";
-import { evaluate as evaluate10 } from "mathjs";
+import { evaluate as evaluate11 } from "mathjs";
 
 // src/dice/bulk.ts
 import { DiceRoller as DiceRoller2, NumberGenerator as NumberGenerator7 } from "@dice-roller/rpg-dice-roller";
-import { evaluate as evaluate8 } from "mathjs";
+import { evaluate as evaluate9 } from "mathjs";
 
 // src/utils.ts
 import "uniformize";
@@ -223,7 +239,7 @@ import { NumberGenerator as NumberGenerator3 } from "@dice-roller/rpg-dice-rolle
 import { Random as Random2 } from "random-js";
 
 // src/verify_template.ts
-import { evaluate } from "mathjs";
+import { evaluate as evaluate2 } from "mathjs";
 import { Random } from "random-js";
 import "uniformize";
 import { NumberGenerator as NumberGenerator2 } from "@dice-roller/rpg-dice-roller";
@@ -291,7 +307,7 @@ function evalCombinaison(combinaison, stats) {
       formula = formula.replace(regex, value.toString());
     }
     try {
-      newStats[stat] = evaluate(formula);
+      newStats[stat] = evaluate2(formula);
     } catch (error) {
       throw new FormulaError(stat, "evalCombinaison", error);
     }
@@ -305,7 +321,7 @@ function evalOneCombinaison(combinaison, stats) {
     formula = formula.replace(regex, value.toString());
   }
   try {
-    return evaluate(formula);
+    return evaluate2(formula);
   } catch (error) {
     throw new FormulaError(combinaison, "evalOneCombinaison", error);
   }
@@ -410,7 +426,7 @@ function testStatCombinaison(template, engine = NumberGenerator2.engines.nodeCry
       formula = formula.replace(regex, randomStatValue.toString());
     }
     try {
-      evaluate(formula);
+      evaluate2(formula);
     } catch (e) {
       error.push(stat);
     }
@@ -468,7 +484,7 @@ function createCriticalCustom(dice, customCritical, template, engine = NumberGen
 
 // src/dice/compare.ts
 import { NumberGenerator as NumberGenerator4 } from "@dice-roller/rpg-dice-roller";
-import { evaluate as evaluate2 } from "mathjs";
+import { evaluate as evaluate3 } from "mathjs";
 function isTrivialComparison(maxValue, minValue, compare) {
   const canSucceed = canComparisonSucceed(maxValue, compare, minValue);
   const canFail = canComparisonFail(maxValue, compare, minValue);
@@ -507,7 +523,7 @@ function rollCompare(value, engine = NumberGenerator4.engines.nodeCrypto, pity)
   const rollComp = roll(value, engine, pity);
   if (!rollComp?.total) {
     try {
-      return { value: evaluate2(value), diceResult: value };
+      return { value: evaluate3(value), diceResult: value };
     } catch (error) {
       return { value: 0, diceResult: value };
     }
@@ -529,7 +545,7 @@ function getCompare(dice, compareRegex, engine = NumberGenerator4.engines.nodeCr
   if (sign) {
     const toCalc = calc.replace(SIGN_REGEX, "").replace(/\s/g, "").replace(/;(.*)/, "");
     const rCompare = rollCompare(toCalc, engine, pity);
-    const total = evaluate2(rCompare.value.toString());
+    const total = evaluate3(rCompare.value.toString());
     dice = dice.replace(SIGN_REGEX_SPACE, `${compareSign}${total}`);
     compare = {
       sign: compareSign,
@@ -571,11 +587,11 @@ function canComparisonSucceed(maxRollValue, compare, minRollValue) {
 }
 
 // src/dice/exploding.ts
-import { evaluate as evaluate4 } from "mathjs";
+import { evaluate as evaluate5 } from "mathjs";
 
 // src/dice/signs.ts
 import { NumberGenerator as NumberGenerator5 } from "@dice-roller/rpg-dice-roller";
-import { evaluate as evaluate3 } from "mathjs";
+import { evaluate as evaluate4 } from "mathjs";
 
 // src/dice/replace.ts
 var PARENTHESIS_REGEX = /d\((\d+)\)/g;
@@ -668,7 +684,7 @@ function compareSignFormule(toRoll, compareRegex, element, diceResult, engine =
   const toCompare = `${compareResult.dice}${compareResult.compare?.sign}${compareResult.compare?.value}`;
   let res;
   try {
-    res = evaluate3(toCompare);
+    res = evaluate4(toCompare);
   } catch (error) {
     res = roll(toCompare, engine, pity);
   }
@@ -680,7 +696,7 @@ function compareSignFormule(toRoll, compareRegex, element, diceResult, engine =
   } else if (res instanceof Object) {
     const diceResult2 = res;
     if (diceResult2.compare) {
-      const toEvaluate = evaluate3(
+      const toEvaluate = evaluate4(
         `${diceResult2.total}${diceResult2.compare.sign}${diceResult2.compare.value}`
       );
       const sign = toEvaluate ? "\u2713" : "\u2715";
@@ -717,7 +733,7 @@ function normalizeExplodingSuccess(dice) {
   let parsedValue = Number.parseFloat(valueStr);
   if (Number.isNaN(parsedValue)) {
     try {
-      parsedValue = Number.parseFloat(evaluate4(valueStr));
+      parsedValue = Number.parseFloat(evaluate5(valueStr));
     } catch (_error) {
       parsedValue = 0;
     }
@@ -755,7 +771,7 @@ function countExplodingSuccesses(diceRoll, sign, value) {
 import { DiceRoller, NumberGenerator as NumberGenerator6 } from "@dice-roller/rpg-dice-roller";
 
 // src/similarities/generateStatsDice.ts
-import { evaluate as evaluate5 } from "mathjs";
+import { evaluate as evaluate6 } from "mathjs";
 
 // src/similarities/similarity.ts
 function calculateSimilarity(str1, str2) {
@@ -913,7 +929,7 @@ function replaceFormulaInDice(dice) {
     if (match.groups?.formula) {
       const formulae = match.groups.formula.replaceAll("{{", "").replaceAll("}}", "");
       try {
-        const result = evaluate5(formulae);
+        const result = evaluate6(formulae);
         modifiedDice = modifiedDice.replace(match.groups.formula, result.toString());
       } catch (error) {
         throw new FormulaError(match.groups.formula, "replaceFormulasInDice", error);
@@ -927,7 +943,7 @@ function cleanedDice(dice) {
 }
 
 // src/similarities/resolveFormula.ts
-import { evaluate as evaluate6 } from "mathjs";
+import { evaluate as evaluate7 } from "mathjs";
 function toFiniteNumber(value) {
   if (typeof value === "number" && Number.isFinite(value)) return value;
   return void 0;
@@ -967,7 +983,7 @@ function resolveFormulaHint(formula, allAttributes, similarityThreshold = MIN_TH
     progress = false;
     for (const [normName, expr2] of pending) {
       try {
-        const result = toFiniteNumber(evaluate6(expr2));
+        const result = toFiniteNumber(evaluate7(expr2));
         if (result === void 0) continue;
         resolved.set(normName, result);
         pending.delete(normName);
@@ -985,7 +1001,7 @@ function resolveFormulaHint(formula, allAttributes, similarityThreshold = MIN_TH
   const normFormula = trimmed.standardize();
   const expr = substituteFormulaTokens(normFormula, resolved, similarityThreshold);
   try {
-    const result = toFiniteNumber(evaluate6(expr));
+    const result = toFiniteNumber(evaluate7(expr));
     if (result !== void 0) return { kind: "resolved", value: result };
     return { kind: "error" };
   } catch {
@@ -994,10 +1010,10 @@ function resolveFormulaHint(formula, allAttributes, similarityThreshold = MIN_TH
 }
 
 // src/dice/calculator.ts
-import { evaluate as evaluate7 } from "mathjs";
+import { evaluate as evaluate8 } from "mathjs";
 function calculator(sign, value, total) {
   if (sign === "^") sign = "**";
-  return evaluate7(`${total} ${sign} ${value}`);
+  return evaluate8(`${total} ${sign} ${value}`);
 }
 
 // src/dice/extract.ts
@@ -1206,7 +1222,7 @@ function handleBulkRollsWithComparison(numberOfDice, diceToRoll, comments, activ
         results.push(formattedRollOutput);
       } else {
         const rollTotal = rollInstance.total;
-        const isSuccess = evaluate8(
+        const isSuccess = evaluate9(
           `${rollTotal}${activeCompare.sign}${activeCompare.value}`
         );
         if (isSuccess) successCount++;
@@ -1269,7 +1285,7 @@ function handleBulkRollsWithComparison(numberOfDice, diceToRoll, comments, activ
 }
 
 // src/dice/pity.ts
-import { evaluate as evaluate9 } from "mathjs";
+import { evaluate as evaluate10 } from "mathjs";
 function handlePitySystem(dice, compare, diceRoll, roller, engine) {
   const currentRoll = Array.isArray(diceRoll) ? diceRoll[0] : diceRoll;
   const maxPossible = currentRoll ? currentRoll.maxTotal : null;
@@ -1277,7 +1293,7 @@ function handlePitySystem(dice, compare, diceRoll, roller, engine) {
   if (!isComparisonPossible) {
     return { rerollCount: 0 };
   }
-  let isFail = evaluate9(`${roller.total}${compare.sign}${compare.value}`);
+  let isFail = evaluate10(`${roller.total}${compare.sign}${compare.value}`);
   if (isFail) {
     return { rerollCount: 0 };
   }
@@ -1292,7 +1308,7 @@ function handlePitySystem(dice, compare, diceRoll, roller, engine) {
     }
     rerollCount++;
     if (res && res.total !== void 0) {
-      isFail = evaluate9(`${res.total}${compare.sign}${compare.value}`);
+      isFail = evaluate10(`${res.total}${compare.sign}${compare.value}`);
     }
   }
   if (!res?.result.length) throw new DiceTypeError(dice, "empty_dice");
@@ -1503,7 +1519,7 @@ function sharedRolls(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, e
         const { diceAll } = replaceText(element, diceResult.total, diceResult.dice);
         let successCount = 0;
         try {
-          const evaluated = evaluate10(toRoll);
+          const evaluated = evaluate11(toRoll);
           successCount = evaluated ? 1 : 0;
         } catch (error) {
           const evaluated = roll(toRoll, engine, pity);
@@ -1537,7 +1553,7 @@ function sharedRolls(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, e
         diceResult.dice
       );
       try {
-        const evaluated = evaluate10(toRoll);
+        const evaluated = evaluate11(toRoll);
         results.push(`\u25C8 ${comment}${diceAll}: ${formule} = ${evaluated}`);
         total += Number.parseInt(evaluated, 10);
       } catch (error) {
@@ -1576,7 +1592,7 @@ function replaceInFormula(element, diceResult, compareResult, res, engine = Numb
   const invertedSign = res ? compareResult.compare.sign : inverseSign(compareResult.compare.sign);
   let evaluateRoll;
   try {
-    evaluateRoll = evaluate10(compareResult.dice);
+    evaluateRoll = evaluate11(compareResult.dice);
     return `${validSign} ${diceAll}: ${formule} = ${evaluateRoll}${invertedSign}${compareResult.compare?.value}`;
   } catch (error) {
     const evaluateRoll2 = roll(compareResult.dice, engine, pity);
@@ -1632,6 +1648,7 @@ export {
   templateSchema,
   testDiceRegistered,
   testStatCombinaison,
+  validateCustomFormula,
   verifyStatMatcherPattern,
   verifyTemplateValue
 };