@yipe/dice 0.8.1 → 0.10.0

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export * from "./common/errors.js";
 export * from "./common/lru-cache.js";
 export * from "./common/types.js";
 export * from "./parser/parser.js";
+export * from "./parser/rollType.js";
 export * from "./pmf/mixture.js";
 export * from "./pmf/pmf.js";
 export * from "./pmf/query.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC"}

package/dist/index.js

@@ -207,6 +207,10 @@ var _DiceQuery = class _DiceQuery {
     if (this._combinedWithAttr) {
       return this._combinedWithAttr;
     }
+    if (this._combinedProvided) {
+      this._combinedWithAttr = this.combined.withAttribution();
+      return this._combinedWithAttr;
+    }
     if (this.singles.every((pmf) => pmf.hasAttribution())) {
       this._combinedWithAttr = this.combined;
       return this._combinedWithAttr;
@@ -977,6 +981,55 @@ var _DiceQuery = class _DiceQuery {
     }
     return out;
   }
+  /**
+   * Per-outcome probabilities and damage ranges, aggregated over the individual
+   * singles rather than read off the combined distribution.
+   *
+   * `damageRange` is the sum, over every single that can produce the outcome, of
+   * that single's own conditional damage range: "what this outcome contributes
+   * across the whole turn when every attack that can produce it does". Linear in
+   * the number of attacks by construction.
+   *
+   * Prefer this over {@link DiceQuery.snapshot} for a multi-attack query.
+   * `snapshot` reads `damageRange` off the combined PMF's `count`, which the
+   * convolution accumulates as an expected count, so its `avg` is size-biased
+   * for N≥2 (its own doc comment says so). The two agree for a single attack.
+   *
+   * Only outcomes that actually occur appear in the result.
+   *
+   * Like every `singles`-based helper on this class, it describes the singles
+   * and not an explicitly provided `combined`. `Turn.toQuery()` supplies one whose
+   * distribution also contains rider attacks that are absent from `singles`
+   * (an `otherwise([unarmed, unarmed])` flurry, say), so those attacks do not
+   * appear here. For rider-inclusive figures read the combined distribution
+   * directly: {@link DiceQuery.outcomeTotals}, {@link DiceQuery.outcomeDamageRanges}.
+   *
+   * @param outcomes Which outcomes to consider; defaults to every canonical one.
+   */
+  outcomeStats(outcomes = ALL_OUTCOME_TYPES) {
+    const stats = /* @__PURE__ */ new Map();
+    const perSingle = this.singles.map((pmf) => new _DiceQuery([pmf], void 0, this._eps));
+    for (const outcome of outcomes) {
+      const atLeastOneProbability = this.probAtLeastOne(outcome);
+      if (atLeastOneProbability <= 0) continue;
+      const damageRange = { min: 0, avg: 0, max: 0 };
+      let contributors = 0;
+      for (const single of perSingle) {
+        if (single.probAtLeastOne(outcome) <= 0) continue;
+        contributors++;
+        const stat = single.damageStatsFrom(outcome);
+        damageRange.min += stat.min;
+        damageRange.avg += stat.avg;
+        damageRange.max += stat.max;
+      }
+      stats.set(outcome, {
+        atLeastOneProbability,
+        allProbability: contributors > 0 ? this.probExactlyK(outcome, contributors) : 0,
+        damageRange
+      });
+    }
+    return stats;
+  }
   /**
    * Snapshot of the distribution in the exact shape the UI consumes.
    * - outcome probabilities are "at least one" (and equal to "all" for a single PMF)
@@ -1513,7 +1566,7 @@ var _PMF = class _PMF {
     const id = this.identifier;
     let key = `${id}`;
     for (let i = 1; i < n; i++) key += `+${id}`;
-    return `${key}@${eps}`;
+    return `${key}@${eps}|${this.fingerprint()}`;
   }
   /**
    * Efficiently computes this PMF convolved with itself `n` times.
@@ -1864,16 +1917,27 @@ var _PMF = class _PMF {
     return `v4:${raw ? "RAW" : "N"}:${id1}+${id2}@${eps}|${p1.fingerprint()}|${p2.fingerprint()}`;
   }
   /**
-   * A small content fingerprint (mass + bin count + face sum) so convolution
-   * cache keys change if the underlying numbers do. Memoized because a PMF is
-   * immutable once constructed — this avoids re-summing every key on each
-   * convolve() call (including cache hits).
+   * A content fingerprint of every bin (probability, per-label `count`, per-label `attr`) plus
+   * the `normalized` flag, so convolution/power cache keys change whenever the underlying
+   * numbers do. Mass/bin-count/face-sum alone are not content-unique: `mapDamage` variants can
+   * keep the same identifier, support, mass, and face sum while differing in per-bin
+   * probabilities or in the `count`/`attr` channels `convolve()`/`power()` actually propagate --
+   * that previously let `power()` return one PMF's cached result for a different PMF. Memoized
+   * because a PMF is immutable once constructed -- this avoids re-deriving the key on every
+   * convolve()/power() call (including cache hits). Bin order is sorted by damage value (and
+   * label keys sorted within each bin) so two equal-content PMFs built via different code paths
+   * fingerprint identically regardless of Map insertion order.
    */
   fingerprint() {
     if (this._fingerprint === void 0) {
-      let faceSum = 0;
-      for (const k of this.map.keys()) faceSum += k;
-      this._fingerprint = `${this.mass().toFixed(12)}|${this.map.size}|${faceSum}`;
+      const bins = [...this.map.entries()].sort((a, b) => a[0] - b[0]);
+      const parts = [];
+      for (const [damageValue, bin] of bins) {
+        const countStr = Object.keys(bin.count).sort().map((k) => `${k}:${bin.count[k]}`).join(",");
+        const attrStr = bin.attr ? Object.keys(bin.attr).sort().map((k) => `${k}:${bin.attr[k]}`).join(",") : "";
+        parts.push(`${damageValue}:${bin.p}[${countStr}]{${attrStr}}`);
+      }
+      this._fingerprint = `${this.normalized ? 1 : 0}|${parts.join(";")}`;
     }
     return this._fingerprint;
   }
@@ -2105,11 +2169,13 @@ var _PMF = class _PMF {
   /** Quantile / inverse CDF for p in [0,1]. Returns smallest x with CDF ≥ p. */
   quantile(p) {
     if (this.map.size === 0) return 0;
+    const totalMass = this.mass();
+    if (totalMass <= 0) return 0;
     const s = this.support().sort((a, b) => a - b);
     let acc = 0;
     for (const x of s) {
       acc += this.pAt(x);
-      if (acc >= p) return x;
+      if (acc / totalMass >= p) return x;
     }
     return s[s.length - 1];
   }
@@ -2970,6 +3036,12 @@ function combineDiceWithNormalization(dice, normValue, outcomeType, currentNorm,
   finalResult = finalResult.combine(dice);
   return { newNorm: currentNorm * normValue, updatedResult: finalResult };
 }
+function subtractCounts(a, b) {
+  const result = new Dice();
+  for (const [key, value] of a.getFaceEntries()) result.increment(key, value);
+  for (const [key, value] of b.getFaceEntries()) result.increment(key, -value);
+  return result;
+}
 function parseExpression(arr, n) {
   const result = (() => {
     const res = parseArgument(arr, n);
@@ -2977,8 +3049,29 @@ function parseExpression(arr, n) {
   })();
   let op = parseOperation(arr);
   let finalResult = result;
+  let baseDieMeta = result.privateData?.checkDie && !result.privateData.checkDie.rerollOne ? result.privateData.checkDie : void 0;
+  let bonusOnly = Dice.scalar(0);
   while (op != null) {
     const arg = !op.unary ? parseArgument(arr, n) : finalResult;
+    let acAlreadyApplied = false;
+    if (baseDieMeta) {
+      if (op === Dice.prototype.addNonZero) {
+        bonusOnly = bonusOnly.add(arg);
+      } else if (op === Dice.prototype.subtract) {
+        bonusOnly = bonusOnly.subtract(arg);
+      } else if (op === Dice.prototype.ac && typeof arg === "number") {
+        const natMaxSlice = bonusOnly.add(baseDieMeta.sides);
+        const restSlice = subtractCounts(finalResult, natMaxSlice);
+        const gatedNatMaxSlice = natMaxSlice.ac(arg);
+        finalResult = restSlice.ac(arg).combine(gatedNatMaxSlice);
+        finalResult.privateData.checkDie = baseDieMeta;
+        finalResult.privateData.natMaxCritSlice = gatedNatMaxSlice;
+        acAlreadyApplied = true;
+        baseDieMeta = void 0;
+      } else {
+        baseDieMeta = void 0;
+      }
+    }
     let crit;
     let critNorm = 1;
     if (arr[0] === "x" || arr[0] === "c") {
@@ -2989,11 +3082,17 @@ function parseExpression(arr, n) {
       assertToken(arr, "i");
       assertToken(arr, "t");
       const count = isXcrit ? parseNumber(arr, n) : 1;
-      crit = new Dice();
-      for (let i = 0; i < count; i++) {
-        const max = finalResult.maxFace();
-        crit.setFace(max, finalResult.get(max));
-        finalResult = finalResult.deleteFace(max);
+      const trackedCritSlice = finalResult.privateData?.natMaxCritSlice;
+      if (count === 1 && trackedCritSlice) {
+        crit = trackedCritSlice;
+        finalResult = subtractCounts(finalResult, trackedCritSlice);
+      } else {
+        crit = new Dice();
+        for (let i = 0; i < count; i++) {
+          const max = finalResult.maxFace();
+          crit.setFace(max, finalResult.get(max));
+          finalResult = finalResult.deleteFace(max);
+        }
       }
       critNorm = crit.total();
       crit = op.call(crit, parseBinaryArgument(arg, arr, n));
@@ -3044,7 +3143,9 @@ function parseExpression(arr, n) {
       missNorm = miss && missNorm ? miss.total() / missNorm : 1;
     }
     let norm = finalResult.total();
-    finalResult = op.call(finalResult, arg);
+    if (!acAlreadyApplied) {
+      finalResult = op.call(finalResult, arg);
+    }
     norm = norm ? finalResult.total() / norm : 1;
     if (crit) {
       const result2 = combineDiceWithNormalization(
@@ -3235,6 +3336,7 @@ function parseDice(s, n) {
   if (rerollOne) {
     result = result.reroll(1);
   }
+  result.privateData.checkDie = { sides, rerollOne };
   return result;
 }
 function peek(arr, expected) {
@@ -3345,6 +3447,65 @@ function parseOperation(s) {
   return;
 }
 
+// src/parser/rollType.ts
+var DECIMAL_INTEGER = /^\s*[+-]?\d+\s*$/;
+function tryParse(expression) {
+  if (DECIMAL_INTEGER.test(expression)) {
+    const value = Number(expression);
+    return Number.isSafeInteger(value) ? PMF.delta(value) : PMF.empty();
+  }
+  try {
+    return parse(expression);
+  } catch {
+    return PMF.empty();
+  }
+}
+var CHECK_TOKEN = /\b(AC|DC)\b/i;
+var D20_RUN = /\bh?d20(?:\s*[><]\s*h?d20)*/i;
+var RUN_FOR_ROLL_TYPE = {
+  flat: "d20",
+  advantage: "d20 > d20",
+  disadvantage: "d20 < d20",
+  "elven accuracy": "d20 > d20 > d20"
+};
+function withRollType(expression, rollType) {
+  const scopes = enclosingScopes(expression);
+  let rewritten = "";
+  let copiedUpTo = 0;
+  for (const run of expression.matchAll(new RegExp(D20_RUN, "gi"))) {
+    const at = run.index;
+    if (!isAttackRoll(expression, scopes, at)) continue;
+    const replacement = run[0].toLowerCase().startsWith("h") ? `h${RUN_FOR_ROLL_TYPE[rollType]}` : RUN_FOR_ROLL_TYPE[rollType];
+    rewritten += expression.slice(copiedUpTo, at) + replacement;
+    copiedUpTo = at + run[0].length;
+  }
+  return rewritten + expression.slice(copiedUpTo);
+}
+function enclosingScopes(expression) {
+  const open = [];
+  const scopes = [];
+  for (let i = 0; i < expression.length; i++) {
+    if (expression[i] === "(") open.push(i);
+    else if (expression[i] === ")") {
+      const start = open.pop();
+      if (start !== void 0) scopes.push({ start, end: i + 1 });
+    }
+  }
+  return scopes.sort((a, b) => a.end - a.start - (b.end - b.start));
+}
+function isAttackRoll(expression, scopes, at) {
+  let scoped = false;
+  for (const scope of scopes) {
+    if (at < scope.start || at >= scope.end) continue;
+    scoped = true;
+    const check2 = CHECK_TOKEN.exec(expression.slice(scope.start, scope.end));
+    if (check2) return check2[1].toUpperCase() === "AC";
+  }
+  if (scoped) return false;
+  const check = CHECK_TOKEN.exec(expression);
+  return check !== null && check[1].toUpperCase() === "AC";
+}
+
 // src/pmf/mixture.ts
 var Mixture = class _Mixture {
   constructor(eps = EPS) {
@@ -3463,6 +3624,6 @@ var Mixture = class _Mixture {
   }
 };
 
-export { ALL_OUTCOME_TYPES, DiceParseError, DiceQuery, EPS, LRUCache, MISS_NONE_OUTCOME, Mixture, OUTCOME_DISPLAY_ORDER, PMF, calculateBounceOdds, clearParserCache, critProbability, getCachingEnabled, onAnyHit, onCritOnly, onHitOnly, onMissDamageOnly, onMissOnly, onPotentCantripOnly, onSaveFailOnly, onSaveHalfOnly, parse, pmfCache, setCachingEnabled, sortOutcomes };
+export { ALL_OUTCOME_TYPES, DiceParseError, DiceQuery, EPS, LRUCache, MISS_NONE_OUTCOME, Mixture, OUTCOME_DISPLAY_ORDER, PMF, calculateBounceOdds, clearParserCache, critProbability, getCachingEnabled, onAnyHit, onCritOnly, onHitOnly, onMissDamageOnly, onMissOnly, onPotentCantripOnly, onSaveFailOnly, onSaveHalfOnly, parse, pmfCache, setCachingEnabled, sortOutcomes, tryParse, withRollType };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map