@sjcrh/proteinpaint-types 2.107.0 → 2.109.0

package/dist/{chunk-IYDRVZXE.js → chunk-2HMIFPRH.js}

@@ -22,7 +22,7 @@ var diffExpPayload = {
 var validDERequest = (input) => {
   const errors = [];
   const __is = (input2) => {
-    const $io0 = (input3) => "string" === typeof input3.genome && "string" === typeof input3.dslabel && true && "number" === typeof input3.min_count && "number" === typeof input3.min_total_count && ("text" === input3.storage_type || "HDF5" === input3.storage_type) && (void 0 === input3.method || "string" === typeof input3.method) && true && (void 0 === input3.VarGenes || "number" === typeof input3.VarGenes);
+    const $io0 = (input3) => "string" === typeof input3.genome && "string" === typeof input3.dslabel && true && "number" === typeof input3.min_count && "number" === typeof input3.min_total_count && ("text" === input3.storage_type || "HDF5" === input3.storage_type) && (void 0 === input3.method || "string" === typeof input3.method) && true && true && (void 0 === input3.VarGenes || "number" === typeof input3.VarGenes);
     return "object" === typeof input2 && null !== input2 && $io0(input2);
   };
   if (false === __is(input)) {
@@ -52,7 +52,7 @@ var validDERequest = (input) => {
         path: _path2 + ".method",
         expected: "(string | undefined)",
         value: input3.method
-      }), true, void 0 === input3.VarGenes || "number" === typeof input3.VarGenes || $report(_exceptionable2, {
+      }), true, true, void 0 === input3.VarGenes || "number" === typeof input3.VarGenes || $report(_exceptionable2, {
         path: _path2 + ".VarGenes",
         expected: "(number | undefined)",
         value: input3.VarGenes

package/dist/{chunk-FUIYK4TP.js → chunk-2R2EFRAW.js}

@@ -3328,31 +3328,53 @@ var validCorrelationVolcanoRequest = (input) => {
 var validCorrelationVolcanoResponse = (input) => {
   const errors = [];
   const __is = (input2) => {
-    const $io0 = (input3) => Array.isArray(input3.variableItems) && input3.variableItems.every((elem) => "object" === typeof elem && null !== elem && $io1(elem));
-    const $io1 = (input3) => "number" === typeof input3.correlation && "number" === typeof input3.original_pvalue && "number" === typeof input3.adjusted_pvalue && "string" === typeof input3.tw$id && "number" === typeof input3.sampleSize;
+    const $io0 = (input3) => Array.isArray(input3.skippedVariables) && input3.skippedVariables.every((elem) => "object" === typeof elem && null !== elem && $io1(elem)) && (Array.isArray(input3.variableItems) && input3.variableItems.every((elem) => "object" === typeof elem && null !== elem && $io2(elem)));
+    const $io1 = (input3) => "string" === typeof input3.tw$id;
+    const $io2 = (input3) => "number" === typeof input3.correlation && "number" === typeof input3.original_pvalue && "number" === typeof input3.adjusted_pvalue && "string" === typeof input3.tw$id && "number" === typeof input3.sampleSize;
     return "object" === typeof input2 && null !== input2 && $io0(input2);
   };
   if (false === __is(input)) {
     const $report = import_typia.createValidate.report(errors);
     ((input2, _path, _exceptionable = true) => {
-      const $vo0 = (input3, _path2, _exceptionable2 = true) => [(Array.isArray(input3.variableItems) || $report(_exceptionable2, {
-        path: _path2 + ".variableItems",
+      const $vo0 = (input3, _path2, _exceptionable2 = true) => [(Array.isArray(input3.skippedVariables) || $report(_exceptionable2, {
+        path: _path2 + ".skippedVariables",
         expected: "Array<__type>",
-        value: input3.variableItems
-      })) && input3.variableItems.map((elem, _index1) => ("object" === typeof elem && null !== elem || $report(_exceptionable2, {
-        path: _path2 + ".variableItems[" + _index1 + "]",
+        value: input3.skippedVariables
+      })) && input3.skippedVariables.map((elem, _index1) => ("object" === typeof elem && null !== elem || $report(_exceptionable2, {
+        path: _path2 + ".skippedVariables[" + _index1 + "]",
         expected: "__type",
         value: elem
-      })) && $vo1(elem, _path2 + ".variableItems[" + _index1 + "]", _exceptionable2) || $report(_exceptionable2, {
-        path: _path2 + ".variableItems[" + _index1 + "]",
+      })) && $vo1(elem, _path2 + ".skippedVariables[" + _index1 + "]", _exceptionable2) || $report(_exceptionable2, {
+        path: _path2 + ".skippedVariables[" + _index1 + "]",
         expected: "__type",
         value: elem
       })).every((flag) => flag) || $report(_exceptionable2, {
-        path: _path2 + ".variableItems",
+        path: _path2 + ".skippedVariables",
         expected: "Array<__type>",
+        value: input3.skippedVariables
+      }), (Array.isArray(input3.variableItems) || $report(_exceptionable2, {
+        path: _path2 + ".variableItems",
+        expected: "Array<__type>.o1",
         value: input3.variableItems
+      })) && input3.variableItems.map((elem, _index2) => ("object" === typeof elem && null !== elem || $report(_exceptionable2, {
+        path: _path2 + ".variableItems[" + _index2 + "]",
+        expected: "__type.o1",
+        value: elem
+      })) && $vo2(elem, _path2 + ".variableItems[" + _index2 + "]", _exceptionable2) || $report(_exceptionable2, {
+        path: _path2 + ".variableItems[" + _index2 + "]",
+        expected: "__type.o1",
+        value: elem
+      })).every((flag) => flag) || $report(_exceptionable2, {
+        path: _path2 + ".variableItems",
+        expected: "Array<__type>.o1",
+        value: input3.variableItems
+      })].every((flag) => flag);
+      const $vo1 = (input3, _path2, _exceptionable2 = true) => ["string" === typeof input3.tw$id || $report(_exceptionable2, {
+        path: _path2 + ".tw$id",
+        expected: "string",
+        value: input3.tw$id
       })].every((flag) => flag);
-      const $vo1 = (input3, _path2, _exceptionable2 = true) => ["number" === typeof input3.correlation || $report(_exceptionable2, {
+      const $vo2 = (input3, _path2, _exceptionable2 = true) => ["number" === typeof input3.correlation || $report(_exceptionable2, {
         path: _path2 + ".correlation",
         expected: "number",
         value: input3.correlation

package/dist/correlationVolcano.js

@@ -2,7 +2,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-FUIYK4TP.js";
+} from "./chunk-2R2EFRAW.js";
 import "./chunk-Z6B6IQIY.js";
 export {
   CorrelationVolcanoPayload,

package/dist/index.js

@@ -82,7 +82,7 @@ import {
   diffExpPayload,
   validDERequest,
   validDEResponse
-} from "./chunk-IYDRVZXE.js";
+} from "./chunk-2HMIFPRH.js";
 import {
   boxplotPayload,
   validBoxPlotRequest,
@@ -212,7 +212,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-FUIYK4TP.js";
+} from "./chunk-2R2EFRAW.js";
 import {
   datasetPayload,
   validDatasetRequest,

package/dist/termdb.DE.js

@@ -2,7 +2,7 @@ import {
   diffExpPayload,
   validDERequest,
   validDEResponse
-} from "./chunk-IYDRVZXE.js";
+} from "./chunk-2HMIFPRH.js";
 import "./chunk-Z6B6IQIY.js";
 export {
   diffExpPayload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-types",
-  "version": "2.107.0",
+  "version": "2.109.0",
   "type": "module",
   "description": "Shared type definitions between ProteinPaint server and client code",
   "main": "src/index.ts",

package/src/dataset.ts

@@ -899,8 +899,10 @@ type ScatterPlotsEntry = {
 	settings?: { [index: string]: any }
 	/** by default the dots are called "samples" on the plot, use this to call it by diff name e.g. "cells" */
 	sampleType?: string
-	/** a plot can be colored by either a dict term termsetting (colorTW) or file column values (colorColumn) */
+	/** a termsetting to supply dot color */
 	colorTW?: { id: string }
+	/** a termsetting to supply dot shape */
+	shapeTW?: { id: string } // TODO replace with tw type
 	colorColumn?: ColorColumn
 	/** provide a sampletype term to filter for specific type of samples for subjects with multiple samples and show in the plot.
 e.g. to only show D samples from all patients
@@ -1386,6 +1388,8 @@ type MassNav = {
 	}
 	/** customize background color of active navigation tab */
 	activeColor?: string
+	/** customize background color of active navigation tab on hover */
+	activeColorHover?: string
 }
 
 type ActiveItem = {

package/src/routes/correlationVolcano.ts

@@ -18,6 +18,11 @@ export type CorrelationVolcanoRequest = {
 }
 
 export type CorrelationVolcanoResponse = {
+	/** Terms with not enough vectors to calculate correlation to be shown in legend */
+	skippedVariables: {
+		/** matching tw $id */
+		tw$id: string
+	}[]
 	/** each element is test result of one variable corresponding to variableTwLst */
 	variableItems: {
 		/** correlation coefficient, -1 to 1 */

package/src/routes/termdb.DE.ts

@@ -15,8 +15,10 @@ export type DERequest = {
 	storage_type: 'text' | 'HDF5'
 	/** Method of DE used wilcoxon/edgeR */
 	method?: string
-	/** Term for confounding variable (if present) */
+	/** Term for confounding variable1 (if present) */
 	tw?: any
+	/** Term for confounding variable2 (if present) */
+	tw2?: any
 	/** Number of variable genes (defined only for parametric DE methods) */
 	VarGenes?: number
 }
@@ -36,10 +38,14 @@ export type ExpressionInput = {
 	min_total_count: number
 	/** Type of storage file: HDF5 or text. Text will be deprecated in the future */
 	storage_type: 'HDF5' | 'text'
-	/** Confounding variable for DE analysis. Maybe array of string (Gender: Male/female) or number (Age). For now supporting 1 confounding variable. Later will add support for multiple confounding variables */
+	/** Confounding variable1 for DE analysis. Maybe array of string (Gender: Male/female) or number (Age). For now supporting 1 confounding variable. */
 	conf1?: any[]
-	/** Type of the confounding variable (categorical/float) */
-	conf1_type?: 'categorical' | 'float'
+	/** Type of the confounding variable1 (continuous/discrete) */
+	conf1_mode?: 'continuous' | 'discrete'
+	/** Confounding variable2 for DE analysis. Maybe array of string (Gender: Male/female) or number (Age). For now supporting 1 confounding variable. */
+	conf2?: any[]
+	/** Type of the confounding variable2 (continuous/discrete) */
+	conf2_mode?: 'continuous' | 'discrete'
 	/** Number of variable genes to be included for DE analysis (optional) */
 	VarGenes?: number
 }