gps-global-types 1.0.4 → 1.0.8

package/global.types.tsx

@@ -14,5 +14,5 @@ export type mrsnId = string  // ###### ('MRSN' + 6 or 7 digit number) typically,
 export type armordPatientId = RegexMatchedString<'M\d+'>  // M###### ('M'+6 digit number), but the bi-db is a cesspool
 export type Hex = RegexMatchedString<'#\d{6}'>  // 6 digit String hexadecimal w/ '#' prepended
 export type Rgb = RegexMatchedString<'rgb\([1-256],[1-256],[1-256]\)'>  // format rgb(\d[1-256],\d[1-256],\d[1-256])
-export type Color = Hex | Rgb | String
+export type Color = Hex | Rgb | string
 

package/mst.types.tsx

@@ -19,7 +19,7 @@ export interface mstGlobalTypes {
     //  highlightedNodes:mrsnId[] ????
 }
 
-export const colorFields = ['armordPatientId', 'mlst', 'sampleType', 'armordFacility', 'armordCountry', 'custom color'] as const; //no :string[] ! removes 'const'
+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;
 
@@ -36,7 +36,7 @@ type CustomDictEntry = Record<colorKey | dateKey, Color> | Record<labelKey, stri
 export type CustomDict = Record<ObjectId, CustomDictEntry>
 
 
-export interface LatestNodes { armordCultureDate: Date | string, isos: NodeType[], _id: ObjectId[] }
+export interface LatestNodes { armordCultureDate: Date | string, isos: any[], _id: ObjectId[] }
 export interface MSTGraph {
     name?:string,
     snapshotData?:SnapshotType
@@ -95,7 +95,7 @@ interface LegendBullet { //or custom upload data
     label: string
 }
 
-export type MSTLegend = Record<colorKey, LegendBullet[]> | Record<dateKey, 'date'> | { 'beforeAndAfter': [{ color: '#666666', label: 'Before ' }, { color: '#4a64aa', label: 'After ' }] }
+export type MSTLegend = Record<colorKey, LegendBullet[]> & Record<dateKey, 'date'> & { 'beforeAndAfter': [{ color: '#666666', label: 'Before ' }, { color: '#4a64aa', label: 'After ' }] }
 
 
 
@@ -147,4 +147,5 @@ export interface SnapshotType {
      *
 */
 // module.exports = { MSTGraph, MSTLegend, NodeType,EdgeType,Hex, ColorField,LabelField}
-// exports.unused = {};
+// exports.unused = {};
+

package/package.json

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

package/pie.types.tsx

@@ -13,11 +13,11 @@ export interface ColorType {
     color: Color, //unique hex of parameter
     value: number //count of how many times value will be represented in the pie
 }
-type LabelType = RegexMatchedString<'(\w&)*'> // if many, seperated by '&' qhich are interpreted as newlines in front-end. var names ends with 'LBL'.
+export type LabelType = RegexMatchedString<'(\w&)*'> // if many, seperated by '&' qhich are interpreted as newlines in front-end. var names ends with 'LBL'.
 type DateType = string | Date;  // must be able to be interpreted as date type by Date js object
 
 
-interface ExtraNodeTypeFields extends SimulationNodeDatum {
+export interface ExtraNodeTypeFields extends SimulationNodeDatum {
     id: ObjectId,//unique identifier referenced by Graph.links and d3 Force. String but it's a string of a mongo id
     beforeAndAfter?: ColorType[], //[=[{color:'#fff',value:1}]] so it doesnt break on recalculation
     dateArr: DateType[], // array of armordCultureDates used for beforeAndAfter coloring