Simplfy schemas by making implementation cast function arguments to array

Author: bkeepers

examples/All.json

@@ -28,10 +28,13 @@
       "expression": { "All": [{ "Boolean": true }, { "Property": "admin" }] },
       "context": { "properties": { "admin": true } },
       "result": { "enum": [true] }
+    },
+    {
+      "expression": { "All": null },
+      "result": { "enum": [true] }
     }
   ],
   "invalid": [
-    { "All": null },
     { "All": [], "Any": [] }
   ]
 }

examples/Any.json

@@ -32,10 +32,13 @@
       "expression": { "Any": [{ "Boolean": false }, { "Property": "admin" }] },
       "context": { "properties": { "admin": true } },
       "result": { "enum": [true] }
+    },
+    {
+      "expression": { "Any": null },
+      "result": { "enum": [false] }
     }
   ],
   "invalid": [
-    { "Any": null },
     { "Any": [], "All": [] }
   ]
 }

examples/Durations.json renamed to examples/Duration.json

@@ -27,11 +27,17 @@
     {
       "expression": { "Duration": [2, "years"] },
       "result": { "enum": [63113904] }
+    },
+    {
+      "expression": { "Duration": 2 },
+      "result": { "enum": [2] }
+    },
+    {
+      "expression": { "Duration": [2] },
+      "result": { "enum": [2] }
     }
   ],
   "invalid": [
-    { "Duration": 2 },
-    { "Duration": [2] },
     { "Duration": [4, "score"] }
   ]
 }

examples/Max.json

@@ -4,6 +4,10 @@
       "expression": { "Max": [] },
       "result": { "enum": [null] }
     },
+    {
+      "expression": { "Max": null },
+      "result": { "enum": [null] }
+    },
     {
       "expression": { "Max": [3, 2, 1] },
       "result": { "enum": [3] }
@@ -26,7 +30,6 @@
     }
   ],
   "invalid": [
-    { "Max": null },
     { "Max": [], "Any": [] }
   ]
 }

examples/Min.json

@@ -4,6 +4,10 @@
       "expression": { "Min": [] },
       "result": { "enum": [null] }
     },
+    {
+      "expression": { "Min": null },
+      "result": { "enum": [null] }
+    },
     {
       "expression": { "Min": [3, 2, 1] },
       "result": { "enum": [1] }
@@ -26,7 +30,6 @@
     }
   ],
   "invalid": [
-    { "Min": null },
     { "Min": [], "Any": [] }
   ]
 }

examples/Now.json

@@ -4,13 +4,16 @@
       "expression": { "Now": [] },
       "result": { "format": "date-time" }
     },
+    {
+      "expression": { "Now": null },
+      "result": { "format": "date-time" }
+    },
     {
       "expression": { "String": {"Now": []} },
       "result": { "pattern": "UTC$" }
     }
   ],
   "invalid": [
-    { "Now": null },
     { "Now": [1] },
     { "Now": 1 }
   ]

examples/Random.json

@@ -4,6 +4,10 @@
       "expression":  { "Random": [] },
       "result": { "type": "float", "minimum": 0, "maximum": 1 }
     },
+    {
+      "expression":  { "Random": null },
+      "result": { "type": "float", "minimum": 0, "maximum": 1 }
+    },
     {
       "expression":  { "Random": 2 },
       "result": { "type": "integer", "minimum": 0, "maximum": 1 }
@@ -19,7 +23,6 @@
     }
   ],
   "invalid": [
-    { "Random": null },
     { "Random": [1, 2] }
   ]
 }

lib/index.js

@@ -1,3 +1,3 @@
 export { default as schemas } from '../schemas'
-export { default as validator } from './validator'
+export { default as validate } from './validate'
 export { default as examples } from '../examples'

lib/validate.js

@@ -0,0 +1,34 @@
+import Ajv from 'ajv'
+import addFormats from 'ajv-formats'
+import schemas from '../schemas'
+
+const ajv = new Ajv({
+  schemas: Object.values(schemas),
+  useDefaults: true,
+  allErrors: true
+})
+addFormats(ajv)
+const validator = ajv.getSchema(schemas.default.$id)
+
+function coerceArgsToArray(object) {
+  if (object && typeof object === 'object') {
+    return Object.fromEntries(Object.entries(object).map(([key, value]) => {
+      if(value === null) {
+        value = []
+      } else if(!Array.isArray(value)){
+        value = [value]
+      }
+
+      return [key, value.map(coerceArgsToArray)]
+    }))
+  } else {
+    return object
+  }
+}
+
+export default (input) => {
+  const result = coerceArgsToArray(input)
+  const valid = validator(result)
+  const errors = validator.errors
+  return { valid, errors, result }
+}