fix some schema errors

mcnuttandrew · Feb 5, 2024 · 3f6a4e6 · 3f6a4e6
1 parent 8bcdbaa
commit 3f6a4e6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 110 deletions.
diff --git a/public/lint-schema.json b/public/lint-schema.json
@@ -1,22 +1,13 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
-    "properties": {
+    "definitions": {
         "LintProgram": {
             "$ref": "#/definitions/LintExpression"
         },
-        "LintExpression": {
-            "$ref": "#/definitions/LintExpression"
-        },
-        "LintConjunction": {
-            "$ref": "#/definitions/LintConjunction"
-        },
         "LintBoolean": {
             "type": "boolean"
         },
-        "LintVariable": {
-            "type": "string"
-        },
         "LintColor": {
             "anyOf": [
                 {
@@ -281,22 +272,6 @@
                 "v"
             ]
         },
-        "LintRef": {
-            "anyOf": [
-                {
-                    "$ref": "#/definitions/LintVariable"
-                },
-                {
-                    "$ref": "#/definitions/LintValue"
-                },
-                {
-                    "$ref": "#/definitions/LintMathOps"
-                },
-                {
-                    "$ref": "#/definitions/LintPairOps"
-                }
-            ]
-        },
         "LintComparisonBase": {
             "type": "object",
             "properties": {
@@ -453,32 +428,6 @@
                 }
             ]
         },
-        "LintQuantifier": {
-            "anyOf": [
-                {
-                    "type": "object",
-                    "properties": {
-                        "all": {
-                            "$ref": "#/definitions/LintQuantifierBase"
-                        }
-                    },
-                    "required": [
-                        "all"
-                    ]
-                },
-                {
-                    "type": "object",
-                    "properties": {
-                        "exist": {
-                            "$ref": "#/definitions/LintQuantifierBase"
-                        }
-                    },
-                    "required": [
-                        "exist"
-                    ]
-                }
-            ]
-        },
         "LintMapAlt": {
             "type": "object",
             "properties": {
@@ -531,9 +480,7 @@
                     "$ref": "#/definitions/LintColorFunction"
                 }
             ]
-        }
-    },
-    "definitions": {
+        },
         "LintExpression": {
             "anyOf": [
                 {
@@ -550,6 +497,25 @@
                 }
             ]
         },
+        "LintVariable": {
+            "type": "string"
+        },
+        "LintRef": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/LintVariable"
+                },
+                {
+                    "$ref": "#/definitions/LintValue"
+                },
+                {
+                    "$ref": "#/definitions/LintMathOps"
+                },
+                {
+                    "$ref": "#/definitions/LintPairOps"
+                }
+            ]
+        },
         "LintConjunction": {
             "anyOf": [
                 {

diff --git a/src/lib/lint-language/lint-schema.json b/src/lib/lint-language/lint-schema.json
@@ -1,22 +1,13 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
-    "properties": {
+    "definitions": {
         "LintProgram": {
             "$ref": "#/definitions/LintExpression"
         },
-        "LintExpression": {
-            "$ref": "#/definitions/LintExpression"
-        },
-        "LintConjunction": {
-            "$ref": "#/definitions/LintConjunction"
-        },
         "LintBoolean": {
             "type": "boolean"
         },
-        "LintVariable": {
-            "type": "string"
-        },
         "LintColor": {
             "anyOf": [
                 {
@@ -281,22 +272,6 @@
                 "v"
             ]
         },
-        "LintRef": {
-            "anyOf": [
-                {
-                    "$ref": "#/definitions/LintVariable"
-                },
-                {
-                    "$ref": "#/definitions/LintValue"
-                },
-                {
-                    "$ref": "#/definitions/LintMathOps"
-                },
-                {
-                    "$ref": "#/definitions/LintPairOps"
-                }
-            ]
-        },
         "LintComparisonBase": {
             "type": "object",
             "properties": {
@@ -453,32 +428,6 @@
                 }
             ]
         },
-        "LintQuantifier": {
-            "anyOf": [
-                {
-                    "type": "object",
-                    "properties": {
-                        "all": {
-                            "$ref": "#/definitions/LintQuantifierBase"
-                        }
-                    },
-                    "required": [
-                        "all"
-                    ]
-                },
-                {
-                    "type": "object",
-                    "properties": {
-                        "exist": {
-                            "$ref": "#/definitions/LintQuantifierBase"
-                        }
-                    },
-                    "required": [
-                        "exist"
-                    ]
-                }
-            ]
-        },
         "LintMapAlt": {
             "type": "object",
             "properties": {
@@ -531,9 +480,7 @@
                     "$ref": "#/definitions/LintColorFunction"
                 }
             ]
-        }
-    },
-    "definitions": {
+        },
         "LintExpression": {
             "anyOf": [
                 {
@@ -550,6 +497,25 @@
                 }
             ]
         },
+        "LintVariable": {
+            "type": "string"
+        },
+        "LintRef": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/LintVariable"
+                },
+                {
+                    "$ref": "#/definitions/LintValue"
+                },
+                {
+                    "$ref": "#/definitions/LintMathOps"
+                },
+                {
+                    "$ref": "#/definitions/LintPairOps"
+                }
+            ]
+        },
         "LintConjunction": {
             "anyOf": [
                 {