@yipe/dice 0.11.0 → 0.12.0

package/dist/builder/attack.d.ts

@@ -3,7 +3,7 @@ import { PMF } from "../pmf/pmf.js";
 import type { DiceQuery } from "../pmf/query.js";
 import type { ACBuilder } from "./ac.js";
 import { AlwaysCritBuilder, AlwaysHitBuilder, RollBuilder } from "./roll.js";
-import type { AttackResolution, CheckBuilder } from "./types.js";
+import type { AttackResolution, Check, CheckBuilder } from "./types.js";
 type ActionEffect = RollBuilder;
 /** Clears the resolved-attack PMF cache (test/bench seam; mirrors {@link clearParserCache}). */
 export declare function clearAttackCache(): void;
@@ -12,7 +12,11 @@ export declare class AttackBuilder implements CheckBuilder {
     private readonly hitEffect?;
     private readonly critEffect?;
     private readonly missEffect?;
-    constructor(check: ACBuilder | AlwaysHitBuilder | AlwaysCritBuilder, hitEffect?: ActionEffect | undefined, critEffect?: ActionEffect | null | undefined, missEffect?: ActionEffect | undefined);
+    private readonly separateDamage;
+    private readonly rerollThreshold?;
+    private readonly minimumDieValue?;
+    private readonly halfOnMissFlag;
+    constructor(check: ACBuilder | AlwaysHitBuilder | AlwaysCritBuilder, hitEffect?: ActionEffect | undefined, critEffect?: ActionEffect | null | undefined, missEffect?: ActionEffect | undefined, separateDamage?: readonly RollBuilder[], rerollThreshold?: number | undefined, minimumDieValue?: number | undefined, halfOnMissFlag?: boolean);
     onCrit(val: number): AttackBuilder;
     onCrit(val: string): AttackBuilder;
     onCrit(val: RollBuilder): AttackBuilder;
@@ -28,26 +32,105 @@ export declare class AttackBuilder implements CheckBuilder {
     onMiss(count: number, die: RollBuilder, modifier: number): AttackBuilder;
     onMiss(count: number, sides: number, modifier: number): AttackBuilder;
     noCrit(): AttackBuilder;
+    /**
+     * Adds a second damage channel, convolved into the hit AND crit payloads (its dice double on
+     * a crit like any attack damage) but excluded from base-payload transforms — base-payload
+     * rerolls and once-per-turn reroll substitutions never touch it. Chainable; several calls
+     * accumulate into one convolved channel.
+     */
+    plusSeparateDamage(damage: RollBuilder): AttackBuilder;
+    /**
+     * Lets every die group of the BASE payload (hit, and the crit branch when it is explicit)
+     * reroll low faces once, leaving `plusSeparateDamage` channels untouched — so a weapon reads in
+     * whichever order the caller likes. The threshold is a permission cap, not an obligation: a
+     * group rerolls faces `1..min(threshold, cap)`, where `cap` is the largest face whose kept value
+     * `max(face, floor)` is below the expected value of a fresh floored face (`floor` from the
+     * group's own `minimum` and {@link minimumDamageDie}; with no floor, `floor(sides / 2)`). For a
+     * die that does not explode that is optimal play, and the result is monotone in `threshold`.
+     * A group's own `reroll` is kept when it is higher. `RollBuilder.reroll()` keeps its own
+     * obligation semantics; this is the attack-level verb.
+     */
+    rerollDamage(threshold: number): AttackBuilder;
+    /**
+     * Raises every die of the BASE payload (hit, and the crit branch when it is explicit) to at
+     * least `minimum`, leaving `plusSeparateDamage` channels untouched. A group's own higher
+     * `minimum` is kept. Order-independent with respect to `plusSeparateDamage` and
+     * `rerollDamage` (whose cap accounts for the floor).
+     */
+    minimumDamageDie(minimum: number): AttackBuilder;
+    /**
+     * The miss payload becomes `floor(resolved hit payload / 2)` — base plus every
+     * `plusSeparateDamage` channel, never the crit payload. Labelled `missDamage`: it is not a
+     * landing, so no `first-hit`/`every-hit`/condition trigger reads it, and no reroll
+     * substitution touches it. Mutually exclusive with `onMiss()`.
+     */
+    halfOnMiss(): AttackBuilder;
+    /**
+     * The one way to re-derive hit/crit/miss probabilities for an existing attack: `vsAC` and the
+     * turn-level condition variants are both callers. Throws if this attack's check has no AC (an
+     * `AlwaysHitBuilder`, or a crit-from-always-hit override) — there is nothing to rebind.
+     */
+    withCheck(fn: (check: Check) => Check): AttackBuilder;
+    private toCheck;
+    private static buildCheck;
+    /**
+     * The base-payload transform for a `rerollDamage` threshold and a `minimumDamageDie` floor
+     * (either may be unset). Each only ever raises a group's own `minimum`/`reroll`, and the reroll
+     * cap reads the final floor, so applying it again after the other call lands on the same config
+     * whichever order the two calls came in.
+     */
+    private static baseTransform;
+    /** Applies the `rerollDamage`/`minimumDamageDie` values already set on this builder to `effect`. */
+    private withStoredBaseTransforms;
+    /**
+     * Shared by `rerollDamage`/`minimumDamageDie`: rewrite every die-bearing `RollConfig` of a
+     * base-payload effect. Refuses (rather than silently no-oping) an effect with no real dice
+     * descriptor — a parsed string or a half/scale/maxOf/pooled/composite wrapper — matching the
+     * "refuse rather than approximate" bar the reroll substitution's `no-dice-descriptor` uses.
+     */
+    private static mapEveryDieGroup;
+    /**
+     * The attack as a string `parse()` reads back to the same outcomes, up to the natural-1 miss and
+     * natural-20 hit, which the grammar does not model. The crit clause is always printed, since a
+     * string without one crits with its hit dice doubled: `noCrit()` prints `xcrit0 (<hit>)` (no
+     * natural face crits, so every landing is a hit), and a crit range keeps its `xcritN`. A check
+     * that crits on every hit (`alwaysCrits()`) prints `xcritS`, S the natural die's size; one that
+     * always hits prints just its natural roll, which never totals 0.
+     */
     toExpression(): string;
+    /**
+     * Hit, crit and miss weights of `check`. A natural 1 misses; a natural 20 hits and crits
+     * whatever the AC, the crit threshold, or crit-on-hit; any other natural roll hits when the total
+     * reaches the AC, and crits when it is in the crit range (or every hit crits: `alwaysCrits()`).
+     * An always-hitting check crits on a natural 20 or in its crit range. A check with no die has no
+     * natural roll, so it hits exactly when its flat total and bonus dice reach the AC and never
+     * crits unless every hit does.
+     */
     resolveProbabilities(check: ACBuilder | AlwaysHitBuilder | AlwaysCritBuilder, eps?: number): {
         pSuccess: number;
         pHit: number;
         pCrit: number;
         pMiss: number;
     };
+    /** Resolves the attack into its weighted slices. `eps` defaults to 0, as for {@link toPMF}: no reachable damage value is pruned. */
     resolve(eps?: number): AttackResolution;
     /**
      * For `dice-match` trigger slicing (`turn/types.ts`'s `HasDiceMatchInfo`): the exact
      * per-damage-value match probability for the hit and crit branches, or `null` per branch when no
      * descriptor is available — a string-parsed effect, a wrapped transform whose PMF isn't fully
      * captured by its `RollConfig`s (half/scale/maxOf/pooled — `cacheKey()` returns `null` for
-     * exactly these), a `keep`/`bestOf` pool (ambiguous "the dice" under crit doubling), a
-     * pool-wide exploding budget (composition with match not yet threaded through here), a
-     * multi-die-type pool, a single die (can never match), or (crit) `noCrit()`.
+     * exactly these), a `keep`/`bestOf` pool (ambiguous "the dice" under crit doubling), an
+     * exploding pool (per-die `explode` or a pool-wide budget: extra dice join the total), a pool
+     * rolled with advantage/disadvantage (one kept die, not a pool), a subtracted pool (its faces
+     * lower the damage), a multi-die-type pool, or (crit) `noCrit()`. A single die is supported and
+     * can never match (an empty map).
      *
      * The crit branch is built from the SAME crit-effect selection `resolve()` uses (an explicit
      * `onCrit` roll, or the hit dice auto-doubled via `copy().doubleDice()`), so its descriptor
      * reflects the crit branch's REAL doubled pool, not the hit pool re-used blindly.
+     *
+     * Reads ONLY `hitEffect`/`critEffect` (the base pool) — `plusSeparateDamage` channels are a
+     * separate channel, so their dice never count toward a match.
      */
     diceMatchInfo(_eps?: number): {
         hit: DiceMatchInfo | null;

package/dist/builder/attack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attack.d.ts","sourceRoot":"","sources":["../../src/builder/attack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"attack.d.ts","sourceRoot":"","sources":["../../src/builder/attack.ts"],"names":[],"mappings":"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"}

package/dist/builder/dc.d.ts

@@ -28,6 +28,19 @@ export declare class DCBuilder extends RollBuilder {
      * serializes. So extend the base key with the DC, mirroring {@link AlwaysHitBuilder.cacheKey}.
      */
     cacheKey(): string | null;
+    /**
+     * P(success) and P(failure) of this save: success iff natural roll + bonus dice + modifier ≥ DC,
+     * with no natural-1/natural-20 rule (a check with no die compares its flat total alone). Each side
+     * is summed from its own outcomes, so a certain success has a failure chance of exactly 0.
+     */
+    saveProbabilities(): {
+        pSuccess: number;
+        pFail: number;
+    };
+    /**
+     * The check outcome as a PMF: a success at 0, a failure at 1 (so `hitProbability()` is the
+     * chance the save fails — the chance the effect lands). `SaveBuilder.resolve().check` is this PMF.
+     */
     toPMF(eps?: number): PMF;
 }
 export {};

package/dist/builder/dc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dc.d.ts","sourceRoot":"","sources":["../../src/builder/dc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ;AAQD,uDAAuD;AACvD,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAED,qBAAa,SAAU,SAAQ,WAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,YAAY,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,EAGzD;IAEQ,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAOrC;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEQ,GAAG,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAGhD;IAEQ,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAG1C;IAED,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;IACxC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;IACxC,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;IAC7C,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;IAC5D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC;IACzD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9E,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC;IAMlE,iBAAiB,IAAI,KAAK,CAIlC;IAGQ,YAAY,IAAI,MAAM,CAK9B;IAED;;;;OAIG;IACM,QAAQ,IAAI,MAAM,GAAG,IAAI,CAGjC;IAEQ,KAAK,CAAC,GAAG,GAAE,MAAU,GAAG,GAAG,CAkCnC;CACF"}
+{"version":3,"file":"dc.d.ts","sourceRoot":"","sources":["../../src/builder/dc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ;AAQD,uDAAuD;AACvD,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAED,qBAAa,SAAU,SAAQ,WAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,YAAY,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,EAGzD;IAEQ,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CASrC;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEQ,GAAG,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAGhD;IAEQ,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAG1C;IAED,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;IACxC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;IACxC,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;IAC7C,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;IAC5D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC;IACzD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9E,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC;IAMlE,iBAAiB,IAAI,KAAK,CAIlC;IAGQ,YAAY,IAAI,MAAM,CAK9B;IAED;;;;OAIG;IACM,QAAQ,IAAI,MAAM,GAAG,IAAI,CAGjC;IAED;;;;OAIG;IACH,iBAAiB,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAYvD;IAED;;;OAGG;IACM,KAAK,CAAC,GAAG,GAAE,MAAU,GAAG,GAAG,CAenC;CACF"}

package/dist/builder/example.d.ts

@@ -12,9 +12,7 @@ export declare const fullAttackWithCritAndMiss: import("./attack.js").AttackBuil
 export declare const fullAttackWithCritAndMissExprExpected = "(d20 + 5 AC 10) * (2d6) crit (4d6) miss (5)";
 export declare const basicDamageRoll: RollBuilder;
 export declare const basicDamageRollExprExpected = "1d6 + 3";
-/** Basic 2d6 + 3 damage roll
- * For multiple dice, you need to use roll().
- */
+/** Basic 2d6 + 3 damage roll; multiple dice use roll(). */
 export declare const basic2d6Plus3: RollBuilder;
 export declare const basic2d6Plus3ExprExpected = "2d6 + 3";
 /** Rollling 2 x (1d6+3) */
@@ -32,18 +30,17 @@ export declare const basicShorthandD6RollExprExpected = "2d6 + 3";
 /** Using die shortcuts without roll() */
 export declare const shortcutDie: RollBuilder;
 export declare const shortcutDieExprExpected = "1d8 + 2";
-/** Flat modifier only (no dice)
- * You can also use roll.flat(n) if you prefer.
- * Many methods take pure numbers, so this may not even be needed in many cases.
+/** Flat modifier only (no dice); roll.flat(n) is the same. Pure-number args are accepted
+ * directly, so a bare flat is rarely needed.
  * */
 export declare const flatFive: RollBuilder;
 export declare const flatFiveExprExpected = "5";
 /** Negative base dice */
 export declare const negativeBaseDieInline: RollBuilder;
-export declare const negativeBaseDieInlineExprExpected = "-1d8";
+export declare const negativeBaseDieInlineExprExpected = "0 - 1d8";
 /** Negative base dice explicit */
 export declare const negativeBaseDie: RollBuilder;
-export declare const negativeBaseDieExprExpected = "-1d8";
+export declare const negativeBaseDieExprExpected = "0 - 1d8";
 /** Subtracting a bonus die via negative roll part.
  * Useful for effects like Bane
  */
@@ -54,10 +51,10 @@ export declare const singleD20: RollBuilder;
 export declare const singleD20ExprExpected = "d20";
 /** Adding a bunch */
 export declare const addAWholeBunch: RollBuilder;
-export declare const addAWholeBunchExprExpected = "1d20 + 1d12 + 1d10 + 1d8 + 1d6";
+export declare const addAWholeBunchExprExpected = "d20 + 1d12 + 1d10 + 1d8 + 1d6";
 /** Subtracting a bunch */
 export declare const subtractAWholeBunch: RollBuilder;
-export declare const subtractAWholeBunchExprExpected = "-1d20 - 1d12 - 1d10 - 1d8 + 1d6";
+export declare const subtractAWholeBunchExprExpected = "1d6 - 1d20 - 1d12 - 1d10 - 1d8";
 export declare const addingMultipleConstants: RollBuilder;
 export declare const addingMultipleConstantsExprExpected = "1d6 + 6";
 export declare const realisticChaining: RollBuilder;
@@ -92,8 +89,7 @@ export declare const disD20ExprExpected = "d20 < d20";
 /** Advantage on hd20. */
 export declare const advHd20: RollBuilder;
 export declare const advHd20ExprExpected = "hd20 > hd20";
-/** Complex chain: 2d6 + 1d8 + 4(d4 reroll 1) + 5
- * Note that reroll(1) applies to the immediate roll before it.
+/** Complex chain: 2d6 + 1d8 + 4(d4 reroll 1) + 5; reroll(1) applies to the roll before it.
  */
 export declare const complexDamage: RollBuilder;
 export declare const complexDamageExprExpected = "4(d4 reroll 1) + 1d8 + 2d6 + 5";
@@ -109,7 +105,7 @@ export declare const bestOfExampleExprExpected = "4kh3(1d6)";
 /** Double a d6 roll, resulting in 2d6. */
 export declare const doubleD6: RollBuilder;
 export declare const doubleD6ExprExpected = "2d6";
-/** Double a d6+1 roll, resulting in 2d6+2. Note that modifiers are also doubled. */
+/** Double a d6+1 roll, resulting in 2d6+2 — modifiers double too. */
 export declare const doubleD6Plus1: RollBuilder;
 export declare const doubleD6Plus1ExprExpected = "2d6 + 2";
 /** Double a 2d6 roll, resulting in 4d6. */
@@ -145,10 +141,10 @@ export declare const detailedAttack: ReturnType<ACBuilder["onHit"]>;
 export declare const detailedAttackExprExpected = "(d20 + 9 AC 17) * (1d12 + 5) xcrit2 (2d12 + 5) miss (0)";
 /** Attack where all hits become crits (natural 1s still miss). */
 export declare const alwaysCritsAttack: ReturnType<ACBuilder["onHit"]>;
-export declare const alwaysCritsAttackExprExpected = "d20 + 5 * (1d8) crit (2d8)";
+export declare const alwaysCritsAttackExprExpected = "(d20 + 5 AC 10) * (1d8) xcrit20 (2d8)";
 /** Attack that always hits and always crits (no misses at all). */
 export declare const alwaysHitsAlwaysCrits: ReturnType<ACBuilder["onHit"]>;
-export declare const alwaysHitsAlwaysCritsExprExpected = "d20 * (1d8) crit (2d8)";
+export declare const alwaysHitsAlwaysCritsExprExpected = "d20 * (1d8) xcrit20 (2d8)";
 /**
  * Basic save: d20 + 5 vs DC 15; on failure, take 3d6.
  * Use `saveHalf()` to apply half damage on success.

package/dist/builder/example.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"example.d.ts","sourceRoot":"","sources":["../../src/builder/example.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"example.d.ts","sourceRoot":"","sources":["../../src/builder/example.ts"],"names":[],"mappings":"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"}

package/dist/builder/expression.d.ts

@@ -0,0 +1,72 @@
+import type { ExpressionNode } from "./nodes.js";
+import type { RollConfig } from "./types.js";
+/**
+ * Printing builders as strings the parser reads back to the same distribution.
+ *
+ * The grammar reads every binary operator left to right at one precedence, so a term that is
+ * itself an expression (`d8 reroll 1`, `3>d6`, `d4 > d4`, `(1d6) // 2`) is parenthesised whenever
+ * something precedes it, and every operand of a `>`/`<` chain is an atom. `+` adds only to a
+ * non-zero running total, so a term joins with ` + ` only when everything before it can never
+ * total 0, and with ` ~+ ` (always add) otherwise. The grammar has no unary minus: a sum whose
+ * every term is subtracted starts from `0 - `.
+ *
+ * Each die group is printed from the AST node the resolver reads (`astFromRollConfigs`), so the
+ * string follows the builder's own reading of counts, keeps, roll types and signs.
+ */
+/** One additive term of a printed sum: the text of its magnitude, its sign, and the range of that
+ * magnitude when it is known. */
+export type ExpressionTerm = {
+    readonly text: string;
+    readonly sign: 1 | -1;
+    readonly range?: readonly [number, number];
+};
+type PrintOptions = {
+    /** A lone plain d20 prints as `d20` rather than `1d20` (the check's natural roll). */
+    readonly d20Shorthand?: boolean;
+    /** A keep-1-of-2 or keep-1-of-3 prints as a `>` / `<` chain (a roll type on a non-d20 die). */
+    readonly rollTypeChain?: boolean;
+};
+/** `text` as one argument: parenthesised unless it already is one. */
+export declare function atom(text: string): string;
+/** A number as one argument; the grammar has no negative literal, so `-3` is `(0 - 3)`. */
+export declare function numberAtom(value: number): string;
+/**
+ * Joins signed terms into one sum. Zero terms are dropped; a positive term leads when there is
+ * one. A term after the first is parenthesised unless it is atomic, and a positive term joins
+ * with ` + ` only when the running total before it can never be 0 (its range excludes 0).
+ */
+export declare function joinTerms(terms: readonly ExpressionTerm[]): string;
+/**
+ * The text of a scaled result `round(value * numerator / denominator)`: `N ** (inner)`,
+ * `(inner) // D`, `(inner) / D` or `(inner) ** N // D`. `**` is the product (`*` is the attack
+ * gate); `//` rounds down and `/` rounds up. Round-half and fractional factors have no token.
+ */
+export declare function printScale(inner: string, numerator: number, denominator: number, rounding: "floor" | "round" | "ceil"): string;
+/** The text of an AST node, read by the parser as the same distribution the resolver gives it. */
+export declare function printNode(node: ExpressionNode, options?: PrintOptions): string;
+/** The least and greatest value `node` can resolve to. */
+export declare function nodeRange(node: ExpressionNode): [number, number];
+/**
+ * The terms of a plain roll's configs: every die group, then the total of their flats. `root` is
+ * the natural-roll config (a d20 root prints first, as `d20`).
+ */
+export declare function configTerms(configs: readonly RollConfig[], root: RollConfig | undefined): ExpressionTerm[];
+/** The minimal shape of a check the printer reads. */
+type CheckDice = {
+    getRootDieConfig(): RollConfig | undefined;
+    getBonusDiceConfigs(): RollConfig[];
+    readonly modifier: number;
+};
+/**
+ * A check's natural roll as the check resolvers read it: ONE root die with its reroll/minimum,
+ * rolled with its roll type (`d20`, `hd20`, `d20 > d20`, `(d20 reroll d2) < (d20 reroll d2)`).
+ * `undefined` for a check with no die.
+ */
+export declare function rootDieExpression(check: CheckDice): string | undefined;
+/**
+ * The to-hit/save total of a check as its resolvers read it: the root die ({@link
+ * rootDieExpression}), its flat total, and every bonus die group (Bless, Bane, Guidance).
+ */
+export declare function checkExpression(check: CheckDice): string;
+export {};
+//# sourceMappingURL=expression.d.ts.map

package/dist/builder/expression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../src/builder/expression.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;;;;;;;;;;;GAYG;AAEH;iCACiC;AACjC,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,sFAAsF;IACtF,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,+FAA+F;IAC/F,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAuBF,sEAAsE;AACtE,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,2FAA2F;AAC3F,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAiClE;AAkCD;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,GACnC,MAAM,CAgBR;AAED,kGAAkG;AAClG,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,GAAE,YAAiB,GAAG,MAAM,CAiDlF;AAED,0DAA0D;AAC1D,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAmDhE;AAoGD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,cAAc,EAAE,CAK1G;AAED,sDAAsD;AACtD,KAAK,SAAS,GAAG;IACf,gBAAgB,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3C,mBAAmB,IAAI,UAAU,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAMtE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAaxD"}

package/dist/builder/factory.d.ts

@@ -1,5 +1,4 @@
-import { LRUCache } from "../common/lru-cache.js";
-import type { PMF } from "../pmf/pmf.js";
+import { PMF } from "../pmf/pmf.js";
 import { RollBuilder } from "./roll.js";
 import type { RollFactory } from "./types.js";
 export declare function d(sides: number | string): RollBuilder;
@@ -13,5 +12,5 @@ export declare const hd20: RollBuilder;
 export declare const d100: RollBuilder;
 export declare const flat: (n: number) => RollBuilder;
 export declare const roll: RollFactory;
-export declare const builderPMFCache: LRUCache<string, PMF>;
+export declare const builderPMFCache: import("..").LRUCache<string, PMF>;
 //# sourceMappingURL=factory.d.ts.map

package/dist/builder/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/builder/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA8D3C,wBAAgB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,CAKrD;AAED,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,IAAI,aAAqC,CAAC;AACvD,eAAO,MAAM,IAAI,aAA4B,CAAC;AAC9C,eAAO,MAAM,IAAI,MAAO,MAAM,gBAA+B,CAAC;AAE9D,eAAO,MAAM,IAAI,EAAE,WAAmC,CAAC;AAEvD,eAAO,MAAM,eAAe,uBAAkC,CAAC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/builder/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAwB3C,wBAAgB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,CAKrD;AAED,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,EAAE,aAA0B,CAAC;AAC1C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,aAA2B,CAAC;AAC5C,eAAO,MAAM,IAAI,aAAqC,CAAC;AACvD,eAAO,MAAM,IAAI,aAA4B,CAAC;AAC9C,eAAO,MAAM,IAAI,MAAO,MAAM,gBAA+B,CAAC;AAE9D,eAAO,MAAM,IAAI,EAAE,WAAmC,CAAC;AAEvD,eAAO,MAAM,eAAe,oCAAwB,CAAC"}