expressa 2.0.8 → 2.0.10

package/controllers/collections.js

@@ -101,7 +101,7 @@ exports.get = async function (req) {
     }
     req.query.pageitems = parseInt(req.query.pageitems) || parseInt(req.query.limit) || 10
     req.query.offset = util.getDatabaseOffset(req.query.page, req.query.pageitems)
-    req.query.orderby = req.query.orderby || util.normalizeOrderBy({ 'meta.created': 1 }) // paging requires orderby to ensure consistent results with offset and limit
+    req.query.orderby = util.orderByForPagedRequests(req.query.orderby)
     delete req.query.limit
     delete req.query.skip
     let pageData, totalItems

package/modules/admin/package.json

@@ -72,7 +72,7 @@
     "sass-loader": "7.0.3",
     "script-ext-html-webpack-plugin": "^2.1.5",
     "semver": "5.5.0",
-    "shelljs": "0.8.2",
+    "shelljs": "0.8.5",
     "svg-sprite-loader": "3.8.0",
     "svgo": "^1.3.2",
     "terser-webpack-plugin": "^2.2.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",

package/util.js

@@ -53,6 +53,19 @@ exports.validateSchema = function(collection, doc) {
   return true
 }
 
+exports.getSchemaProperty = function(collection, path) {
+  const parts = path.split('.')
+  let obj = schemas[collection]
+  for (const part of parts) {
+    if (obj.properties && obj.properties[part]) {
+      obj = obj.properties[part]
+    } else {
+      return
+    }
+  }
+  return obj
+}
+
 exports.orderBy = function (data, orderby) {
   data.sort(function compare (a, b) {
     for (let i = 0; i < orderby.length; i++) {
@@ -185,6 +198,20 @@ exports.mongoUpdate = function(doc, update) {
   return mongoQuery(doc, {}, update)
 }
 
+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') {
+  orderby = exports.normalizeOrderBy(orderby || {})
+  const allFields = orderby.map(([field]) => field)
+  if (!allFields.includes(finalSortField)) {
+    orderby.push([finalSortField, 1])
+  }
+  return orderby
+}
+
 exports.normalizeOrderBy = function(orderby) {
   if (Array.isArray(orderby)) {
     orderby = orderby.map(function (ordering) {