@yipe/dice 0.2.19 → 0.2.21

package/dist/builder/index.cjs

@@ -3340,9 +3340,15 @@ var RollBuilder = class _RollBuilder {
       this.subRollConfigs = countOrConfigs.map((c) => ({ ...c }));
     }
   }
+  create(configs) {
+    return new _RollBuilder(configs);
+  }
   get lastConfig() {
     return this.subRollConfigs[this.subRollConfigs.length - 1];
   }
+  hasHiddenState() {
+    return false;
+  }
   getSubRollConfigs() {
     return this.subRollConfigs.map((c) => ({ ...c }));
   }
@@ -3376,6 +3382,11 @@ var RollBuilder = class _RollBuilder {
       }
       if (isNaN(count)) throw new Error("Invalid NaN value for count argument");
       if (sidesOrDie instanceof _RollBuilder) {
+        if (sidesOrDie.hasHiddenState()) {
+          throw new Error(
+            "Cannot use a roll with hidden state (like a pooled roll) as a die type."
+          );
+        }
         const subRollConfigs = sidesOrDie.getSubRollConfigs();
         if (subRollConfigs.length === 0) {
           const result = new _RollBuilder(0);
@@ -3416,12 +3427,17 @@ var RollBuilder = class _RollBuilder {
     if (sides === 0) return this;
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].sides = sides;
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   plus(modOrRoll, die) {
     if (typeof modOrRoll === "number" && isNaN(modOrRoll))
       throw new Error("Invalid NaN value for modOrRoll");
     if (die instanceof _RollBuilder && typeof modOrRoll === "number") {
+      if (die.hasHiddenState()) {
+        throw new Error(
+          "Cannot use a roll with hidden state (like a pooled roll) as a die type."
+        );
+      }
       const count = modOrRoll;
       const subRollConfigs = die.getSubRollConfigs();
       if (subRollConfigs.length === 0) return this;
@@ -3446,7 +3462,7 @@ var RollBuilder = class _RollBuilder {
       if (modOrRoll === 0) return this;
       const newConfigs = this.getSubRollConfigs();
       newConfigs[newConfigs.length - 1].modifier += modOrRoll;
-      return new this.constructor(newConfigs);
+      return this.create(newConfigs);
     }
     return this.add(modOrRoll);
   }
@@ -3464,7 +3480,7 @@ var RollBuilder = class _RollBuilder {
     if (value === this.lastConfig.reroll) return this;
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].reroll = value;
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   /** Set finite explode count for max-face explosions (Infinity allowed). */
   explode(count = Infinity) {
@@ -3475,7 +3491,7 @@ var RollBuilder = class _RollBuilder {
     if (count < 0) throw new Error("Explode count must be >= 0");
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].explode = count;
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   /** Apply per-die minimum value (min > 0). */
   minimum(val) {
@@ -3486,7 +3502,7 @@ var RollBuilder = class _RollBuilder {
     if (val < 0) throw new Error("Minimum value must be >= 0");
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].minimum = val + 1;
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   bestOf(count) {
     if (count !== void 0 && isNaN(count))
@@ -3495,40 +3511,83 @@ var RollBuilder = class _RollBuilder {
     if (count <= 0) throw new Error("Best of count must be > 0");
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].bestOf = count;
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   keepHighest(total, count) {
     if (isNaN(total) || isNaN(count))
       throw new Error("Invalid NaN value for keepHighest");
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].keep = { total, count, mode: "highest" };
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   keepLowest(total, count) {
     if (isNaN(total) || isNaN(count))
       throw new Error("Invalid NaN value for keepLowest");
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].keep = { total, count, mode: "lowest" };
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
+  }
+  keepHighestAll(total, count) {
+    if (isNaN(total) || isNaN(count))
+      throw new Error("Invalid NaN value for keepHighestAll");
+    const currentAST = this.toAST();
+    const trialPool = {
+      type: "sum",
+      count: total,
+      child: currentAST
+    };
+    const keepNode = {
+      type: "keep",
+      mode: "highest",
+      count,
+      child: trialPool
+    };
+    const currentExpr = this.toExpression();
+    const expression = `${total}kh${count}(${currentExpr})`;
+    return new PooledRollBuilder(keepNode, expression);
+  }
+  keepLowestAll(total, count) {
+    if (isNaN(total) || isNaN(count))
+      throw new Error("Invalid NaN value for keepLowestAll");
+    const currentAST = this.toAST();
+    const trialPool = {
+      type: "sum",
+      count: total,
+      child: currentAST
+    };
+    const keepNode = {
+      type: "keep",
+      mode: "lowest",
+      count,
+      child: trialPool
+    };
+    const currentExpr = this.toExpression();
+    const expression = `${total}kl${count}(${currentExpr})`;
+    return new PooledRollBuilder(keepNode, expression);
   }
   withAdvantage() {
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].rollType = "advantage";
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   withDisadvantage() {
     const configs = this.getSubRollConfigs();
     configs[configs.length - 1].rollType = "disadvantage";
-    return new this.constructor(configs);
+    return this.create(configs);
   }
   add(anotherRoll) {
     if (anotherRoll === void 0) return this;
+    if (anotherRoll.hasHiddenState()) {
+      throw new Error(
+        "Cannot add a roll with hidden state (like a pooled roll) to a standard roll. Try adding the standard roll to the pooled roll instead: pool.plus(roll)."
+      );
+    }
     const configs = [...this.subRollConfigs, ...anotherRoll.subRollConfigs];
-    return new this.constructor(configs);
+    return this.create(configs);
   }
   withBonus(anotherRoll) {
     const configs = [...this.subRollConfigs, ...anotherRoll.subRollConfigs];
-    return new this.constructor(configs);
+    return this.create(configs);
   }
   addRoll(count = 1) {
     if (isNaN(count)) throw new Error("Invalid NaN value for count");
@@ -3540,7 +3599,7 @@ var RollBuilder = class _RollBuilder {
         isSubtraction: count < 0
       }
     ];
-    return new this.constructor(configs);
+    return this.create(configs);
   }
   scaleDice(scale) {
     const scaleInt = Math.floor(scale);
@@ -3550,7 +3609,7 @@ var RollBuilder = class _RollBuilder {
       if (!config.sides || config.sides <= 0) return config;
       return { ...config, count: config.count * scaleInt };
     });
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   doubleDice() {
     return this.scaleDice(2);
@@ -3562,12 +3621,12 @@ var RollBuilder = class _RollBuilder {
     return new AlwaysCritBuilder(this);
   }
   copy() {
-    return new this.constructor(this.getSubRollConfigs());
+    return this.create(this.getSubRollConfigs());
   }
   withElvenAccuracy() {
     const newConfigs = this.getSubRollConfigs();
     newConfigs[newConfigs.length - 1].rollType = "elven accuracy";
-    return new this.constructor(newConfigs);
+    return this.create(newConfigs);
   }
   toExpression() {
     const originalDiceConfigs = this.subRollConfigs.filter(
@@ -3781,6 +3840,19 @@ var HalfRollBuilder = class _HalfRollBuilder extends RollBuilder {
     super(0);
     this.innerRoll = innerRoll;
   }
+  hasHiddenState() {
+    return this.innerRoll.hasHiddenState();
+  }
+  // No need to override create if we don't expose RollBuilder methods that use it,
+  // but HalfRollBuilder extends RollBuilder so it does.
+  // However, HalfRollBuilder seems to just wrap another roll.
+  // If we call .plus() on HalfRollBuilder, it returns a HalfRollBuilder?
+  // No, RollBuilder.plus returns RollBuilder.
+  // The inheritance here is a bit tricky.
+  // Existing code for HalfRollBuilder doesn't seem to implement plus/etc.
+  // So .plus() on a HalfRollBuilder would return a RollBuilder (base class).
+  // Which is fine.
+  // The only issue is if we want it to return HalfRollBuilder, but it doesn't seem designed for that.
   get lastConfig() {
     return this.innerRoll.lastConfig;
   }
@@ -3812,6 +3884,9 @@ var MaxOfRollBuilder = class _MaxOfRollBuilder extends RollBuilder {
     this.diceCount = diceCount;
     this.diceSides = diceSides;
   }
+  hasHiddenState() {
+    return this.innerRoll.hasHiddenState();
+  }
   get lastConfig() {
     return this.innerRoll.lastConfig;
   }
@@ -3867,6 +3942,11 @@ var MaxOfRollBuilder = class _MaxOfRollBuilder extends RollBuilder {
 };
 var AlwaysHitBuilder = class _AlwaysHitBuilder extends RollBuilder {
   constructor(baseRoll, attackConfig) {
+    if (baseRoll.hasHiddenState()) {
+      throw new Error(
+        "Cannot create AlwaysHitBuilder from a roll with hidden state."
+      );
+    }
     super(baseRoll.getSubRollConfigs());
     __publicField(this, "attackConfig");
     if (attackConfig) {
@@ -3875,6 +3955,9 @@ var AlwaysHitBuilder = class _AlwaysHitBuilder extends RollBuilder {
       this.attackConfig = { critThreshold: 20 };
     }
   }
+  create(configs) {
+    return new RollBuilder(configs);
+  }
   onHit(...args) {
     const damageRoll = RollBuilder.fromArgs(...args);
     return new AttackBuilder(this, damageRoll);
@@ -3909,6 +3992,11 @@ var AlwaysHitBuilder = class _AlwaysHitBuilder extends RollBuilder {
 };
 var AlwaysCritBuilder = class _AlwaysCritBuilder extends RollBuilder {
   constructor(baseRoll, attackConfig, fromAlwaysHit = false) {
+    if (baseRoll.hasHiddenState()) {
+      throw new Error(
+        "Cannot create AlwaysCritBuilder from a roll with hidden state."
+      );
+    }
     super(baseRoll.getSubRollConfigs());
     __publicField(this, "attackConfig");
     __publicField(this, "fromAlwaysHit");
@@ -3919,6 +4007,9 @@ var AlwaysCritBuilder = class _AlwaysCritBuilder extends RollBuilder {
     }
     this.fromAlwaysHit = fromAlwaysHit || baseRoll instanceof AlwaysHitBuilder;
   }
+  create(configs) {
+    return new RollBuilder(configs);
+  }
   onHit(...args) {
     const damageRoll = RollBuilder.fromArgs(...args);
     return new AttackBuilder(this, damageRoll);
@@ -3955,7 +4046,13 @@ var ParsedRollBuilder = class _ParsedRollBuilder extends RollBuilder {
     this.originalExpression = expression;
     this.cachedPMF = parse(expression, 0);
   }
-  toPMF(eps = 0) {
+  hasHiddenState() {
+    return true;
+  }
+  create(configs) {
+    return new RollBuilder(configs);
+  }
+  toPMF(_eps = 0) {
     return this.cachedPMF;
   }
   toExpression() {
@@ -3975,10 +4072,122 @@ var ParsedRollBuilder = class _ParsedRollBuilder extends RollBuilder {
     );
   }
 };
+var PooledRollBuilder = class _PooledRollBuilder extends RollBuilder {
+  constructor(baseAST, baseExpression, configs = []) {
+    super(configs.length > 0 ? configs : 0);
+    this.baseAST = baseAST;
+    this.baseExpression = baseExpression;
+  }
+  create(configs) {
+    return new _PooledRollBuilder(this.baseAST, this.baseExpression, configs);
+  }
+  hasHiddenState() {
+    return true;
+  }
+  d(_sides) {
+    throw new Error("Cannot add dice to a pooled roll. The pool is finalized.");
+  }
+  reroll(_value) {
+    throw new Error("Cannot set reroll on a pooled roll.");
+  }
+  explode(_count = Infinity) {
+    throw new Error("Cannot set explode on a pooled roll.");
+  }
+  minimum(_val) {
+    throw new Error("Cannot set minimum on a pooled roll.");
+  }
+  bestOf(_count) {
+    throw new Error("Cannot set bestOf on a pooled roll.");
+  }
+  keepHighest(_total, _count) {
+    throw new Error(
+      "Cannot use keepHighest on a pooled roll. Use keepHighestAll again if you want nested pooling."
+    );
+  }
+  keepLowest(_total, _count) {
+    throw new Error(
+      "Cannot use keepLowest on a pooled roll. Use keepLowestAll again if you want nested pooling."
+    );
+  }
+  withAdvantage() {
+    throw new Error("Cannot set advantage on a pooled roll.");
+  }
+  withDisadvantage() {
+    throw new Error("Cannot set disadvantage on a pooled roll.");
+  }
+  withElvenAccuracy() {
+    throw new Error("Cannot set elven accuracy on a pooled roll.");
+  }
+  toAST() {
+    const configsAST = super.toAST();
+    const isZero = configsAST.type === "constant" && configsAST.value === 0;
+    if (isZero) {
+      return this.baseAST;
+    }
+    const children = [
+      { node: this.baseAST, sign: 1 },
+      { node: configsAST, sign: 1 }
+    ];
+    return { type: "add", children };
+  }
+  toExpression() {
+    const configsExpression = super.toExpression();
+    if (configsExpression === "0") {
+      return this.baseExpression;
+    }
+    if (configsExpression.startsWith("-")) {
+      return `${this.baseExpression} - ${configsExpression.substring(1)}`;
+    }
+    return `${this.baseExpression} + ${configsExpression}`;
+  }
+  copy() {
+    return new _PooledRollBuilder(
+      this.baseAST,
+      this.baseExpression,
+      this.getSubRollConfigs()
+    );
+  }
+  scaleDice(scale) {
+    const scaleInt = Math.floor(scale);
+    if (scaleInt !== scale) throw new Error("Scale must be an integer");
+    if (scaleInt <= 0) throw new Error("Scale must be > 0");
+    const newBaseAST = {
+      type: "sum",
+      count: scaleInt,
+      child: this.baseAST
+    };
+    const newBaseExpr = scaleInt === 1 ? this.baseExpression : `${scaleInt}(${this.baseExpression})`;
+    return new _PooledRollBuilder(
+      newBaseAST,
+      newBaseExpr,
+      this.getSubRollConfigs()
+    );
+  }
+  times(count) {
+    if (isNaN(count)) throw new Error("Invalid NaN value for times");
+    if (Math.floor(count) !== count)
+      throw new Error("times() requires an integer");
+    if (count < 0) throw new Error("times() requires a non-negative integer");
+    const currentAST = this.toAST();
+    const currentExpr = this.toExpression();
+    const sumNode = {
+      type: "sum",
+      count,
+      child: currentAST
+    };
+    const newExpr = count === 1 ? currentExpr : `${count}(${currentExpr})`;
+    return new _PooledRollBuilder(sumNode, newExpr);
+  }
+};
 
 // src/builder/factory.ts
 var rollFn = (count, sidesOrDie, modifier) => {
   if (sidesOrDie instanceof RollBuilder) {
+    if (sidesOrDie.hasHiddenState()) {
+      throw new Error(
+        "Cannot use a roll with hidden state (like a pooled roll) as a die type."
+      );
+    }
     const subRollConfigs = sidesOrDie.getSubRollConfigs();
     if (subRollConfigs.length === 0) return new RollBuilder(0).plus(modifier);
     const absCount = Math.abs(count);
@@ -4755,7 +4964,7 @@ var SaveBuilder = class _SaveBuilder {
     const { pSuccess: psuccess = 0, pFail: pfail = 1 } = resolveProbabilities(
       this.check
     );
-    const failPMF = this.failureEffect ? pmfFromRollBuilder(this.failureEffect) : PMF.delta(0);
+    const failPMF = this.failureEffect ? this.failureEffect instanceof ParsedRollBuilder ? this.failureEffect.toPMF(eps) : pmfFromRollBuilder(this.failureEffect) : PMF.delta(0);
     const onSuccess = this.saveOutcome ?? "half";
     let successPMF = PMF.delta(0, eps);
     if (onSuccess === "half") successPMF = failPMF.scaleDamage(0.5, "floor");
@@ -4887,6 +5096,7 @@ exports.DCBuilder = DCBuilder;
 exports.HalfRollBuilder = HalfRollBuilder;
 exports.MaxOfRollBuilder = MaxOfRollBuilder;
 exports.ParsedRollBuilder = ParsedRollBuilder;
+exports.PooledRollBuilder = PooledRollBuilder;
 exports.RollBuilder = RollBuilder;
 exports.SaveBuilder = SaveBuilder;
 exports.builderPMFCache = builderPMFCache;