Move system code around to avoid top level await

Kruptein · Aug 11, 2024 · c99f42d · c99f42d
1 parent 083c98a
commit c99f42d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/client/src/game/systems/dice/index.ts b/client/src/game/systems/dice/index.ts
@@ -1,4 +1,4 @@
-import type { Part, RollResult } from "@planarally/dice/core";
+import { SYSTEMS, type Part, type RollResult } from "@planarally/dice/core";
 import type { DeepReadonly } from "vue";
 
 import { registerSystem } from "..";
@@ -19,6 +19,14 @@ class DiceSystem implements System {
         return rollString;
     }
 
+    async loadSystems(): Promise<void> {
+        if ($.systems) return;
+
+        const { DX } = await SYSTEMS.DX();
+        const { DX3 } = await SYSTEMS.DX3();
+        $.systems = { "2d": DX, "3d": DX3 };
+    }
+
     async load3d(): Promise<void> {
         if (!diceState.raw.loaded3d) {
             await loadDiceEnv();

diff --git a/client/src/game/systems/dice/state.ts b/client/src/game/systems/dice/state.ts
@@ -1,12 +1,15 @@
-import type { Part, RollResult } from "@planarally/dice/core";
+import { type Part, type RollResult, type SYSTEMS } from "@planarally/dice/core";
 import type { DeepReadonly } from "vue";
 
 import { buildState } from "../state";
 
+type AsyncReturnType<T extends (..._args: any) => Promise<any>> = Awaited<ReturnType<T>>;
+
 interface DiceState {
     dimensions3d: { width: number; height: number };
     history: { roll: RollResult<Part>; name: string; player: string }[];
     loaded3d: boolean;
+    systems?: { "2d": AsyncReturnType<typeof SYSTEMS.DX>["DX"]; "3d": AsyncReturnType<typeof SYSTEMS.DX3>["DX3"] };
     result?: DeepReadonly<RollResult<Part>>;
 }
 
@@ -15,7 +18,6 @@ const state = buildState<DiceState>({
     history: [],
     loaded3d: false,
 });
-
 export const diceState = {
     ...state,
 };
diff --git a/client/src/game/tools/variants/dice.ts b/client/src/game/tools/variants/dice.ts
@@ -1,5 +1,5 @@
 import { Vector3 } from "@babylonjs/core/Maths/math";
-import { type Part, type RollResult, rollString, SYSTEMS } from "@planarally/dice/core";
+import { type Part, type RollResult, rollString } from "@planarally/dice/core";
 import tinycolor from "tinycolor2";
 import { reactive } from "vue";
 
@@ -17,9 +17,6 @@ import { playerSettingsState } from "../../systems/settings/players/state";
 import { SelectFeatures } from "../models/select";
 import { Tool } from "../tool";
 
-export const { DX } = await SYSTEMS.DX();
-const { DX3 } = await SYSTEMS.DX3();
-
 function generate3dOptions(): {
     color: string;
     physics: () => {
@@ -85,6 +82,10 @@ class DiceTool extends Tool implements ITool {
     // );
     // }
 
+    async onSelect(): Promise<void> {
+        await diceSystem.loadSystems();
+    }
+
     get permittedTools(): ToolPermission[] {
         return [{ name: ToolName.Select, features: { disabled: [SelectFeatures.Resize, SelectFeatures.Rotate] } }];
     }
@@ -93,9 +94,9 @@ class DiceTool extends Tool implements ITool {
         let roll: RollResult<Part>;
         if (use3d) {
             const dieDefaults = generate3dOptions();
-            roll = await rollString(input, DX3, { thrower: diceThrower!, dieDefaults });
+            roll = await rollString(input, diceState.raw.systems!["3d"], { thrower: diceThrower!, dieDefaults });
         } else {
-            roll = await rollString(input, DX);
+            roll = await rollString(input, diceState.raw.systems!["2d"]);
         }
 
         if (shareWith !== "none") {

diff --git a/client/src/game/ui/tools/DiceTool.vue b/client/src/game/ui/tools/DiceTool.vue
@@ -9,7 +9,7 @@ import ToggleGroup from "../../../core/components/ToggleGroup.vue";
 import { diceSystem } from "../../systems/dice";
 import { DxHelper } from "../../systems/dice/dx";
 import { diceState } from "../../systems/dice/state";
-import { diceTool, DX } from "../../tools/variants/dice";
+import { diceTool } from "../../tools/variants/dice";
 
 const showHistory = ref(false);
 
@@ -79,7 +79,7 @@ function addSymbol(symbol: (typeof DxConfig.symbolOptions)[number]): void {
 }
 
 function updateFromString(event: Event): void {
-    input.value = DX.parse((event.target as HTMLInputElement).value);
+    input.value = diceState.raw.systems!["2d"].parse((event.target as HTMLInputElement).value);
 }
 
 async function roll(): Promise<void> {