@sjcrh/proteinpaint-server 2.99.1-2 → 2.99.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sjcrh/proteinpaint-server",
3
- "version": "2.99.1-2",
3
+ "version": "2.99.1",
4
4
  "type": "module",
5
5
  "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
6
6
  "main": "src/app.js",
@@ -60,8 +60,8 @@
60
60
  "dependencies": {
61
61
  "@sjcrh/augen": "2.87.0",
62
62
  "@sjcrh/proteinpaint-rust": "2.99.0",
63
- "@sjcrh/proteinpaint-shared": "2.99.0",
64
- "@sjcrh/proteinpaint-types": "2.99.1-2",
63
+ "@sjcrh/proteinpaint-shared": "2.99.1",
64
+ "@sjcrh/proteinpaint-types": "2.99.1",
65
65
  "@types/express": "^5.0.0",
66
66
  "@types/express-session": "^1.18.1",
67
67
  "better-sqlite3": "^9.4.1",
@@ -1,12 +1,13 @@
1
1
  import fs from "fs";
2
2
  import path from "path";
3
3
  import { read_file, file_is_readable } from "#src/utils.js";
4
- import { joinUrl, mayLog } from "#src/helpers.ts";
4
+ import { mayLog } from "#src/helpers.ts";
5
+ import { joinUrl } from "#shared/joinUrl.js";
5
6
  import { run_rust } from "@sjcrh/proteinpaint-rust";
6
7
  import serverconfig from "#src/serverconfig.js";
7
8
  import { termdbSingleCellSamplesPayload } from "#types/checkers";
8
9
  import { validate_query_singleCell_DEgenes } from "./termdb.singlecellDEgenes.ts";
9
- import { gdc_validate_query_singleCell_samples, gdc_validate_query_singleCell_data } from "#src/mds3.gdc.js";
10
+ import { gdc_validate_query_singleCell_data } from "#src/mds3.gdc.js";
10
11
  import ky from "ky";
11
12
  const api = {
12
13
  endpoint: "termdb/singlecellSamples",
@@ -50,12 +51,8 @@ async function validate_query_singleCell(ds, genome) {
50
51
  const q = ds.queries.singleCell;
51
52
  if (!q)
52
53
  return;
53
- if (q.samples.src == "gdcapi") {
54
- gdc_validate_query_singleCell_samples(ds, genome);
55
- } else if (q.samples.src == "native") {
54
+ if (typeof q.samples.get != "function") {
56
55
  validateSamplesNative(q.samples, q.data, ds);
57
- } else {
58
- throw "unknown singleCell.samples.src";
59
56
  }
60
57
  if (q.data.src == "gdcapi") {
61
58
  gdc_validate_query_singleCell_data(ds, genome);
@@ -4,7 +4,7 @@ import serverconfig from "#src/serverconfig.js";
4
4
  import { get_samples } from "#src/termdb.sql.js";
5
5
  import { makeFilter } from "#src/mds3.gdc.js";
6
6
  import { cachedFetch } from "#src/utils.js";
7
- import { joinUrl } from "#src/helpers.ts";
7
+ import { joinUrl } from "#shared/joinUrl.js";
8
8
  const api = {
9
9
  endpoint: "termdb/topVariablyExpressedGenes",
10
10
  methods: {