@dicelette/core 1.28.2 → 1.28.3

package/dist/index.mjs

@@ -212,10 +212,6 @@ import { evaluate as evaluate10 } from "mathjs";
 import { DiceRoller as DiceRoller2, NumberGenerator as NumberGenerator7 } from "@dice-roller/rpg-dice-roller";
 import { evaluate as evaluate8 } from "mathjs";
 
-// src/dice/compare.ts
-import { NumberGenerator as NumberGenerator4 } from "@dice-roller/rpg-dice-roller";
-import { evaluate as evaluate2 } from "mathjs";
-
 // src/utils.ts
 import "uniformize";
 import { NumberGenerator as NumberGenerator3 } from "@dice-roller/rpg-dice-roller";
@@ -434,6 +430,12 @@ function generateRandomStat(total = 100, max, min, engine = NumberGenerator2.eng
 }
 
 // src/utils.ts
+function splitDiceComment(dice) {
+  const match = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/i.exec(dice);
+  if (!match?.groups) return { dice: dice.trimEnd(), comment: void 0 };
+  const comment = match.groups.comment.trim() || void 0;
+  return { dice: dice.slice(0, match.index).trimEnd(), comment };
+}
 function escapeRegex(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -470,6 +472,8 @@ 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";
 function isTrivialComparison(maxValue, minValue, compare) {
   const canSucceed = canComparisonSucceed(maxValue, compare, minValue);
   const canFail = canComparisonFail(maxValue, compare, minValue);
@@ -1060,7 +1064,7 @@ function setSortOrder(toRoll, sort) {
 }
 function prepareDice(diceInput) {
   let dice = standardizeDice(replaceFormulaInDice(diceInput)).replace(/^\+/, "").replaceAll("=>", ">=").replaceAll("=<", "<=").trimStart();
-  dice = dice.replaceAll(DETECT_CRITICAL, "").trimEnd();
+  dice = dice.replaceAll(REMOVER_PATTERN.CRITICAL_BLOCK, "").trimEnd();
   const explodingSuccess = normalizeExplodingSuccess(dice);
   if (explodingSuccess) dice = explodingSuccess.dice;
   let diceDisplay;
@@ -1112,9 +1116,8 @@ function handleBulkRolls(dice, isCurlyBulk, bulkContent, compare, explodingSucce
   const bulkProcessContent = isCurlyBulk ? bulkContent : dice;
   const diceArray = bulkProcessContent.split("#");
   const numberOfDice = Number.parseInt(diceArray[0], 10);
-  let diceToRoll = diceArray[1].replace(COMMENT_REGEX, "");
-  const commentsMatch = diceArray[1].match(COMMENT_REGEX);
-  const comments = commentsMatch ? commentsMatch[2] : void 0;
+  const { dice: diceToRollBase, comment: comments } = splitDiceComment(diceArray[1]);
+  let diceToRoll = diceToRollBase;
   let curlyCompare;
   if (isCurlyBulk) {
     const curlyCompareRegex = diceToRoll.match(SIGN_REGEX_SPACE);
@@ -1299,7 +1302,7 @@ function handlePitySystem(dice, compare, diceRoll, roller, engine) {
 }
 
 // src/roll.ts
-function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
+function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort, comment) {
   if (sort === "none" /* None */) sort = void 0;
   const prepared = prepareDice(dice);
   if (!prepared.dice.includes("d")) return void 0;
@@ -1342,8 +1345,10 @@ function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
   }
   const roller = new DiceRoller3();
   NumberGenerator8.generator.engine = engine;
-  let diceWithoutComment = processedDice.replace(COMMENT_REGEX, "").trimEnd();
-  diceWithoutComment = setSortOrder(diceWithoutComment, sort);
+  const splitResult = splitDiceComment(processedDice);
+  const diceBase = comment !== void 0 ? processedDice.trimEnd() : splitResult.dice;
+  const resolvedComment = comment ?? splitResult.comment;
+  const diceWithoutComment = setSortOrder(diceBase, sort);
   let diceRoll;
   try {
     diceRoll = roller.roll(diceWithoutComment);
@@ -1359,8 +1364,6 @@ function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
     );
     compare.trivial = trivial ? true : void 0;
   }
-  const commentMatch = processedDice.match(COMMENT_REGEX);
-  const comment = commentMatch ? commentMatch[2] : void 0;
   let rerollCount = 0;
   let pityResult;
   if (pity && compare) {
@@ -1377,7 +1380,7 @@ function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
       return {
         ...pityResult,
         dice: prepared.isSimpleCurly ? finalDiceDisplay : processedDice,
-        comment,
+        comment: resolvedComment,
         compare,
         modifier: modificator,
         pityLogs: rerollCount,
@@ -1399,7 +1402,7 @@ function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
     return {
       dice: prepared.isSimpleCurly ? finalDiceDisplay : prepared.diceDisplay,
       result: resultOutput,
-      comment,
+      comment: resolvedComment,
       compare: compare ? compare : void 0,
       modifier: modificator,
       total: successes,
@@ -1410,7 +1413,7 @@ function roll(dice, engine = NumberGenerator8.engines.nodeCrypto, pity, sort) {
   return {
     dice: prepared.isSimpleCurly ? finalDiceDisplay : processedDice,
     result: resultOutput,
-    comment,
+    comment: resolvedComment,
     compare: compare ? compare : void 0,
     modifier: modificator,
     total: roller.total,
@@ -1626,6 +1629,7 @@ export {
   replaceUnknown,
   resolveFormulaHint,
   roll,
+  splitDiceComment,
   standardizeDice,
   templateSchema,
   testDiceRegistered,