remult 0.26.9 → 0.26.10

package/esm/src/sort.js

@@ -1,4 +1,3 @@
-import { CompoundIdField } from './CompoundIdField.js';
 import { getRelationFieldInfo } from './remult3/relationInfoMember.js';
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -140,17 +139,12 @@ export class Sort {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField) {
-            for (const field of entityMetadata.idMetadata.field.fields) {
-                if (!orderBy.Segments.find((x) => x.field == field)) {
-                    orderBy.Segments.push({ field: field });
-                }
+            orderBy = new Sort();
+        for (const field of entityMetadata.idMetadata.fields) {
+            if (!orderBy.Segments.find((x) => x.field == field)) {
+                orderBy.Segments.push({ field: field });
             }
         }
-        else if (!orderBy.Segments.find((x) => x.field == entityMetadata.idMetadata.field)) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
-        }
         return orderBy;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.9",
+    "version": "0.26.10",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/sort.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sort = void 0;
 var tslib_1 = require("tslib");
-var CompoundIdField_js_1 = require("./CompoundIdField.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -169,29 +168,24 @@ var Sort = /** @class */ (function () {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField) {
-            var _loop_2 = function (field) {
-                if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
-                    orderBy.Segments.push({ field: field });
-                }
-            };
-            try {
-                for (var _b = tslib_1.__values(entityMetadata.idMetadata.field.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var field = _c.value;
-                    _loop_2(field);
-                }
+            orderBy = new Sort();
+        var _loop_2 = function (field) {
+            if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
+                orderBy.Segments.push({ field: field });
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_3) throw e_3.error; }
+        };
+        try {
+            for (var _b = tslib_1.__values(entityMetadata.idMetadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                _loop_2(field);
             }
         }
-        else if (!orderBy.Segments.find(function (x) { return x.field == entityMetadata.idMetadata.field; })) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
         }
         return orderBy;
     };