@sjcrh/proteinpaint-types 2.141.0 → 2.142.0

package/dist/correlationVolcano.js

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

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-UYBVE3DL.js";
+} from "./chunk-IR4QSJI7.js";
 import {
   topMutatedGenePayload,
   validtopMutatedGeneRequest,
@@ -12,17 +12,17 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-77RH7U6G.js";
+} from "./chunk-2VDOPTRV.js";
 import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-T3GTEGQN.js";
+} from "./chunk-4R265LDJ.js";
 import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-424IUJWR.js";
+} from "./chunk-DMJFOII6.js";
 import {
   tilePayload,
   validTileRequest,
@@ -82,7 +82,7 @@ import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-56JQGGZJ.js";
+} from "./chunk-SMVDKR2O.js";
 import {
   termdbCohortSummaryPayload,
   validTermdbCohortSummaryRequest,
@@ -97,7 +97,7 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-VMQUAU5V.js";
+} from "./chunk-GDM7YUXH.js";
 import {
   FilterTermValuesPayload,
   validFilterTermValuesRequest,
@@ -107,12 +107,12 @@ import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-WCWYMCZD.js";
+} from "./chunk-3BQ57P2P.js";
 import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-KEJROUTM.js";
+} from "./chunk-SOM5WKDM.js";
 import {
   ProfileFormScoresPayload,
   validProfileFormScoresRequest,
@@ -152,12 +152,12 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-EOBFYFLQ.js";
+} from "./chunk-3L3ASC3B.js";
 import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-QWAPDNYB.js";
+} from "./chunk-CEDL2QZT.js";
 import {
   GRIN2Payload,
   validGRIN2Request,
@@ -245,7 +245,7 @@ import {
   brainImagingPayload,
   validBrainImagingRequest,
   validBrainImagingResponse
-} from "./chunk-S6OBK4RE.js";
+} from "./chunk-FVBXC7SY.js";
 import {
   brainImagingSamplesPayload,
   validBrainImagingSamplesRequest,
@@ -267,7 +267,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-I7FTK55B.js";
+} from "./chunk-MVMUZSLL.js";
 import {
   datasetPayload,
   validDatasetRequest,

package/dist/termdb.boxplot.js

@@ -2,7 +2,7 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-EOBFYFLQ.js";
+} from "./chunk-3L3ASC3B.js";
 import "./chunk-CNSSF43V.js";
 export {
   boxplotPayload,

package/dist/termdb.categories.js

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

package/dist/termdb.cluster.js

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

package/dist/termdb.descrstats.js

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

package/dist/termdb.numericcategories.js

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

package/dist/termdb.percentile.js

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

package/dist/termdb.termsbyids.js

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

package/dist/termdb.topTermsByType.js

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

package/dist/termdb.topVariablyExpressedGenes.js

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

package/dist/termdb.violin.js

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

package/package.json

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

package/src/terms/date.ts

@@ -1,4 +1,4 @@
-import type { NumericBaseTerm, PresetNumericBins, NumTWTypes } from '../index.ts'
+import type { NumericBaseTerm, PresetNumericBins, NumTW, RawNumTW } from '../index.ts'
 
 /*
 --------EXPORTED--------
@@ -8,11 +8,13 @@ DateTermSettingInstance
 */
 
 export type DateTerm = NumericBaseTerm & {
-	name?: string
+	name: string
 	type: 'date'
-	metabolite: string
 	bins?: PresetNumericBins
-	unit?: string
 }
 
-export type DateTW = NumTWTypes & { term: DateTerm }
+export type DateTW = NumTW & { term: DateTerm }
+
+type RawDateTerm = DateTerm & { name?: string }
+
+export type RawDateTW = RawNumTW & { term: RawDateTerm }

package/src/terms/geneExpression.ts

@@ -1,4 +1,4 @@
-import type { PresetNumericBins, NumericBaseTerm, NumTWTypes } from '../index.ts'
+import type { PresetNumericBins, NumericBaseTerm, NumTW, RawNumTW } from '../index.ts'
 
 /*
 --------EXPORTED--------
@@ -7,16 +7,30 @@ GeneExpressionTermWrapper
 GeneExpressionTermSettingInstance
 */
 
-export type GeneExpressionTerm = NumericBaseTerm & {
+type Gene = {
+	kind?: 'gene'
 	gene: string
-	name: string
-	type: 'geneExpression'
-	bins?: PresetNumericBins
-	// temporarily allowing chr/start/stop to support
-	// legacy fpkm files
+	// chr,start,stop should exist together as a separate type called
+	// 'Coord', but hard to code as atomic `& Coord` because it may
+	// need to be filled in
 	chr?: string
 	start?: number
 	stop?: number
 }
 
-export type GeneExpressionTW = NumTWTypes & { term: GeneExpressionTerm }
+type Coord = {
+	kind?: 'coord'
+	gene?: string
+	chr: string
+	start: number
+	stop: number
+}
+
+export type GeneExpressionTerm = NumericBaseTerm & {
+	type: 'geneExpression'
+	bins?: PresetNumericBins
+} & (Gene | Coord)
+
+export type GeneExpressionTW = NumTW & { term: GeneExpressionTerm }
+
+export type RawGeneExpTW = RawNumTW & { term: GeneExpressionTerm & { name?: string } }

package/src/terms/metaboliteIntensity.ts

@@ -1,4 +1,4 @@
-import type { NumericBaseTerm, PresetNumericBins, NumTWTypes } from '../index.ts'
+import type { NumericBaseTerm, PresetNumericBins, NumTW, RawNumTW } from '../index.ts'
 
 /*
 --------EXPORTED--------
@@ -8,11 +8,21 @@ MetaboliteIntensityTermSettingInstance
 */
 
 export type MetaboliteIntensityTerm = NumericBaseTerm & {
-	name?: string
+	name: string
 	type: 'metaboliteIntensity'
 	metabolite: string
 	bins?: PresetNumericBins
 	unit?: string
 }
 
-export type MetaboliteIntensityTW = NumTWTypes & { term: MetaboliteIntensityTerm }
+export type MetaboliteIntensityTW = NumTW & { term: MetaboliteIntensityTerm }
+
+type RawMetabolitIntensityTerm = {
+	type: 'metaboliteIntensity'
+	metabolite: string
+	name?: string
+	bins?: PresetNumericBins
+	unit?: string
+}
+
+export type RawMetaboliteIntensityTW = RawNumTW & { term: RawMetabolitIntensityTerm }

package/src/terms/numeric.ts

@@ -209,7 +209,7 @@ export type NumTWSpline = BaseTW & {
 	q: SplineNumericQ
 }
 
-export type NumTWTypes = NumTWRegularBin | NumTWCustomBin | NumTWBinary | NumTWCont | NumTWSpline
+export type NumTW = NumTWRegularBin | NumTWCustomBin | NumTWBinary | NumTWCont | NumTWSpline
 export type NumTWDiscreteTypes = NumTWRegularBin | NumTWCustomBin //| NumTWBinary
 
 export type DefaultMedianQ = {

package/src/terms/ssGSEA.ts

@@ -1,4 +1,4 @@
-import type { NumericBaseTerm, NumericQ, PresetNumericBins, NumTWTypes } from './numeric.ts'
+import type { NumericBaseTerm, NumericQ, PresetNumericBins, NumTW, RawNumTW } from './numeric.ts'
 
 /*
 duplicated from geneExpression.ts
@@ -17,4 +17,6 @@ export type SsGSEATerm = NumericBaseTerm & {
 	unit?: string
 }
 
-export type SsGSEATW = NumTWTypes & { term: SsGSEATerm }
+export type SsGSEATW = NumTW & { term: SsGSEATerm }
+
+export type RawSsGSEATW = RawNumTW & { term: SsGSEATerm }

package/src/terms/tw.ts

@@ -3,10 +3,10 @@ import type { SnpQ, SnpTW } from './snp.ts'
 import type { ConditionQ, ConditionTW } from './condition.ts'
 import type { SampleLstQ } from './samplelst.ts'
 import type { CatTWTypes, CategoricalQ } from './categorical.ts'
-import type { NumTWTypes, NumericQ } from './numeric.ts'
+import type { NumTW, NumericQ } from './numeric.ts'
 import type { GvTW, GvQ } from './geneVariant.ts'
 
-export type TermWrapper = CatTWTypes | NumTWTypes | GvTW | ConditionTW | SnpsTW | SnpTW
+export type TermWrapper = CatTWTypes | NumTW | GvTW | ConditionTW | SnpsTW | SnpTW
 
 export type Q = CategoricalQ | NumericQ | GvQ | ConditionQ | SnpsQ | SnpQ | SampleLstQ // | other q