@sjcrh/proteinpaint-types 2.150.0 → 2.152.0

package/dist/correlationVolcano.js

@@ -2,7 +2,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-75GS5ZG5.js";
+} from "./chunk-LXW2FSLR.js";
 import "./chunk-YNHC5SXO.js";
 export {
   CorrelationVolcanoPayload,

package/dist/index.js

@@ -7,17 +7,17 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-KQNLROUN.js";
+} from "./chunk-GZKTMVAU.js";
 import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-OZ3CVAFP.js";
+} from "./chunk-EBPGV76U.js";
 import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-MMFL6N5M.js";
+} from "./chunk-OLXOQLZH.js";
 import {
   tilePayload,
   validTileRequest,
@@ -42,7 +42,7 @@ import {
   termdbSampleScatterPayload,
   validTermdbSampleScatterRequest,
   validTermdbSampleScatterResponse
-} from "./chunk-OSBVSZBB.js";
+} from "./chunk-5BNDT4E6.js";
 import {
   termdbSingleSampleMutationPayload,
   validTermdbSingleSampleMutationRequest,
@@ -72,7 +72,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-WL7ZVGZS.js";
+} from "./chunk-C27KCAQH.js";
 import {
   termdbCohortsPayload,
   validTermdbCohortsRequest,
@@ -82,7 +82,7 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-4SJC57Y6.js";
+} from "./chunk-ZXPLL3NT.js";
 import {
   FilterTermValuesPayload,
   validFilterTermValuesRequest,
@@ -92,12 +92,12 @@ import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-4MLQS6N7.js";
+} from "./chunk-OLWNM7QP.js";
 import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-TTUU5XQC.js";
+} from "./chunk-5F24QFE7.js";
 import {
   ProfileFormScoresPayload,
   validProfileFormScoresRequest,
@@ -132,22 +132,22 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-3SKFYOKV.js";
+} from "./chunk-JT4DSNJ3.js";
 import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-RA7IEGS4.js";
+} from "./chunk-MCL6EDOS.js";
 import {
   ChatPayload,
   validChatRequest,
   validChatResponse
-} from "./chunk-DBSRGRXR.js";
+} from "./chunk-OAETETAO.js";
 import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-5MGSKBUU.js";
+} from "./chunk-CC32XCET.js";
 import {
   termdbCohortSummaryPayload,
   validTermdbCohortSummaryRequest,
@@ -239,7 +239,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-75GS5ZG5.js";
+} from "./chunk-LXW2FSLR.js";
 import {
   datasetPayload,
   validDatasetRequest,
@@ -297,7 +297,7 @@ import {
   brainImagingPayload,
   validBrainImagingRequest,
   validBrainImagingResponse
-} from "./chunk-KSVIBMFQ.js";
+} from "./chunk-5OMJAZK4.js";
 import {
   brainImagingSamplesPayload,
   validBrainImagingSamplesRequest,

package/dist/termdb.boxplot.js

@@ -2,7 +2,7 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-3SKFYOKV.js";
+} from "./chunk-JT4DSNJ3.js";
 import "./chunk-YNHC5SXO.js";
 export {
   boxplotPayload,

package/dist/termdb.categories.js

@@ -2,7 +2,7 @@ import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-RA7IEGS4.js";
+} from "./chunk-MCL6EDOS.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termdbCategoriesPayload,

package/dist/termdb.chat.js

@@ -2,7 +2,7 @@ import {
   ChatPayload,
   validChatRequest,
   validChatResponse
-} from "./chunk-DBSRGRXR.js";
+} from "./chunk-OAETETAO.js";
 import "./chunk-YNHC5SXO.js";
 export {
   ChatPayload,

package/dist/termdb.cluster.js

@@ -2,7 +2,7 @@ import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-5MGSKBUU.js";
+} from "./chunk-CC32XCET.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termdbClusterPayload,

package/dist/termdb.descrstats.js

@@ -2,7 +2,7 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-4SJC57Y6.js";
+} from "./chunk-ZXPLL3NT.js";
 import "./chunk-YNHC5SXO.js";
 export {
   descrStatsPayload,

package/dist/termdb.numericcategories.js

@@ -2,7 +2,7 @@ import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-4MLQS6N7.js";
+} from "./chunk-OLWNM7QP.js";
 import "./chunk-YNHC5SXO.js";
 export {
   numericCategoriesPayload,

package/dist/termdb.percentile.js

@@ -2,7 +2,7 @@ import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-TTUU5XQC.js";
+} from "./chunk-5F24QFE7.js";
 import "./chunk-YNHC5SXO.js";
 export {
   percentilePayload,

package/dist/termdb.sampleScatter.js

@@ -2,7 +2,7 @@ import {
   termdbSampleScatterPayload,
   validTermdbSampleScatterRequest,
   validTermdbSampleScatterResponse
-} from "./chunk-OSBVSZBB.js";
+} from "./chunk-5BNDT4E6.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termdbSampleScatterPayload,

package/dist/termdb.termsbyids.js

@@ -2,7 +2,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-WL7ZVGZS.js";
+} from "./chunk-C27KCAQH.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termsByIdsPayload,

package/dist/termdb.topTermsByType.js

@@ -2,7 +2,7 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-KQNLROUN.js";
+} from "./chunk-GZKTMVAU.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termdbTopTermsByTypePayload,

package/dist/termdb.topVariablyExpressedGenes.js

@@ -2,7 +2,7 @@ import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-OZ3CVAFP.js";
+} from "./chunk-EBPGV76U.js";
 import "./chunk-YNHC5SXO.js";
 export {
   termdbTopVariablyExpressedGenesPayload,

package/dist/termdb.violin.js

@@ -2,7 +2,7 @@ import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-MMFL6N5M.js";
+} from "./chunk-OLXOQLZH.js";
 import "./chunk-YNHC5SXO.js";
 export {
   validViolinRequest,

package/package.json

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

package/src/routes/termdb.sampleScatter.ts

@@ -19,7 +19,7 @@ export type TermdbSampleScatterRequest = {
 export type ScatterSample = {
 	category: string
 	sample: string
-	info: { [index: string]: any }
+	info?: { [index: string]: any }
 	shape: string
 	x: number
 	y: number
@@ -37,10 +37,8 @@ export type ShapeMap = { [index: string]: ShapeObject }
 type ScatterResult = {
 	[index: string]: {
 		colorLegend: ColorLegendEntry[]
-		colorMap: ColorMap
 		samples: ScatterSample[]
 		shapeLegend: ShapeLegendEntry[]
-		shapeMap: ShapeMap
 	}
 }
 

package/src/terms/numeric.ts

@@ -108,14 +108,27 @@ export type RegularNumericBinConfig = MinBaseQ & {
 	// if last_bin?.start is set, then a fixed last bin is used; otherwise it's not fixed and computed from data
 	last_bin?: StopUnboundedBin | FullyBoundedBin
 	label_offset?: number
+	startinclusive?: boolean
+	stopinclusive?: boolean
+	/** a d3-format value to format the bin boundary values.
+	 * Defaults to none, in which case the computed bin start and stop values
+	 * (float numbers in javascript) will be used as-is for labels.
+	 * Or, when using the browser UI to edit the numeric bin, the number of decimals
+	 * in the bin_size will be used as the number of fixed decimals;
+	 * for example, bin_size = 0.25 and bin_size = 0.250 will imply a ‘.2f’ and ‘.3f’ d3-format value, respectively.
+	 * Note that the generated bin labels may use integer values in some cases for less clutter, such as when bins.size = 1.
+	 *  */
+	rounding?: string
 }
 
+export type CustomNumericBinConfigLst = [NumericBin, ...NumericBin[]]
+
 export type CustomNumericBinConfig = MinBaseQ & {
 	type: 'custom-bin'
 	mode?: 'discrete' | 'binary'
 	// since ts will allow NumericBin[] to be empty,
 	// use this workaround to define a non-empty array
-	lst: [NumericBin, ...NumericBin[]]
+	lst: CustomNumericBinConfigLst
 	preferredBins?: 'median'
 }
 
@@ -142,6 +155,8 @@ export type BinaryNumericQ = MinBaseQ & {
 	type: 'custom-bin'
 	// tuple type with 2 members
 	lst: [StartUnboundedBin | FullyBoundedBin, StopUnboundedBin | FullyBoundedBin]
+	cutoffType?: 'normal' | 'percentile'
+	cutoffPercentile?: number
 }
 
 export type ContinuousNumericQ = MinBaseQ & {
@@ -154,6 +169,7 @@ export type ContinuousNumericQ = MinBaseQ & {
 	// making type optional here makes NumericQ operations/conditions
 	// work consistently within the TermWrapper union type
 	type?: undefined
+	scale?: number
 }
 
 export type SplineNumericQ = MinBaseQ & {

package/src/terms/term.ts

@@ -39,6 +39,11 @@ export type BaseTerm = {
 	/** Do not build .values{} when building termdb. Used for 
 	making categorical term with empty .values{} in TermdbTest */
 	skipValuesBuild?: boolean
+	valueConversion?: {
+		fromUnit: string
+		toUnit: string
+		scaleFactor: string
+	}
 }
 
 // NumericTerm includes integer, float, date, geneExpression, metaboliteIntensity, and other non-dict terms