fix: Fixes issue where sometimes table lookup rollers wouldn't resolve

javalent · Sep 26, 2024 · d8df63d · d8df63d
1 parent 5700981
commit d8df63d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/api/api.ts b/src/api/api.ts
@@ -175,7 +175,6 @@ class APIInstance {
         }
         if (content.includes("|lookup=")) {
             [, lookup] = content.match(/\|lookup=(.+?)(?:\||$)/) ?? [];
-            console.log("🚀 ~ file: api.ts:178 ~ lookup:", lookup);
         }
 
         content = decode(

diff --git a/src/processor/processor.ts b/src/processor/processor.ts
@@ -87,10 +87,7 @@ export default class DiceProcessor extends Component {
                     continue;
 
                 //build result map;
-                const maybeRoller = await API.getRoller(
-                    content,
-                    ctx.sourcePath
-                );
+                const maybeRoller = API.getRoller(content, ctx.sourcePath);
                 if (maybeRoller.isNone()) {
                     return;
                 }
@@ -147,22 +144,19 @@ export default class DiceProcessor extends Component {
             }
             try {
                 //build result map;
-                const maybeRoller = await API.getRoller(
-                    content,
-                    ctx.sourcePath
-                );
+                const maybeRoller = API.getRoller(content, ctx.sourcePath);
                 if (maybeRoller.isNone()) {
                     return;
                 }
-                const roller = maybeRoller.unwrap();
                 /** Add the roller to the child context, so it can be unloaded with the context. */
-                roller.addContexts(ctx, this.plugin);
+                const roller = maybeRoller.unwrap();
 
                 roller.onLoad(async () => {
                     await roller.roll();
 
                     node.replaceWith(roller.containerEl);
                 });
+                roller.addContexts(ctx, this.plugin);
 
                 if (!file || !(file instanceof TFile)) continue;
 

diff --git a/src/roller/table.ts b/src/roller/table.ts
@@ -10,7 +10,7 @@ import {
 
 import { TABLE_REGEX } from "src/utils/constants";
 import { StackRoller } from ".";
-import { GenericFileRoller } from "./roller";
+import { GenericFileRoller, type ComponentLike } from "./roller";
 import { API } from "src/api/api";
 import type { DiceRollerSettings } from "src/settings/settings.types";
 import type { LexicalToken } from "src/lexer/lexer";
@@ -30,6 +30,11 @@ export class TableRoller extends GenericFileRoller<string> {
     lookupRanges: [range: [min: number, max: number], option: string][];
     combinedTooltip: string = "";
     prettyTooltip: string = "";
+    #components: ComponentLike[] = [];
+    override addContexts(...components: ComponentLike[]): void {
+        this.#components = components;
+        super.addContexts(...components);
+    }
     constructor(
         data: DiceRollerSettings,
         original: string,
@@ -159,6 +164,7 @@ export class TableRoller extends GenericFileRoller<string> {
                     continue;
                 }
                 const subRoller = maybeRoller.unwrap();
+                subRoller.addContexts(...this.#components);
                 // Roll it
                 await subRoller.roll();
                 // Get sub result
@@ -209,6 +215,7 @@ export class TableRoller extends GenericFileRoller<string> {
                         return "ERROR";
                     }
                     const rollsRoller = roller as StackRoller;
+                    rollsRoller.addContexts(...this.#components);
                     await rollsRoller.roll();
                     this.rolls = rollsRoller.result;
                     if (!rollsRoller.isStatic) {
@@ -353,10 +360,9 @@ export class TableRoller extends GenericFileRoller<string> {
                 );
                 if (maybeRoller.isSome()) {
                     const roller = maybeRoller.unwrap();
+                    roller.addContexts(...this.#components);
                     if (roller instanceof StackRoller) {
                         this.lookupRoller = roller;
-                        // TODO: useless roll I think
-                        // let result = await this.lookupRoller.roll();
 
                         this.lookupRanges = table.rows.map((row) => {
                             const [range, option] = row