Shuffle around somethings in schema.json and rename defs

Author: bkeepers

schemas/All.schema.json

@@ -2,8 +2,5 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://www.flippercloud.io/expressions/All.schema.json",
   "title": "All",
-  "oneOf": [
-    { "$ref": "schema.json#/$defs/expression" },
-    { "type": "array", "items": { "$ref": "schema.json#/$defs/expression" } }
-  ]
+  "$ref": "schema.json#/$defs/arguments(n)"
 }

schemas/Any.schema.json

@@ -2,8 +2,5 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://www.flippercloud.io/expressions/Any.schema.json",
   "title": "Any",
-  "oneOf": [
-    { "$ref": "schema.json#/$defs/expression" },
-    { "type": "array", "items": { "$ref": "schema.json#/$defs/expression" } }
-  ]
+  "$ref": "schema.json#/$defs/arguments(n)"
 }

schemas/Equal.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/Equal.schema.json",
   "title": "Equal",
   "description": "Compare two values for equality",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/GreaterThan.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThan.schema.json",
   "title": "GreaterThan",
   "description": "Compare if the first argument is > the second argument.",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/GreaterThanOrEqualTo.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThanOrEqualTo.schema.json",
   "title": "GreaterThanOrEqualTo",
   "description": "Compare if the first argument is >= the second argument.",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/LessThan.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/LessThan.schema.json",
   "title": "LessThan",
   "description": "Compare if the first argument is < the second argument.",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/LessThanOrEqualTo.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/LessThanOrEqualTo.schema.json",
   "title": "LessThanOrEqualTo",
   "description": "Compare if the first argument is < the second argument.",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/NotEqual.schema.json

@@ -3,5 +3,5 @@
   "$id": "https://www.flippercloud.io/expressions/NotEqual.schema.json",
   "title": "NotEqual",
   "description": "Compare two values for equality",
-  "$ref": "schema.json#/$defs/comparison"
+  "$ref": "schema.json#/$defs/arguments(<=>)"
 }

schemas/schema.json

@@ -6,40 +6,16 @@
   "$ref": "#/$defs/expression",
   "$defs": {
     "expression": {
+      "description": "An expression can be a function or a constant (string, boolean, or number)",
       "oneOf": [
         { "$ref": "#/$defs/function" },
         { "type": "string" },
         { "type": "boolean" },
         { "type": "number" }
       ]
     },
-    "string": {
-      "oneOf": [
-        { "$ref": "#/$defs/function" },
-        { "type": "string" }
-      ]
-    },
-    "number": {
-      "oneOf": [
-        { "$ref": "#/$defs/function" },
-        { "type": "number" }
-      ]
-    },
-    "argument": {
-      "$comment": "Allow a single expression or an array with a single expression",
-      "oneOf": [
-        { "$ref": "#/$defs/expression" },
-        { "type": "array", "items": { "$ref": "#/$defs/expression" }, "maxItems": 1 }
-      ]
-    },
-    "comparison": {
-      "$comment": "An array with exactly two expressions",
-      "type": "array",
-      "items": { "$ref": "#/$defs/expression" },
-      "maxItems": 2,
-      "minItems": 2
-    },
     "function": {
+      "description": "A function is an object with a single property that is the name of the function and the value is the arguments to the function",
       "type": "object",
       "maxProperties": 1,
       "minProperties": 1,
@@ -64,6 +40,41 @@
         "Time": { "$ref": "Time.schema.json" }
       },
       "additionalProperties": false
+    },
+    "string": {
+      "description": "A constant string value or a function that returns a string",
+      "oneOf": [
+        { "$ref": "#/$defs/function" },
+        { "type": "string" }
+      ]
+    },
+    "number": {
+      "description": "A constant numeric value or a function that returns a number",
+      "oneOf": [
+        { "$ref": "#/$defs/function" },
+        { "type": "number" }
+      ]
+    },
+    "arguments(n)": {
+      "description": "A single expression or an array of expressions",
+      "oneOf": [
+        { "$ref": "#/$defs/expression" },
+        { "type": "array", "items": { "$ref": "#/$defs/expression" } }
+      ]
+    },
+    "argument": {
+      "description": "A single expression or an array with at most one expression",
+      "oneOf": [
+        { "$ref": "#/$defs/expression" },
+        { "type": "array", "items": { "$ref": "#/$defs/expression" }, "maxItems": 1 }
+      ]
+    },
+    "arguments(<=>)": {
+      "description": "An array with exactly two expressions",
+      "type": "array",
+      "items": { "$ref": "#/$defs/expression" },
+      "maxItems": 2,
+      "minItems": 2
     }
   }
 }