Updating-typings

Merge into one file and update
TripSit · Apr 27, 2024 · 5fb6cb5 · 5fb6cb5
2 parents 18a0335 + 80c2830
commit 5fb6cb5
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 135 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tripsit_drug_db",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "TripSit's Drug Database",
   "main": "./scripts/index.ts",
   "scripts": {
@@ -26,7 +26,7 @@
     "url": "https://github.com/TripSit/drugs/issues"
   },
   "homepage": "https://github.com/TripSit/drugs#readme",
-  "types": "types/drugs.d.ts",
+  "types": "types/tripsit.d.ts",
   "devDependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",

diff --git a/scripts/combosToDrugs.ts b/scripts/combosToDrugs.ts
@@ -23,8 +23,7 @@ The steps to achieve this are:
 
 import fs from 'fs/promises';
 import path from 'path';
-import { Combo, Drug } from '../types/drugs';
-import { ComboData, Combos, Interactions } from '../types/combos';
+import { Drug, ComboData, Combos, Interactions } from '../types/tripsit';
 import drugsData from '../drugs.json';
 import combosData from '../combos.json';
 import { log } from 'console';
@@ -113,7 +112,7 @@ function schemaValidated(): boolean {
     log(`Drugs.json is valid!`)
   }
 
-  const comboSchema: JSONSchemaType<Combo> = JSON.parse(fsSync.readFileSync(
+  const comboSchema: JSONSchemaType<ComboData> = JSON.parse(fsSync.readFileSync(
     path.join(__dirname, '..', 'schemas', 'combos-schema.json'), 'utf8'));
 
   const comboValidate = ajv.compile(comboSchema);
@@ -223,7 +222,7 @@ async function compareData(): Promise<boolean> {
           pretty_name: drugAName.slice(0, 1).toUpperCase() + drugAName.slice(1),
           properties: {},
           combos: {
-            [drugBName]: interaction as Combo
+            [drugBName]: interaction
           }
         };
         dataMatches = false;
@@ -239,12 +238,12 @@ async function compareData(): Promise<boolean> {
 
       // Need to declare the type for drugACombos
       const drugACombos = drugData[drugAName].combos as {
-        [key: string]: Combo;
+        [key: string]: ComboData;
       };
 
       // If the combo interaction does not exist, create it
       if (!drugACombos[drugBName]) {
-        drugACombos[drugBName] = interaction as Combo;
+        drugACombos[drugBName] = interaction;
         dataMatches = false;
         log(`+ ${drugBName} + ${drugAName}`);
       }
@@ -255,7 +254,7 @@ async function compareData(): Promise<boolean> {
         log(`combo.json: ${JSON.stringify(interaction)}`);
         log(`drugs.json: ${JSON.stringify(drugACombos[drugBName])}`);
         // Update the drugBInfo with the new data from interaction
-        drugACombos[drugBName] = interaction as Combo;
+        drugACombos[drugBName] = interaction;
         dataMatches = false;
       }
     });

diff --git a/scripts/index.ts b/scripts/index.ts
@@ -1,4 +1,6 @@
 import drugs from '../drugs.json';
 import drugsSchema from '../schemas/drugs-schema.json';
+import combos from '../combos.json';
+import combosSchema from '../schemas/combos-schema.json';
 
-export { drugs, drugsSchema };
+export { drugs, drugsSchema, combos, combosSchema};
diff --git a/types/combo_definitions.d.ts b/types/combo_definitions.d.ts
diff --git a/types/combos.d.ts b/types/combos.d.ts
diff --git a/types/drugs.d.ts → types/tripsit.d.ts b/types/drugs.d.ts → types/tripsit.d.ts
@@ -13,7 +13,7 @@ export type Drug = {
   pweffects?: { [key: string]: string };
   dose_note?: string;
   sources?: Sources;
-  combos?: { [key: string]: Combo };
+  combos?: Interactions;
 };
 
 export enum Category {
@@ -36,15 +36,27 @@ export enum Category {
   Tentative = "tentative",
 }
 
-export type Dosage = {
-  common?: string;
-  light?: string;
-  strong?: string;
-  threshold?: string;
-  heavy?: string;
-  dangerous?: string;
-  fatal?: string;
-  note?: string;
+export type Duration = {
+  _unit: Unit;
+  value?: string;
+  insufflated?: string;
+  oral?: string;
+  rectal?: string;
+  vapourized?: string;
+  smoked?: string;
+  Oral_ER?: string;
+  Oral_IR?: string;
+  Oral_MAOI?: string;
+  intramuscular?: string;
+  intravenous?: string;
+  metabolites?: string;
+  parent?: string;
+  oralMAOI?: string;
+  buccal?: string;
+  transdermal?: string;
+  sublingual?: string;
+  Insufflated_IR?: string;
+  Insufflated_XR?: string;
 };
 
 export type Dose = {
@@ -69,27 +81,15 @@ export type Dose = {
   wet?: Dosage;
 };
 
-export type Duration = {
-  _unit: Unit;
-  value?: string;
-  insufflated?: string;
-  oral?: string;
-  rectal?: string;
-  vapourized?: string;
-  smoked?: string;
-  Oral_ER?: string;
-  Oral_IR?: string;
-  Oral_MAOI?: string;
-  intramuscular?: string;
-  intravenous?: string;
-  metabolites?: string;
-  parent?: string;
-  oralMAOI?: string;
-  buccal?: string;
-  transdermal?: string;
-  sublingual?: string;
-  Insufflated_IR?: string;
-  Insufflated_XR?: string;
+export type Dosage = {
+  common?: string;
+  light?: string;
+  strong?: string;
+  threshold?: string;
+  heavy?: string;
+  dangerous?: string;
+  fatal?: string;
+  note?: string;
 };
 
 export type Links = {
@@ -141,25 +141,100 @@ export type Properties = {
   potentiators?: string;
 };
 
-export type Combo = {
+export interface Combos {
+  "2c-t-x":         Interactions;
+  "2c-x":           Interactions;
+  "5-meo-xxt":      Interactions;
+  alcohol:          Interactions;
+  amphetamines:     Interactions;
+  amt:              Interactions;
+  benzodiazepines:  Interactions;
+  caffeine:         Interactions;
+  cannabis:         Interactions;
+  cocaine:          Interactions;
+  diphenhydramine:  Interactions;
+  dextromethorphan: Interactions;
+  dmt:              Interactions;
+  dox:              Interactions;
+  "ghb/gbl":        Interactions;
+  ketamine:         Interactions;
+  lithium:          Interactions;
+  lsd:              Interactions;
+  maois:            Interactions;
+  mdma:             Interactions;
+  mephedrone:       Interactions;
+  mescaline:        Interactions;
+  mushrooms:        Interactions;
+  mxe:              Interactions;
+  nbomes:           Interactions;
+  nitrous:          Interactions;
+  opioids:          Interactions;
+  pcp:              Interactions;
+  ssris:            Interactions;
+  tramadol:         Interactions;
+}
+
+export interface Interactions {
+  "2c-t-x"?:         ComboData;
+  "2c-x"?:           ComboData;
+  "5-meo-xxt"?:      ComboData;
+  alcohol?:          ComboData;
+  amphetamines?:     ComboData;
+  amt?:              ComboData;
+  benzodiazepines?:  ComboData;
+  caffeine?:         ComboData;
+  cannabis?:         ComboData;
+  cocaine?:          ComboData;
+  diphenhydramine?:  ComboData;
+  dextromethorphan?: ComboData;
+  dmt?:              ComboData;
+  dox?:              ComboData;
+  "ghb/gbl"?:        ComboData;
+  lithium?:          ComboData;
+  ketamine?:         ComboData;
+  lsd?:              ComboData;
+  maois?:            ComboData;
+  mdma?:             ComboData;
+  mephedrone?:       ComboData;
+  mescaline?:        ComboData;
+  mushrooms?:        ComboData;
+  mxe?:              ComboData;
+  nbomes?:           ComboData;
+  nitrous?:          ComboData;
+  opioids?:          ComboData;
+  pcp?:              ComboData;
+  ssris?:            ComboData;
+  tramadol?:         ComboData;
+}
+
+export interface ComboData {
   note?: string;
   sources?: {
     author: string;
     title: string;
     url: string;
   }[];
   status: Status;
-};
+}
 
 export enum Status {
   Caution = "Caution",
   Dangerous = "Dangerous",
   LowRiskDecrease = "Low Risk & Decrease",
   LowRiskNoSynergy = "Low Risk & No Synergy",
   LowRiskSynergy = "Low Risk & Synergy",
+  Self = "Self",
   Unsafe = "Unsafe",
 }
 
+export type ComboDefinitions = {
+  status:     Status;
+  emoji:      string;
+  color:      string;
+  definition: string;
+  thumbnail:  string;
+}
+
 export enum Unit {
   Hours = "hours",
   Minutes = "minutes",