@sjcrh/proteinpaint-server 2.52.0 → 2.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.52.0",
+  "version": "2.54.0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -16,7 +16,7 @@
   "scripts": {
     "dev": "npm run start",
     "prestart": "tsx emitImports.js dev > server.js",
-    "start": "tsx watch src/app.ts",
+    "start": "tsx watch . /start.js",
     "test:unit": "tsx emitImports.js unit > serverTests.js && tsx serverTests.js && rm -rf ./cache",
     "getconf": "../build/getConfigProp.js",
     "doc": "../augen/build.sh routes shared/types/routes shared/checkers ../public/docs/server",

package/routes/termdb.cluster.js

@@ -5,6 +5,7 @@ import serverconfig from "#src/serverconfig.js";
 import { gdc_validate_query_geneExpression } from "#src/mds3.gdc.js";
 import { mayLimitSamples } from "#src/mds3.filter.js";
 import { dtgeneexpression } from "#shared/common.js";
+import { clusterMethodLst, distanceMethodLst } from "#shared/clustering.js";
 const api = {
   endpoint: "termdb/cluster",
   methods: {
@@ -71,6 +72,10 @@ async function doClustering(data, q) {
       sampleSet.add(s);
     break;
   }
+  if (!clusterMethodLst.find((i) => i.value == q.clusterMethod))
+    throw "Invalid cluster method";
+  if (!distanceMethodLst.find((i) => i.value == q.distanceMethod))
+    throw "Invalid distance method";
   const inputData = {
     matrix: [],
     row_names: [],
@@ -78,6 +83,7 @@ async function doClustering(data, q) {
     col_names: [...sampleSet],
     // samples
     cluster_method: q.clusterMethod,
+    distance_method: q.distanceMethod,
     plot_image: false
     // When true causes cluster.rs to plot the image into a png file (EXPERIMENTAL)
   };