@sjcrh/proteinpaint-server 2.135.2 → 2.136.0

package/dataset/termdb.test.js

@@ -111,6 +111,7 @@ function termdb_test_default() {
         plotConfigByCohort: {
           default: {
             report: {
+              filterTWs: [{ id: "diaggrp" }],
               sections: [
                 {
                   name: "Demographics",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.135.2",
+  "version": "2.136.0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -47,7 +47,6 @@
     "babel-loader": "^8.2.2",
     "c8": "^10.1.3",
     "esbuild": "^0.19.12",
-    "glob": "^10.4.5",
     "monocart-coverage-reports": "^2.12.1",
     "node-notifier": "^9.0.1",
     "node-watch": "^0.7.1",
@@ -60,12 +59,12 @@
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@sjcrh/augen": "2.121.0",
+    "@sjcrh/augen": "2.136.0",
     "@sjcrh/proteinpaint-python": "2.135.2-0",
     "@sjcrh/proteinpaint-r": "2.130.0",
-    "@sjcrh/proteinpaint-rust": "2.135.2-0",
-    "@sjcrh/proteinpaint-shared": "2.135.2-0",
-    "@sjcrh/proteinpaint-types": "2.135.2-0",
+    "@sjcrh/proteinpaint-rust": "2.136.0",
+    "@sjcrh/proteinpaint-shared": "2.136.0",
+    "@sjcrh/proteinpaint-types": "2.136.0",
     "@types/express": "^5.0.0",
     "@types/express-session": "^1.18.1",
     "better-sqlite3": "^9.4.1",

package/routes/filterTermValues.js

@@ -35,7 +35,8 @@ function getList(samplesPerFilter, filtersData, tw) {
   for (const sample of twSamples) {
     data.push(filtersData.samples[sample]);
   }
-  const sampleValues = Array.from(new Set(data.map((sample) => sample[tw.$id]?.value)));
+  const annotations = data.filter((s) => s != void 0).map((sample) => sample[tw.$id]?.value);
+  const sampleValues = Array.from(new Set(annotations));
   for (const value of values) {
     value.value = value.label;
     const label = value.label;

package/routes/termdb.categories.js

@@ -51,12 +51,20 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
   const data = await getData(arg, ds, genome);
   if (data.error)
     throw data.error;
+  const [lst, orderedLabels] = getCategories(data, q, ds, $id);
+  res.send({
+    lst,
+    orderedLabels
+  });
+}
+function getCategories(data, q, ds, $id) {
   const lst = [];
   if (q.tw.term.type == "geneVariant" && q.tw.q.type != "predefined-groupset" && q.tw.q.type != "custom-groupset") {
     const samples = data.samples;
     const dtClassMap = /* @__PURE__ */ new Map();
     if (ds.assayAvailability?.byDt) {
-      for (const [dtType, dtValue] of Object.entries(ds.assayAvailability.byDt)) {
+      for (const [dtType, _dtValue] of Object.entries(ds.assayAvailability.byDt)) {
+        const dtValue = _dtValue;
         if (dtValue.byOrigin) {
           dtClassMap.set(parseInt(dtType), { byOrigin: { germline: {}, somatic: {} } });
         }
@@ -65,6 +73,8 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
     const sampleCountedFor = /* @__PURE__ */ new Set();
     for (const sampleData of Object.values(samples)) {
       const key = $id;
+      if (!Object.keys(sampleData).includes(key))
+        continue;
       const values = sampleData[key].values;
       sampleCountedFor.clear();
       for (const value of values) {
@@ -126,11 +136,9 @@ async function trigger_getcategories(q, res, tdb, ds, genome) {
   if (orderedLabels.length) {
     lst.sort((a, b) => orderedLabels.indexOf(a.label) - orderedLabels.indexOf(b.label));
   }
-  res.send({
-    lst,
-    orderedLabels
-  });
+  return [lst, orderedLabels];
 }
 export {
-  api
+  api,
+  getCategories
 };

package/routes/termdb.singlecellSamples.js

@@ -51,9 +51,14 @@ async function validate_query_singleCell(ds, genome) {
   const q = ds.queries.singleCell;
   if (!q)
     return;
-  if (typeof q.samples.get != "function") {
+  if (typeof q.samples != "object")
+    throw "singleCell.samples{} not object";
+  if (typeof q.samples.get == "function") {
+  } else {
     validateSamplesNative(q.samples, q.data, ds);
   }
+  if (typeof q.data != "object")
+    throw "singleCell.data{} not object";
   if (q.data.src == "gdcapi") {
     gdc_validate_query_singleCell_data(ds, genome);
   } else if (q.data.src == "native") {
@@ -62,6 +67,8 @@ async function validate_query_singleCell(ds, genome) {
     throw "unknown singleCell.data.src";
   }
   if (q.geneExpression) {
+    if (typeof q.geneExpression != "object")
+      throw "singleCell.geneExpression not object";
     if (q.geneExpression.src == "native") {
       validateGeneExpressionNative(q.geneExpression);
     } else if (q.geneExpression.src == "gdcapi") {
@@ -71,9 +78,13 @@ async function validate_query_singleCell(ds, genome) {
     }
   }
   if (q.DEgenes) {
+    if (typeof q.DEgenes != "object")
+      throw "singleCell.DEgenes not object";
     validate_query_singleCell_DEgenes(ds);
   }
   if (q.images) {
+    if (typeof q.images != "object")
+      throw "singleCell.images not object";
     validateImages(q.images);
   }
 }
@@ -127,68 +138,69 @@ function validateDataNative(D, ds) {
     if (nameSet.has(plot.name))
       throw "duplicate plot.name";
     nameSet.add(plot.name);
+    if (!plot.folder)
+      throw "plot.folder missing";
   }
+  const file2Lines = {};
   D.get = async (q) => {
-    try {
-      const plots = [];
-      let geneExpMap;
-      if (ds.queries.singleCell.geneExpression && q.gene) {
-        geneExpMap = await ds.queries.singleCell.geneExpression.get({ sample: q.sample, gene: q.gene });
-      }
-      const file2Lines = {};
-      for (const plot of D.plots) {
-        if (!q.plots.includes(plot.name))
-          continue;
-        const tsvfile = path.join(
-          serverconfig.tpmasterdir,
-          plot.folder,
-          (q.sample.eID || q.sample.sID) + plot.fileSuffix
-        );
-        if (!file2Lines[tsvfile]) {
-          await file_is_readable(tsvfile);
-          file2Lines[tsvfile] = (await read_file(tsvfile)).trim().split("\n");
-        }
-        const colorColumn = plot.colorColumns.find((c) => c.name == q.colorBy?.[plot.name]) || plot.colorColumns[0];
-        const lines = file2Lines[tsvfile];
-        const expCells = [];
-        const noExpCells = [];
-        for (let i = 1; i < lines.length; i++) {
-          const l = lines[i].split("	");
-          const cellId = lines.length > 3 ? l[0] : void 0, x = Number(l[plot.coordsColumns.x]), y = Number(l[plot.coordsColumns.y]);
-          const category = l[colorColumn?.index] || "";
-          if (!cellId)
-            throw "cell id missing";
-          if (!Number.isFinite(x) || !Number.isFinite(y))
-            throw "x/y not number";
-          const cell = { cellId, x, y, category };
-          if (geneExpMap) {
-            if (geneExpMap[cellId] !== void 0) {
-              cell.geneExp = geneExpMap[cellId];
-              expCells.push(cell);
-            } else {
-              noExpCells.push(cell);
-            }
-          } else
-            noExpCells.push(cell);
+    const plots = [];
+    let geneExpMap;
+    if (ds.queries.singleCell.geneExpression && q.gene) {
+      geneExpMap = await ds.queries.singleCell.geneExpression.get({ sample: q.sample, gene: q.gene });
+    }
+    for (const plot of D.plots) {
+      if (!q.plots.includes(plot.name))
+        continue;
+      const tsvfile = path.join(serverconfig.tpmasterdir, plot.folder, (q.sample.eID || q.sample.sID) + plot.fileSuffix);
+      if (!file2Lines[tsvfile]) {
+        await file_is_readable(tsvfile);
+        const text = await read_file(tsvfile);
+        const lines = text.trim().split("\n");
+        let first = true;
+        const lines2 = [];
+        for (const line of lines) {
+          if (first) {
+            first = false;
+            continue;
+          }
+          lines2.push(line.split("	"));
         }
-        plots.push({
-          name: plot.name,
-          expCells,
-          noExpCells,
-          colorColumns: plot.colorColumns.map((c) => c.name),
-          colorBy: colorColumn?.name,
-          colorMap: colorColumn?.colorMap
-        });
+        file2Lines[tsvfile] = lines2;
       }
-      if (plots.length == 0) {
-        return { nodata: true };
+      const colorColumn = plot.colorColumns.find((c) => c.name == q.colorBy?.[plot.name]) || plot.colorColumns[0];
+      const expCells = [];
+      const noExpCells = [];
+      for (const l of file2Lines[tsvfile]) {
+        const cellId = l[0], x = Number(l[plot.coordsColumns.x]), y = Number(l[plot.coordsColumns.y]);
+        const category = l[colorColumn?.index] || "";
+        if (!cellId)
+          throw "cell id missing";
+        if (!Number.isFinite(x) || !Number.isFinite(y))
+          throw "x/y not number";
+        const cell = { cellId, x, y, category };
+        if (geneExpMap) {
+          if (geneExpMap[cellId] !== void 0) {
+            cell.geneExp = geneExpMap[cellId];
+            expCells.push(cell);
+          } else {
+            noExpCells.push(cell);
+          }
+        } else
+          noExpCells.push(cell);
       }
-      return { plots };
-    } catch (e) {
-      if (e.stack)
-        console.log(e.stack);
-      return { error: e.message || e };
+      plots.push({
+        name: plot.name,
+        expCells,
+        noExpCells,
+        colorColumns: plot.colorColumns.map((c) => c.name),
+        colorBy: colorColumn?.name,
+        colorMap: colorColumn?.colorMap
+      });
+    }
+    if (plots.length == 0) {
+      return { nodata: true };
     }
+    return { plots };
   };
 }
 function validateGeneExpressionNative(G) {