@sjcrh/proteinpaint-types 2.119.0-0 → 2.121.0

package/dist/correlationVolcano.js

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

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   termsByIdsPayload,
   validTermsByIdsRequest,
   validTermsByIdsResponse
-} from "./chunk-BM3JLR6T.js";
+} from "./chunk-AGSW7G4T.js";
 import {
   topMutatedGenePayload,
   validTopMutatedGeneRequest,
@@ -12,17 +12,17 @@ import {
   termdbTopTermsByTypePayload,
   validTermdbTopTermsByTypeRequest,
   validTermdbTopTermsByTypeResponse
-} from "./chunk-OL4OMJSP.js";
+} from "./chunk-NCFUZ5VV.js";
 import {
   termdbTopVariablyExpressedGenesPayload,
   validTermdbTopVariablyExpressedGenesRequest,
   validTermdbTopVariablyExpressedGenesResponse
-} from "./chunk-ROPNHRVV.js";
+} from "./chunk-SQBZAOWB.js";
 import {
   validViolinRequest,
   validViolinResponse,
   violinPayload
-} from "./chunk-DL4UYYVE.js";
+} from "./chunk-RX5EB2HL.js";
 import {
   tilePayload,
   validTileRequest,
@@ -42,7 +42,7 @@ import {
   percentilePayload,
   validPercentileRequest,
   validPercentileResponse
-} from "./chunk-T2CSA2MC.js";
+} from "./chunk-3ZT4UCFM.js";
 import {
   rootTermPayload,
   validRootTermRequest,
@@ -87,17 +87,17 @@ import {
   boxplotPayload,
   validBoxPlotRequest,
   validBoxPlotResponse
-} from "./chunk-7NNYHDAK.js";
+} from "./chunk-XPOHYEAY.js";
 import {
   termdbCategoriesPayload,
   validCategoriesRequest,
   validCategoriesResponse
-} from "./chunk-UVOO2LBD.js";
+} from "./chunk-ZMOSABYP.js";
 import {
   termdbClusterPayload,
   validTermdbClusterRequest,
   validTermdbClusterResponse
-} from "./chunk-J6SJ4M3S.js";
+} from "./chunk-F64WJMRL.js";
 import {
   termdbCohortSummaryPayload,
   validTermdbCohortSummaryRequest,
@@ -112,12 +112,12 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-4V46EBDF.js";
+} from "./chunk-5XRJ5ATE.js";
 import {
   numericCategoriesPayload,
   validNumericCategoriesRequest,
   validNumericCategoriesResponse
-} from "./chunk-GI4NNB34.js";
+} from "./chunk-LBGUOJR3.js";
 import {
   hicstatPayload,
   validHicstatRequest,
@@ -197,7 +197,7 @@ import {
   brainImagingPayload,
   validBrainImagingRequest,
   validBrainImagingResponse
-} from "./chunk-GD3KAF6V.js";
+} from "./chunk-QMWUUGEK.js";
 import {
   brainImagingSamplesPayload,
   validBrainImagingSamplesRequest,
@@ -212,7 +212,7 @@ import {
   CorrelationVolcanoPayload,
   validCorrelationVolcanoRequest,
   validCorrelationVolcanoResponse
-} from "./chunk-YURGGHZI.js";
+} from "./chunk-K7P6C6KU.js";
 import {
   datasetPayload,
   validDatasetRequest,

package/dist/termdb.boxplot.js

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

package/dist/termdb.categories.js

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

package/dist/termdb.cluster.js

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

package/dist/termdb.descrstats.js

@@ -2,7 +2,7 @@ import {
   descrStatsPayload,
   validDescrStatsRequest,
   validDescrStatsResponse
-} from "./chunk-4V46EBDF.js";
+} from "./chunk-5XRJ5ATE.js";
 import "./chunk-CNSSF43V.js";
 export {
   descrStatsPayload,

package/dist/termdb.numericcategories.js

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

package/dist/termdb.percentile.js

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

package/dist/termdb.termsbyids.js

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

package/dist/termdb.topTermsByType.js

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

package/dist/termdb.topVariablyExpressedGenes.js

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

package/dist/termdb.violin.js

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

package/package.json

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

package/src/filter.ts

@@ -1,8 +1,8 @@
-import { BaseValue } from './terms/term.ts'
-import { NumericTerm, NumericBin } from './terms/numeric.ts'
-import { CategoricalTerm } from './terms/categorical.ts'
-import { GeneVariantTerm } from './terms/geneVariant.ts'
-import { ConditionTerm } from './terms/condition.ts'
+import type { BaseValue } from './terms/term.ts'
+import type { NumericTerm, NumericBin } from './terms/numeric.ts'
+import type { CategoricalTerm } from './terms/categorical.ts'
+import type { DtTerm } from './terms/geneVariant.ts'
+import type { ConditionTerm } from './terms/condition.ts'
 
 /*
 --------EXPORTED--------
@@ -52,74 +52,19 @@ export type ConditionTvs = BaseTvs & {
 	grade_and_child?: GradeAndChildEntry[]
 }
 
-type GeneVariantOrigin = 'somatic' | 'germline'
-
-type SNVIndelClasses =
-	| 'M'
-	| 'E'
-	| 'F'
-	| 'N'
-	| 'S'
-	| 'D'
-	| 'I'
-	| 'P'
-	| 'L'
-	| 'Intron'
-	| 'Blank'
-	| 'WT'
-	| 'ITD'
-	| 'DEL'
-	| 'NLOSS'
-	| 'CLOSS'
-	| 'Utr3'
-	| 'Utr5'
-	| 'X'
-	| 'noncoding'
-type SNVIndelTvsValue = {
-	dt: 1
-	mclassLst: SNVIndelClasses[]
-	mclassExcludeLst: SNVIndelClasses[]
-	origin?: GeneVariantOrigin
-}
-
-type CNVClasses = 'CNV_amp' | 'CNV_loss' | 'CNV_loh' | 'Blank' | 'WT' | 'CNV_amplification' | 'CNV_homozygous_deletion'
-type CNVTvsValue = {
-	dt: 4
-	mclassLst: CNVClasses[]
-	mclassExcludeLst: CNVClasses[]
-	origin?: GeneVariantOrigin
-}
-
-type SVClasses = 'SV' | 'Blank' | 'WT'
-type SVTvsValue = {
-	dt: 5
-	mclassLst: SVClasses[]
-	mclassExcludeLst: SVClasses[]
-	origin?: GeneVariantOrigin
-}
-
-type FusionRNAClasses = 'Fuserna' | 'Blank' | 'WT'
-type FusionTvsValue = {
-	dt: 2
-	mclassLst: FusionRNAClasses[]
-	mclassExcludeLst: FusionRNAClasses[]
-	origin?: GeneVariantOrigin
-}
-
-type GeneVariantTvsValue = SNVIndelTvsValue | CNVTvsValue | SVTvsValue | FusionTvsValue
-
 type GeneVariantTvs = BaseTvs & {
-	term: GeneVariantTerm
-	values: GeneVariantTvsValue[]
+	term: DtTerm
+	values: { key: string; label: string; value: string }[]
 }
+
 /*** types supporting Filter type ***/
 
 export type Tvs = CategoricalTvs | NumericTvs | ConditionTvs | GeneVariantTvs // | SampleLstTvs ...
 
 export type Filter = {
-	type: 'lst'
-	in?: boolean
-	join: 'and' | 'or'
+	type: 'tvslst'
+	in: boolean
+	join: string
 	tag?: string // client-side only
-	lst: (Filter | Tvs)[]
+	lst: ({ type: 'tvs'; tvs: Tvs } | Filter)[]
 }

package/src/genome.ts

@@ -1,4 +1,4 @@
-import { Cohort } from './dataset.ts'
+import type { Cohort } from './dataset.ts'
 
 /********* server/genome ********
  

package/src/routes/hicgenome.ts

@@ -1,5 +1,5 @@
 import type { BaseHicRequest, XYZCoord } from './hicdata.ts'
-import { RoutePayload } from './routeApi.ts'
+import type { RoutePayload } from './routeApi.ts'
 
 export type HicGenomeRequest = BaseHicRequest & {
 	/** Entire chromosome list read from the file (see hicstate) */

package/src/routes/isoformlst.ts

@@ -1,4 +1,4 @@
-import { RoutePayload } from './routeApi.js'
+import type { RoutePayload } from './routeApi.js'
 
 export type IsoformLstRequest = any
 export type IsoformLstResponse = any

package/src/routes/termdb.cohorts.ts

@@ -1,4 +1,4 @@
-import { RoutePayload } from './routeApi.js'
+import type { RoutePayload } from './routeApi.js'
 
 export type TermdbCohortsRequest = any
 export type TermdbCohortsResponse = any

package/src/routes/termdb.singlecellData.ts

@@ -1,5 +1,5 @@
 import type { RoutePayload } from './routeApi.js'
-import { ErrorResponse } from './errorResponse.ts'
+import type { ErrorResponse } from './errorResponse.ts'
 
 export type Cell = {
 	/** Cell id or barcode */

package/src/terms/categorical.ts

@@ -1,4 +1,4 @@
-import {
+import type {
 	BaseTerm,
 	TermValues,
 	GroupSettingQ,
@@ -8,8 +8,8 @@ import {
 	PredefinedGroupSettingQ,
 	CustomGroupSettingQ
 } from './term.ts'
-import { RawValuesQ, RawPredefinedGroupsetQ, RawCustomGroupsetQ, MinBaseQ } from './q.ts'
-import { TermSettingInstance } from '../termsetting.ts'
+import type { RawValuesQ, RawPredefinedGroupsetQ, RawCustomGroupsetQ, MinBaseQ } from './q.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
 
 /**
  * A raw categorical term q object, before filling-in

package/src/terms/condition.ts

@@ -1,5 +1,5 @@
-import { BaseTerm, BaseQ, TermValues } from './term.ts'
-import { TermWrapper } from './tw.ts'
+import type { BaseTerm, BaseQ, TermValues } from './term.ts'
+import type { TermWrapper } from './tw.ts'
 
 /**
  * @category TW

package/src/terms/geneExpression.ts

@@ -1,6 +1,6 @@
-import { TermWrapper } from './tw.ts'
-import { NumericTerm, NumericQ } from './numeric.ts'
-import { TermSettingInstance } from '../termsetting.ts'
+import type { TermWrapper } from './tw.ts'
+import type { NumericTerm, NumericQ } from './numeric.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
 
 /*
 --------EXPORTED--------

package/src/terms/geneVariant.ts

@@ -1,24 +1,28 @@
-import type { MinBaseQ, BaseTerm, TermGroupSetting, BaseTW, GroupSettingQ, ValuesQ, TermValues } from '../index.ts'
+import type { MinBaseQ, BaseTerm, TermGroupSetting, BaseTW, TermValues, BaseGroupSet, TermFilter } from '../index.ts'
 import type { TermSettingInstance } from '../termsetting.ts'
 
-export type GeneVariantBaseQ = MinBaseQ & {
-	// cnv cutoffs may no longer be necessary, but keeping for now
-	// see fillTW() in termsetting/handlers/geneVariant.ts
+// q types
+export type GvBaseQ = MinBaseQ & {
 	cnvGainCutoff?: number
 	cnvMaxLength?: number
 	cnvMinAbsValue?: number
 	cnvLossCutoff?: number
-	exclude: string[]
 }
 
-export type GeneVariantQ = GeneVariantBaseQ & (ValuesQ | GroupSettingQ)
+type RawGvValuesQ = GvBaseQ & { type?: 'values' }
+type RawGvCustomGsQ = GvBaseQ & { type: 'custom-groupset'; customset?: BaseGroupSet }
 
-type GeneVariantBaseTerm = BaseTerm & {
+export type GvValuesQ = GvBaseQ & { type: 'values' }
+export type GvCustomGsQ = GvBaseQ & { type: 'custom-groupset'; customset: BaseGroupSet }
+
+export type GvQ = GvValuesQ | GvCustomGsQ
+
+// term types
+type GvBaseTerm = BaseTerm & {
 	type: 'geneVariant'
-	groupsetting: TermGroupSetting
 }
 
-export type GeneVariantGeneTerm = GeneVariantBaseTerm & {
+export type GvGene = {
 	kind: 'gene'
 	gene: string
 	// chr,start,stop should exist together as a separate type called
@@ -29,36 +33,71 @@ export type GeneVariantGeneTerm = GeneVariantBaseTerm & {
 	stop?: number
 }
 
-export type GeneVariantCoordTerm = GeneVariantBaseTerm & {
+export type GvCoord = {
 	kind: 'coord'
 	chr: string
 	start: number
 	stop: number
 }
 
-export type GeneVariantTerm = GeneVariantGeneTerm | GeneVariantCoordTerm
+export type RawGvTerm = GvBaseTerm &
+	(GvGene | GvCoord) & {
+		groupsetting?: TermGroupSetting
+		filter?: TermFilter
+	}
+
+export type GvTerm = GvBaseTerm &
+	(GvGene | GvCoord) & {
+		groupsetting: TermGroupSetting
+		filter: TermFilter
+	}
+
+// tw types
+export type RawGvValuesTW = BaseTW & {
+	type?: 'GvValuesTW'
+	term: RawGvTerm
+	q: RawGvValuesQ
+}
+
+export type RawGvCustomGsTW = BaseTW & {
+	type?: 'GvCustomGsTW'
+	term: RawGvTerm
+	q: RawGvCustomGsQ
+}
 
-export type GeneVariantTW = BaseTW & {
-	term: GeneVariantTerm
-	q: GeneVariantQ
+export type GvValuesTW = BaseTW & {
+	type: 'GvValuesTW'
+	term: GvTerm
+	q: GvValuesQ
 }
 
+export type GvCustomGsTW = BaseTW & {
+	type: 'GvCustomGsTW'
+	term: GvTerm
+	q: GvCustomGsQ
+}
+
+export type RawGvTW = RawGvValuesTW | RawGvCustomGsTW
+export type GvTW = GvValuesTW | GvCustomGsTW
+
+// termsetting types
 export type GeneVariantTermSettingInstance = TermSettingInstance & {
-	q: GeneVariantQ
-	term: GeneVariantTerm
+	q: GvQ
+	term: GvTerm
 	category2samplecount: any
 	groupSettingInstance?: any
 }
 
+// miscellaneous types
 export type DtTerm = {
 	id: string
+	query: string
 	name: string
+	name_noOrigin: string
 	parent_id: any
 	isleaf: boolean
 	type: string
 	dt: number
 	origin?: string
-	values?: TermValues
-	min?: number
-	max?: number
+	values: TermValues
 }

package/src/terms/metaboliteIntensity.ts

@@ -1,7 +1,7 @@
-import { TermWrapper } from './tw.ts'
-import { BaseQ } from './term.ts'
-import { NumericTerm } from './numeric.ts'
-import { TermSettingInstance } from '../termsetting.ts'
+import type { TermWrapper } from './tw.ts'
+import type { BaseQ } from './term.ts'
+import type { NumericTerm } from './numeric.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
 
 /*
 --------EXPORTED--------

package/src/terms/q.ts

@@ -1,4 +1,4 @@
-import { HiddenValues, GroupSettingQ, GroupEntry } from './term.ts'
+import type { HiddenValues, GroupSettingQ, GroupEntry } from './term.ts'
 
 // MinBaseQ is BaseQ without .mode and .type
 // MinBaseQ should eventually replace BaseQ because .mode and .type

package/src/terms/samplelst.ts

@@ -1,6 +1,6 @@
-import { BaseTerm, BaseQ } from './term.ts'
-import { TermWrapper } from './tw.ts'
-import { TermSettingInstance } from '../termsetting.ts'
+import type { BaseTerm, BaseQ } from './term.ts'
+import type { TermWrapper } from './tw.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
 
 /*
 --------EXPORTED--------

package/src/terms/singleCellCellType.ts

@@ -1,5 +1,5 @@
-import { BaseTerm, BaseTW, GroupSettingQ, TermGroupSetting, TermValues } from './term.ts'
-import { MinBaseQ } from './q.ts'
+import type { BaseTerm, BaseTW, GroupSettingQ, TermGroupSetting, TermValues } from './term.ts'
+import type { MinBaseQ } from './q.ts'
 
 type SingleCellCellTypeBaseQ = MinBaseQ & { mode: 'discrete' | 'binary' }
 

package/src/terms/singleCellGeneExpression.ts

@@ -1,8 +1,7 @@
-import { TermWrapper } from './tw.ts'
-import { BaseQ } from './term.ts'
-import { GeneExpressionQ } from './geneExpression.ts'
-import { TermSettingInstance } from '../termsetting.ts'
-import { NumericTerm } from './numeric.ts'
+import type { TermWrapper } from './tw.ts'
+import type { GeneExpressionQ } from './geneExpression.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
+import type { NumericTerm } from './numeric.ts'
 
 /*
 --------EXPORTED--------

package/src/terms/snp.ts

@@ -1,6 +1,6 @@
-import { TermWrapper } from './tw.ts'
-import { BaseQ, BaseTerm, GroupSettingQ, TermGroupSetting } from './term.ts'
-import { TermSettingInstance } from '../termsetting.ts'
+import type { TermWrapper } from './tw.ts'
+import type { BaseQ, BaseTerm, GroupSettingQ, TermGroupSetting } from './term.ts'
+import type { TermSettingInstance } from '../termsetting.ts'
 
 /*
 For term type 'snp'

package/src/terms/snps.ts

@@ -1,7 +1,7 @@
-import { BaseTW, BaseQ, BaseTerm } from './term.ts'
-import { TermSettingInstance, InstanceDom, UseCase } from '../termsetting.ts'
-import { VocabApi } from '../vocab.ts'
-import { Tvs, Filter } from '../filter.ts'
+import type { BaseTW, BaseQ, BaseTerm } from './term.ts'
+import type { TermSettingInstance, InstanceDom, UseCase } from '../termsetting.ts'
+import type { VocabApi } from '../vocab.ts'
+import type { Tvs, Filter } from '../filter.ts'
 
 /*
 --------EXPORTED--------

package/src/terms/term.ts

@@ -2,7 +2,7 @@ import type { Filter } from '../filter.js'
 import type { CategoricalTerm, CategoricalBaseQ } from './categorical.js'
 import type { ConditionTerm } from './condition.js'
 import type { NumericTerm } from './numeric.js'
-import type { GeneVariantTerm } from './geneVariant.js'
+import type { GvTerm, DtTerm } from './geneVariant.js'
 import type { SampleLstTerm } from './samplelst.js'
 import type { SnpsTerm } from './snps.js'
 
@@ -105,11 +105,10 @@ export type BaseTerm = {
 	included_types?: string[]
 	isleaf?: boolean
 	values?: TermValues
-	filter?: any
+	filter?: TermFilter
 }
 
-export type Term = BaseTerm &
-	(NumericTerm | CategoricalTerm | ConditionTerm | GeneVariantTerm | SampleLstTerm | SnpsTerm)
+export type Term = BaseTerm & (NumericTerm | CategoricalTerm | ConditionTerm | SampleLstTerm | SnpsTerm | GvTerm)
 
 export type ValuesGroup = {
 	name: string
@@ -118,12 +117,19 @@ export type ValuesGroup = {
 	uncomputable?: boolean // if true, do not include this group in computations
 }
 
-// TODO: determine if this is used
 export type FilterGroup = {
 	name: string
 	type: 'filter'
-	filter: any
-	uncomputable?: boolean // if true, do not include this group in computations
+	filter: TermFilter & {
+		active: Filter // active filter
+		group: number // group index
+	}
+	uncomputable: boolean
+}
+
+export type TermFilter = {
+	opts: { joinWith: string[] } // options for joining filters
+	terms: DtTerm[] // terms used to build a frontend vocab that will be used for filtering // TODO: generalize the term structure used here
 }
 
 export type GroupEntry = ValuesGroup | FilterGroup
@@ -156,7 +162,7 @@ export type TermGroupSetting =
 
 export type BaseTW = {
 	id?: string
-	$id: string
+	$id?: string
 	isAtomic?: true
 	// plot-specific customizations that are applied to a tw copy
 	// todo: should rethink these

package/src/terms/tw.ts

@@ -1,15 +1,14 @@
-import { BaseQ, BaseTW, Term } from './term.ts'
-import { CategoricalQ, CategoricalTW } from './categorical.ts'
-import { NumericQ, NumericTW } from './numeric.ts'
-import { SnpsQ, SnpsTW } from './snps.ts'
-import { ConditionQ } from './condition.ts'
-import { GeneVariantQ } from './geneVariant.ts'
-import { SampleLstQ } from './samplelst.ts'
+import type { BaseQ, BaseTW, Term } from './term.ts'
+import type { CategoricalQ, CategoricalTW } from './categorical.ts'
+import type { NumericQ, NumericTW } from './numeric.ts'
+import type { SnpsQ, SnpsTW } from './snps.ts'
+import type { ConditionQ } from './condition.ts'
+import type { SampleLstQ } from './samplelst.ts'
 
 export type TermWrapper = CategoricalTW | NumericTW | SnpsTW | (BaseTW & { term: Term; q: Q })
 export type TwLst = TermWrapper[]
 
-export type Q = BaseQ | CategoricalQ | ConditionQ | NumericQ | GeneVariantQ | SampleLstQ | SnpsQ
+export type Q = BaseQ | CategoricalQ | ConditionQ | NumericQ | SampleLstQ | SnpsQ
 
 export type RawTW =
 	//{ id: string } | RawCatTW