@sjcrh/proteinpaint-server 2.142.0 → 2.143.0

package/dataset/protected.test.js

@@ -2,8 +2,7 @@ import termdbTestInit from "./termdb.test.js";
 const minSampleSize = 10;
 function protected_test_default() {
   const ds = termdbTestInit();
-  if (!ds.cohort)
-    ds.cohort = { termdb: {} };
+  if (!ds.cohort) ds.cohort = { termdb: {} };
   ds.cohort.termdb.checkAccessToSampleData = (_, data) => {
     return {
       minSampleSize,

package/dataset/termdb.test.js

@@ -186,8 +186,9 @@ function termdb_test_default() {
           {
             name: "TermdbTest TSNE",
             dimension: 2,
-            file: "files/hg38/TermdbTest/tnse.txt",
-            colorTW: { id: "diaggrp" }
+            file: "files/hg38/TermdbTest/tsne.txt",
+            colorTW: { id: "diaggrp" },
+            shapeTW: { id: "sex" }
           }
         ]
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.142.0",
+  "version": "2.143.0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -41,16 +41,17 @@
     "@babel/preset-env": "^7.9.6",
     "@babel/preset-typescript": "^7.21.4",
     "@babel/register": "^7.14.5",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^20.11.24",
     "@types/tough-cookie": "^4.0.5",
     "@typescript-eslint/eslint-plugin": "^8.13.0",
     "babel-loader": "^8.2.2",
     "c8": "^10.1.3",
-    "esbuild": "^0.19.12",
+    "esbuild": "^0.25.9",
     "monocart-coverage-reports": "^2.12.1",
     "node-notifier": "^9.0.1",
     "node-watch": "^0.7.1",
-    "nodemon": "^2.0.19",
+    "nodemon": "^3.1.10",
     "prettier": "^2.8.8",
     "tape": "^5.2.2",
     "ts-node": "^10.9.1",
@@ -59,12 +60,12 @@
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@sjcrh/augen": "2.136.0",
-    "@sjcrh/proteinpaint-python": "2.139.1",
+    "@sjcrh/augen": "2.143.0",
+    "@sjcrh/proteinpaint-python": "2.143.0",
     "@sjcrh/proteinpaint-r": "2.137.2-0",
-    "@sjcrh/proteinpaint-rust": "2.142.0",
-    "@sjcrh/proteinpaint-shared": "2.142.0",
-    "@sjcrh/proteinpaint-types": "2.142.0",
+    "@sjcrh/proteinpaint-rust": "2.143.0",
+    "@sjcrh/proteinpaint-shared": "2.143.0",
+    "@sjcrh/proteinpaint-types": "2.143.0",
     "@types/express": "^5.0.0",
     "@types/express-session": "^1.18.1",
     "better-sqlite3": "^9.4.1",

package/routes/aiProjectAdmin.js

@@ -1,8 +1,8 @@
 import { aiProjectAdminPayload } from "#types/checkers";
-import { connect_db } from "../src/utils.js";
-const routePath = "aiProjectAdmin";
+import { getDbConnection } from "#src/aiHistoDBConnection.js";
+import { runMultiStmtSQL, runSQL } from "#src/runSQLHelpers.ts";
 const api = {
-  endpoint: `${routePath}`,
+  endpoint: "aiProjectAdmin",
   methods: {
     get: {
       //all requests
@@ -35,33 +35,39 @@ function init({ genomes }) {
       }
       const g = genomes[query.genome];
       const ds = g.datasets[query.dslabel];
-      if (!ds.queries?.WSImages?.db)
-        throw new Error("WSImages database not found.");
-      const db = ds.queries.WSImages.db;
-      db.connection = connect_db(db.file, { readonly: false, fileMustExist: true });
+      if (!ds.queries?.WSImages?.db) throw new Error("WSImages database not found.");
+      const connection = getDbConnection(ds);
       if (query.for === "list") {
-        const projects = getProjects(db.connection);
+        const projects = getProjects(connection);
         res.send(projects);
       } else if (query.for === "admin") {
-        if (req.method === "PUT" || query.project.type === "new")
-          addProject(db.connection, query.project);
-        else if (req.method === "POST")
-          editProject(db.connection, query.project);
-        else if (req.method === "DELETE")
-          deleteProject(db.connection, query.project.id);
-        else
-          throw new Error('Invalid request method for="admin" in aiProjectAdmin route.');
+        if (req.method === "PUT" || query.project.type === "new") addProject(connection, query.project);
+        else if (req.method === "POST") editProject(connection, query.project);
+        else if (req.method === "DELETE") deleteProject(connection, query.project.id);
+        else throw new Error('Invalid request method for="admin" in aiProjectAdmin route.');
+        let projectId = query.project.id;
+        if (!projectId) {
+          const row = connection.prepare(`SELECT id FROM project WHERE name = ?`).get(query.project.name);
+          if (!row) {
+            throw new Error(`Project not found: ${query.project.name}`);
+          }
+          projectId = row.id;
+        }
         res.status(200).send({
           status: "ok",
+          projectId,
           message: `Project ${query.project.name} processed successfully`
         });
-      } else if (query.for === "images") {
+      } else if (query.for === "filterImages") {
         const q = ds.cohort.termdb.q;
         const data = await q.getFilteredImages(query.project.filter);
         res.status(200).send({
           status: "ok",
           data
         });
+      } else if (query.for === "images") {
+        const images = getImages(connection, query.project);
+        res.send({ images });
       } else {
         res.send({
           status: "error",
@@ -78,9 +84,18 @@ function init({ genomes }) {
   };
 }
 function getProjects(connection) {
-  const sql = "SELECT project.name as value, id FROM project";
+  const sql = "SELECT name, id FROM project";
   return runSQL(connection, sql);
 }
+function getImages(connection, project) {
+  if (!project.id) {
+    const res = connection.prepare(`SELECT id FROM project WHERE name = ?`).get(project.name);
+    if (!res) throw new Error(`Project not found for name: ${project.name}`);
+    project.id = res.id;
+  }
+  const imageRows = connection.prepare(`SELECT image_path FROM project_images WHERE project_id = ? ORDER BY id ASC`).all(project.id);
+  return imageRows.map((r) => r.image_path);
+}
 function editProject(connection, project) {
   const stmts = [];
   if (!project.id) {
@@ -89,18 +104,17 @@ function editProject(connection, project) {
   }
   if (project.images) {
     stmts.push({
-      sql: `DELETE FROM project_images WHERE project_id = ? AND image NOT IN (${project.images.map(() => "?").join(",") || "''"})`,
+      sql: `DELETE FROM project_images WHERE project_id = ? AND image_path NOT IN (${project.images.map(() => "?").join(",") || "''"})`,
       params: [[project.id, ...project.images]]
     });
-    const existingImg = connection.prepare(`SELECT 1 FROM project_images WHERE project_id = ? AND image = ?`);
+    const existingImg = connection.prepare(`SELECT 1 FROM project_images WHERE project_id = ? AND image_path = ?`);
     const multiParams = [];
     for (const img of project.images) {
       const exists = existingImg.get(project.id, img);
-      if (!exists)
-        multiParams.push([project.id, img]);
+      if (!exists) multiParams.push([project.id, img]);
     }
     if (multiParams.length > 0) {
-      const insertImg = `INSERT INTO project_images (project_id, image) VALUES (?, ?)`;
+      const insertImg = `INSERT INTO project_images (project_id, image_path) VALUES (?, ?)`;
       stmts.push({ sql: insertImg, params: multiParams });
     }
   }
@@ -119,8 +133,7 @@ function editProject(connection, project) {
     const multiParams = [];
     for (const cls of project.classes) {
       const exists = existingClasses.get(project.id, cls.name);
-      if (!exists)
-        multiParams.push([project.id, cls.name, cls.color, cls.key_shortcut || ""]);
+      if (!exists) multiParams.push([project.id, cls.name, cls.color, cls.key_shortcut || ""]);
     }
     if (multiParams.length > 0) {
       const insertClass = `INSERT INTO project_classes (project_id, name, color, key_shortcut) VALUES (?, ?, ?, ?)`;
@@ -130,8 +143,7 @@ function editProject(connection, project) {
   runMultiStmtSQL(connection, stmts, "add");
 }
 function deleteProject(connection, projectId) {
-  if (!projectId)
-    throw new Error("Invalid project ID [aiProjectAdmin route deleteProject()]");
+  if (!projectId) throw new Error("Invalid project ID [aiProjectAdmin route deleteProject()]");
   const stmts = [
     { sql: "DELETE FROM project_annotations WHERE project_id = ?", params: [[projectId]] },
     { sql: "DELETE FROM project_classes WHERE project_id = ?", params: [[projectId]] },
@@ -144,39 +156,13 @@ function deleteProject(connection, projectId) {
 function addProject(connection, project) {
   const projectSql = `INSERT INTO project (name, filter) VALUES (?, ?)`;
   const projectParams = [project.name, JSON.stringify(project.filter)];
-  const rows = runSQL(connection, projectSql, projectParams, "add");
-  const classSql = `INSERT INTO project_classes (project_id, name, color, key_shortcut) VALUES (?, ?, ?, ?)`;
-  const classParams = project.classes.map((c) => [rows.lastInsertRowid, c.label, c.color, c.key_shortcut || ""]);
-  for (const params of classParams) {
-    runSQL(connection, classSql, params, "add");
-  }
-}
-function runSQL(connection, sql, params = [], errorText = "fetch") {
-  try {
-    if (!params.length) {
-      return connection.prepare(sql).all();
-    }
-    return connection.prepare(sql).run(params);
-  } catch (e) {
-    console.error(`Error executing SQL for ${errorText}: ${e.message || e}`);
-    throw new Error(`Failed to ${errorText} projects`);
-  }
-}
-function runMultiStmtSQL(connection, stmts, errorText = "execute") {
-  const transaction = connection.transaction((batch) => {
-    for (const { sql, params = [] } of batch) {
-      const sqlStmt = connection.prepare(sql);
-      for (const item of params) {
-        sqlStmt.run(item);
-      }
-    }
-  });
-  try {
-    transaction(stmts);
-  } catch (e) {
-    console.error(`Error executing transaction for ${errorText}: ${e.message || e}`);
-    throw new Error(`Failed to ${errorText} projects`);
-  }
+  const row = runSQL(connection, projectSql, projectParams, "add");
+  const userSql = `INSERT INTO project_users (project_id, email) VALUES (?, ?)`;
+  const userParams = [row.lastInsertRowid, "user@domain.com"];
+  runSQL(connection, userSql, userParams, "add");
+  const classSql = `INSERT INTO project_classes (project_id, label, color, key_shortcut) VALUES (?, ?, ?, ?)`;
+  const classParams = project.classes.map((c) => [row.lastInsertRowid, c.label, c.color, c.key_shortcut || ""]);
+  runMultiStmtSQL(connection, [{ sql: classSql, params: classParams }], "add");
 }
 export {
   api

package/routes/aiProjectSelectedWSImages.js

@@ -0,0 +1,161 @@
+import path from "path";
+import fs from "fs";
+import serverconfig from "#src/serverconfig.js";
+import { aiProjectSelectedWSImagesResponsePayload } from "#types/checkers";
+import { getDbConnection } from "#src/aiHistoDBConnection.ts";
+const api = {
+  endpoint: "aiProjectSelectedWSImages",
+  methods: {
+    get: {
+      ...aiProjectSelectedWSImagesResponsePayload,
+      init
+    },
+    post: {
+      ...aiProjectSelectedWSImagesResponsePayload,
+      init
+    }
+  }
+};
+function init({ genomes }) {
+  return async (req, res) => {
+    try {
+      const query = req.query;
+      const g = genomes[query.genome];
+      if (!g) throw "invalid genome name";
+      const ds = g.datasets[query.dslabel];
+      if (!ds) throw "invalid dataset name";
+      const projectId = query.projectId;
+      const wsimagesFilenames = query.wsimagesFilenames;
+      const wsimages = [];
+      if (ds.queries.WSImages.getWSIAnnotations) {
+        for (const wsimageFilename of wsimagesFilenames) {
+          const wsimage = {
+            filename: wsimageFilename
+          };
+          wsimage.annotations = await ds.queries.WSImages.getWSIAnnotations(projectId, wsimageFilename);
+          wsimage.classes = await ds.queries.WSImages.getAnnotationClasses(projectId);
+          wsimage.uncertainty = ds.queries?.WSImages?.uncertainty;
+          wsimage.activePatchColor = ds.queries?.WSImages?.activePatchColor;
+          if (ds.queries.WSImages.getWSIPredictionPatches) {
+            const predictionsFile = await ds.queries.WSImages.getWSIPredictionPatches(projectId, wsimageFilename);
+            const mount = serverconfig.features?.tileserver?.mount;
+            if (!mount) throw new Error("No mount available for TileServer");
+            const predictionsFilePath = path.join(mount, ds.queries.WSImages.aiToolImageFolder, predictionsFile[0]);
+            const predictionsData = JSON.parse(fs.readFileSync(predictionsFilePath, "utf8"));
+            wsimage.predictions = predictionsData.features.map((d) => {
+              const featClass = wsimage.classes?.find((f) => f.id == d.properties.class)?.label;
+              return {
+                zoomCoordinates: d.properties.zoomCoordinates,
+                uncertainty: d.properties.uncertainty,
+                class: featClass
+              };
+            });
+          }
+          if (ds.queries.WSImages.makeGeoJson) {
+            await ds.queries.WSImages.makeGeoJson(projectId, wsimageFilename);
+          }
+          wsimages.push(wsimage);
+        }
+      }
+      if (ds.queries.WSImages.getWSIPredictionOverlay) {
+        for (const wsimage of wsimages) {
+          const predictionOverlay = await ds.queries.WSImages.getWSIPredictionOverlay(wsimage.filename);
+          if (predictionOverlay) {
+            wsimage.predictionLayers = [predictionOverlay];
+          }
+        }
+      }
+      res.send({ wsimages });
+    } catch (e) {
+      console.log(e);
+      res.status(404).send("Sample images not found");
+    }
+  };
+}
+async function validate_query_getWSIAnnotations(ds) {
+  if (!ds.queries?.WSImages?.db) return;
+  const connection = getDbConnection(ds);
+  if (!connection) return;
+  validateWSIAnnotationsQuery(ds, connection);
+}
+async function validate_query_getWSIClassesQuery(ds) {
+  if (!ds.queries?.WSImages?.db) return;
+  const connection = getDbConnection(ds);
+  if (!connection) return;
+  validateWSIClassesQuery(ds, connection);
+}
+function validateWSIAnnotationsQuery(ds, connection) {
+  if (!ds.queries?.WSImages?.db) return;
+  const GET_ANNOTATIONS_SQL = `
+        SELECT
+            pa.id,
+            pa.project_id,
+            pa.user_id,
+            pa.coordinates,
+            pa.timestamp,
+            pa.status,
+            pc.label AS label
+        FROM project_annotations pa
+                 INNER JOIN project_images pi
+                            ON pi.id = pa.image_id
+                 LEFT JOIN project_classes pc
+                           ON pc.id = pa.class_id
+        WHERE pa.project_id = ?
+          AND pi.image_path = ?
+          AND pa.status = 1
+        ORDER BY pa.timestamp DESC, pa.id DESC
+    `;
+  if (!ds.queries) ds.queries = {};
+  if (!ds.queries.WSImages) ds.queries.WSImages = {};
+  ds.queries.WSImages.getWSIAnnotations = async (projectId, filename) => {
+    try {
+      const stmt = connection.prepare(GET_ANNOTATIONS_SQL);
+      const rows = stmt.all(projectId, filename);
+      return rows.map((r) => {
+        let coords = [NaN, NaN];
+        try {
+          const parsed = typeof r.coordinates === "string" ? JSON.parse(r.coordinates) : r.coordinates;
+          if (Array.isArray(parsed) && parsed.length >= 2) {
+            const x = Number(parsed[0]);
+            const y = Number(parsed[1]);
+            if (!Number.isNaN(x) && !Number.isNaN(y)) coords = [x, y];
+          }
+        } catch {
+        }
+        return {
+          zoomCoordinates: coords,
+          class: r.label ?? ""
+        };
+      });
+    } catch (error) {
+      console.error("Error loading annotations:", error);
+      return [];
+    }
+  };
+}
+function validateWSIClassesQuery(ds, connection) {
+  if (!ds.queries) ds.queries = {};
+  if (!ds.queries.WSImages) ds.queries.WSImages = {};
+  const GET_CLASSES_SQL = `
+        SELECT id, project_id, label, color, key_shortcut
+        FROM project_classes
+        WHERE project_id = ?
+        ORDER BY id
+    `;
+  ds.queries.WSImages.getAnnotationClasses = async (projectId) => {
+    try {
+      const stmt = connection.prepare(GET_CLASSES_SQL);
+      return stmt.all(projectId);
+    } catch (error) {
+      console.error("Error loading project classes:", error);
+      return [];
+    }
+  };
+}
+export {
+  api,
+  validateWSIAnnotationsQuery,
+  validateWSIClassesQuery,
+  validate_query_getWSIAnnotations,
+  validate_query_getWSIClassesQuery
+};

package/routes/brainImaging.js

@@ -23,11 +23,9 @@ function init({ genomes }) {
     try {
       const query = req.query;
       const g = genomes[query.genome];
-      if (!g)
-        throw "invalid genome name";
+      if (!g) throw "invalid genome name";
       const ds = g.datasets[query.dslabel];
-      if (!ds)
-        throw "invalid dataset name";
+      if (!ds) throw "invalid dataset name";
       let plane, index;
       if (query.l) {
         plane = "L";
@@ -57,10 +55,8 @@ async function getBrainImage(query, genomes, plane, index) {
     const terms = [];
     const divideByTW = query.divideByTW;
     const overlayTW = query.overlayTW;
-    if (divideByTW)
-      terms.push(divideByTW);
-    if (overlayTW)
-      terms.push(overlayTW);
+    if (divideByTW) terms.push(divideByTW);
+    if (overlayTW) terms.push(overlayTW);
     const selectedSampleNames = query.selectedSampleFileNames.map((s) => s.split(".nii")[0]);
     const data = await getData({ terms }, ds);
     const divideByCat = {};
@@ -73,8 +69,7 @@ async function getBrainImage(query, genomes, plane, index) {
       let overlayCategory = "default";
       if (divideByTW) {
         const value = sampleData[divideByTW.$id];
-        if (value)
-          divideCategory = divideByTW.term.values?.[value.key]?.label || value.key;
+        if (value) divideCategory = divideByTW.term.values?.[value.key]?.label || value.key;
       }
       if (overlayTW) {
         const value = sampleData[overlayTW.$id];
@@ -83,8 +78,7 @@ async function getBrainImage(query, genomes, plane, index) {
           uniqueOverlayTwCats.add(overlayCategory);
         }
       }
-      if (!divideByCat[divideCategory])
-        divideByCat[divideCategory] = {};
+      if (!divideByCat[divideCategory]) divideByCat[divideCategory] = {};
       if (!query.legendFilter?.includes(overlayCategory)) {
         if (!divideByCat[divideCategory][overlayCategory]) {
           let color = overlayTW?.term?.values?.[overlayCategory]?.color;
@@ -107,8 +101,7 @@ async function getBrainImage(query, genomes, plane, index) {
         const overlayCat = divideByCat[dcategory][category];
         const samples = overlayCat.samples;
         lengths.push(samples.length);
-        if (!overlayCat.color)
-          overlayCat.color = category == "default" ? "red" : k2c(category);
+        if (!overlayCat.color) overlayCat.color = category == "default" ? "red" : k2c(category);
       }
     }
     const maxLength = Math.max(...lengths);
@@ -118,11 +111,9 @@ async function getBrainImage(query, genomes, plane, index) {
       let catNum = 0;
       const filesByCat = divideByCat[dcategory];
       for (const category in filesByCat) {
-        if (filesByCat[category].samples.length < 1)
-          continue;
+        if (filesByCat[category].samples.length < 1) continue;
         catNum += filesByCat[category].samples.length;
-        if (!legend[category])
-          legend[category] = { color: filesByCat[category].color, maxLength };
+        if (!legend[category]) legend[category] = { color: filesByCat[category].color, maxLength };
       }
       const arg = {
         refFile,

package/routes/brainImagingSamples.js

@@ -20,11 +20,9 @@ function init({ genomes }) {
     try {
       const query = req.query;
       const g = genomes[query.genome];
-      if (!g)
-        throw "invalid genome name";
+      if (!g) throw "invalid genome name";
       const ds = g.datasets[query.dslabel];
-      if (!ds)
-        throw "invalid dataset name";
+      if (!ds) throw "invalid dataset name";
       const samples = await getBrainImageSamples(query, genomes);
       res.send({ samples });
     } catch (e) {

package/routes/burden.js

@@ -19,18 +19,13 @@ function init({ genomes }) {
   return async function handler(req, res) {
     try {
       const genome = genomes[req.query.genome];
-      if (!genome)
-        throw `invalid q.genome=${req.query.genome}`;
+      if (!genome) throw `invalid q.genome=${req.query.genome}`;
       const q = req.query;
       const ds = genome.datasets[q.dslabel];
-      if (!ds)
-        throw `invalid q.dslabel=${req.query.dslabel}`;
-      if (!ds.cohort.cumburden?.files)
-        throw `missing ds.cohort.cumburden.files`;
-      if (!ds.cohort?.cumburden?.db)
-        throw `missing ds.cohort.cumburden.db`;
-      if (!ds.cohort?.cumburden?.bootsubdir)
-        throw `missing ds.cohort.cumburden.bootsubdir`;
+      if (!ds) throw `invalid q.dslabel=${req.query.dslabel}`;
+      if (!ds.cohort.cumburden?.files) throw `missing ds.cohort.cumburden.files`;
+      if (!ds.cohort?.cumburden?.db) throw `missing ds.cohort.cumburden.db`;
+      if (!ds.cohort?.cumburden?.bootsubdir) throw `missing ds.cohort.cumburden.bootsubdir`;
       const result = await getBurdenResult(q, ds.cohort.cumburden);
       if (!q.showCI) {
         res.send({
@@ -39,8 +34,7 @@ function init({ genomes }) {
           ...formatPayload(result.estimate)
         });
       } else {
-        if (!result.ci95)
-          await compute95ci(result, ds.cohort.cumburden);
+        if (!result.ci95) await compute95ci(result, ds.cohort.cumburden);
         res.send({
           status: "ok",
           /*ci95: result.ci95,*/
@@ -63,8 +57,7 @@ async function getBurdenResult(q, cumburden) {
     const overall = { chc: 0 };
     for (const age of ages) {
       overall[age] = [0];
-      for (const est of estimate)
-        overall[age][0] += est[age];
+      for (const est of estimate) overall[age][0] += est[age];
     }
     estimate.push(overall);
     const burden = {};
@@ -76,8 +69,7 @@ async function getBurdenResult(q, cumburden) {
     result.estimate = burden;
   }
   for (const [k, v] of Object.entries(result)) {
-    if (k !== "id" && typeof v == "string")
-      result[k] = JSON.parse(v);
+    if (k !== "id" && typeof v == "string") result[k] = JSON.parse(v);
   }
   return result;
 }
@@ -85,8 +77,7 @@ function normalizeInput(q, cumburden) {
   const keys = Object.keys(q).filter((k) => k in defaultInputValues).sort();
   const id = keys.map((k) => q[k]).join("-");
   const normalized = {};
-  for (const k of keys)
-    normalized[k] = q[k];
+  for (const k of keys) normalized[k] = q[k];
   normalized.datafiles = {
     dir: path.join(serverconfig.tpmasterdir, cumburden.dir),
     files: cumburden.files,
@@ -97,21 +88,18 @@ function normalizeInput(q, cumburden) {
 }
 async function compute95ci(result, cumburden) {
   try {
-    if (!result.input)
-      throw "result{} does not have .input";
+    if (!result.input) throw "result{} does not have .input";
     const input = structuredClone(result.input);
     input.burden = Object.values(result.estimate).filter((est) => est.chc !== 0);
     const lowup = await run_R("burden-ci95.R", JSON.stringify(input), []);
     const { low, up, overall } = JSON.parse(lowup);
     const ci95 = { 0: {} };
     for (const est of Object.values(result.estimate)) {
-      if (!ci95[est.chc])
-        ci95[est.chc] = {};
+      if (!ci95[est.chc]) ci95[est.chc] = {};
       const lower = low.find((l) => l.chc === est.chc);
       const upper = up.find((u) => u.chc === est.chc);
       for (const [age, val] of Object.entries(est)) {
-        if (!age.startsWith("["))
-          continue;
+        if (!age.startsWith("[")) continue;
         const burden = est.chc === 0 ? overall[0][age] : val;
         ci95[est.chc][age] = [burden, lower[age], upper[age]];
       }
@@ -129,8 +117,7 @@ function formatPayload(estimates) {
   const rows = [];
   for (const [chc, burdenByAge] of Object.entries(estimates)) {
     const arr = [chc];
-    for (const age of rawKeys)
-      arr.push(Array.isArray(burdenByAge[age]) ? burdenByAge[age] : [burdenByAge[age]]);
+    for (const age of rawKeys) arr.push(Array.isArray(burdenByAge[age]) ? burdenByAge[age] : [burdenByAge[age]]);
     rows.push(arr);
   }
   return { keys: outKeys, rows };