@yipe/dice 0.2.6 → 0.2.8

package/dist/builder/index.cjs

@@ -2429,6 +2429,12 @@ var defaultConfig = {
   keep: void 0,
   rollType: "flat"
 };
+var rollConfigsEqual = (a, b) => {
+  return a.count === b.count && a.sides === b.sides && a.modifier === b.modifier && a.reroll === b.reroll && a.explode === b.explode && a.minimum === b.minimum && a.bestOf === b.bestOf && a.keep === b.keep && a.rollType === b.rollType;
+};
+var configComplexityScore = (config) => {
+  return (config.reroll > 0 ? 1 : 0) + (config.explode > 0 ? 1 : 0) + (config.minimum > 0 ? 1 : 0) + (config.bestOf > 0 ? 1 : 0) + (config.keep !== void 0 ? 1 : 0) + (config.rollType !== "flat" ? 1 : 0);
+};
 var RollBuilder = class _RollBuilder {
   constructor(countOrConfigs = 1) {
     __publicField(this, "subRollConfigs");
@@ -2698,12 +2704,9 @@ var RollBuilder = class _RollBuilder {
     })).sort((a, b) => {
       const aHasPriority = a.reroll > 0 || a.minimum > 0;
       const bHasPriority = b.reroll > 0 || b.minimum > 0;
-      if (aHasPriority !== bHasPriority) {
-        return aHasPriority ? -1 : 1;
-      }
+      if (aHasPriority !== bHasPriority) return aHasPriority ? -1 : 1;
       if (b.sides !== a.sides) return b.sides - a.sides;
-      const complexity = (c) => (c.reroll > 0 ? 1 : 0) + (c.minimum > 0 ? 1 : 0) + (c.explode > 0 ? 1 : 0) + (c.bestOf > 0 ? 1 : 0) + (c.keep ? 1 : 0);
-      return complexity(b) - complexity(a);
+      return configComplexityScore(b) - configComplexityScore(a);
     });
     const diceConfigs = rootD20Group ? [
       { ...rootD20Group.config, count: rootD20Group.totalCount },
@@ -2715,9 +2718,7 @@ var RollBuilder = class _RollBuilder {
     );
     if (diceConfigs.length === 0) return totalModifier.toString();
     const rootDieConfig = this.getRootDieConfig();
-    const newRootConfig = rootDieConfig ? diceConfigs.find(
-      (c) => c.sides === rootDieConfig.sides && c.rollType === rootDieConfig.rollType && c.reroll === rootDieConfig.reroll && c.explode === rootDieConfig.explode && c.minimum === rootDieConfig.minimum && c.bestOf === rootDieConfig.bestOf && c.keep === rootDieConfig.keep
-    ) : void 0;
+    const newRootConfig = rootDieConfig ? diceConfigs.find((c) => rollConfigsEqual(c, rootDieConfig)) : void 0;
     const diceExpressions = diceConfigs.map(
       (config) => this.configToSingleExpressionWithoutModifier(
         config,
@@ -2763,7 +2764,11 @@ var RollBuilder = class _RollBuilder {
       }
     }
     if (config.minimum > 0) {
-      baseDie = `${config.minimum}>${baseDie}`;
+      if (config.reroll > 0 && !config.explode) {
+        baseDie = `${config.minimum}>(${baseDie})`;
+      } else {
+        baseDie = `${config.minimum}>${baseDie}`;
+      }
       if (config.reroll > 0 && config.explode > 0) {
         for (let i = 1; i <= config.reroll; i++) {
           baseDie += ` reroll ${i}`;
@@ -2788,11 +2793,10 @@ var RollBuilder = class _RollBuilder {
           const baseDieExpression = this.configToSingleExpressionWithoutModifier(
             {
               ...config,
-              count: 1,
+              count: config.count,
               modifier: 0,
               rollType: "flat",
-              keep: void 0,
-              bestOf: 0
+              keep: void 0
             },
             false
           );
@@ -2801,21 +2805,20 @@ var RollBuilder = class _RollBuilder {
           const isComplex = baseDie.length > `d${config.sides}`.length;
           const isHalflingShorthand = baseDie === "hd20";
           const isD20Shorthand = baseDie === "d20" && isRootDie;
-          const hasMinimum = baseDie.startsWith("(") && baseDie.includes(">");
-          const hasReroll = baseDie.includes("reroll");
+          const hasMinimum = config.minimum > 0;
+          const hasReroll = config.reroll > 0;
           const effectiveCount = config.isSubtraction ? Math.abs(config.count) : config.count < 0 ? 1 : Math.abs(config.count);
           if (effectiveCount > 1) {
-            const shouldAddParentheses = isComplex && (// Complex single roll: explode + reroll
-            !hasMinimum && !hasReroll || // Simple complex case
-            hasReroll && !hasMinimum);
+            const shouldAddParentheses = isComplex;
             mainExpression = shouldAddParentheses ? `${effectiveCount}(${baseDie})` : `${effectiveCount}${baseDie}`;
           } else if (effectiveCount === 1) {
+            const needsParens = hasReroll && hasMinimum;
             if (config.isSubtraction) {
-              mainExpression = `1${baseDie}`;
+              mainExpression = needsParens ? `1(${baseDie})` : `1${baseDie}`;
             } else if (isComplex || isHalflingShorthand || isD20Shorthand || config.count < 0) {
-              mainExpression = baseDie;
+              mainExpression = needsParens ? `1(${baseDie})` : baseDie;
             } else {
-              mainExpression = `1${baseDie}`;
+              mainExpression = needsParens ? `1(${baseDie})` : `1${baseDie}`;
             }
           } else {
             mainExpression = baseDie;