gps-global-types 1.0.2 → 1.0.3

package/mst.types.tsx

@@ -1,4 +1,6 @@
-import { armordAccessionNumber, Color, mrsnId, ObjectId, RegexMatchedString } from "./global.types";
+import type { armordAccessionNumber, Color, mrsnId, ObjectId, RegexMatchedString } from "./global.types.js";
+import type { EdgeType } from "./link.types.js";
+import type { NodeType } from "./pie.types.js";
 
 export interface mstGlobalTypes {
     //form values
@@ -29,29 +31,6 @@ export type labelKey = typeof labelFields[number];
 
 
 
-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'.
-type DateType = string | Date  // must be able to be interpreted as date type by Date js object
-
-
-interface ExtraNodeTypeFields {
-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
-hover?:String, // [=""] //unique fieldfields \/ \/ list seperated by ', ' (only tier1 alleles for now)
-mrsnIds: String[] // for selection logic between table and node=
-}
-
-type NodeType = ExtraNodeTypeFields | Record<colorKey|dateKey, ColorType[]> | Record<labelKey, LabelType[]>;
-
-interface EdgeType {
-    source:string, //node _id edge to
-    target:string, //node _id edge from
-    value:number   //distance between source and target
-}
 
 type CustomDictEntry  = Record<colorKey|dateKey,Color> | Record<labelKey,string>;
 type CustomDict = Record<ObjectId,CustomDictEntry>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gps-global-types",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "types shared between front-end and back-end",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
     "react": "^19.1.1"
   },
   "devDependencies": {
+    "@types/d3": "^7.4.3",
     "typescript": "^5.9.2"
   }
 }

package/pie.types.tsx

@@ -1,6 +1,6 @@
-import { BaseType, Selection, SimulationNodeDatum } from "d3"
-import { ObjectId, Color, RegexMatchedString } from "./global.types"
-import { colorKey, dateKey, labelKey } from "./mst.types"
+import type { BaseType, Selection, SimulationNodeDatum } from "d3";
+import type { ObjectId, Color, RegexMatchedString } from "./global.types.tsx"
+import type  { colorKey, dateKey, labelKey } from "./mst.types.tsx"
 
 export interface ColorField {//TYPES OF GRAPH FIELDS ColorField datefields become colorFields but require additional processing  
     color: string, //  unique hex or rgb  of parameter