gps-global-types 1.0.15 → 1.0.17

package/mst.types.tsx

@@ -3,9 +3,7 @@ import type { armordAccessionNumber, Color, mrsnId, ObjectId, RegexMatchedString
 import type { IsolateFields } from "./isolate.types.js";
 import type { EdgeType } from "./link.types.js";
 import type { NodeType } from "./pie.types.js";
-
-export interface mstGlobalTypes {
-    //form values
+export interface mstGlobalForm {    
     charge: number, //= -100, // repulsion
     radius: number, //= 15, // user adjustment of node radius
     cluster: number, //= 0, // less than highlight threshold for links
@@ -15,12 +13,17 @@ export interface mstGlobalTypes {
     fuzzyThreshold: number, //= 0, // nodes outside of requested list that are x alleles away from the original mst
     neighbor: number, //= 1, // how many isolate neighbors to return (minimum) 
     slim?: boolean, //false //are the node labels collapsed or expanded?
-
+}
+export interface mstGlobalTypes extends mstGlobalForm {
+    //form values
+    
+    graph?:MSTGraph,
     //interactive nodes
-    //  checkedNodes:mrsnId[], ????
-    //  highlightedNodes:mrsnId[] ????
+     checkedNodes:ObjectId[], //
+     highlightedNodes:ObjectId[]
 }
 
+
 export const colorFields = ['armordPatientId', 'mlst', 'sampleType', 'armordFacility', 'country', 'custom color'] as const; //no :string[] ! removes 'const'
 export const dateFields = ['armordCultureDate', 'month', 'quarter', 'year'] as const;
 export const labelFields = ['armordMrsnIdLBL', 'mrsnIdLBL', 'armordAccessionNumberLBL', 'armordPatientIdLBL', 'custom label'] as const;
@@ -152,12 +155,14 @@ export interface SnapshotType {
 // module.exports = { MSTGraph, MSTLegend, NodeType,EdgeType,Hex, ColorField,LabelField}
 // exports.unused = {};
 
+export type QueryFields = keyof typeof IsolateFields | 'cluster' | `cluster.${keyof typeof ClusterFields}` | keyof typeof ClusterFields
+
 
 export interface getAClusterBody {
     //theres 4 ways of calling this function
     //1. through a BAQ involving iso and/or cluster fields
-    isolatesQuery?:Partial<Record<keyof typeof IsolateFields, Object>>,
-    clusterQuery?:Partial<Record<keyof typeof ClusterFields, Object>>, //2. selecting a cluster on /clusters (sending cluster _id)
+    query?:Partial<Record< QueryFields, Object>>,
+    // clusterQuery?:Partial<Record<keyof typeof ClusterFields, Object>>, //2. selecting a cluster on /clusters (sending cluster _id)
     fuzzy?:number, //3. by recalculating a previous query
     neighbors?:number, // (fuzzy and neighbors are only available on recalc)
     snapshotData?:SnapshotType //4. uploading a snapshot. (should i extrapolate ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gps-global-types",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "types shared between front-end and back-end",
   "main": "index.js",
   "scripts": {