Add category to schema

bkeepers · bkeepers · commit dca7134ae966 · 2023-10-11T10:36:54.000-04:00
diff --git a/lib/schemas.js b/lib/schemas.js
@@ -14,7 +14,8 @@ const ajv = new Ajv({
   strict: true
 })
 addFormats(ajv)
-ajv.addKeyword('operator')
+ajv.addKeyword('symbol')
+ajv.addKeyword('category')
 
 // Delegate property access to the schema definition
 const DelegateToDefinition = {
diff --git a/schemas/Add.schema.json b/schemas/Add.schema.json
@@ -3,6 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Add.schema.json",
   "title": "Add",
   "description": "Add two values",
-  "operator": "+",
+  "symbol": "+",
+  "category": "Operation",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/All.schema.json b/schemas/All.schema.json
@@ -3,5 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/All.schema.json",
   "title": "All",
   "description": "Returns true if all of the expressions return true.",
+  "category": "Group",
+  "symbol": "&",
   "$ref": "schema.json#/definitions/arguments-n"
 }
diff --git a/schemas/Any.schema.json b/schemas/Any.schema.json
@@ -2,6 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://www.flippercloud.io/expressions/Any.schema.json",
   "title": "Any",
+  "category": "Group",
+  "symbol": "||",
   "description": "Returns true if any of the expressions return true.",
   "$ref": "schema.json#/definitions/arguments-n"
 }
diff --git a/schemas/Boolean.schema.json b/schemas/Boolean.schema.json
@@ -2,6 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://www.flippercloud.io/expressions/Boolean.schema.json",
   "title": "Boolean",
+  "category": "Cast",
+  "symbol": "!!",
   "description": "Cast a value to a boolean.",
   "$ref": "schema.json#/definitions/argument"
 }
diff --git a/schemas/Divide.schema.json b/schemas/Divide.schema.json
@@ -3,6 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Divide.schema.json",
   "title": "Divide",
   "description": "Divide two values",
-  "operator": "/",
+  "symbol": "÷",
+  "category": "Operation",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Duration.schema.json b/schemas/Duration.schema.json
@@ -4,6 +4,7 @@
   "title": "Duration",
   "description": "A period of time expressed as a number of seconds, minutes, hours, days, weeks, months, or years.",
   "type": "array",
+  "category": "Value",
   "items": [
     { "$ref": "schema.json#/definitions/number" },
     {
diff --git a/schemas/Equal.schema.json b/schemas/Equal.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Equal.schema.json",
   "title": "Equal",
   "description": "Compare two values for equality",
-  "operator": "==",
+  "symbol": "=",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/GreaterThan.schema.json b/schemas/GreaterThan.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThan.schema.json",
   "title": "GreaterThan",
   "description": "Compare if the first argument is > the second argument.",
-  "operator": ">",
+  "symbol": ">",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/GreaterThanOrEqualTo.schema.json b/schemas/GreaterThanOrEqualTo.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThanOrEqualTo.schema.json",
   "title": "GreaterThanOrEqualTo",
   "description": "Compare if the first argument is >= the second argument.",
-  "operator": ">=",
+  "symbol": "≥",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/LessThan.schema.json b/schemas/LessThan.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/LessThan.schema.json",
   "title": "LessThan",
   "description": "Compare if the first argument is < the second argument.",
-  "operator": "<",
+  "symbol": "<",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/LessThanOrEqualTo.schema.json b/schemas/LessThanOrEqualTo.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/LessThanOrEqualTo.schema.json",
   "title": "LessThanOrEqualTo",
   "description": "Compare if the first argument is < the second argument.",
-  "operator": "<=",
+  "symbol": "≤",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Max.schema.json b/schemas/Max.schema.json
@@ -3,5 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Max.schema.json",
   "title": "Max",
   "description": "Returns the maximum value in a list.",
+  "category": "Operation",
+  "symbol": "∨",
   "$ref": "schema.json#/definitions/arguments-n"
 }
diff --git a/schemas/Min.schema.json b/schemas/Min.schema.json
@@ -3,5 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Min.schema.json",
   "title": "Min",
   "description": "Returns the minimum value in a list.",
+  "category": "Operation",
+  "symbol": "∧",
   "$ref": "schema.json#/definitions/arguments-n"
 }
diff --git a/schemas/Multiply.schema.json b/schemas/Multiply.schema.json
@@ -3,6 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Multiply.schema.json",
   "title": "Multiply",
   "description": "Multiply two values",
-  "operator": "*",
+  "symbol": "×",
+  "category": "Operation",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/NotEqual.schema.json b/schemas/NotEqual.schema.json
@@ -3,6 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/NotEqual.schema.json",
   "title": "NotEqual",
   "description": "Compare two values for equality",
-  "operator": "!=",
+  "symbol": "≠",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Now.schema.json b/schemas/Now.schema.json
@@ -3,6 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Now.schema.json",
   "title": "Now",
   "description": "The current time in UTC",
+  "category": "Value",
   "type": "array",
   "maxItems": 0
 }
diff --git a/schemas/Number.schema.json b/schemas/Number.schema.json
@@ -3,5 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Number.schema.json",
   "title": "Number",
   "description": "Cast a value to a number.",
+  "category": "Cast",
+  "symbol": "#",
   "$ref": "schema.json#/definitions/argument"
 }
diff --git a/schemas/Percentage.schema.json b/schemas/Percentage.schema.json
@@ -3,6 +3,8 @@
   "$id": "https://www.flippercloud.io/expressions/Percentage.schema.json",
   "title": "Percentage",
   "description": "Cast a value to a percentage between 0 and 100.",
+  "category": "Cast",
+  "symbol": "%",
   "type": "array",
   "items": { "$ref": "schema.json#/definitions/number" },
   "minItems": 1,
diff --git a/schemas/Random.schema.json b/schemas/Random.schema.json
@@ -4,6 +4,13 @@
   "title": "Random",
   "description": "Return a random number",
   "type": "array",
-  "items": { "$ref": "schema.json#/definitions/number" },
+  "items": {
+    "title": "Maximum",
+    "description": "When max is an Integer, returns a random integer greater than or equal to zero and less than max.",
+    "anyOf": [
+      { "type": "number" },
+      { "$ref": "schema.json#/definitions/function" }
+    ]
+  },
   "maxItems": 1
 }
diff --git a/schemas/String.schema.json b/schemas/String.schema.json
@@ -3,5 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/String.schema.json",
   "title": "String",
   "description": "Cast a value to a string.",
+  "category": "Cast",
+  "symbol": "\"",
   "$ref": "schema.json#/definitions/argument"
 }
diff --git a/schemas/Subtract.schema.json b/schemas/Subtract.schema.json
@@ -3,6 +3,7 @@
   "$id": "https://www.flippercloud.io/expressions/Subtract.schema.json",
   "title": "Subtract",
   "description": "Subtract two values",
-  "operator": "-",
+  "category": "Operation",
+  "symbol": "-",
   "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Time.schema.json b/schemas/Time.schema.json
@@ -4,15 +4,13 @@
   "title": "Time",
   "description": "A time in ISO8601 format",
   "type": "array",
-  "items": { "$ref": "#/definitions/argument" },
+  "items": {
+    "title": "Time",
+    "anyOf": [
+      { "type": "string", "format": "date-time" },
+      { "$ref": "schema.json#/definitions/function" }
+    ]
+  },
   "minItems": 1,
-  "maxItems": 1,
-  "definitions": {
-    "argument": {
-      "anyOf": [
-        { "type": "string", "format": "date-time" },
-        { "$ref": "schema.json#/definitions/function" }
-      ]
-    }
-  }
+  "maxItems": 1
 }
diff --git a/schemas/schema.json b/schemas/schema.json
@@ -89,6 +89,7 @@
     "operation": {
       "title": "Operation",
       "description": "An array with exactly two expressions",
+      "category": "Condition",
       "type": "array",
       "items": { "$ref": "#" },
       "minItems": 2,

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Add.schema.json",`
`4`	`4`	`"title": "Add",`
`5`	`5`	`"description": "Add two values",`
`6`		`- "operator": "+",`
	`6`	`+ "symbol": "+",`
	`7`	`+ "category": "Operation",`
`7`	`8`	`"$ref": "schema.json#/definitions/operation"`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,7 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/All.schema.json",`
`4`	`4`	`"title": "All",`
`5`	`5`	`"description": "Returns true if all of the expressions return true.",`
	`6`	`+ "category": "Group",`
	`7`	`+ "symbol": "&",`
`6`	`8`	`"$ref": "schema.json#/definitions/arguments-n"`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`"$schema": "http://json-schema.org/draft-07/schema#",`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Any.schema.json",`
`4`	`4`	`"title": "Any",`
	`5`	`+ "category": "Group",`
	`6`	`+ "symbol": "\|\|",`
`5`	`7`	`"description": "Returns true if any of the expressions return true.",`
`6`	`8`	`"$ref": "schema.json#/definitions/arguments-n"`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Divide.schema.json",`
`4`	`4`	`"title": "Divide",`
`5`	`5`	`"description": "Divide two values",`
`6`		`- "operator": "/",`
	`6`	`+ "symbol": "÷",`
	`7`	`+ "category": "Operation",`
`7`	`8`	`"$ref": "schema.json#/definitions/operation"`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"title": "Duration",`
`5`	`5`	`"description": "A period of time expressed as a number of seconds, minutes, hours, days, weeks, months, or years.",`
`6`	`6`	`"type": "array",`
	`7`	`+ "category": "Value",`
`7`	`8`	`"items": [`
`8`	`9`	`{ "$ref": "schema.json#/definitions/number" },`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Equal.schema.json",`
`4`	`4`	`"title": "Equal",`
`5`	`5`	`"description": "Compare two values for equality",`
`6`		`- "operator": "==",`
	`6`	`+ "symbol": "=",`
`7`	`7`	`"$ref": "schema.json#/definitions/operation"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/GreaterThan.schema.json",`
`4`	`4`	`"title": "GreaterThan",`
`5`	`5`	`"description": "Compare if the first argument is > the second argument.",`
`6`		`- "operator": ">",`
	`6`	`+ "symbol": ">",`
`7`	`7`	`"$ref": "schema.json#/definitions/operation"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/GreaterThanOrEqualTo.schema.json",`
`4`	`4`	`"title": "GreaterThanOrEqualTo",`
`5`	`5`	`"description": "Compare if the first argument is >= the second argument.",`
`6`		`- "operator": ">=",`
	`6`	`+ "symbol": "≥",`
`7`	`7`	`"$ref": "schema.json#/definitions/operation"`
`8`	`8`	`}`