adapt to null return for api element helpers

src/settings.ts

@@ -14,6 +14,7 @@ const firstSettings: { tool: string; key: string }[] = [];
 function onRenderSettingsConfig(app: SettingsConfig, $html: JQuery) {
     const html = htmlElement($html);
     const tab = querySelector(html, `.tab[data-tab="${MODULE.id}"]`);
+    if (!tab) return;
 
     for (const { tool, key } of firstSettings) {
         const group = tab.querySelector(`[data-setting-id="${MODULE.id}.${key}"]`);
@@ -31,7 +32,7 @@ function onRenderSettingsConfig(app: SettingsConfig, $html: JQuery) {
         const setting = game.settings.settings.get(settingId)!;
 
         if (setting.requiresReload) {
-            const label = querySelector(group, "label");
+            const label = querySelector(group, "label")!;
             label.textContent = `${label.textContent} ${localize("settings.requiresReload")}`;
         }
     }

src/tools/actionable.ts

@@ -158,18 +158,24 @@ async function actionSheetPF2eRenderInner(
     const html = htmlElement($html);
     const label = localize("itemSheet.label");
     const group = querySelector(html, "[data-drop-zone='self-applied-effect']");
-    const dropZone = group.querySelector(".drop-zone.empty");
-    const macro = await getActionMacro(item);
+    if (!group) return $html;
+
+    const labelEl = querySelector(group, ":scope > label");
+    const hintEl = querySelector(group, ".hint");
 
-    querySelector(group, ":scope > label").innerText += ` / ${label}`;
-    querySelector(group, ".hint").innerText += localize("itemSheet.hint");
+    if (labelEl) labelEl.innerText += ` / ${label}`;
+    if (hintEl) hintEl.innerText += localize("itemSheet.hint");
 
+    const dropZone = group?.querySelector(".drop-zone.empty");
     if (!dropZone) return $html;
 
+    const macro = await getActionMacro(item);
+
     if (macro) {
         dropZone.outerHTML = await render("dropzone", { macro });
     } else {
-        querySelector(dropZone, ".name").innerText += ` / ${label}`;
+        const nameEl = querySelector(dropZone, ".name");
+        if (nameEl) nameEl.innerText += ` / ${label}`;
     }
 
     return $html;
@@ -187,11 +193,12 @@ function actionSheetPF2eActivateListeners(
         item.system.actionType.value === "passive" ||
         item.permission <= CONST.DOCUMENT_PERMISSION_LEVELS.LIMITED
     ) {
-        return $html;
+        return;
     }
 
     const html = htmlElement($html);
     const group = querySelector(html, "[data-drop-zone='self-applied-effect']");
+    if (!group) return;
 
     addListener(group, "[data-action='open-macro-sheet']", async () => {
         const macro = await getActionMacro(item);

src/tools/betterMerchant.ts

@@ -1,5 +1,4 @@
 import {
-    ErrorPF2e,
     R,
     addListener,
     addListenerAll,
@@ -496,6 +495,7 @@ async function browserRenderInner(
         html,
         "section.content .tab[data-tab='equipment'] .list-buttons"
     );
+    if (!listButtons) return $html;
 
     html.classList.add("toolbelt-merchant");
 
@@ -611,6 +611,8 @@ function updateBrowser(selection: string[], skipAll = false) {
     if (!browserTab) return;
 
     const listButtons = querySelector(browserTab, ".list-buttons");
+    if (!listButtons) return;
+
     const tab = game.pf2e.compendiumBrowser.tabs.equipment;
     const selected = selection.length;
     const total = tab.currentIndex.length;
@@ -640,7 +642,7 @@ function updateBrowser(selection: string[], skipAll = false) {
         }
     }
 
-    querySelector<HTMLButtonElement>(listButtons, "button").disabled = selected === 0;
+    querySelector<HTMLButtonElement>(listButtons, "button")!.disabled = selected === 0;
 
     for (const checkbox of checkboxes) {
         const checked = checkbox.checked;
@@ -661,12 +663,14 @@ function browserActivateListeners(
     const data = getInMemory<BrowserData>(this);
     if (!data?.actor?.isMerchant) return;
 
-    const actor = data.actor;
     const html = htmlElement($html);
-    const browser = this;
-    const tab = browser.tabs.equipment;
     const tabEl = querySelector(html, "section.content .tab[data-tab='equipment']");
     const listButtons = querySelector(tabEl, ".list-buttons");
+    if (!listButtons) return;
+
+    const actor = data.actor;
+    const browser = this;
+    const tab = browser.tabs.equipment;
 
     if (data.type === "pull") {
         addListener(listButtons, "[data-action='add-to-merchant']", async () => {
@@ -707,7 +711,7 @@ function browserActivateListeners(
                     selection.length = 0;
                 }
 
-                const checkboxes = tabEl.querySelectorAll<HTMLInputElement>(".item input");
+                const checkboxes = tabEl!.querySelectorAll<HTMLInputElement>(".item input");
                 for (const checkbox of checkboxes) {
                     const { uuid } = elementData(checkbox);
                     checkbox.checked = selection.includes(uuid);
@@ -827,25 +831,31 @@ async function lootSheetPF2eRenderInner(
             if (filter) {
                 const priceElement = querySelector(itemElement, ".price");
 
-                priceElement.classList.add(filter.ratio < 1 ? "cheap" : "expensive");
-                priceElement.dataset.tooltip = `${filter.name} (${filter.ratio})`;
+                if (priceElement) {
+                    priceElement.classList.add(filter.ratio < 1 ? "cheap" : "expensive");
+                    priceElement.dataset.tooltip = `${filter.name} (${filter.ratio})`;
+                }
             }
         }
 
         if (infiniteAll) {
             const quantityElement = querySelector(itemElement, ".quantity");
-            quantityElement.innerHTML = INFINITE;
+            if (quantityElement) quantityElement.innerHTML = INFINITE;
         }
     }
 
     if (isGM && infiniteAll) {
         const bulkElement = querySelector(html, ".total-bulk span");
         const wealthElement = querySelector(html, ".coinage .wealth .item-name:last-child span");
 
-        wealthElement.innerHTML = INFINITE;
-        bulkElement.innerHTML = game.i18n.format("PF2E.Actor.Inventory.TotalBulk", {
-            bulk: INFINITE,
-        });
+        if (bulkElement) {
+            bulkElement.innerHTML = game.i18n.format("PF2E.Actor.Inventory.TotalBulk", {
+                bulk: INFINITE,
+            });
+        }
+        if (wealthElement) {
+            wealthElement.innerHTML = INFINITE;
+        }
     }
 
     return $html;
@@ -863,6 +873,7 @@ function lootSheetPF2eActivateListeners(
 
     const html = htmlElement($html);
     const betterMenu = querySelector(html, ".better-merchant");
+    if (!betterMenu) return;
 
     addListener(betterMenu, "[data-action='open-equipment-tab']", () => {
         openEquipmentTab({ actor, type: "pull", owned: [] });
@@ -955,7 +966,7 @@ class FiltersMenu extends Application {
 
         const getItemData = (el: HTMLElement) => {
             const data = elementData<{ id: string; type: ItemFilterType }>(
-                closest(el, "[data-id]")
+                closest(el, "[data-id]")!
             );
             const { type, id } = data;
 

src/tools/effectsPanel.ts

@@ -84,6 +84,7 @@ function onRenderEffectsPanel(panel: EffectsPanel, $html: JQuery) {
             effect.slug !== "persistent-damage"
         ) {
             const h1 = querySelector(effectsPanel, ".effect-info > h1");
+            if (!h1) continue;
 
             appendHTMLFromString(h1, editIcon);
             addListener(h1, "[data-action='edit']", (event, el) =>
@@ -117,6 +118,8 @@ function onEditCondition(event: MouseEvent, el: HTMLElement, actor: ActorPF2e) {
 
 function getEffect(target: HTMLElement, actor: ActorPF2e) {
     const effectEl = closest(target, ".effect-item[data-item-id]");
+    if (!effectEl) return;
+
     const { itemId } = elementData(effectEl);
     return actor.items.get<EffectPF2e>(itemId);
 }

src/tools/heroActions.ts

@@ -173,6 +173,7 @@ function characterSheetPF2eActivateListeners(this: CharacterSheetPF2e, html: HTM
     const actor = this.actor;
     const tab = querySelector(html, ".tab[data-tab=actions] .tab-content .tab[data-tab=encounter]");
     const list = querySelector(tab, ".heroActions-list");
+    if (!list || !tab) return;
 
     addListener(tab, "[data-action='hero-actions-draw']", () => drawHeroActions(actor));
     addListener(tab, "[data-action='hero-actions-trade']", () => tradeHeroAction(actor, this));
@@ -187,6 +188,8 @@ function characterSheetPF2eActivateListeners(this: CharacterSheetPF2e, html: HTM
     ) => {
         addListenerAll(list, `[data-action="${action}"]`, (event: Event, el: HTMLElement) => {
             const actionEl = closest(el, "[data-uuid]");
+            if (!actionEl) return;
+
             const { uuid } = elementData(actionEl);
             callback(actor, uuid, actionEl);
         });
@@ -305,7 +308,10 @@ async function onTradeRequest(packet: SocketPacket, senderId: string) {
         content: await TextEditor.enrichHTML(content, { async: true }),
         onRender: (html) => {
             addListenerAll(html, "[data-action='description']", async (event, el) => {
-                const { uuid } = elementData(closest(el, ".action"));
+                const action = closest(el, ".action");
+                if (!action) return;
+
+                const { uuid } = elementData(action);
                 const entry = await fromUuid(uuid);
                 entry?.sheet.render(true);
             });
@@ -324,7 +330,7 @@ async function onTradeRequest(packet: SocketPacket, senderId: string) {
         packet.receiver.uuid = querySelector<HTMLInputElement>(
             html,
             "[name='action']:checked"
-        ).value;
+        )!.value;
     }
 
     if (game.user.isGM) {
@@ -394,7 +400,10 @@ async function tradeHeroAction(actor: CharacterPF2e, app?: Application) {
         });
 
         addListenerAll(html, "[data-action='description']", async (event, el) => {
-            const { uuid } = elementData(closest(el, ".action"));
+            const action = closest(el, ".action");
+            if (!action) return;
+
+            const { uuid } = elementData(action);
             const entry = await fromUuid(uuid);
             entry?.sheet.render(true);
         });
@@ -415,15 +424,20 @@ async function tradeHeroAction(actor: CharacterPF2e, app?: Application) {
 
     if (html === null) return;
 
-    const targetId = querySelector<HTMLSelectElement>(html, ".header [name='target']").value;
+    const targetId = querySelector<HTMLSelectElement>(html, ".header [name='target']")?.value;
     const target = game.actors.get<CharacterPF2e>(targetId);
     if (!target) return;
 
-    const actionUuid = querySelector<HTMLInputElement>(html, ".left [name='action']:checked").value;
+    const actionUuid = querySelector<HTMLInputElement>(
+        html,
+        ".left [name='action']:checked"
+    )?.value;
     const targetActionUUid = html.querySelector<HTMLInputElement>(
         `.right [name="action-${targetId}"]:checked`
     )?.value;
 
+    if (!actionUuid || !targetActionUUid) return;
+
     if (target.isOwner && targetActionUUid) {
         const targetActions = others.find((x) => x.id === targetId)!.actions;
 
@@ -452,7 +466,7 @@ async function tradeHeroAction(actor: CharacterPF2e, app?: Application) {
         },
         receiver: {
             id: getOwner(target)?.id ?? game.users.activeGM!.id,
-            cid: targetId,
+            cid: targetId!,
             uuid: targetActionUUid,
         },
     });
@@ -476,7 +490,7 @@ function exchangeHeroActions(trader1: ExchangeObj, trader2: ExchangeObj, senderI
 
 async function onExpandAction(actor: CharacterPF2e, uuid: string, actionEl: HTMLElement) {
     const duration = 0.4;
-    const summaryEl = querySelector(actionEl, ".item-summary");
+    const summaryEl = querySelector(actionEl, ".item-summary")!;
 
     if (!summaryEl.classList.contains("loaded")) {
         const details = await getHeroActionDetails(uuid);
@@ -579,7 +593,7 @@ async function getHeroActionDetails(uuid: string) {
 }
 
 function onDiscardAction(actor: CharacterPF2e, uuid: string, el: HTMLElement) {
-    const parent = closest(el, ".actions-list");
+    const parent = closest(el, ".actions-list")!;
     const toDiscard = Number(elementData(parent).discard);
     const discarded = querySelectorArray(parent, ".item.discarded").map((x) => elementData(x).uuid);
 
@@ -813,6 +827,8 @@ async function giveHeroActions(actor: CharacterPF2e) {
         onRender: (html) => {
             addListenerAll(html, "[data-action='expand']", (event, el) => {
                 const actionEl = closest(el, "[data-uuid]");
+                if (!actionEl) return;
+
                 const { uuid } = elementData(actionEl);
                 onExpandAction(actor, uuid, actionEl);
             });
@@ -822,11 +838,11 @@ async function giveHeroActions(actor: CharacterPF2e) {
     if (!html) return;
 
     const selected = querySelectorArray(html, "[name='action']:checked").map((el) => {
-        const parent = closest(el, ".action");
+        const parent = closest(el, ".action")!;
         return elementData<{ uuid: string; name: string; key: string }>(parent);
     });
-    const asDrawn = html.querySelector<HTMLInputElement>("[name='drawn']")?.checked;
-    const withMessage = querySelector<HTMLInputElement>(html, "[name='message']").checked;
+    const asDrawn = querySelector<HTMLInputElement>(html, "[name='drawn']")?.checked;
+    const withMessage = querySelector<HTMLInputElement>(html, "[name='message']")!.checked;
     const tableUpdates = [];
 
     for (const { uuid, name, key } of selected) {
@@ -860,7 +876,7 @@ async function removeHeroActions() {
     const translate = localize.sub("removeActions");
 
     const onRender = (html: HTMLElement) => {
-        const allInput = querySelector<HTMLInputElement>(html, "[name='all']");
+        const allInput = querySelector<HTMLInputElement>(html, "[name='all']")!;
         const actorInputs = querySelectorArray<HTMLInputElement>(html, "[name='actor']");
 
         allInput.addEventListener("change", () => {

src/tools/mergeDamage.ts

@@ -53,7 +53,7 @@ async function onRenderChatMessage(message: ChatMessagePF2e, $html: JQuery) {
         html.classList.add("merged");
     }
 
-    querySelector(html, ".dice-result .dice-total").append(buttons);
+    querySelector(html, ".dice-result .dice-total")?.append(buttons);
 
     addListener(buttons, "[data-action='merge-damage']", (event) => {
         event.stopPropagation();

src/tools/spellsSummary.ts

@@ -87,6 +87,7 @@ function characterSheetPF2eActivateListeners(this: CharacterSheetPF2e, html: HTM
 
     const spellcastingTab = getSpellcastingTab(html);
     const spellsSummaryTab = querySelector(spellcastingTab, ".tab.spells-summary");
+    if (!spellsSummaryTab) return;
 
     addListenerAll(
         spellsSummaryTab,
@@ -111,7 +112,7 @@ function toggleSpellcastingTab(this: CharacterSheetPF2e, html: HTMLElement, navI
     const isActive = querySelector(
         spellcastingNav,
         "[data-tab='spells-summary']"
-    ).classList.contains("active");
+    )?.classList.contains("active");
 
     const tabName = isActive ? "known-spells" : "spells-summary";
     this.activateTab(tabName, { group: "spell-collections" });

src/tools/stances.ts

@@ -135,6 +135,7 @@ function characterSheetPF2eActivateListeners(this: CharacterSheetPF2e, html: HTM
     if (!actor.isOwner) return;
 
     const encounterTab = getEncounterTab(html);
+    if (!encounterTab) return;
 
     addListenerAll(encounterTab, ".pf2e-stances .stance", (event, el) => {
         const uuid = elementData(el).effectUuid;
@@ -195,9 +196,10 @@ async function onCreateCombatant(combatant: CombatantPF2e) {
     });
 
     const effectUUID = html
-        ? querySelector<HTMLInputElement>(html, "[name='stance']:checked").value
+        ? querySelector<HTMLInputElement>(html, "[name='stance']:checked")?.value
         : stances[0].effectUUID;
 
+    if (!effectUUID) return;
     addStance(actor, effectUUID);
 }