fix: update and improve schemas

williamdes · Mar 23, 2024 · a0cb494 · a0cb494
1 parent edc6964
commit a0cb494
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/schemas/merged-raw.json b/schemas/merged-raw.json
@@ -9,6 +9,7 @@
             "patternProperties": {
                 "^([a-zA-Z_]+)": {
                     "type": "object",
+                    "required": ["name", "ids"],
                     "properties": {
                         "name": {
                             "type": "string",
@@ -35,6 +36,7 @@
                             "items": {
                                 "type": "object",
                                 "additionalProperties": false,
+                                "required": ["anchor", "url"],
                                 "properties": {
                                     "anchor": {
                                         "type": "string",
@@ -61,6 +63,7 @@
                         "range": {
                             "type": "object",
                             "additionalProperties": false,
+                            "required": [],
                             "properties": {
                                 "from": {
                                     "type": "number"

diff --git a/schemas/merged-slim.json b/schemas/merged-slim.json
@@ -3,12 +3,14 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
     "definitions": {},
+    "required": ["vars", "version", "urls"],
     "properties": {
         "vars": {
             "type": "object",
             "patternProperties": {
                 "^([a-zA-Z_]+)": {
                     "type": "object",
+                    "required": ["name", "ids"],
                     "properties": {
                         "name": {
                             "type": "string",
@@ -50,6 +52,7 @@
                         "range": {
                             "type": "object",
                             "additionalProperties": false,
+                            "required": [],
                             "properties": {
                                 "from": {
                                     "type": "number"
@@ -70,6 +73,7 @@
                         "validValues": {
                             "type": "array",
                             "additionalItems": false,
+                            "minItems": 1,
                             "items": {
                                 "type": [ "string", "number"]
                             }
@@ -89,12 +93,6 @@
             "items": {
                 "$ref": "doc-url.json"
             }
-        },
-        "types": {
-            "$ref": "linked-key-var.json"
-        },
-        "varTypes": {
-            "$ref": "linked-key-var.json"
         }
     },
     "additionalProperties": false

diff --git a/schemas/merged-ultraslim.json b/schemas/merged-ultraslim.json
@@ -3,6 +3,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
     "definitions": {},
+    "required": ["vars", "version", "urls", "types", "varTypes"],
     "properties": {
         "vars": {
             "$id": "/properties/vars",
@@ -22,6 +23,7 @@
                             "additionalItems": false,
                             "items": {
                                 "type": "object",
+                                "required": ["u", "t"],
                                 "properties": {
                                     "a": {
                                         "type": "string"
@@ -30,7 +32,8 @@
                                         "type": "integer"
                                     },
                                     "t": {
-                                        "type": "integer"
+                                        "type": "integer",
+                                        "enum": [1, 2, 3]
                                     }
                                 },
                                 "additionalProperties": false