@yipe/dice 0.2.4 → 0.2.6

package/dist/builder/index.js

@@ -2679,22 +2679,42 @@ var RollBuilder = class _RollBuilder {
         configGroups.set(key, { config, totalCount: config.count });
       }
     }
-    const diceConfigs = Array.from(configGroups.values()).map(({ config, totalCount }) => ({
+    const rootConfig = this.getRootDieConfig();
+    const groupedConfigs = Array.from(configGroups.values());
+    let rootD20Group;
+    if (rootConfig && rootConfig.sides === 20) {
+      const rootIndex = groupedConfigs.findIndex(
+        ({ config }) => config.sides === rootConfig.sides && config.rollType === rootConfig.rollType && config.reroll === rootConfig.reroll && config.explode === rootConfig.explode && config.minimum === rootConfig.minimum && config.bestOf === rootConfig.bestOf && JSON.stringify(config.keep) === JSON.stringify(rootConfig.keep)
+      );
+      if (rootIndex !== -1) {
+        rootD20Group = groupedConfigs.splice(rootIndex, 1)[0];
+      }
+    }
+    const sortedDiceConfigs = groupedConfigs.map(({ config, totalCount }) => ({
       ...config,
       count: totalCount
     })).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 (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);
     });
+    const diceConfigs = rootD20Group ? [
+      { ...rootD20Group.config, count: rootD20Group.totalCount },
+      ...sortedDiceConfigs
+    ] : sortedDiceConfigs;
     const totalModifier = this.subRollConfigs.reduce(
       (sum, config) => sum + config.modifier,
       0
     );
     if (diceConfigs.length === 0) return totalModifier.toString();
-    const rootConfig = this.getRootDieConfig();
-    const newRootConfig = rootConfig ? diceConfigs.find(
-      (c) => c.sides === rootConfig.sides && c.rollType === rootConfig.rollType && c.reroll === rootConfig.reroll && c.explode === rootConfig.explode && c.minimum === rootConfig.minimum && c.bestOf === rootConfig.bestOf && c.keep === rootConfig.keep
+    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 diceExpressions = diceConfigs.map(
       (config) => this.configToSingleExpressionWithoutModifier(
@@ -2763,7 +2783,18 @@ var RollBuilder = class _RollBuilder {
       case "flat":
         if (config.keep) {
           const mode = config.keep.mode === "highest" ? "kh" : "kl";
-          mainExpression = `${config.keep.total}${mode}${config.keep.count}(${baseDie})`;
+          const baseDieExpression = this.configToSingleExpressionWithoutModifier(
+            {
+              ...config,
+              count: 1,
+              modifier: 0,
+              rollType: "flat",
+              keep: void 0,
+              bestOf: 0
+            },
+            false
+          );
+          mainExpression = `${config.keep.total}${mode}${config.keep.count}(${baseDieExpression})`;
         } else {
           const isComplex = baseDie.length > `d${config.sides}`.length;
           const isHalflingShorthand = baseDie === "hd20";