@tachybase/actions 1.3.10 → 1.3.11

package/lib/actions/list.js

@@ -31,7 +31,7 @@ __export(list_exports, {
   list: () => list
 });
 module.exports = __toCommonJS(list_exports);
-var import_querystring = __toESM(require("querystring"));
+var import_node_querystring = __toESM(require("node:querystring"));
 var import_utils = require("@tachybase/utils");
 var import_sequelize = require("sequelize");
 var import_constants = require("../constants");
@@ -42,7 +42,7 @@ function totalPage(total, pageSize) {
 __name(totalPage, "totalPage");
 const MAX_ASSOCIATION_SORT_DEPTH = 2;
 function findArgs(ctx) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const resourceName = ctx.action.resourceName;
   const params = ctx.action.params;
   const includeSort = ((_a = params.sort) == null ? void 0 : _a.filter((item) => typeof item === "string" && item.split(".").length > 1)) ?? [];
@@ -67,7 +67,7 @@ function findArgs(ctx) {
     var _a2;
     const i = ((_a2 = params.appends) == null ? void 0 : _a2.findIndex((append) => append === item.prefix)) ?? -1;
     if (i !== -1) {
-      params.appends[i] = `${item.prefix}(${import_querystring.default.stringify({ sort: item.sortItems })})`;
+      params.appends[i] = `${item.prefix}(${import_node_querystring.default.stringify({ sort: item.sortItems })})`;
     } else if (item.prefix) {
       associationAppend.add(item.prefix);
     }
@@ -85,7 +85,7 @@ function findArgs(ctx) {
     const [collectionName, associationName] = resourceName.split(".");
     const collection = ctx.db.getCollection(resourceName);
     if (collection.options.tree && !(associationName && collectionName === collection.name)) {
-      const foreignKey = ((_c = collection.treeParentField) == null ? void 0 : _c.foreignKey) || "parentId";
+      const foreignKey = ((_e = (_d = collection.treeParentField) == null ? void 0 : _d.collection.model.rawAttributes[(_c = collection.treeParentField) == null ? void 0 : _c.foreignKey]) == null ? void 0 : _e.field) || "parentId";
       (0, import_utils.assign)(params, { filter: { [foreignKey]: null } }, { filter: "andMerge" });
     }
   }
@@ -94,7 +94,7 @@ function findArgs(ctx) {
 }
 __name(findArgs, "findArgs");
 async function listWithPagination(ctx) {
-  var _a;
+  var _a, _b, _c;
   const { page = import_constants.DEFAULT_PAGE, pageSize = import_constants.DEFAULT_PER_PAGE } = ctx.action.params;
   const repository = (0, import_utils2.getRepositoryFromParams)(ctx);
   const resourceName = ctx.action.resourceName;
@@ -112,7 +112,10 @@ async function listWithPagination(ctx) {
   let filterTreeData = [];
   let filterTreeCount = 0;
   if (ctx.action.params.tree && options.filter) {
-    const foreignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
+    let foreignKey = ((_c = (_b = collection.treeParentField) == null ? void 0 : _b.collection.model.rawAttributes[(_a = collection.treeParentField) == null ? void 0 : _a.foreignKey]) == null ? void 0 : _c.field) || "parentId";
+    if (!ctx.db.isMySQLCompatibleDialect()) {
+      foreignKey = `"${foreignKey}"`;
+    }
     const params = Object.values(options.filter).flat()[0] || {};
     let dataIds = [];
     if (Object.entries(params).length) {
@@ -127,26 +130,26 @@ async function listWithPagination(ctx) {
       for (const dataId of dataIds) {
         const query = `
         WITH RECURSIVE tree1 AS (
-            SELECT id, "${foreignKey}"
+            SELECT id, ${foreignKey}
             FROM ${collection.name}
             WHERE id = :dataId
 
               UNION ALL
 
-              SELECT p.id, p."${foreignKey}"
+              SELECT p.id, p.${foreignKey}
               FROM tree1 up
-              JOIN ${collection.name} p ON up."${foreignKey}" = p.id
+              JOIN ${collection.name} p ON up.${foreignKey} = p.id
           ),
           tree2 AS (
-              SELECT id, "${foreignKey}"
+              SELECT id, ${foreignKey}
               FROM ${collection.name}
               WHERE id = :dataId
 
               UNION ALL
 
-            SELECT p.id, p."${foreignKey}"
+            SELECT p.id, p.${foreignKey}
             FROM tree2 down
-            JOIN ${collection.name} p ON down.id = p."${foreignKey}"
+            JOIN ${collection.name} p ON down.id = p.${foreignKey}
         )
         SELECT DISTINCT *
         FROM (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/actions",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -9,10 +9,10 @@
     "koa": "^2.15.3",
     "lodash": "4.17.21",
     "sequelize": "^6.37.5",
-    "@tachybase/cache": "1.3.10",
-    "@tachybase/database": "1.3.10",
-    "@tachybase/resourcer": "1.3.10",
-    "@tachybase/utils": "1.3.10"
+    "@tachybase/cache": "1.3.11",
+    "@tachybase/resourcer": "1.3.11",
+    "@tachybase/utils": "1.3.11",
+    "@tachybase/database": "1.3.11"
   },
   "devDependencies": {
     "@types/koa": "^2.15.0",