@sjcrh/proteinpaint-client 2.209.0 → 2.210.0

package/dist/chunk-2HNJF5ZI.js

@@ -0,0 +1,240 @@
+import {
+  make_radios
+} from "./chunk-55FABQU2.js";
+import {
+  initBinConfig
+} from "./chunk-VA57CUC7.js";
+import {
+  toStoredUnit,
+  toUserUnit
+} from "./chunk-W5J3LTYS.js";
+import {
+  format
+} from "./chunk-4OLM3KSB.js";
+
+// termsetting/handlers/NumRegularBinEditor.ts
+var NumRegularBinEditor = class {
+  constructor(editHandler) {
+    this.dom = {};
+    this.editHandler = editHandler;
+    this.opts = editHandler.opts;
+    this.tw = editHandler.tw;
+    this.termsetting = editHandler.termsetting;
+  }
+  /* q holds bin boundaries in the unit the term's values are stored in, while the <input>s and the
+  density plot show them in the term's user-facing unit. toDisplay()/toStored() cross that boundary;
+  both are identity functions unless the term declares valueConversion{} */
+  toDisplay(v) {
+    return toUserUnit(v, this.tw.term);
+  }
+  toStored(v) {
+    return toStoredUnit(v, this.tw.term);
+  }
+  render(div) {
+    this.tw = this.editHandler.tw;
+    const isRemounting = !!this.dom.binsTable && this.editHandler.dom.binsDiv?.node().contains(this.dom.binsTable.node());
+    if (!isRemounting) this.q = this.getDefaultQ();
+    this.editHandler.handler.density.setBinLines(this.getBoundaryOpts());
+    if (isRemounting) return;
+    if (this.dom.binsTable) {
+      this.dom.binsTable.remove();
+      delete this.dom.binsTable;
+    }
+    const binsTable = div.append("table");
+    this.dom.binsTable = binsTable;
+    this.renderBinSizeInput(binsTable.append("tr"));
+    this.renderFirstBinInput(binsTable.append("tr"));
+    this.renderLastBinInputs(binsTable.append("tr"));
+  }
+  getDefaultQ() {
+    if (this.tw.q.type == "regular-bin") return JSON.parse(JSON.stringify(this.tw.q));
+    const t = this.tw.term;
+    const defaultQ = this.termsetting.opts.use_bins_less && t.bins?.less || t.bins?.default;
+    if (defaultQ) return JSON.parse(JSON.stringify(defaultQ));
+    const binConfig = initBinConfig(this.editHandler.handler.density_data);
+    return typeof binConfig == "string" ? JSON.parse(binConfig) : binConfig;
+  }
+  renderBinSizeInput(tr) {
+    const handler = this.editHandler.handler;
+    tr.append("td").style("margin", "5px").style("opacity", 0.5).text("Bin Size");
+    const { min, max } = handler.density_data;
+    const q = this.q;
+    const origBinSize = this.toDisplay(q.bin_size);
+    this.dom.bin_size_input = tr.append("td").append("input").attr("type", "number").attr(
+      "value",
+      handler.density.scaleFactor == 1 && "rounding" in q ? format(q.rounding || ".0f")(q.bin_size) : origBinSize
+    ).attr("data-testid", "sjpp-num-reg-bin-editor-size").style("margin-left", "15px").style("width", "100px").style("color", () => q.bin_size > Math.abs(max - min) ? "red" : "").on("change", (event) => {
+      const newValue = this.toStored(Number(event.target.value));
+      if (newValue <= 0) {
+        window.alert("Please enter non-negative bin size.");
+        event.target.value = origBinSize;
+        return;
+      }
+      if ((max - min) / newValue > 100) {
+        window.alert("Bin size too small. Try setting a bigger value.");
+        event.target.value = origBinSize;
+        return;
+      }
+      q.bin_size = newValue;
+      this.dom.bin_size_input.style(
+        "color",
+        q.bin_size > max - min ? "red" : this.toDisplay(newValue) != origBinSize ? "green" : ""
+      );
+      handler.density.setBinLines(this.getBoundaryOpts());
+    });
+  }
+  renderFirstBinInput(tr) {
+    const handler = this.editHandler.handler;
+    const q = this.q;
+    if (!q.first_bin) throw "missing q.first_bin";
+    tr.append("td").style("margin", "5px").style("opacity", 0.5).text("First Bin Stop");
+    const { min, max } = handler.density_data;
+    const origValue = this.toDisplay(q.first_bin.stop);
+    this.dom.first_stop_input = tr.append("td").append("input").attr("type", "number").property("value", origValue).style("width", "100px").style("margin-left", "15px").on("change", (event) => {
+      const newValue = this.toStored(Number(event.target.value));
+      if (Number(event.target.value) < this.toDisplay(min) || Number(event.target.value) > this.toDisplay(max)) {
+        window.alert("First bin stop value out of bound.");
+        event.target.value = origValue;
+        return;
+      }
+      this.q.first_bin.stop = newValue;
+      handler.density.setBinLines(this.getBoundaryOpts());
+    });
+    tr.append("td").append("div").style("font-size", ".6em").style("opacity", 0.5).style("display", handler.density.no_density_data ? "none" : "block").text("Indicated by left-most red line. Drag to change.");
+  }
+  renderLastBinInputs(tr) {
+    const handler = this.editHandler.handler;
+    const q = this.q;
+    const isAuto = !q.last_bin || !Number.isFinite(q.last_bin.start);
+    tr.append("td").style("padding-top", "4px").style("opacity", 0.5).style("vertical-align", "top").text("Last Bin Start");
+    const td1 = tr.append("td").style("padding-left", "15px").style("vertical-align", "top");
+    const radio_div = td1.append("div");
+    const radios = make_radios({
+      holder: radio_div,
+      options: [
+        { label: "Automatic", value: "auto", checked: isAuto },
+        { label: "Fixed", value: "fixed", checked: !isAuto }
+      ],
+      callback: (v) => {
+        if (v == "auto") {
+          delete q.last_bin;
+          edit_div.style("display", "none");
+          handler.density.setBinLines(this.getBoundaryOpts());
+          return;
+        }
+        edit_div.style("display", "inline-block");
+        if (this.dom.last_start_input.property("value") == "") {
+          this.dom.last_start_input.property(
+            "value",
+            this.toDisplay(this.tw.q.last_bin?.start || handler.density_data.max)
+          );
+        }
+        this.setLastBinStart();
+      }
+    });
+    this.dom.fixed_radio = radios.inputs.filter((_, i) => i === 1);
+    const edit_div = tr.append("td").append("div").style("display", isAuto ? "none" : "inline-block");
+    this.dom.last_start_input = edit_div.append("input").attr("type", "number").property("value", Number.isFinite(q.last_bin?.start) ? this.toDisplay(q.last_bin.start) : "").style("width", "100px").on("change", () => this.setLastBinStart());
+    edit_div.append("div").style("font-size", ".6em").style("opacity", 0.5).style("display", handler.density.no_density_data ? "none" : "block").text("Indicated by right-most red line. Drag to change.");
+  }
+  setLastBinStart() {
+    const q = this.q;
+    const { max } = this.editHandler.handler.density_data;
+    const strInput = this.dom.last_start_input.property("value");
+    if (strInput === "") return;
+    const inputValue = this.toStored(Number(strInput));
+    if (q.first_bin && Number(strInput) <= this.toDisplay(q.first_bin.stop)) {
+      window.alert("Last bin start cannot be smaller than first bin stop.");
+      this.dom.last_start_input.property("value", this.toDisplay(max));
+      return;
+    }
+    if (Number(strInput) > this.toDisplay(max)) {
+      window.alert("Last bin start value out of bound.");
+      this.dom.last_start_input.property("value", this.toDisplay(max));
+      return;
+    }
+    if (q.last_bin) q.last_bin.start = inputValue;
+    else
+      q.last_bin = {
+        start: inputValue,
+        stopunbounded: true,
+        stopinclusive: false
+      };
+    this.editHandler.handler.density.setBinLines(this.getBoundaryOpts());
+  }
+  getBoundaryOpts() {
+    const { min, max } = this.editHandler.handler.density_data;
+    const binLinesStop = this.q.last_bin?.start ?? max + Math.abs(this.q.first_bin.stop) - Math.min(min, 0);
+    const boundaryValues = [];
+    for (let i = this.q.first_bin.stop; i <= binLinesStop; i = i + this.q.bin_size) {
+      if (this.q.last_bin?.start === i) break;
+      if (i > binLinesStop) boundaryValues[boundaryValues.length - 1].isLastVisibleLine = true;
+      const isDraggable = i === this.q.first_bin.stop || i === this.q.bin_size - 1;
+      boundaryValues.push({ x: this.toDisplay(i), isDraggable, movesWithLineIndex: !isDraggable ? 0 : -1 });
+    }
+    if (this.q.last_bin) {
+      boundaryValues.push({
+        x: this.toDisplay(this.q.last_bin.start),
+        isDraggable: true,
+        isLastVisibleLine: true,
+        movesWithLineIndex: -1
+      });
+    }
+    return {
+      values: boundaryValues,
+      // the dragged value arrives in display units, matching what the <input>s show
+      callback: (d, value) => {
+        if (d.index === 0) {
+          this.dom.first_stop_input.property("value", value);
+          this.q.first_bin.stop = this.toStored(value);
+        } else {
+          this.dom.last_start_input.property("value", value);
+          if (this.q.last_bin) this.q.last_bin.start = this.toStored(value);
+        }
+      }
+    };
+  }
+  getEditedQ(destroyDom = true) {
+    const bin_size = this.dom.bin_size_input.property("value");
+    const config = {
+      mode: "discrete",
+      type: "regular-bin",
+      startinclusive: this.editHandler.boundaryInclusion == "startinclusive",
+      stopinclusive: this.editHandler.boundaryInclusion == "stopinclusive",
+      bin_size: this.toStored(Number(bin_size)),
+      first_bin: {
+        startunbounded: true,
+        stop: this.toStored(Number(this.dom.first_stop_input.property("value")))
+      },
+      /* rounding formats the stored bin size, so it cannot be derived from the decimals of a
+      converted input. a converted term labels its bins through valueConversion instead */
+      rounding: this.editHandler.handler.density.scaleFactor != 1 ? ".0f" : bin_size.includes(".") && !bin_size.endsWith(".") ? `.${bin_size.split(".")[1].length}f` : ".0f"
+    };
+    if (this.dom.fixed_radio.property("checked")) {
+      config.last_bin = {
+        start: this.toStored(Number(this.dom.last_start_input.property("value"))),
+        stopunbounded: true
+      };
+    }
+    if (destroyDom) {
+      for (const name of Object.keys(this.dom)) {
+        this.dom[name].remove();
+        delete this.dom[name];
+      }
+    }
+    return config;
+  }
+  undoEdits() {
+    this.q = this.getDefaultQ();
+    this.dom.binsTable.selectAll("*").remove();
+    this.renderBinSizeInput(this.dom.binsTable.append("tr"));
+    this.renderFirstBinInput(this.dom.binsTable.append("tr"));
+    this.renderLastBinInputs(this.dom.binsTable.append("tr"));
+    this.editHandler.handler.density.setBinLines(this.getBoundaryOpts());
+  }
+};
+
+export {
+  NumRegularBinEditor
+};
+//# sourceMappingURL=chunk-2HNJF5ZI.js.map

package/dist/chunk-2LNGHIOC.js

@@ -0,0 +1,281 @@
+import {
+  getMclassSorter,
+  getSampleGroupSorter,
+  getSampleSorter,
+  getTermSorter
+} from "./chunk-XQYDXA47.js";
+import {
+  setRelatedSamples
+} from "./chunk-C2MCQZWH.js";
+import {
+  filterVariantValues,
+  sample_match_termvaluesetting
+} from "./chunk-BK6UDL7F.js";
+import {
+  dtcnv,
+  dtfusionrna,
+  dtgeneexpression,
+  dtsnvindel
+} from "./chunk-SB36AUG7.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-2LNGHIOC.js.map