@yipe/dice 0.7.0 → 0.8.0

package/dist/builder/ac.d.ts

@@ -16,6 +16,7 @@ export declare class ACBuilder extends RollBuilder {
     onHit(count: number, die: RollBuilder, modifier: number): AttackBuilder;
     onHit(count: number, sides: number, modifier: number): AttackBuilder;
     get critThreshold(): number;
+    cacheKey(): string | null;
     critOn(threshold: number): ACBuilder;
     alwaysCrits(): AlwaysCritBuilder;
     toExpression(): string;

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

@@ -1 +1 @@
-{"version":3,"file":"ac.d.ts","sourceRoot":"","sources":["../../src/builder/ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,CAAC;CACvB;AACD,qBAAa,SAAU,SAAQ,WAAW;IACxC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC,YAAY,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,EAQzE;IAMD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACtD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IACxE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAMrE,IAAI,aAAa,IAAI,MAAM,CAE1B;IAGD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAMnC;IAED,WAAW,IAAI,iBAAiB,CAS/B;IAGQ,YAAY,IAAI,MAAM,CAM9B;IAEQ,KAAK,CAAC,GAAG,GAAE,MAAU,GAAG,GAAG,CA0BnC;IAEQ,IAAI,IAAI,SAAS,CAOzB;CACF"}
+{"version":3,"file":"ac.d.ts","sourceRoot":"","sources":["../../src/builder/ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,CAAC;CACvB;AACD,qBAAa,SAAU,SAAQ,WAAW;IACxC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC,YAAY,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,EAQzE;IAMD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACtD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IACxE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAMrE,IAAI,aAAa,IAAI,MAAM,CAE1B;IAEQ,QAAQ,IAAI,MAAM,GAAG,IAAI,CAGjC;IAGD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAMnC;IAED,WAAW,IAAI,iBAAiB,CAS/B;IAGQ,YAAY,IAAI,MAAM,CAM9B;IAEQ,KAAK,CAAC,GAAG,GAAE,MAAU,GAAG,GAAG,CA0BnC;IAEQ,IAAI,IAAI,SAAS,CAOzB;CACF"}

package/dist/builder/attack.d.ts

@@ -4,6 +4,8 @@ import type { ACBuilder } from "./ac.js";
 import { AlwaysCritBuilder, AlwaysHitBuilder, RollBuilder } from "./roll.js";
 import type { AttackResolution, CheckBuilder } from "./types.js";
 type ActionEffect = RollBuilder;
+/** Clears the resolved-attack PMF cache (test/bench seam; mirrors {@link clearParserCache}). */
+export declare function clearAttackCache(): void;
 export declare class AttackBuilder implements CheckBuilder {
     readonly check: ACBuilder | AlwaysHitBuilder | AlwaysCritBuilder;
     private readonly hitEffect?;
@@ -33,6 +35,13 @@ export declare class AttackBuilder implements CheckBuilder {
         pMiss: number;
     };
     resolve(eps?: number): AttackResolution;
+    /**
+     * A cheap, complete key for this attack's resolved PMF, or `null` when it can't be cached soundly (an
+     * effect whose PMF isn't captured by its {@link RollConfig}s — see {@link RollBuilder.cacheKey}). Composed
+     * from the check + hit/crit/miss effect keys + `eps`. `critEffect === null` (noCrit) and `undefined`
+     * (auto-double the hit dice) are distinct crit states, encoded separately.
+     */
+    private cacheKey;
     toPMF(eps?: number): PMF;
     get pmf(): PMF;
     toQuery(eps?: number): DiceQuery;

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

@@ -1 +1 @@
-{"version":3,"file":"attack.d.ts","sourceRoot":"","sources":["../../src/builder/attack.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGtC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAEhB,WAAW,EACZ,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9D,KAAK,YAAY,GAAG,WAAW,CAAC;AAEhC,qBAAa,aAAc,YAAW,YAAY;IAE9C,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,gBAAgB,GAAG,iBAAiB;IAChE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAJ9B,YACW,KAAK,EAAE,SAAS,GAAG,gBAAgB,GAAG,iBAAiB,EAC/C,SAAS,CAAC,EAAE,YAAY,YAAA,EACxB,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,YAAA,EAChC,UAAU,CAAC,EAAE,YAAY,YAAA,EACxC;IAEJ,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACvD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACpD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IACzE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAWtE,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC;IACvD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACpD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IACzE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAWtE,MAAM,IAAI,aAAa,CAEtB;IAGD,YAAY,IAAI,MAAM,CA+CrB;IAED,oBAAoB,CAClB,KAAK,EAAE,SAAS,GAAG,gBAAgB,GAAG,iBAAiB,EACvD,GAAG,GAAE,MAAU,GACd;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAmGlE;IAED,OAAO,CAAC,GAAG,GAAE,MAAY,GAAG,gBAAgB,CA+D3C;IAGD,KAAK,CAAC,GAAG,GAAE,MAAU,GAAG,GAAG,CAE1B;IAED,IAAI,GAAG,QAEN;IAGD,OAAO,CAAC,GAAG,GAAE,MAAU,GAAG,SAAS,CAElC;CACF"}
+{"version":3,"file":"attack.d.ts","sourceRoot":"","sources":["../../src/builder/attack.ts"],"names":[],"mappings":"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"}

package/dist/builder/index.cjs

@@ -3503,6 +3503,17 @@ var RollBuilder = class _RollBuilder {
   getSubRollConfigs() {
     return this.subRollConfigs.map((c) => ({ ...c }));
   }
+  /**
+   * A cheap, stable string that FULLY identifies this builder's PMF — used by {@link AttackBuilder.toPMF}
+   * to cache resolved attack PMFs across rebuilds without walking the AST via {@link toExpression}. A plain
+   * roll is fully determined by its {@link RollConfig} array (count/sides/modifier/reroll/explode/minimum/
+   * bestOf/keep/rollType/isSubtraction), so serializing that is sound. Subclasses whose PMF depends on
+   * hidden state NOT captured by `subRollConfigs` (half/scale/max/parsed/pooled/composite transforms) return
+   * `null` to opt OUT of caching — a conservative miss is always safe; a wrong key would corrupt DPR.
+   */
+  cacheKey() {
+    return JSON.stringify(this.subRollConfigs);
+  }
   // for testing
   static fromConfig(config) {
     return new _RollBuilder([{ ...defaultConfig, ...config }]);
@@ -4011,6 +4022,9 @@ var HalfRollBuilder = class _HalfRollBuilder extends RollBuilder {
   hasHiddenState() {
     return this.innerRoll.hasHiddenState();
   }
+  cacheKey() {
+    return null;
+  }
   // 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.
@@ -4055,6 +4069,9 @@ var ScaleRollBuilder = class _ScaleRollBuilder extends RollBuilder {
   hasHiddenState() {
     return this.innerRoll.hasHiddenState();
   }
+  cacheKey() {
+    return null;
+  }
   get lastConfig() {
     return this.innerRoll.lastConfig;
   }
@@ -4099,6 +4116,9 @@ var MaxOfRollBuilder = class _MaxOfRollBuilder extends RollBuilder {
   hasHiddenState() {
     return this.innerRoll.hasHiddenState();
   }
+  cacheKey() {
+    return null;
+  }
   get lastConfig() {
     return this.innerRoll.lastConfig;
   }
@@ -4176,6 +4196,10 @@ var AlwaysHitBuilder = class _AlwaysHitBuilder extends RollBuilder {
   get critThreshold() {
     return this.attackConfig.critThreshold;
   }
+  cacheKey() {
+    const base = super.cacheKey();
+    return base === null ? null : `H|${this.attackConfig.critThreshold}|${base}`;
+  }
   // TODO - move this to AC Builder… or if we create a DC builder that has critOn, throw an error?
   critOn(critThreshold) {
     const newConfig = { critThreshold };
@@ -4226,6 +4250,10 @@ var AlwaysCritBuilder = class _AlwaysCritBuilder extends RollBuilder {
   get critThreshold() {
     return this.attackConfig.critThreshold;
   }
+  cacheKey() {
+    const base = super.cacheKey();
+    return base === null ? null : `C|${this.fromAlwaysHit ? 1 : 0}|${this.attackConfig.critThreshold}|${this.attackConfig.ac ?? ""}|${base}`;
+  }
   critOn(critThreshold) {
     const newConfig = { critThreshold, ac: this.attackConfig.ac };
     return new _AlwaysCritBuilder(this, newConfig, this.fromAlwaysHit);
@@ -4256,6 +4284,9 @@ var ParsedRollBuilder = class _ParsedRollBuilder extends RollBuilder {
   hasHiddenState() {
     return true;
   }
+  cacheKey() {
+    return null;
+  }
   create(configs) {
     return new RollBuilder(configs);
   }
@@ -4291,6 +4322,9 @@ var PooledRollBuilder = class _PooledRollBuilder extends RollBuilder {
   hasHiddenState() {
     return true;
   }
+  cacheKey() {
+    return null;
+  }
   d(_sides) {
     throw new Error("Cannot add dice to a pooled roll. The pool is finalized.");
   }
@@ -4394,6 +4428,9 @@ var CompositeSumRollBuilder = class _CompositeSumRollBuilder extends RollBuilder
   hasHiddenState() {
     return true;
   }
+  cacheKey() {
+    return null;
+  }
   getSubRollConfigs() {
     return [];
   }
@@ -4946,6 +4983,10 @@ function getASTSignature(node) {
 }
 
 // src/builder/attack.ts
+var attackPMFCache = new LRUCache(4e3);
+function clearAttackCache() {
+  attackPMFCache.clear();
+}
 var AttackBuilder = class _AttackBuilder {
   constructor(check, hitEffect, critEffect, missEffect) {
     this.check = check;
@@ -5124,9 +5165,46 @@ var AttackBuilder = class _AttackBuilder {
       weights: { hit: phit, crit: pcrit, miss: pmiss }
     };
   }
-  // By default, create PMF with no pruning
+  /**
+   * A cheap, complete key for this attack's resolved PMF, or `null` when it can't be cached soundly (an
+   * effect whose PMF isn't captured by its {@link RollConfig}s — see {@link RollBuilder.cacheKey}). Composed
+   * from the check + hit/crit/miss effect keys + `eps`. `critEffect === null` (noCrit) and `undefined`
+   * (auto-double the hit dice) are distinct crit states, encoded separately.
+   */
+  cacheKey(eps) {
+    const checkKey = this.check.cacheKey();
+    if (checkKey === null) return null;
+    let hitKey = "";
+    if (this.hitEffect) {
+      const k = this.hitEffect.cacheKey();
+      if (k === null) return null;
+      hitKey = k;
+    }
+    let critKey;
+    if (this.critEffect === null) critKey = "n";
+    else if (this.critEffect === void 0) critKey = "a";
+    else {
+      const k = this.critEffect.cacheKey();
+      if (k === null) return null;
+      critKey = k;
+    }
+    let missKey = "";
+    if (this.missEffect) {
+      const k = this.missEffect.cacheKey();
+      if (k === null) return null;
+      missKey = k;
+    }
+    return `${checkKey}*H${hitKey}*C${critKey}*M${missKey}*e${eps}`;
+  }
+  // By default, create PMF with no pruning. Cached by the cheap config key across identical rebuilds.
   toPMF(eps = 0) {
-    return this.resolve(eps).pmf;
+    const key = this.cacheKey(eps);
+    if (key === null) return this.resolve(eps).pmf;
+    const cached = attackPMFCache.get(key);
+    if (cached) return cached;
+    const pmf = this.resolve(eps).pmf;
+    attackPMFCache.set(key, pmf);
+    return pmf;
   }
   get pmf() {
     return this.toPMF();
@@ -5154,6 +5232,10 @@ var ACBuilder = class _ACBuilder extends RollBuilder {
   get critThreshold() {
     return this.attackConfig.critThreshold;
   }
+  cacheKey() {
+    const base = super.cacheKey();
+    return base === null ? null : `A|${this.attackConfig.ac}|${this.attackConfig.critThreshold}|${base}`;
+  }
   // TODO - move this to AC Builder… or if we create a DC builder that has critOn, throw an error?
   critOn(threshold) {
     const newConfig = {
@@ -5371,6 +5453,7 @@ exports.RollBuilder = RollBuilder;
 exports.SaveBuilder = SaveBuilder;
 exports.ScaleRollBuilder = ScaleRollBuilder;
 exports.builderPMFCache = builderPMFCache;
+exports.clearAttackCache = clearAttackCache;
 exports.d = d;
 exports.d10 = d10;
 exports.d100 = d100;