feat(typescript) :: typecheck browser JavaScript in CI

package.json

@@ -2,7 +2,8 @@
   "name": "sqlpage",
   "version": "1.0.0",
   "scripts": {
-    "test": "biome check . && node --test \"tests/js/**/*.spec.ts\"",
+    "test": "biome check . && npm run typecheck && node --test \"tests/js/**/*.spec.ts\"",
+    "typecheck": "tsc && tsc -p tests/js && tsc -p tests/end-to-end",
     "format": "biome format --write .",
     "fix": "biome check --fix --unsafe ."
   },
@@ -12,7 +13,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@biomejs/biome": "^2.5.4"
+    "@biomejs/biome": "^2.5.4",
+    "@types/node": "^26.2.0",
+    "typescript": "^7.0.2"
   },
   "workspaces": [
     "tests/end-to-end"

sqlpage/apexcharts.js

@@ -2,7 +2,9 @@
 
 sqlpage_chart = (() => {
   function sqlpage_chart() {
-    for (const c of document.querySelectorAll("[data-pre-init=chart]")) {
+    /** @type {NodeListOf<HTMLElement>} */
+    const charts = document.querySelectorAll("[data-pre-init=chart]");
+    for (const c of charts) {
       try {
         build_sqlpage_chart(c);
       } catch (e) {
@@ -69,7 +71,7 @@ sqlpage_chart = (() => {
       const with_lowest_x = unread
         .filter((xs) => xs.length > 0)
         .reduce((a, b) => (b[0] < a[0] ? b : a));
-      const x = with_lowest_x.shift();
+      const x = /** @type {XValue} */ (with_lowest_x.shift());
       merged.set(x_key(x), x);
     }
     return [...merged.values()];
@@ -120,7 +122,9 @@ sqlpage_chart = (() => {
   function build_sqlpage_chart(c) {
     const [data_element] = c.getElementsByTagName("data");
     const data = JSON.parse(data_element.textContent);
-    const chartContainer = c.querySelector(".chart");
+    const chartContainer = /** @type {HTMLElement} */ (
+      c.querySelector(".chart")
+    );
     chartContainer.innerHTML = "";
     const is_timeseries = !!data.time;
     const chart_type =

sqlpage/globals.d.ts

@@ -0,0 +1,38 @@
+// Names the browser bundle relies on at runtime rather than through an import:
+// libraries build.rs inlines ahead of our own code, libraries loaded on demand,
+// and the objects SQLPage's scripts hang off the window for each other.
+
+/**
+ * A library this project ships no type definitions for. Saying `unknown`
+ * instead would only move the guesswork to a cast at every call site.
+ */
+// biome-ignore lint/suspicious/noExplicitAny: that is what an untyped library is
+type Untyped = any;
+
+/** Leaflet, loaded from a CDN by sqlpage_map when a page holds a map. */
+declare const L: Untyped;
+
+/** ApexCharts, inlined ahead of apexcharts.js by build.rs. */
+declare const ApexCharts: Untyped;
+
+/** Tom Select, inlined ahead of tomselect.js by build.rs. */
+declare const TomSelect: Untyped;
+
+/** apexcharts.js publishes its initialiser under this name. */
+declare var sqlpage_chart: () => void;
+
+/**
+ * Tabler's bundled Bootstrap, inlined ahead of sqlpage.js by build.rs. Its
+ * widgets are untyped: naming a few of them here would only claim more than
+ * this file knows.
+ */
+interface TablerBootstrap {
+  [widget: string]: Untyped;
+}
+
+interface Window {
+  /** Every chart rendered on the page, in the order they were built. */
+  charts?: unknown[];
+  tabler: { bootstrap: TablerBootstrap };
+  bootstrap?: TablerBootstrap;
+}

sqlpage/sqlpage.js

@@ -1,20 +1,21 @@
 /* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js */
-const nonce = document.currentScript.nonce;
+const nonce = /** @type {HTMLScriptElement} */ (document.currentScript).nonce;
 
 function sqlpage_card() {
-  for (const c of document.querySelectorAll("[data-pre-init=card]")) {
+  /** @type {NodeListOf<HTMLElement>} */
+  const cards = document.querySelectorAll("[data-pre-init=card]");
+  for (const c of cards) {
     c.removeAttribute("data-pre-init");
+    if (!c.dataset.embed) continue;
     const url = new URL(c.dataset.embed, window.location.href);
     url.searchParams.set("_sqlpage_embed", "1");
     fetch(url)
       .then((res) => res.text())
       .then((html) => {
         const body = c.querySelector(".card-content");
-        body.innerHTML = html;
+        if (body) body.innerHTML = html;
         const spinner = c.querySelector(".card-loading-placeholder");
-        if (spinner) {
-          spinner.parentNode.removeChild(spinner);
-        }
+        spinner?.remove();
         const fragLoadedEvt = new CustomEvent("fragment-loaded", {
           bubbles: true,
         });
@@ -28,14 +29,18 @@ function setup_table(root_el) {
   /** @type {HTMLInputElement | null} */
   const search_input = root_el.querySelector("input.search");
   const table_el = root_el.querySelector("table");
-  const sort_buttons = [...table_el.querySelectorAll("button.sort[data-sort]")];
+  if (!table_el) return;
+  /** @type {NodeListOf<HTMLElement>} */
+  const sort_button_els = table_el.querySelectorAll("button.sort[data-sort]");
+  const sort_buttons = [...sort_button_els];
   const item_parent = table_el.querySelector("tbody");
   const has_sort = sort_buttons.length > 0;
 
   if (search_input || has_sort) {
     const items = table_parse_data(table_el, sort_buttons);
     if (search_input) setup_table_search_behavior(search_input, items);
-    if (has_sort) setup_sort_behavior(sort_buttons, items, item_parent);
+    if (has_sort && item_parent)
+      setup_sort_behavior(sort_buttons, items, item_parent);
   }
 
   // Change number format AFTER parsing and storing the sort keys
@@ -44,7 +49,7 @@ function setup_table(root_el) {
 
 /**
  * @param {HTMLInputElement} search_input
- * @param {Array<{el: HTMLElement, sort_keys: Array<{num: number, str: string}>}>} items
+ * @param {TableRow[]} items
  */
 function setup_table_search_behavior(search_input, items) {
   function onSearch() {
@@ -66,12 +71,15 @@ function setup_table_search_behavior(search_input, items) {
 
 /**@param {HTMLElement} table_el */
 function apply_number_formatting(table_el) {
+  /** @type {NodeListOf<HTMLElement>} */
   const header_els = table_el.querySelectorAll("thead > tr > th");
   const col_types = [...header_els].map((el) => el.dataset.column_type);
   const col_rawnums = [...header_els].map((el) => !!el.dataset.raw_number);
   const col_money = [...header_els].map((el) => !!el.dataset.money);
   const number_format_locale = table_el.dataset.number_format_locale;
-  const number_format_digits = table_el.dataset.number_format_digits;
+  const number_format_digits = table_el.dataset.number_format_digits
+    ? Number(table_el.dataset.number_format_digits)
+    : undefined;
   const currency = table_el.dataset.currency;
 
   for (const tr_el of table_el.querySelectorAll("tbody tr, tfoot tr")) {
@@ -95,20 +103,25 @@ function apply_number_formatting(table_el) {
   }
 }
 
+/** @typedef { {el: HTMLElement, sort_keys: {num: number, str: string}[]} } TableRow */
+
 /** Prepare the table rows for sorting.
  * @param {HTMLElement} table_el
  * @param {HTMLElement[]} sort_buttons
+ * @returns {TableRow[]}
  */
 function table_parse_data(table_el, sort_buttons) {
   const is_num = [...sort_buttons].map(
-    (btn_el) => btn_el.parentElement.dataset.column_type === "number",
+    (btn_el) => btn_el.parentElement?.dataset.column_type === "number",
   );
-  return [...table_el.querySelectorAll("tbody tr")].map((tr_el) => {
+  /** @type {NodeListOf<HTMLElement>} */
+  const row_els = table_el.querySelectorAll("tbody tr");
+  return [...row_els].map((tr_el) => {
     const cells = tr_el.getElementsByTagName("td");
     return {
       el: tr_el,
       sort_keys: sort_buttons.map((_btn_el, idx) => {
-        const str = cells[idx]?.textContent;
+        const str = cells[idx]?.textContent ?? "";
         const num = is_num[idx] ? Number.parseFloat(str) : Number.NaN;
         return { num, str };
       }),
@@ -119,7 +132,7 @@ function table_parse_data(table_el, sort_buttons) {
 /**
  * Adds event listeners to the sort buttons to sort the table rows.
  * @param {HTMLElement[]} sort_buttons
- * @param {HTMLElement[]} items
+ * @param {TableRow[]} items
  * @param {HTMLElement} item_parent
  */
 function setup_sort_behavior(sort_buttons, items, item_parent) {
@@ -147,7 +160,9 @@ function setup_sort_behavior(sort_buttons, items, item_parent) {
 }
 
 function sqlpage_table() {
-  for (const r of document.querySelectorAll("[data-pre-init=table]")) {
+  /** @type {NodeListOf<HTMLElement>} */
+  const tables = document.querySelectorAll("[data-pre-init=table]");
+  for (const r of tables) {
     r.removeAttribute("data-pre-init");
     setup_table(r);
   }
@@ -198,13 +213,14 @@ function sqlpage_map() {
   }
   function onLeafletLoad() {
     is_leaflet_loaded = true;
+    /** @type {NodeListOf<HTMLElement>} */
     const maps = document.querySelectorAll("[data-pre-init=map]");
     for (const m of maps) {
       const tile_source = m.dataset.tile_source;
-      const maxZoom = +m.dataset.max_zoom;
+      const maxZoom = Number(m.dataset.max_zoom);
       const attribution = m.dataset.attribution;
       const map = L.map(m, { attributionControl: !!attribution });
-      const zoom = m.dataset.zoom;
+      const zoom = Number(m.dataset.zoom);
       const center = parseCoords(m.dataset.center);
       if (tile_source)
         L.tileLayer(tile_source, { attribution, maxZoom }).addTo(map);
@@ -213,14 +229,14 @@ function sqlpage_map() {
         setTimeout(addMarker, 0, marker_elem, map);
       }
       setTimeout(() => {
-        if (center) map.setView(center, +zoom);
+        if (center) map.setView(center, zoom);
         else {
           const markerBounds = (m) =>
             m.getLatLng ? m.getLatLng() : m.getBounds();
           const bounds = map._sqlpage_markers.map(markerBounds);
           if (bounds.length > 0) map.fitBounds(bounds);
-          else map.setView([51.505, 10], +zoom);
-          if (zoom != null) map.setZoom(+zoom);
+          else map.setView([51.505, 10], zoom);
+          if (!Number.isNaN(zoom)) map.setZoom(zoom);
         }
       }, 100);
       m.removeAttribute("data-pre-init");
@@ -282,15 +298,16 @@ function sqlpage_map() {
 }
 
 function sqlpage_form() {
+  /** @type {NodeListOf<HTMLInputElement>} */
   const file_inputs = document.querySelectorAll(
     "input[type=file][data-max-size]",
   );
   for (const input of file_inputs) {
-    const max_size = +input.dataset.maxSize;
-    input.addEventListener("change", function () {
+    const max_size = Number(input.dataset.maxSize);
+    input.addEventListener("change", () => {
       input.classList.remove("is-invalid");
       input.setCustomValidity("");
-      for (const { size } of this.files) {
+      for (const { size } of input.files ?? []) {
         if (size > max_size) {
           input.classList.add("is-invalid");
           return input.setCustomValidity(
@@ -301,6 +318,7 @@ function sqlpage_form() {
     });
   }
 
+  /** @type {NodeListOf<HTMLFormElement>} */
   const auto_submit_forms = document.querySelectorAll("form[data-auto-submit]");
   for (const form of auto_submit_forms) {
     form.addEventListener("change", () => form.submit());
@@ -314,11 +332,13 @@ function get_tabler_color(name) {
 }
 
 function load_scripts() {
+  /** @type {NodeListOf<HTMLElement>} */
   const addjs = document.querySelectorAll("[data-sqlpage-js]");
   const existing_scripts = new Set(
     [...document.querySelectorAll("script")].map((s) => s.src),
   );
   for (const el of addjs) {
+    if (!el.dataset.sqlpageJs) continue;
     const js = new URL(el.dataset.sqlpageJs, window.location.href).href;
     if (existing_scripts.has(js)) continue;
     existing_scripts.add(js);
@@ -375,11 +395,16 @@ function sqlpage_toast() {
   if (!Toast) return;
 
   const initialized_toasts = [];
-  for (const toast of document.querySelectorAll('[data-pre-init="toast"]')) {
+  /** @type {NodeListOf<HTMLElement>} */
+  const toasts = document.querySelectorAll('[data-pre-init="toast"]');
+  for (const toast of toasts) {
     const source_container = toast.parentElement;
+    if (!source_container) continue;
     const position = source_container.dataset.sqlpageToastPosition;
-    let container = document.querySelector(
-      `.toast-container[data-sqlpage-toast-position="${position}"]:not([data-pre-init])`,
+    let container = /** @type {HTMLElement | null} */ (
+      document.querySelector(
+        `.toast-container[data-sqlpage-toast-position="${position}"]:not([data-pre-init])`,
+      )
     );
     if (!container) {
       container = source_container;

sqlpage/tomselect.js

@@ -1,9 +1,9 @@
 /* !include https://cdn.jsdelivr.net/npm/tom-select@2.6.1/dist/js/tom-select.popular.min.js */
 
 function sqlpage_select_dropdown() {
-  for (const s of document.querySelectorAll(
-    "[data-pre-init=select-dropdown]",
-  )) {
+  /** @type {NodeListOf<HTMLSelectElement>} */
+  const selects = document.querySelectorAll("[data-pre-init=select-dropdown]");
+  for (const s of selects) {
     try {
       sqlpage_select_dropdown_individual(s);
     } catch (e) {

tests/end-to-end/globals.d.ts

@@ -0,0 +1,21 @@
+// What the browser tests reach for on the page: widgets that the scripts under
+// test attach to elements at runtime, and libraries the page loads itself.
+
+interface TomSelectInstance {
+  getValue(): string | string[];
+  setTextboxValue(value: string): void;
+  focus(): void;
+  options: Record<string, { label?: string } | undefined>;
+}
+
+interface HTMLElement {
+  /** Attached by sqlpage_select_dropdown to every select it takes over. */
+  tomselect?: TomSelectInstance;
+}
+
+interface Window {
+  /** Tabler's bundled Bootstrap, inlined ahead of sqlpage.js by build.rs. */
+  tabler?: {
+    bootstrap: { Toast: { getInstance(element: Element): unknown } };
+  };
+}