remult 0.23.0-exp.19 → 0.23.0-exp.20

package/esm/src/sort.js

@@ -29,8 +29,8 @@ export class Sort {
         let r = 0;
         for (let i = 0; i < this.Segments.length; i++) {
             let seg = this.Segments[i];
-            let left = a[getFieldKey(seg.field)];
-            let right = b[getFieldKey(seg.field)];
+            let left = makeComparable(a[getFieldKey(seg.field)]);
+            let right = makeComparable(b[getFieldKey(seg.field)]);
             if (left > right)
                 r = 1;
             else if (left < right)
@@ -126,3 +126,13 @@ export class Sort {
         return orderBy;
     }
 }
+function makeComparable(x) {
+    if (x === undefined || x == null)
+        return undefined;
+    if (x instanceof Date)
+        return x.valueOf();
+    if (x['id']) {
+        return x['id'];
+    }
+    return x;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.23.0-exp.19",
+    "version": "0.23.0-exp.20",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/src/sort.js

@@ -58,8 +58,8 @@ var Sort = /** @class */ (function () {
         var r = 0;
         for (var i = 0; i < this.Segments.length; i++) {
             var seg = this.Segments[i];
-            var left = a[getFieldKey(seg.field)];
-            var right = b[getFieldKey(seg.field)];
+            var left = makeComparable(a[getFieldKey(seg.field)]);
+            var right = makeComparable(b[getFieldKey(seg.field)]);
             if (left > right)
                 r = 1;
             else if (left < right)
@@ -186,3 +186,13 @@ var Sort = /** @class */ (function () {
     return Sort;
 }());
 exports.Sort = Sort;
+function makeComparable(x) {
+    if (x === undefined || x == null)
+        return undefined;
+    if (x instanceof Date)
+        return x.valueOf();
+    if (x['id']) {
+        return x['id'];
+    }
+    return x;
+}