@dicelette/core 1.24.2 → 1.25.1

package/dist/index.js

@@ -154,11 +154,11 @@ var NoStatisticsError = class extends Error {
 };
 
 // src/interfaces/index.ts
-var SortOrder = /* @__PURE__ */ ((SortOrder2) => {
-  SortOrder2["Ascending"] = "sa";
-  SortOrder2["Descending"] = "sd";
-  SortOrder2["None"] = "none";
-  return SortOrder2;
+var SortOrder = /* @__PURE__ */ ((SortOrder3) => {
+  SortOrder3["Ascending"] = "sa";
+  SortOrder3["Descending"] = "sd";
+  SortOrder3["None"] = "none";
+  return SortOrder3;
 })(SortOrder || {});
 
 // src/interfaces/constant.ts
@@ -274,7 +274,9 @@ function generateStatsDice(originalDice, stats, dollarValue) {
       while ((tokenMatch = tokenRegex.exec(outsideText)) !== null) {
         result += outsideText.slice(lastIndex, tokenMatch.index);
         const token = tokenMatch[0];
-        const tokenStd = token.standardize();
+        const tokenHasDollar = token.startsWith("$");
+        const tokenForCompare = tokenHasDollar ? token.slice(1) : token;
+        const tokenStd = tokenForCompare.standardize();
         const diceMatch = /^(\d*)d(.+)$/i.exec(tokenStd);
         if (diceMatch) {
           const diceCount = diceMatch[1] || "";
@@ -320,7 +322,7 @@ function generateStatsDice(originalDice, stats, dollarValue) {
     }
     dice = result;
   }
-  if (dollarValue) dice = dice.replaceAll(/\$\B/g, dollarValue);
+  if (dollarValue) dice = dice.replaceAll("$", dollarValue);
   return replaceFormulaInDice(dice);
 }
 function replaceFormulaInDice(dice) {
@@ -506,8 +508,28 @@ var import_rpg_dice_roller4 = require("@dice-roller/rpg-dice-roller");
 var import_mathjs3 = require("mathjs");
 
 // src/dice/replace.ts
-function replaceUnwantedText(dice) {
-  return dice.replaceAll(/[{}]/g, "").replaceAll(/s[ad]/gi, "");
+function replaceUnwantedText(dice, sortOrder) {
+  const d = dice.replaceAll(/[{}]/g, "").replaceAll(/s[ad]/gi, "");
+  if (sortOrder) return sortDice(d, sortOrder);
+  return d;
+}
+function sortDice(dice, sortOrder) {
+  if (sortOrder === "none" /* None */) return dice;
+  const dices = dice.split(/; ?/);
+  if (sortOrder === "sa" /* Ascending */) {
+    dices.sort((a, b) => {
+      const totalA = Number.parseInt(a.split("= ")[1], 10) || 0;
+      const totalB = Number.parseInt(b.split("= ")[1], 10) || 0;
+      return totalB - totalA;
+    });
+  } else if (sortOrder === "sd" /* Descending */) {
+    dices.sort((a, b) => {
+      const totalA = Number.parseInt(a.split("= ")[1], 10) || 0;
+      const totalB = Number.parseInt(b.split("= ")[1], 10) || 0;
+      return totalA - totalB;
+    });
+  }
+  return dices.join("; ");
 }
 function fixParenthesis(dice) {
   const parenthesisRegex = /d\((\d+)\)/g;
@@ -773,6 +795,11 @@ function prepareDice(diceInput) {
     isSimpleCurly
   };
 }
+function getSortOrder(dice) {
+  if (dice.startsWith("sa") || dice.endsWith("sa")) return "sa" /* Ascending */;
+  if (dice.startsWith("sd") || dice.endsWith("sd")) return "sd" /* Descending */;
+  return void 0;
+}
 
 // src/dice/bulk.ts
 function handleBulkRolls(dice, isCurlyBulk, bulkContent, compare, explodingSuccess, diceDisplay, engine, sort) {
@@ -797,6 +824,7 @@ function handleBulkRolls(dice, isCurlyBulk, bulkContent, compare, explodingSucce
       }
     }
   }
+  sort = sort ?? getSortOrder(diceToRoll);
   diceToRoll = setSortOrder(diceToRoll, sort);
   const activeCompare = compare || curlyCompare || (explodingSuccess ? { sign: explodingSuccess.sign, value: explodingSuccess.value } : void 0);
   if (activeCompare) {
@@ -810,7 +838,8 @@ function handleBulkRolls(dice, isCurlyBulk, bulkContent, compare, explodingSucce
       isCurlyBulk,
       curlyCompare,
       compare,
-      engine
+      engine,
+      sort
     );
   }
   const roller = new import_rpg_dice_roller6.DiceRoller();
@@ -826,14 +855,14 @@ function handleBulkRolls(dice, isCurlyBulk, bulkContent, compare, explodingSucce
   const modificator = getModifier(dice);
   return {
     dice: finalDice,
-    result: replaceUnwantedText(roller.output),
+    result: replaceUnwantedText(roller.output, sort),
     comment: comments,
     compare: compare ? compare : void 0,
     modifier: modificator,
     total: roller.total
   };
 }
-function handleBulkRollsWithComparison(numberOfDice, diceToRoll, comments, activeCompare, explodingSuccess, diceDisplay, isCurlyBulk, curlyCompare, compare, engine) {
+function handleBulkRollsWithComparison(numberOfDice, diceToRoll, comments, activeCompare, explodingSuccess, diceDisplay, isCurlyBulk, curlyCompare, compare, engine, sort) {
   const results = [];
   let successCount = 0;
   const roller = new import_rpg_dice_roller6.DiceRoller();
@@ -917,7 +946,7 @@ function handleBulkRollsWithComparison(numberOfDice, diceToRoll, comments, activ
   }
   if (compare && trivialComparisonDetected) compare.trivial = true;
   const finalDice = isCurlyBulk ? `{${diceToRoll}${curlyCompare?.sign}${curlyCompare?.value}}` : diceToRoll;
-  const resultOutput = replaceUnwantedText(results.join("; "));
+  const resultOutput = replaceUnwantedText(results.join("; "), sort);
   const finalTotal = explodingSuccess ? resultOutput.split(";").flatMap((segment) => extractValuesFromOutput(segment)).filter(
     (val) => matchComparison(explodingSuccess.sign, val, explodingSuccess.value)
   ).length : successCount;
@@ -975,7 +1004,8 @@ function roll(dice, engine = import_rpg_dice_roller7.NumberGenerator.engines.nod
       pity,
       prepared.explodingSuccess,
       prepared.diceDisplay,
-      prepared.isSharedCurly
+      prepared.isSharedCurly,
+      sort
     );
   }
   let processedDice = fixParenthesis(prepared.dice);
@@ -1049,7 +1079,7 @@ function roll(dice, engine = import_rpg_dice_roller7.NumberGenerator.engines.nod
       };
     }
   }
-  let resultOutput = replaceUnwantedText(roller.output);
+  let resultOutput = replaceUnwantedText(roller.output, sort);
   if (prepared.explodingSuccess) {
     const successes = countExplodingSuccesses(
       diceRoll,
@@ -1082,7 +1112,7 @@ function roll(dice, engine = import_rpg_dice_roller7.NumberGenerator.engines.nod
     trivial: compare?.trivial ? true : void 0
   };
 }
-function sharedRolls(dice, engine = import_rpg_dice_roller7.NumberGenerator.engines.nodeCrypto, pity, explodingSuccessMain, diceDisplay, isSharedCurly) {
+function sharedRolls(dice, engine = import_rpg_dice_roller7.NumberGenerator.engines.nodeCrypto, pity, explodingSuccessMain, diceDisplay, isSharedCurly, sort) {
   if (!explodingSuccessMain)
     explodingSuccessMain = normalizeExplodingSuccess(dice.split(";")[0] ?? dice);
   if (explodingSuccessMain) {
@@ -1114,11 +1144,12 @@ function sharedRolls(dice, engine = import_rpg_dice_roller7.NumberGenerator.engi
   } else {
     diceMain = diceMainWithoutComments;
   }
+  const sortFromMain = getSortOrder(diceMain);
   const rollBounds = getRollBounds(diceMain, engine);
-  let diceResult = roll(diceMain, engine, pity);
+  let diceResult = roll(diceMain, engine, pity, sort);
   if (!diceResult || !diceResult.total) {
     if (hidden) {
-      diceResult = roll(fixParenthesis(split[0]), engine, pity);
+      diceResult = roll(fixParenthesis(split[0]), engine, pity, sort);
       hidden = false;
     } else return void 0;
   }
@@ -1137,7 +1168,7 @@ function sharedRolls(dice, engine = import_rpg_dice_roller7.NumberGenerator.engi
   if (!total) {
     return {
       dice: displayDice,
-      result: results.join(";"),
+      result: replaceUnwantedText(results.join(";"), sortFromMain),
       comment: mainComment,
       compare: aggregatedCompare,
       modifier: diceResult.modifier,
@@ -1219,7 +1250,7 @@ function sharedRolls(dice, engine = import_rpg_dice_roller7.NumberGenerator.engi
     results.shift();
   return {
     dice: displayDice,
-    result: results.join(";"),
+    result: replaceUnwantedText(results.join(";"), sortFromMain),
     comment: mainComment,
     compare: hasTrivialComparison && aggregatedCompare ? { ...aggregatedCompare, trivial: true } : aggregatedCompare,
     modifier: diceResult.modifier,