expressa 2.0.10 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",
@@ -17,7 +17,7 @@
     "jfs": "^0.3.0",
     "jsonwebtoken": "^9.0.0",
     "mongo-query": "^0.5.7",
-    "mongo-query-to-postgres-jsonb": "^0.2.9",
+    "mongo-query-to-postgres-jsonb": "^0.2.16",
     "mongo-querystring": "4.1.1",
     "mongodb": "^3.5.7",
     "on-finished": "^2.3.0",

package/util.js

@@ -37,8 +37,11 @@ const schemas = {}
 const schemaValidators = {}
 
 exports.addSchema = function(collection, schema) {
+  schema.$id = collection
+  ajv.removeSchema(collection)
   schemas[collection] = schema
   schemaValidators[collection] = ajv.compile(schema)
+  delete schema.$id
 }
 
 exports.validateSchema = function(collection, doc) {
@@ -53,6 +56,19 @@ exports.validateSchema = function(collection, doc) {
   return true
 }
 
+exports.validateSchemaProperty = function(collection, path, value) {
+  if (!schemaValidators[collection]) {
+    console.error(`missing schema validator for collection ${collection}`)
+    return true
+  }
+  const $ref = `${collection}#/properties/${path.split('.').join('/properties/')}`
+  const isValid = ajv.validate({ $ref }, value)
+  if (!isValid) {
+    throw new ApiError(400, ajv.errors.map((err) => `${err.instancePath} ${err.message}: ${JSON.stringify(err.params)}`).join(', '))
+  }
+  return true
+}
+
 exports.getSchemaProperty = function(collection, path) {
   const parts = path.split('.')
   let obj = schemas[collection]
@@ -203,11 +219,11 @@ exports.mongoToPostgres = mongoToPostgres
 // paging requires orderby to include a field that is known to be unique and constant
 // to ensure consistent results from database with offset and limit. Chosen field should
 // also represent a preferred ordering when doing final sort
-exports.orderByForPagedRequests = function(orderby, finalSortField = 'meta.created') {
+exports.orderByForPagedRequests = function(orderby, finalSortField = 'meta.created', finalSortDirection = 1) {
   orderby = exports.normalizeOrderBy(orderby || {})
   const allFields = orderby.map(([field]) => field)
   if (!allFields.includes(finalSortField)) {
-    orderby.push([finalSortField, 1])
+    orderby.push([finalSortField, finalSortDirection])
   }
   return orderby
 }