Add operator keyword to schemas

bkeepers · bkeepers · commit f4a8c34f9854 · 2023-04-12T08:49:56.000-04:00
diff --git a/lib/schemas.js b/lib/schemas.js
@@ -14,7 +14,7 @@ const ajv = new Ajv({
   strict: true
 })
 addFormats(ajv)
-
+ajv.addKeyword('operator')
 
 // Delegate property access to the schema definition
 const DelegateToDefinition = {
diff --git a/schemas/Add.schema.json b/schemas/Add.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Add.schema.json",
   "title": "Add",
   "description": "Add two values",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "+",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Divide.schema.json b/schemas/Divide.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Divide.schema.json",
   "title": "Divide",
   "description": "Divide two values",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "/",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Duration.schema.json b/schemas/Duration.schema.json
@@ -7,12 +7,11 @@
   "items": [
     { "$ref": "schema.json#/definitions/number" },
     {
-      "title": "Unit",
       "anyOf": [
         {
+          "title": "Unit",
           "type": "string",
-          "enum": ["seconds", "minutes", "hours", "days", "weeks", "months", "years"],
-          "default": "seconds"
+          "enum": ["seconds", "minutes", "hours", "days", "weeks", "months", "years"]
         },
         { "$ref": "schema.json#/definitions/function" }
       ]
diff --git a/schemas/Equal.schema.json b/schemas/Equal.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Equal.schema.json",
   "title": "Equal",
   "description": "Compare two values for equality",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "==",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/GreaterThan.schema.json b/schemas/GreaterThan.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThan.schema.json",
   "title": "GreaterThan",
   "description": "Compare if the first argument is > the second argument.",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": ">",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/GreaterThanOrEqualTo.schema.json b/schemas/GreaterThanOrEqualTo.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/GreaterThanOrEqualTo.schema.json",
   "title": "GreaterThanOrEqualTo",
   "description": "Compare if the first argument is >= the second argument.",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": ">=",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/LessThan.schema.json b/schemas/LessThan.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/LessThan.schema.json",
   "title": "LessThan",
   "description": "Compare if the first argument is < the second argument.",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "<",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/LessThanOrEqualTo.schema.json b/schemas/LessThanOrEqualTo.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/LessThanOrEqualTo.schema.json",
   "title": "LessThanOrEqualTo",
   "description": "Compare if the first argument is < the second argument.",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "<=",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Multiply.schema.json b/schemas/Multiply.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Multiply.schema.json",
   "title": "Multiply",
   "description": "Multiply two values",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "*",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/NotEqual.schema.json b/schemas/NotEqual.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/NotEqual.schema.json",
   "title": "NotEqual",
   "description": "Compare two values for equality",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "!=",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/Subtract.schema.json b/schemas/Subtract.schema.json
@@ -3,5 +3,6 @@
   "$id": "https://www.flippercloud.io/expressions/Subtract.schema.json",
   "title": "Subtract",
   "description": "Subtract two values",
-  "$ref": "schema.json#/definitions/arguments-two"
+  "operator": "-",
+  "$ref": "schema.json#/definitions/operation"
 }
diff --git a/schemas/schema.json b/schemas/schema.json
@@ -22,7 +22,8 @@
         },
         {
           "title": "Boolean",
-          "type": "boolean"
+          "type": "boolean",
+          "enum": [true, false]
         }
       ]
     },
@@ -82,8 +83,8 @@
       "items": { "$ref": "#" },
       "minItems": 0
     },
-    "arguments-two": {
-      "title": "Comparison",
+    "operation": {
+      "title": "Operation",
       "description": "An array with exactly two expressions",
       "type": "array",
       "items": { "$ref": "#" },

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Add.schema.json",`
`4`	`4`	`"title": "Add",`
`5`	`5`	`"description": "Add two values",`
`6`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "+",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Divide.schema.json",`
`4`	`4`	`"title": "Divide",`
`5`	`5`	`"description": "Divide two values",`
`6`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "/",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,11 @@`
`7`	`7`	`"items": [`
`8`	`8`	`{ "$ref": "schema.json#/definitions/number" },`
`9`	`9`	`{`
`10`		`- "title": "Unit",`
`11`	`10`	`"anyOf": [`
`12`	`11`	`{`
	`12`	`+ "title": "Unit",`
`13`	`13`	`"type": "string",`
`14`		`- "enum": ["seconds", "minutes", "hours", "days", "weeks", "months", "years"],`
`15`		`- "default": "seconds"`
	`14`	`+ "enum": ["seconds", "minutes", "hours", "days", "weeks", "months", "years"]`
`16`	`15`	`},`
`17`	`16`	`{ "$ref": "schema.json#/definitions/function" }`
`18`	`17`	`]`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +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`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "==",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +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`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": ">",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +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`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": ">=",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/LessThan.schema.json",`
`4`	`4`	`"title": "LessThan",`
`5`	`5`	`"description": "Compare if the first argument is < the second argument.",`
`6`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "<",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/LessThanOrEqualTo.schema.json",`
`4`	`4`	`"title": "LessThanOrEqualTo",`
`5`	`5`	`"description": "Compare if the first argument is < the second argument.",`
`6`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "<=",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"$id": "https://www.flippercloud.io/expressions/Multiply.schema.json",`
`4`	`4`	`"title": "Multiply",`
`5`	`5`	`"description": "Multiply two values",`
`6`		`- "$ref": "schema.json#/definitions/arguments-two"`
	`6`	`+ "operator": "*",`
	`7`	`+ "$ref": "schema.json#/definitions/operation"`
`7`	`8`	`}`