@sjcrh/proteinpaint-types 2.119.0 → 2.123.0

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

package/src/terms/updated-types.ts

@@ -1,9 +1,10 @@
 // temporary code file to hold updated type definitions
 // as part of the tw router/handler refactor
 
-import { CatTWTypes, CategoricalQ } from './categorical.ts'
-import { NumTWTypes, NumericQ } from './numeric.ts'
+import type { CatTWTypes, CategoricalQ } from './categorical.ts'
+import type { NumTWTypes, NumericQ } from './numeric.ts'
+import type { GvTW, GvQ } from './geneVariant.ts'
 
-export type TermWrapper = CatTWTypes | NumTWTypes
+export type TermWrapper = CatTWTypes | NumTWTypes | GvTW
 
-export type Q = CategoricalQ | NumericQ // | other q
+export type Q = CategoricalQ | NumericQ | GvQ // | other q

package/src/termsetting.ts

@@ -1,8 +1,8 @@
 // TODO: will deprecate this code, should use client/termsetting/types.ts instead
-import { VocabApi } from './vocab.ts'
-import { TermWrapper, Q } from './terms/tw.ts'
-import { Term } from './terms/term.ts'
-import { Filter } from './filter.ts'
+import type { VocabApi } from './vocab.ts'
+import type { TermWrapper, Q } from './terms/tw.ts'
+import type { Term } from './terms/term.ts'
+import type { Filter } from './filter.ts'
 
 /*
 

package/src/test/numeric.type.spec.ts

@@ -1,7 +1,7 @@
-import { StartUnboundedBin, StopUnboundedBin, FullyBoundedBin, NumericTerm } from '../terms/numeric'
+import type { StartUnboundedBin, StopUnboundedBin, FullyBoundedBin, NumericTerm } from '../terms/numeric'
 
 /*
-	Non-asserted type definition tests 
+	Non-asserted type definition tests: NOT FOR CI, for training only
 	
 	For training only 
 	- these tests are not meant to be written for all declared types