@sjcrh/proteinpaint-client 2.211.0 → 2.211.1-0

package/dist/chunk-HYOCZPKO.js

@@ -0,0 +1,281 @@
+import {
+  getMclassSorter,
+  getSampleGroupSorter,
+  getSampleSorter,
+  getTermSorter
+} from "./chunk-753GDKSC.js";
+import {
+  setRelatedSamples
+} from "./chunk-C2MCQZWH.js";
+import {
+  filterVariantValues,
+  sample_match_termvaluesetting
+} from "./chunk-HH5JKOE6.js";
+import {
+  dtcnv,
+  dtfusionrna,
+  dtgeneexpression,
+  dtsnvindel
+} from "./chunk-57Z4VYLM.js";
+import {
+  __export
+} from "./chunk-HS5PO5ZQ.js";
+
+// plots/matrix/matrix.groups.js
+var matrix_groups_exports = {};
+__export(matrix_groups_exports, {
+  classifyValues: () => classifyValues,
+  getSampleGroups: () => getSampleGroups,
+  getSampleOrder: () => getSampleOrder,
+  getTermOrder: () => getTermOrder,
+  stackSiblingCellsByClass: () => stackSiblingCellsByClass
+});
+function getTermOrder(data) {
+  const s = this.settings.matrix;
+  this.termSorter = getTermSorter(this, s);
+  const termOrder = [];
+  let totalIndex = 0, visibleGrpIndex = 0, numClusterTerms = 0;
+  this.mclassSorter = getMclassSorter(this);
+  this.samplesByAncestorId = /* @__PURE__ */ new Map();
+  const seenAncestorSamples = /* @__PURE__ */ new Set();
+  for (const sd of data.lst) {
+    if (seenAncestorSamples.has(sd.sample)) continue;
+    seenAncestorSamples.add(sd.sample);
+    if (!sd._ref_?.ancestors) continue;
+    for (const a of sd._ref_.ancestors) {
+      const id = a.ancestor_id;
+      if (id === void 0) continue;
+      if (!this.samplesByAncestorId.has(id)) this.samplesByAncestorId.set(id, /* @__PURE__ */ new Set());
+      this.samplesByAncestorId.get(id).add(sd);
+    }
+  }
+  for (const [grpIndex, grp] of this.termGroups.entries()) {
+    const lst = [];
+    for (const [index, tw] of grp.lst.entries()) {
+      const counts = { samples: 0, hits: 0 };
+      const countedSamples = /* @__PURE__ */ new Set();
+      for (const sd of data.lst) {
+        if (countedSamples.has(sd.sample)) continue;
+        countedSamples.add(sd.sample);
+        const anno = sd[tw.$id];
+        if (anno) {
+          const { filteredValues, countedValues, renderedValues } = this.classifyValues(anno, tw, grp, s, sd);
+          anno.filteredValues = filteredValues;
+          anno.countedValues = countedValues;
+          anno.renderedValues = renderedValues;
+          if (anno.countedValues?.length) {
+            const v = tw.term.values?.[anno.value];
+            if (v?.uncountable) continue;
+            counts.samples += 1;
+            counts.hits += anno.countedValues.length;
+            if (tw.q?.mode == "continuous") {
+              const v2 = anno.value;
+              if (!("minval" in counts) || counts.minval > v2) counts.minval = v2;
+              if (!("maxval" in counts) || counts.maxval < v2) counts.maxval = v2;
+            }
+          }
+        }
+      }
+      if (grp.type != "hierCluster" || counts.samples) lst.push({ tw, counts, index });
+      if (grp.type == "hierCluster") numClusterTerms++;
+    }
+    const termSorter = grp.sortTermsBy || grp.type == "hierCluster" ? getTermSorter(this, s, grp) : this.termSorter;
+    const processedLst = lst.filter((t) => {
+      if ("minNumSamples" in t.tw) return t.tw.minNumSamples <= t.counts.samples;
+      if (!grp.settings) return true;
+      return !("minNumSamples" in grp.settings) || t.counts.samples >= grp.settings.minNumSamples;
+    }).sort(termSorter);
+    if (!processedLst.length) continue;
+    for (const [index, t] of processedLst.entries()) {
+      const { tw, counts } = t;
+      const ref = data.refs.byTermId[t.tw.$id] || {};
+      termOrder.push({
+        grp,
+        grpIndex,
+        visibleGrpIndex,
+        tw,
+        index,
+        // rendered index
+        lstIndex: t.index,
+        // as-listed index, before applying term filters
+        processedLst,
+        prevGrpTotalIndex: totalIndex,
+        totalIndex: totalIndex + index,
+        ref,
+        allCounts: counts
+        // note: term label will be assigned after sample counts are known
+        // label: t.tw.label || t.tw.term.name,
+      });
+    }
+    totalIndex += processedLst.length;
+    visibleGrpIndex += 1;
+  }
+  for (const [ancestor_id, samples] of this.samplesByAncestorId.entries()) {
+    if (samples.size < 2) this.samplesByAncestorId.delete(ancestor_id);
+  }
+  this.numTerms = termOrder.length;
+  this.numClusterTerms = numClusterTerms;
+  return termOrder;
+}
+function getSampleGroups(data) {
+  const s = this.settings.matrix;
+  const defaultSampleGrp = {
+    id: this.config.divideBy?.$id,
+    name: this.config.divideBy ? "Not annotated" : "",
+    lst: []
+  };
+  const sampleGroups = /* @__PURE__ */ new Map();
+  const term = this.config.divideBy?.term || {};
+  const $id = this.config.divideBy?.$id || "-";
+  const exclude = this.config.divideBy?.exclude || [];
+  const values = term.values || {};
+  const ref = data.refs.byTermId[$id] || {};
+  for (const row of data.lst) {
+    if ($id in row) {
+      const cell = row[$id];
+      const keys = term.type == "multivalue" && Array.isArray(cell.values) ? cell.values.map((v) => v.key) : [cell.key];
+      for (const key of keys) {
+        const name = key in values && values[key].label ? values[key].label : key;
+        if (!sampleGroups.has(key)) {
+          const grp = {
+            name: `${name}`,
+            // convert to a string
+            id: key,
+            lst: [],
+            tw: this.config.divideBy,
+            legendGroups: {},
+            isExcluded: exclude.includes(key)
+          };
+          if (ref.bins && s.sortSampleGrpsBy == "name") grp.order = ref.bins.findIndex((bin) => bin.name == key);
+          else delete grp.order;
+          sampleGroups.set(key, grp);
+        }
+        sampleGroups.get(key).lst.push(row);
+      }
+    } else {
+      defaultSampleGrp.lst.push(row);
+    }
+  }
+  const sampleGrpsArr = [...sampleGroups.values()];
+  const n = sampleGroups.size;
+  if (n > 100 && sampleGrpsArr.filter((sg) => sg.lst.length < 3).length > 0.8 * n) {
+    const l = s.controlLabels;
+    throw `Did not group ${l.samples} by "${term.name}": too many ${l.sample} groups (${n}), with the majority of groups having <= 2 ${l.samples} per group.`;
+  }
+  if (defaultSampleGrp.lst.length && !sampleGroups.size) {
+    sampleGroups.set(void 0, defaultSampleGrp);
+    sampleGrpsArr.push(...sampleGroups.values());
+  }
+  this.asListedSampleOrder = [];
+  for (const grp of sampleGrpsArr) {
+    this.asListedSampleOrder.push(...grp.lst.map((s2) => s2.sample));
+  }
+  const selectedDictTerms = this.termOrder.filter((t) => t.tw.sortSamples && t.tw.term.type != "geneVariant");
+  const noGrpSampleSorter = getSampleSorter(this, s, data.lst, {
+    skipSorter: (p, tw) => !p.types?.includes("geneVariant") && selectedDictTerms.find((t) => t.tw.$id === tw.$id)
+  });
+  const noGrpSampleOrder = data.lst.sort(noGrpSampleSorter);
+  const allowedSamples = noGrpSampleOrder.slice(0, s.maxSample);
+  const dataFilter = (d) => allowedSamples.includes(d);
+  const hitsPerSample = (t, c) => t + (typeof c == "object" && c.countedValues?.length ? 1 : 0);
+  const countHits = (total, d) => total + (Object.values(d).reduce(hitsPerSample, 0) ? 1 : 0);
+  const grpLstSampleSorter = getSampleSorter(this, s, data.lst);
+  for (const grp of sampleGrpsArr) {
+    grp.lst = grp.lst.filter(dataFilter);
+    grp.totalCountedValues = grp.lst.reduce(countHits, 0);
+    grp.lst.sort(grpLstSampleSorter);
+    if (this.config.chartType == "matrix" && s.sortBySampleAncestry) setRelatedSamples(grp);
+  }
+  const sampleGrpSorter = getSampleGroupSorter(this);
+  return sampleGrpsArr.sort(sampleGrpSorter);
+}
+function getSampleOrder(data) {
+  const s = this.settings.matrix;
+  this.visibleSampleGrps = /* @__PURE__ */ new Set();
+  const sampleOrder = [];
+  let total = 0, numHiddenGrps = 0;
+  for (const [grpIndex, grp] of this.sampleGroups.entries()) {
+    if (!grp.lst.length) continue;
+    if (grp.isExcluded) numHiddenGrps++;
+    let processedLst = grp.lst;
+    for (const [index, row] of processedLst.entries()) {
+      sampleOrder.push({
+        grp,
+        grpIndex: grpIndex - numHiddenGrps,
+        // : this.sampleGroups.length,
+        row,
+        index,
+        prevGrpTotalIndex: total,
+        totalIndex: total + index,
+        totalHtAdjustments: 0,
+        // may be required when transposed???
+        grpTotals: { htAdjustment: 0 },
+        // may be required when transposed???
+        processedLst
+      });
+    }
+    if (!grp.isExcluded) total += processedLst.length;
+    this.visibleSampleGrps.add(grp);
+  }
+  this.unfilteredSampleOrder = sampleOrder;
+  return sampleOrder.filter((so) => !so.grp.isExcluded);
+}
+function classifyValues(anno, tw, grp, s, sample) {
+  let values = "value" in anno ? [anno.value] : anno.values;
+  if (!values) return { filteredValues: null, countedValues: null, renderedValues: null };
+  if (tw.term.type == "geneVariant" && tw.q?.type == "values" && tw.q.variantFilter) {
+    values = filterVariantValues(values, tw.q.variantFilter);
+  }
+  const isSpecific = [tw.valueFilter || grp.valueFilter].filter((v) => v && true);
+  if (isSpecific.length && isSpecific[0].type !== "tvs" && isSpecific[0].type !== "tvslst")
+    throw `unknown matrix value filter type='${isSpecific.type}'`;
+  let filteredValues = !isSpecific.length ? values : values.filter((v) => sample_match_termvaluesetting(v, isSpecific[0], tw.term, sample));
+  const renderedValues = [];
+  if (tw.term.type == "geneVariant" && tw.q?.type == "values") {
+    filteredValues.sort(this.mclassSorter);
+    if (s.cellEncoding == "") renderedValues.push(...filteredValues);
+    else {
+      const sortedFilteredValues = [];
+      for (const dt of [dtcnv, dtsnvindel, dtfusionrna, dtgeneexpression]) {
+        const v = dt == dtgeneexpression ? filteredValues.find((v2) => v2.dt === dt) : filteredValues.find((v2) => v2.dt === dt && v2.class !== "WT" && v2.class !== "Blank");
+        if (v) renderedValues.push(v);
+        const oneDtV = filteredValues.filter((v2) => v2.dt === dt);
+        sortedFilteredValues.push(...oneDtV);
+      }
+      filteredValues = sortedFilteredValues;
+    }
+  } else {
+    renderedValues.push(...filteredValues);
+  }
+  return {
+    filteredValues,
+    countedValues: filteredValues.filter((v) => {
+      if (tw.term.type == "geneVariant") {
+        if (tw.q?.type == "predefined-groupset" || tw.q?.type == "custom-groupset") {
+          const groupset = tw.q.type == "predefined-groupset" ? tw.term.groupsetting.lst[tw.q.predefined_groupset_idx] : tw.q.customset;
+          if (!groupset) throw "groupset not found";
+          const group = groupset.groups[0];
+          if (v != group.name) return false;
+        } else {
+          if (v.class == "WT" || v.class == "Blank" || s.geneVariantCountSamplesSkipMclass.includes(v.class))
+            return false;
+        }
+      }
+      return true;
+    }),
+    renderedValues
+  };
+}
+function stackSiblingCellsByClass(a, b) {
+  return a.class === b.class ? 0 : a.class === "Blank" ? 1 : b.class == "Blank" ? -1 : a.class < b.class ? -1 : 1;
+}
+
+export {
+  getTermOrder,
+  getSampleGroups,
+  getSampleOrder,
+  classifyValues,
+  stackSiblingCellsByClass,
+  matrix_groups_exports
+};
+//# sourceMappingURL=chunk-HYOCZPKO.js.map

package/dist/chunk-I6P4LZP3.js

@@ -0,0 +1,194 @@
+import {
+  sample_match_termvaluesetting
+} from "./chunk-DD3DWHUY.js";
+import {
+  isDictionaryType
+} from "./chunk-RU2UHH7M.js";
+import {
+  __export
+} from "./chunk-HS5PO5ZQ.js";
+
+// plots/matrix/matrix.data.js
+var matrix_data_exports = {};
+__export(matrix_data_exports, {
+  applyLegendValueFilter: () => applyLegendValueFilter,
+  getMatrixRequestOpts: () => getMatrixRequestOpts,
+  mayRequireToken: () => mayRequireToken,
+  setData: () => setData
+});
+function mayRequireToken(tokenMessage = "") {
+  const message = tokenMessage || this.state.tokenVerificationMessage;
+  if (!message && this.state.hasVerifiedToken) {
+    this.dom.errdiv.style("display", "none").html();
+    this.dom.controls.style("display", this.opts.controls ? "inline-block" : "");
+    this.dom.svg.style("display", "");
+    return false;
+  } else {
+    this.dom.errdiv.style("display", "").html(message || "Requires login");
+    this.dom.controls.style("display", "none");
+    this.dom.svg.style("display", "none");
+    return true;
+  }
+}
+function getMatrixRequestOpts(state, config) {
+  const terms = [];
+  const termgroups = this.chartType == "hierCluster" ? config.termgroups.filter((grp) => grp.type != "hierCluster") : config.termgroups;
+  for (const grp of termgroups) {
+    terms.push(...getNormalizedTwLstCopy(grp.lst));
+  }
+  if (config.divideBy) terms.push(normalizeTwForRequest(structuredClone(config.divideBy)));
+  const opts = {
+    terms,
+    filter: state.filter,
+    filter0: state.filter0,
+    maxGenes: state.config.settings.matrix.maxGenes,
+    /*********** quick fix
+    when the flag is true, set artificially large number to ensure all genes are sent in one query
+    this avoids changing getAnnotatedSampleData()
+    additional non-matrix app that calls getAnnotatedSampleData will NEED THE SAME FIX
+    */
+    termsPerRequest: this.app.vocabApi.termdbConfig.queries?.snvindel?.byisoform?.processTwsInOneQuery ? 1e3 : 1
+  };
+  if (this.chartType == "hierCluster") {
+    opts.isHierCluster = 1;
+  }
+  return opts;
+}
+function getNormalizedTwLstCopy(twlst) {
+  const lst = [];
+  for (const tw of twlst) {
+    if (tw.type && tw.constructor.name != "Object") lst.push(tw);
+    else lst.push(normalizeTwForRequest(tw));
+  }
+  lst.forEach(normalizeTwForRequest);
+  lst.sort(sortTwLst);
+  return lst;
+}
+function normalizeTwForRequest(_tw) {
+  const tw = structuredClone(_tw);
+  if (!tw?.term) return;
+  delete tw.term.category2samplecount;
+  if (isDictionaryType(tw.term.type) && tw.term.type !== "samplelst") delete tw.term.values;
+  return tw;
+}
+function sortTwLst(twa, twb) {
+  const a = twa?.$id || twa.term?.id || twa?.term?.name;
+  const b = twb?.$id || twb.term?.id || twb?.term?.name;
+  return a < b ? -1 : 1;
+}
+async function setData(_data) {
+  const opts = this.currRequestOpts?.matrix || this.getMatrixRequestOpts(this.state, this.config);
+  this.numTerms = opts.terms.length;
+  opts.loadingDiv = this.chartType != "hierCluster" && this.dom.loadingDiv;
+  opts.signal = this.api.getAbortSignal();
+  const data = await this.app.vocabApi.getAnnotatedSampleData(opts, _data);
+  this.data = data;
+  this.origData = structuredClone(this.data);
+  this.sampleIdMap = {};
+  for (const d of this.data.lst) {
+    this.sampleIdMap[d.sample] = d._ref_.label;
+  }
+}
+function applyLegendValueFilter() {
+  const self = this;
+  if (!self.config.legendValueFilter.lst.length && !self.config.legendGrpFilter.lst.length) return;
+  for (const grpFilter of self.config.legendGrpFilter.lst) {
+    if (grpFilter.dt) {
+      const filteredOutCats = /* @__PURE__ */ new Set();
+      for (const oneSampleData of self.origData.lst) {
+        for (const annoForOneTerm of Object.values(oneSampleData)) {
+          if (annoForOneTerm.values) {
+            const newValues = [];
+            for (const v of annoForOneTerm.values) {
+              if (!(grpFilter.dt.includes(v.dt) && (!grpFilter.origin || v.origin == grpFilter.origin))) {
+                newValues.push(v);
+              } else {
+                filteredOutCats.add(v.class);
+              }
+            }
+            annoForOneTerm.values = newValues;
+          }
+        }
+      }
+      grpFilter.filteredOutCats = [...filteredOutCats];
+      for (const oneSampleData of Object.values(self.origData.samples)) {
+        for (const annoForOneTerm of Object.values(oneSampleData)) {
+          if (annoForOneTerm.values)
+            annoForOneTerm.values = annoForOneTerm.values.filter(
+              (v) => !(grpFilter.dt.includes(v.dt) && (!grpFilter.origin || v.origin == grpFilter.origin))
+            );
+        }
+      }
+    }
+  }
+  const geneVariant$ids = Object.values(self.data.refs.byTermId).filter((v) => v.term?.type == "geneVariant").map((v) => v.$id);
+  const data = { samples: {}, lst: [], refs: self.data.refs };
+  const onlyHardFilter = structuredClone(self.config.legendValueFilter);
+  onlyHardFilter.lst = onlyHardFilter.lst.filter(
+    (l) => !l.tvs.legendFilterType || l.tvs.legendFilterType !== "geneVariant_soft"
+  );
+  for (const row of self.origData.lst) {
+    const include = sample_match_termvaluesetting(row, onlyHardFilter, geneVariant$ids);
+    if (include || self.chartType == "hierCluster") {
+      data.samples[row.sample] = row;
+      data.lst.push(row);
+    }
+  }
+  for (const valFilter of self.config.legendValueFilter.lst) {
+    if (valFilter.tvs.legendFilterType !== "geneVariant_soft") continue;
+    const tvsV = valFilter.tvs.values[0];
+    const filteredOutCats = /* @__PURE__ */ new Set();
+    for (const oneSampleData of data.lst) {
+      for (const annoForOneTerm of Object.values(oneSampleData)) {
+        if (annoForOneTerm.values) {
+          const newValues = [];
+          for (const v of annoForOneTerm.values) {
+            if (!(v.dt == tvsV.dt && (!tvsV.origin || v.origin == tvsV.origin) && tvsV.mclasslst.includes(v.class))) {
+              newValues.push(v);
+            } else {
+              filteredOutCats.add(v.class);
+            }
+          }
+          annoForOneTerm.values = newValues;
+        }
+      }
+    }
+    valFilter.filteredOutCats = [...filteredOutCats];
+    for (const oneSampleData of Object.values(data.samples)) {
+      for (const annoForOneTerm of Object.values(oneSampleData)) {
+        if (annoForOneTerm.values)
+          annoForOneTerm.values = annoForOneTerm.values.filter(
+            (v) => !(v.dt == tvsV.dt && (!tvsV.origin || v.origin == tvsV.origin) && tvsV.mclasslst.includes(v.class))
+          );
+      }
+    }
+  }
+  if (self.chartType !== "hierCluster" && geneVariant$ids.length && self.app.vocabApi.termdbConfig?.matrix?.removeEmptySamples)
+    remove_empty_sample(data, geneVariant$ids);
+  self.data = data;
+}
+function remove_empty_sample(data) {
+  for (const oneSampleData of data.lst) {
+    let removeSample = true;
+    for (const [key, annoForOneTerm] of Object.entries(oneSampleData)) {
+      if (!annoForOneTerm.values) continue;
+      const annoType = data.refs.byTermId[key].term.type;
+      if (annoType != "geneVariant") continue;
+      if (annoForOneTerm.values.length) removeSample = false;
+    }
+    if (removeSample) {
+      data.lst = data.lst.filter((dl) => dl.sample !== oneSampleData.sample);
+      delete data.samples[parseInt(oneSampleData.sample)];
+    }
+  }
+  return data;
+}
+
+export {
+  mayRequireToken,
+  getMatrixRequestOpts,
+  setData,
+  applyLegendValueFilter,
+  matrix_data_exports
+};
+//# sourceMappingURL=chunk-I6P4LZP3.js.map