@sjcrh/proteinpaint-types 2.116.1-1 → 2.117.0

package/dist/{chunk-EQGBEPDC.js → chunk-T2CSA2MC.js}

@@ -102,8 +102,8 @@ var validPercentileRequest = (input) => {
     const $io24 = (input3) => "string" === typeof input3.id && "string" === typeof input3.name && "condition" === input3.type && (void 0 === input3.child_types || Array.isArray(input3.child_types) && input3.child_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.hashtmldetail || "boolean" === typeof input3.hashtmldetail) && (void 0 === input3.included_types || Array.isArray(input3.included_types) && input3.included_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.isleaf || "boolean" === typeof input3.isleaf) && (void 0 === input3.values || "object" === typeof input3.values && null !== input3.values && false === Array.isArray(input3.values) && $io4(input3.values)) && true;
     const $io25 = (input3) => "number" === typeof input3.grade && "string" === typeof input3.grade_label && (void 0 === input3.child_id || "string" === typeof input3.child_id) && "string" === typeof input3.child_label;
     const $io26 = (input3) => (void 0 === input3.join || "string" === typeof input3.join) && (void 0 === input3.isnot || "boolean" === typeof input3.isnot) && ("object" === typeof input3.term && null !== input3.term && $iu8(input3.term)) && (Array.isArray(input3.values) && input3.values.every((elem) => "object" === typeof elem && null !== elem && $iu3(elem)));
-    const $io27 = (input3) => "string" === typeof input3.id && "string" === typeof input3.name && "geneVariant" === input3.type && (void 0 === input3.child_types || Array.isArray(input3.child_types) && input3.child_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.hashtmldetail || "boolean" === typeof input3.hashtmldetail) && (void 0 === input3.included_types || Array.isArray(input3.included_types) && input3.included_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.isleaf || "boolean" === typeof input3.isleaf) && (void 0 === input3.values || "object" === typeof input3.values && null !== input3.values && false === Array.isArray(input3.values) && $io4(input3.values)) && true && ("object" === typeof input3.groupsetting && null !== input3.groupsetting && $io6(input3.groupsetting)) && "gene" === input3.kind && "string" === typeof input3.gene && (void 0 === input3.chr || "string" === typeof input3.chr) && (void 0 === input3.start || "number" === typeof input3.start) && (void 0 === input3.stop || "number" === typeof input3.stop);
-    const $io28 = (input3) => "string" === typeof input3.id && "string" === typeof input3.name && "geneVariant" === input3.type && (void 0 === input3.child_types || Array.isArray(input3.child_types) && input3.child_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.hashtmldetail || "boolean" === typeof input3.hashtmldetail) && (void 0 === input3.included_types || Array.isArray(input3.included_types) && input3.included_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.isleaf || "boolean" === typeof input3.isleaf) && (void 0 === input3.values || "object" === typeof input3.values && null !== input3.values && false === Array.isArray(input3.values) && $io4(input3.values)) && true && ("object" === typeof input3.groupsetting && null !== input3.groupsetting && $io6(input3.groupsetting)) && "coord" === input3.kind && "string" === typeof input3.chr && "number" === typeof input3.start && "number" === typeof input3.stop;
+    const $io27 = (input3) => "string" === typeof input3.id && "string" === typeof input3.name && "geneVariant" === input3.type && (void 0 === input3.child_types || Array.isArray(input3.child_types) && input3.child_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.hashtmldetail || "boolean" === typeof input3.hashtmldetail) && (void 0 === input3.included_types || Array.isArray(input3.included_types) && input3.included_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.isleaf || "boolean" === typeof input3.isleaf) && (void 0 === input3.values || "object" === typeof input3.values && null !== input3.values && false === Array.isArray(input3.values) && $io4(input3.values)) && true && ("object" === typeof input3.groupsetting && null !== input3.groupsetting && $iu4(input3.groupsetting)) && "gene" === input3.kind && "string" === typeof input3.gene && (void 0 === input3.chr || "string" === typeof input3.chr) && (void 0 === input3.start || "number" === typeof input3.start) && (void 0 === input3.stop || "number" === typeof input3.stop);
+    const $io28 = (input3) => "string" === typeof input3.id && "string" === typeof input3.name && "geneVariant" === input3.type && (void 0 === input3.child_types || Array.isArray(input3.child_types) && input3.child_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.hashtmldetail || "boolean" === typeof input3.hashtmldetail) && (void 0 === input3.included_types || Array.isArray(input3.included_types) && input3.included_types.every((elem) => "string" === typeof elem)) && (void 0 === input3.isleaf || "boolean" === typeof input3.isleaf) && (void 0 === input3.values || "object" === typeof input3.values && null !== input3.values && false === Array.isArray(input3.values) && $io4(input3.values)) && true && ("object" === typeof input3.groupsetting && null !== input3.groupsetting && $iu4(input3.groupsetting)) && "coord" === input3.kind && "string" === typeof input3.chr && "number" === typeof input3.start && "number" === typeof input3.stop;
     const $io29 = (input3) => 1 === input3.dt && (Array.isArray(input3.mclassLst) && input3.mclassLst.every((elem) => "M" === elem || "E" === elem || "F" === elem || "N" === elem || "S" === elem || "D" === elem || "I" === elem || "P" === elem || "L" === elem || "Intron" === elem || "Blank" === elem || "WT" === elem || "ITD" === elem || "DEL" === elem || "NLOSS" === elem || "CLOSS" === elem || "Utr3" === elem || "Utr5" === elem || "X" === elem || "noncoding" === elem)) && (Array.isArray(input3.mclassExcludeLst) && input3.mclassExcludeLst.every((elem) => "M" === elem || "E" === elem || "F" === elem || "N" === elem || "S" === elem || "D" === elem || "I" === elem || "P" === elem || "L" === elem || "Intron" === elem || "Blank" === elem || "WT" === elem || "ITD" === elem || "DEL" === elem || "NLOSS" === elem || "CLOSS" === elem || "Utr3" === elem || "Utr5" === elem || "X" === elem || "noncoding" === elem)) && (void 0 === input3.origin || "somatic" === input3.origin || "germline" === input3.origin);
     const $io30 = (input3) => 4 === input3.dt && (Array.isArray(input3.mclassLst) && input3.mclassLst.every((elem) => "Blank" === elem || "WT" === elem || "CNV_amp" === elem || "CNV_loss" === elem || "CNV_loh" === elem || "CNV_amplification" === elem || "CNV_homozygous_deletion" === elem)) && (Array.isArray(input3.mclassExcludeLst) && input3.mclassExcludeLst.every((elem) => "Blank" === elem || "WT" === elem || "CNV_amp" === elem || "CNV_loss" === elem || "CNV_loh" === elem || "CNV_amplification" === elem || "CNV_homozygous_deletion" === elem)) && (void 0 === input3.origin || "somatic" === input3.origin || "germline" === input3.origin);
     const $io31 = (input3) => 5 === input3.dt && (Array.isArray(input3.mclassLst) && input3.mclassLst.every((elem) => "Blank" === elem || "WT" === elem || "SV" === elem)) && (Array.isArray(input3.mclassExcludeLst) && input3.mclassExcludeLst.every((elem) => "Blank" === elem || "WT" === elem || "SV" === elem)) && (void 0 === input3.origin || "somatic" === input3.origin || "germline" === input3.origin);
@@ -1134,11 +1134,11 @@ var validPercentileRequest = (input) => {
         value: input3.values
       }), true, ("object" === typeof input3.groupsetting && null !== input3.groupsetting || $report(_exceptionable2, {
         path: _path2 + ".groupsetting",
-        expected: "EnabledTermGroupSetting",
+        expected: "(EnabledTermGroupSetting | __type.o1)",
         value: input3.groupsetting
-      })) && $vo6(input3.groupsetting, _path2 + ".groupsetting", _exceptionable2) || $report(_exceptionable2, {
+      })) && $vu4(input3.groupsetting, _path2 + ".groupsetting", _exceptionable2) || $report(_exceptionable2, {
         path: _path2 + ".groupsetting",
-        expected: "EnabledTermGroupSetting",
+        expected: "(EnabledTermGroupSetting | __type.o1)",
         value: input3.groupsetting
       }), "gene" === input3.kind || $report(_exceptionable2, {
         path: _path2 + ".kind",
@@ -1215,11 +1215,11 @@ var validPercentileRequest = (input) => {
         value: input3.values
       }), true, ("object" === typeof input3.groupsetting && null !== input3.groupsetting || $report(_exceptionable2, {
         path: _path2 + ".groupsetting",
-        expected: "EnabledTermGroupSetting",
+        expected: "(EnabledTermGroupSetting | __type.o1)",
         value: input3.groupsetting
-      })) && $vo6(input3.groupsetting, _path2 + ".groupsetting", _exceptionable2) || $report(_exceptionable2, {
+      })) && $vu4(input3.groupsetting, _path2 + ".groupsetting", _exceptionable2) || $report(_exceptionable2, {
         path: _path2 + ".groupsetting",
-        expected: "EnabledTermGroupSetting",
+        expected: "(EnabledTermGroupSetting | __type.o1)",
         value: input3.groupsetting
       }), "coord" === input3.kind || $report(_exceptionable2, {
         path: _path2 + ".kind",

package/dist/correlationVolcano.js

@@ -2,7 +2,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-MDBZCBM2.js";
+} from "./chunk-53UNFIIG.js";
 import "./chunk-CNSSF43V.js";
 export {
   CorrelationVolcanoPayload,

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-I3U2T7HV.js";
+} from "./chunk-JYO2T4HZ.js";
 import {
   topMutatedGenePayload,
   validTopMutatedGeneRequest,
@@ -12,17 +12,17 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-KZIZMP7Y.js";
+} from "./chunk-OL4OMJSP.js";
 import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-7GSVLBKZ.js";
+} from "./chunk-ROPNHRVV.js";
 import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-ZPN2DV5E.js";
+} from "./chunk-DL4UYYVE.js";
 import {
   tilePayload,
   validTileRequest,
@@ -42,7 +42,7 @@ import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-EQGBEPDC.js";
+} from "./chunk-T2CSA2MC.js";
 import {
   rootTermPayload,
   validRootTermRequest,
@@ -87,17 +87,17 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-PTYGGJLG.js";
+} from "./chunk-4U546XOJ.js";
 import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-C7DJDPLP.js";
+} from "./chunk-JOGEIPHA.js";
 import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-NESPJ4GG.js";
+} from "./chunk-J6SJ4M3S.js";
 import {
   termdbCohortSummaryPayload,
   validTermdbCohortSummaryRequest,
@@ -112,12 +112,12 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-GS37E7DB.js";
+} from "./chunk-KG7UDG6M.js";
 import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-M26XQDA4.js";
+} from "./chunk-GI4NNB34.js";
 import {
   hicstatPayload,
   validHicstatRequest,
@@ -197,7 +197,7 @@ import {
   brainImagingPayload,
   validBrainImagingRequest,
   validBrainImagingResponse
-} from "./chunk-KBTAXZM4.js";
+} from "./chunk-GD3KAF6V.js";
 import {
   brainImagingSamplesPayload,
   validBrainImagingSamplesRequest,
@@ -212,7 +212,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-MDBZCBM2.js";
+} from "./chunk-53UNFIIG.js";
 import {
   datasetPayload,
   validDatasetRequest,

package/dist/termdb.boxplot.js

@@ -2,7 +2,7 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-PTYGGJLG.js";
+} from "./chunk-4U546XOJ.js";
 import "./chunk-CNSSF43V.js";
 export {
   boxplotPayload,

package/dist/termdb.categories.js

@@ -2,7 +2,7 @@ import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-C7DJDPLP.js";
+} from "./chunk-JOGEIPHA.js";
 import "./chunk-CNSSF43V.js";
 export {
   termdbCategoriesPayload,

package/dist/termdb.cluster.js

@@ -2,7 +2,7 @@ import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-NESPJ4GG.js";
+} from "./chunk-J6SJ4M3S.js";
 import "./chunk-CNSSF43V.js";
 export {
   termdbClusterPayload,

package/dist/termdb.descrstats.js

@@ -2,7 +2,7 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-GS37E7DB.js";
+} from "./chunk-KG7UDG6M.js";
 import "./chunk-CNSSF43V.js";
 export {
   descrStatsPayload,

package/dist/termdb.numericcategories.js

@@ -2,7 +2,7 @@ import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-M26XQDA4.js";
+} from "./chunk-GI4NNB34.js";
 import "./chunk-CNSSF43V.js";
 export {
   numericCategoriesPayload,

package/dist/termdb.percentile.js

@@ -2,7 +2,7 @@ import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-EQGBEPDC.js";
+} from "./chunk-T2CSA2MC.js";
 import "./chunk-CNSSF43V.js";
 export {
   percentilePayload,

package/dist/termdb.termsbyids.js

@@ -2,7 +2,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-I3U2T7HV.js";
+} from "./chunk-JYO2T4HZ.js";
 import "./chunk-CNSSF43V.js";
 export {
   termsByIdsPayload,

package/dist/termdb.topTermsByType.js

@@ -2,7 +2,7 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-KZIZMP7Y.js";
+} from "./chunk-OL4OMJSP.js";
 import "./chunk-CNSSF43V.js";
 export {
   termdbTopTermsByTypePayload,

package/dist/termdb.topVariablyExpressedGenes.js

@@ -2,7 +2,7 @@ import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-7GSVLBKZ.js";
+} from "./chunk-ROPNHRVV.js";
 import "./chunk-CNSSF43V.js";
 export {
   termdbTopVariablyExpressedGenesPayload,

package/dist/termdb.violin.js

@@ -2,7 +2,7 @@ import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-ZPN2DV5E.js";
+} from "./chunk-DL4UYYVE.js";
 import "./chunk-CNSSF43V.js";
 export {
   validViolinRequest,

package/package.json

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

package/src/dataset.ts

@@ -1346,6 +1346,32 @@ keep this setting here for reason of:
 		/** allow color or shape changes in the lollipop */
 		allowSkewerChanges: boolean
 	}
+	//* specify color map per module/group of terms. Used in the profile dataset.
+	/** For example "National Context" is a profile module, that groups some multivalue terms for wich the category colors are the ones shown below: 
+	 colorMap: {
+				['*']: {
+					['Not applicable for my role']: '#aaa',
+					['Not Available/Do Not Know']: '#aaa',
+					["I don't know"]: '#aaa',
+					['Almost Never']: '#595959',
+					['Infrequently']: '#747474',
+					['No']: '#aaa'
+				},
+				['National Context']: {
+					['Almost Always']: '#15557C',
+					['Frequently']: '#1E77BB',
+					['Sometimes']: '#2FA9F4',
+					['Yes']: '#1E77BB'
+				},
+	}
+	If the colors are the same for all the categories, use the wildcard '*' to define the color for all the modules.
+	**/
+	colorMap?: {
+		/** colors for a category multivalues */
+		[index: string]: { [index: string]: string }
+	}
+	//terms that are not shown in the dictionary tree unless the user is admin. If there is no authentication the terms listes are always hidden
+	hiddenTermIds?: string[]
 }
 
 type SampleType = {
@@ -1453,6 +1479,7 @@ export type Cohort = {
 	/** if present, supplies premade scatter plots */
 	scatterplots?: Scatterplots
 	termdb: Termdb
+	hiddenTermIds?: string[]
 }
 
 /** Customizations specific to the mass nav component */

package/src/routes/correlationVolcano.ts

@@ -24,18 +24,20 @@ export type CorrelationVolcanoResponse = {
 		tw$id: string
 	}[]
 	/** each element is test result of one variable corresponding to variableTwLst */
-	variableItems: {
-		/** correlation coefficient, -1 to 1 */
-		correlation: number
-		/** pvalue */
-		original_pvalue: number
-		/** pvalue */
-		adjusted_pvalue: number
-		/** tw.$id, for client to match the item with variableTwLst */
-		tw$id: string
-		/** number of samples analyzed. samples not having complete data for all terms will be excluded, thus size may be lower than current cohort */
-		sampleSize: number
-	}[]
+	variableItems: VariableItemEntry[]
+}
+
+export type VariableItemEntry = {
+	/** correlation coefficient, -1 to 1 */
+	correlation: number
+	/** pvalue */
+	original_pvalue: number
+	/** pvalue */
+	adjusted_pvalue: number
+	/** tw.$id, for client to match the item with variableTwLst */
+	tw$id: string
+	/** number of samples analyzed. samples not having complete data for all terms will be excluded, thus size may be lower than current cohort */
+	sampleSize: number
 }
 
 export const CorrelationVolcanoPayload: RoutePayload = {

package/src/terms/geneVariant.ts

@@ -1,12 +1,4 @@
-import type {
-	MinBaseQ,
-	BaseTerm,
-	EnabledTermGroupSetting,
-	BaseTW,
-	GroupSettingQ,
-	ValuesQ,
-	TermValues
-} from '../index.ts'
+import type { MinBaseQ, BaseTerm, TermGroupSetting, BaseTW, GroupSettingQ, ValuesQ, TermValues } from '../index.ts'
 import type { TermSettingInstance } from '../termsetting.ts'
 
 export type GeneVariantBaseQ = MinBaseQ & {
@@ -23,7 +15,7 @@ export type GeneVariantQ = GeneVariantBaseQ & (ValuesQ | GroupSettingQ)
 
 type GeneVariantBaseTerm = BaseTerm & {
 	type: 'geneVariant'
-	groupsetting: EnabledTermGroupSetting
+	groupsetting: TermGroupSetting
 }
 
 export type GeneVariantGeneTerm = GeneVariantBaseTerm & {

package/src/vocab.ts

@@ -1,7 +1,7 @@
-import { TermWrapper } from './terms/tw.ts'
-import { Term } from './terms/term.ts'
-import { Filter } from './filter.ts'
-import { UseCase } from './termsetting.ts'
+import type { TermWrapper } from './terms/tw.ts'
+import type { Term } from './terms/term.ts'
+import type { Filter } from './filter.ts'
+import type { UseCase } from './termsetting.ts'
 
 /*
 --------EXPORTED--------
@@ -16,7 +16,7 @@ export type VocabApi = {
 	//Methods
 	cacheTermQ: (term: Term, q: any) => any
 	findTerm: (f: string, activeCohort: number, usecase: UseCase, x: string) => { lst: Term[] }
-	getCategories: (term: Term, filer: Filter, body?: any) => any
+	getCategories: (term: Term, filter?: Filter, body?: any) => any
 	getCustomTermQLst: (f: Term) => any
 	getPercentile: (term_id: string | number, percentile_lst: number[], filter?: Filter) => any
 	getterm: (f: any) => Term