unconventional 2.4.0 → 3.1.1

package/dist/core/base.model.js

@@ -95,6 +95,7 @@ class BaseModel extends Document {
             action: db_types_1.SqlAction.Select,
             type: unconventional_pg_queries_1.OneOrMany.Many,
             table: this.collection,
+            idField: this.idField,
             expand,
             where,
             order: (0, db_utils_1.getOrder)(this, config?.sort),

package/dist/utils/db.utils.js

@@ -177,11 +177,21 @@ function getOrder(model, sort) {
         return [{ field: model.idField, direction: unconventional_pg_queries_1.SqlDirection.Asc }];
     const propSummary = model.schema.props;
     const orders = [];
-    sort.split(',').forEach((item) => {
-        let [field, direction] = item.split(' ');
-        let jsonPath = [];
+    sort.split(/,(?![^()]*\))/).forEach((item) => {
+        let [field, direction] = item.trim().split(/\s+(?![^()]*\))/);
         direction ||= unconventional_pg_queries_1.SqlDirection.Asc;
+        const coalesce = field.match(/^COALESCE\(([^()]+)\)$/i)?.[1].split(',').map(column => column.trim());
+        if (coalesce) {
+            field = coalesce.shift() ?? '';
+            if (!coalesce.length)
+                throw api_error_1.APIError.errInvalidQueryParameter(`COALESCE requires a fallback field`);
+            coalesce.forEach(column => {
+                if (!propSummary[column])
+                    throw api_error_1.APIError.errInvalidQueryParameter(`Invalid orderBy field: '${column}'`);
+            });
+        }
         // Handle JSON path
+        let jsonPath = [];
         if (field.includes('.')) {
             jsonPath = field.split('.');
             field = jsonPath.shift();
@@ -190,7 +200,7 @@ function getOrder(model, sort) {
             throw api_error_1.APIError.errInvalidQueryParameter(`Invalid orderBy field: '${field}'`);
         if (!db_types_1.ValidSortDirections.includes(direction.toUpperCase()))
             throw api_error_1.APIError.errInvalidQueryParameter(`Invalid orderBy direction: '${direction}'`);
-        orders.push({ field, jsonPath, direction: direction.toUpperCase() });
+        orders.push({ field, jsonPath, direction: direction.toUpperCase(), ...(coalesce ? { coalesce } : {}) });
     });
     return orders;
 }

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "unconventional",
-  "version": "2.4.0",
-  "description": "A complete server built on Cloudflare Workers/Pages",
+  "version": "3.1.1",
+  "description": "A complete server built on Cloudflare Workers",
   "keywords": [
     "cloudflare",
-    "pages",
     "functions",
     "workers",
     "edge",
@@ -46,7 +45,7 @@
   },
   "peerDependencies": {
     "hono": "^4",
-    "unconventional-pg-queries": "^2.0.0"
+    "unconventional-pg-queries": "^3.1.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231121.0",
@@ -56,6 +55,6 @@
     "hono": "^4",
     "tsx": "^4.20.6",
     "typescript": "^5.3.3",
-    "unconventional-pg-queries": "^2.0.0"
+    "unconventional-pg-queries": "^3.1.1"
   }
 }