chore: adjust to type changes

Author: Ethaks

bun.lockb

@@ -54,7 +54,7 @@
 		"wildcard-match": "^5.1.3"
 	},
 	"peerDependencies": {
-		"@league-of-foundry-developers/foundry-vtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#e787013319b46f7465cce2c71263083abba70ce8"
+		"fvtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#main"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.9.0",

package.json

@@ -1,5 +1,7 @@
 import * as Diff from "diff";
 
+import type { AnyObject } from "fvtt-types/utils";
+
 import type { Quench, QuenchBatchKey } from "../quench";
 import { type RUNNABLE_STATE, getBatchKey } from "../utils/quench-utils";
 
@@ -20,14 +22,13 @@ import { pause } from "../utils/user-utils";
 
 import ApplicationV2 = foundry.applications.api.ApplicationV2;
 import HandlebarsApplicationMixin = foundry.applications.api.HandlebarsApplicationMixin;
-// const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 /**
  * The visual UI for representing Quench test batches and the tests results thereof.
  *
  * @internal
  */
-export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
+export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2<QuenchResultData>) {
 	/** The `Quench` instance this `Application` is used by */
 	quench: Quench;
 
@@ -97,9 +98,11 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 	/* -------------------------------------------- */
 
 	/** @inheritDoc */
-	override async _prepareContext(): Promise<QuenchResultData> {
+	override async _prepareContext(_options: ApplicationV2.RenderOptions): Promise<QuenchResultData> {
 		const filterSetting = getFilterSetting();
-		const preselected = this.quench._filterBatches(filterSetting, { preSelectedOnly: true });
+		const preselected = this.quench._filterBatches(filterSetting, {
+			preSelectedOnly: true,
+		});
 		return {
 			anyBatches: this.quench._testBatches.size > 0,
 			batches: this.quench._testBatches.map((batchData) => {
@@ -113,10 +116,7 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 	}
 
 	/** @inheritDoc */
-	override _onRender(
-		context: QuenchResultData,
-		options: foundry.applications.types.ApplicationRenderOptions,
-	) {
+	override _onRender(context: QuenchResultData, options: ApplicationV2.RenderOptions) {
 		super._onRender(context, options);
 		this.#searchFilter.bind(this.element);
 	}
@@ -449,7 +449,10 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 		}
 	}
 
-	private static _getErrorDiff(error: { actual: unknown; expected: unknown }): HTMLElement {
+	private static _getErrorDiff(error: {
+		actual: unknown;
+		expected: unknown;
+	}): HTMLElement {
 		const diffNode = createNode("div", { attr: { class: "diff" } });
 
 		const expected =
@@ -511,7 +514,9 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 					}
 
 					return createNode("span", {
-						attr: { class: part.removed ? "expected" : part.added ? "actual" : "unchanged" },
+						attr: {
+							class: part.removed ? "expected" : part.added ? "actual" : "unchanged",
+						},
 						children: part.value,
 					});
 				})
@@ -671,7 +676,9 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 
 		if (!batchKey || !isBatchRoot) return;
 
-		const errorTitle = localize("ERROR.Hook", { hook: hook.title.replace("_root", "") });
+		const errorTitle = localize("ERROR.Hook", {
+			hook: hook.title.replace("_root", ""),
+		});
 		const hookId = hook.id as string;
 
 		const batchLi = this.element.querySelector(`li.test-batch[data-batch="${batchKey}"]`);
@@ -739,7 +746,7 @@ export class QuenchResults extends HandlebarsApplicationMixin(ApplicationV2) {
 	}
 }
 
-interface QuenchResultData extends foundry.applications.api.ApplicationV2.RenderContext {
+interface QuenchResultData extends AnyObject {
 	anyBatches: boolean;
 	batches: { name: string; displayName: string; selected: boolean }[];
 }

src/module/apps/quench-results.ts

@@ -66,7 +66,9 @@ function registerBasicFailingTestBatch(quench: Quench) {
 					expect(1).to.equal(2);
 				});
 				it("Another Failing Test", function () {
-					expect({ foo: "bar", baz: "bam", kel: { tok: "zam" } }).to.equal({ foo: { bar: "baz" } });
+					expect({ foo: "bar", baz: "bam", kel: { tok: "zam" } }).to.equal({
+						foo: { bar: "baz" },
+					});
 				});
 				it("A Failing Test Using Assert", function () {
 					assert.ok(false);
@@ -174,7 +176,8 @@ function registerSnapshotTestBatch(quench: Quench) {
 					"Some Test ¯\\_(ツ)_/¯".should.matchSnapshot();
 				});
 				it("Passing Test using temporary actor", function () {
-					const type = Object.keys(game.system?.documentTypes.Actor ?? { base: "" })[0];
+					const type = Object.keys(Actor.TYPES[0] ?? { base: "" })[0];
+					if (!type) throw new Error("No type found");
 					// @ts-expect-error -- Some type has to exist
 					const actor = new Actor({ name: "Test Actor", type });
 					expect(actor).to.matchSnapshot();

src/module/quench-tests/nonsense-tests.ts

@@ -179,7 +179,7 @@ export class Quench {
 		const { displayName, snapBaseDir, preSelected } = context;
 		const [packageName] = getBatchNameParts(key);
 
-		if (![...getGame().modules.keys(), getGame().system.id].includes(packageName)) {
+		if (![...(game.modules?.keys() ?? []), game.system?.id || ""].includes(packageName)) {
 			ui?.notifications?.error(localize("ERROR.InvalidPackageName", { key, packageName }));
 		}
 		if (this._testBatches.has(key)) {

src/module/quench.ts

@@ -17,7 +17,7 @@ declare global {
  * Registers all settings
  */
 export function registerSettings(): void {
-	const game = getGame();
+	if (!(game instanceof Game)) throw new Error("Game is not initialized");
 
 	game.settings.register(MODULE_ID, "logTestDetails", {
 		name: "QUENCH.LogTestDetailsLabel",

src/module/settings.ts

@@ -119,7 +119,7 @@ export const MODULE_ID = "quench" as const;
 /** Ensures {@link game} is initialized, either returning the {@link Game} instance or throwing an error. */
 export function getGame() {
 	if (!(game instanceof Game)) throw new Error("Game is not initialized yet!");
-	return game as ReadyGame;
+	return game;
 }
 
 /**
@@ -152,7 +152,7 @@ export function enforce(value: unknown, message?: string | Error): asserts value
  * @returns The localized string
  */
 export function localize(key: string, data?: Record<string, unknown>): string {
-	return getGame().i18n.format(`QUENCH.${key}`, data);
+	return game.i18n?.format(`QUENCH.${key}`, data) ?? key;
 }
 
 /**

src/module/utils/quench-utils.ts

@@ -155,7 +155,7 @@
   margin-left: 0.4rem;
 }
 
-#quench-results li>.summary>.status-icon:not(".fa-sync") {
+#quench-results li>.summary>.status-icon:not(.fa-sync) {
   font-weight: normal;
 }
 

src/styles/quench.css

@@ -9,7 +9,7 @@
 		"exactOptionalPropertyTypes": true,
 		"strict": true,
 		"lib": ["DOM", "DOM.Iterable", "ES2023"],
-		"skipLibCheck": true,
+		"skipLibCheck": false,
 		"noEmit": true
 	},
 	"exclude": ["dist", "foundry"],