Merge pull request #137 from TripSit/schema-validation

Schema validation
TripSit · Apr 22, 2024 · 18a0335 · 18a0335
2 parents 28fbe43 + cb04c61
commit 18a0335
Show file tree

Hide file tree

Showing 10 changed files with 269 additions and 207 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,6 +8,7 @@ combo_definitions.json @utaninja @zelixir25
 /translations @LunaUrsa
 /types/ @LunaUrsa
 .gitignore @LunaUrsa
+package-lock.json @LunaUrsa
 package.json @LunaUrsa
 README.md @LunaUrsa
 tsconfig.json @LunaUrsa
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -2,9 +2,6 @@ name: Validate changes
 
 on:
   pull_request:
-    branches:
-      - main
-      - development
     types:
       - opened
       - synchronize
@@ -29,3 +26,14 @@ jobs:
       run: npx ts-node ./scripts/combosToDrugs.ts --github-check
       env:
         CI: true
+
+    - name: Assign Pull Request
+      uses: actions/github-script@v5
+      with:
+        script: |
+          github.rest.issues.addAssignees({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.issue.number,
+            assignees: ['LunaUrsa']
+          })
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -652,6 +652,7 @@
     "tsbuildinfo",
     "Tyramine",
     "uneccessary",
+    "utaninja",
     "Valproic",
     "Vapaatalo",
     "vapourised",
@@ -666,6 +667,7 @@
     "Xanax",
     "xaxis",
     "yage",
+    "zelixir",
     "zyban",
     "αphp",
     "αpvp"

diff --git a/drugs.json b/drugs.json
@@ -32049,7 +32049,7 @@
       ],
       "dose": "Intravenously Light: 10-30mg Common: 30-60mg Strong: 60-100mg | Note: Do not take this as gospel. Please read ~experiences if you use this substance outside of a hospital setting.",
       "duration": "Intravenous: 10-20 minutes.",
-      "experiences": "https://www.reddit.com/r/Drugs/comments/56n5vq/michael_jackson_the_addict/d8l0qe7 (PM Sleep/Hypnos if you'd like more information)",
+      "experiences": "https://www.reddit.com/r/Drugs/comments/56n5vq/michael_jackson_the_addict/d8l0qe7",
       "onset": "Intravenous: 0-2 minutes.",
       "summary": "A very short acting sedative that is usually given at the start of general anesthesia, and for maintenance of the prior. It should never be used outside of a medical setting. With that in mind, if you do plan to use this drug recreational, please have a very experienced friend with you that has the skills to insert a cannula, and monitor you very closely."
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "tripsit_drug_db",
   "version": "1.0.2",
   "description": "TripSit's Drug Database",
-  "main": "index.ts",
+  "main": "./scripts/index.ts",
   "scripts": {
     "compare": "ts-node ./scripts/combosToDrugs.ts"
   },
@@ -28,6 +28,8 @@
   "homepage": "https://github.com/TripSit/drugs#readme",
   "types": "types/drugs.d.ts",
   "devDependencies": {
+    "ajv": "^8.12.0",
+    "ajv-formats": "^3.0.1",
     "@types/node": "^20.11.10",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"

diff --git a/schemas/combo_definitions-schema.json b/schemas/combo_definitions-schema.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "array",
     "items": {
         "$ref": "#/definitions/ComboDefinition"

diff --git a/schemas/combos-schema.json b/schemas/combos-schema.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/Combos",
     "definitions": {
         "Combos": {

diff --git a/schemas/drugs-schema.json b/schemas/drugs-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "additionalProperties": {
       "$ref": "#/definitions/Drug"
@@ -55,10 +55,7 @@
                   "type": "object",
                   "additionalProperties": {
                       "type": "string",
-                      "format": "uri",
-                      "qt-uri-protocols": [
-                          "https"
-                      ]
+                      "format": "uri"
                   }
               },
               "dose_note": {
@@ -305,33 +302,15 @@
           "properties": {
               "experiences": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "https"
-                  ],
-                  "qt-uri-extensions": [
-                      ".shtml"
-                  ]
+                  "format": "uri"
               },
               "pihkal": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "https"
-                  ],
-                  "qt-uri-extensions": [
-                      ".shtml"
-                  ]
+                  "format": "uri"
               },
               "tihkal": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "https"
-                  ],
-                  "qt-uri-extensions": [
-                      ".shtml"
-                  ]
+                  "format": "uri"
               }
           },
           "required": [
@@ -381,14 +360,7 @@
               },
               "experiences": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "https"
-                  ],
-                  "qt-uri-extensions": [
-                      ".php",
-                      ".shtml"
-                  ]
+                  "format": "uri"
               },
               "warning": {
                   "type": "string"
@@ -413,10 +385,7 @@
               },
               "wiki": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "http"
-                  ]
+                  "format": "uri"
               },
               "mdma": {
                   "type": "string"
@@ -462,34 +431,18 @@
               },
               "molecule": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "http"
-                  ],
-                  "qt-uri-extensions": [
-                      ".jpg",
-                      ".png"
-                  ]
+                  "format": "uri"
               },
               "vaporization": {
                   "type": "string"
               },
               "calculator": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "http"
-                  ]
+                  "format": "uri"
               },
               "chart": {
                   "type": "string",
-                  "format": "uri",
-                  "qt-uri-protocols": [
-                      "http"
-                  ],
-                  "qt-uri-extensions": [
-                      ".png"
-                  ]
+                  "format": "uri"
               },
               "Oral": {
                   "type": "string"
@@ -569,65 +522,35 @@
               "_general": {
                   "type": "array",
                   "items": {
-                      "type": "string",
-                      "qt-uri-protocols": [
-                          "http",
-                          "https"
-                      ]
+                      "type": "string"
                   }
               },
               "dose": {
                   "type": "array",
                   "items": {
                       "type": "string",
-                      "format": "uri",
-                      "qt-uri-protocols": [
-                          "http"
-                      ],
-                      "qt-uri-extensions": [
-                          ".full"
-                      ]
+                      "format": "uri"
                   }
               },
               "duration": {
                   "type": "array",
                   "items": {
                       "type": "string",
-                      "format": "uri",
-                      "qt-uri-protocols": [
-                          "http"
-                      ],
-                      "qt-uri-extensions": [
-                          ".full"
-                      ]
+                      "format": "uri"
                   }
               },
               "bioavailability": {
                   "type": "array",
                   "items": {
                       "type": "string",
-                      "format": "uri",
-                      "qt-uri-protocols": [
-                          "https"
-                      ]
+                      "format": "uri"
                   }
               },
               "legality": {
                   "type": "array",
                   "items": {
                       "type": "string",
-                      "format": "uri",
-                      "qt-uri-protocols": [
-                          "http",
-                          "https"
-                      ],
-                      "qt-uri-extensions": [
-                          ".asp",
-                          ".aspx",
-                          ".cfm",
-                          ".html",
-                          ".pdf"
-                      ]
+                      "format": "uri"
                   }
               },
               "onset": {