@nocobase/database 1.0.0-alpha.3 → 1.0.0-alpha.5

package/lib/options-parser.js

@@ -117,15 +117,21 @@ const _OptionsParser = class _OptionsParser {
    * @protected
    */
   parseSort(filterParams) {
-    var _a;
+    var _a, _b;
     let sort = ((_a = this.options) == null ? void 0 : _a.sort) || [];
     if (typeof sort === "string") {
       sort = sort.split(",");
     }
+    const primaryKeyField = this.model.primaryKeyAttribute;
+    if (primaryKeyField && !((_b = this.options) == null ? void 0 : _b.group)) {
+      if (!sort.includes(primaryKeyField)) {
+        sort.push(primaryKeyField);
+      }
+    }
     const orderParams = [];
     for (const sortKey of sort) {
       let direction = sortKey.startsWith("-") ? "DESC" : "ASC";
-      const sortField = sortKey.replace("-", "").split(".");
+      const sortField = sortKey.startsWith("-") ? sortKey.replace("-", "").split(".") : sortKey.split(".");
       if (this.database.inDialect("postgres", "sqlite")) {
         direction = `${direction} NULLS LAST`;
       }

package/lib/repository.js

@@ -198,7 +198,8 @@ const _Repository = class _Repository {
       fields: []
     });
     (_a = options.optionsTransformer) == null ? void 0 : _a.call(options, queryOptions);
-    const hasAssociationFilter = /* @__PURE__ */ __name(() => {
+    delete queryOptions.order;
+    const hasAssociationFilter = (() => {
       if (queryOptions.include && queryOptions.include.length > 0) {
         const filterInclude = queryOptions.include.filter((include) => {
           var _a2;
@@ -207,8 +208,8 @@ const _Repository = class _Repository {
         return filterInclude.length > 0;
       }
       return false;
-    }, "hasAssociationFilter");
-    if (hasAssociationFilter()) {
+    })();
+    if (hasAssociationFilter) {
       const primaryKeyField = this.model.primaryKeyAttribute;
       const queryInterface = this.database.sequelize.getQueryInterface();
       const findOptions = {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.0.0-alpha.3",
-    "@nocobase/utils": "1.0.0-alpha.3",
+    "@nocobase/logger": "1.0.0-alpha.5",
+    "@nocobase/utils": "1.0.0-alpha.5",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -37,5 +37,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "7ccb137c7616cba5d238f87368239640e1d9ace1"
+  "gitHead": "c85c3e8af1b57d7078aa0df4d4cdecb73269f2eb"
 }