@nocobase/plugin-collection-tree 2.1.0-beta.37 → 2.1.0-beta.40

package/dist/externalVersion.js

@@ -8,11 +8,11 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.37",
-  "@nocobase/database": "2.1.0-beta.37",
-  "@nocobase/utils": "2.1.0-beta.37",
+  "@nocobase/client": "2.1.0-beta.40",
+  "@nocobase/database": "2.1.0-beta.40",
+  "@nocobase/utils": "2.1.0-beta.40",
   "lodash": "4.18.1",
-  "@nocobase/data-source-manager": "2.1.0-beta.37",
-  "@nocobase/server": "2.1.0-beta.37",
+  "@nocobase/data-source-manager": "2.1.0-beta.40",
+  "@nocobase/server": "2.1.0-beta.40",
   "sequelize": "6.35.2"
 };

package/dist/server/adjacency-list-repository.js

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(adjacency_list_repository_exports);
 var import_database = require("@nocobase/database");
 var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
+var import_cycle_detection = require("./cycle-detection");
 class AdjacencyListRepository extends import_database.Repository {
   async update(options) {
     return super.update({
@@ -118,13 +119,23 @@ class AdjacencyListRepository extends import_database.Repository {
       }
       nodeMap[`${node[foreignKey]}`].push(node);
     });
-    function buildTree(rootId) {
-      const children = nodeMap[rootId];
+    const getNodePrimaryKey = (node) => node.get(primaryKey);
+    function buildTree(rootId, path, pathIndex) {
+      const children = nodeMap[String(rootId)];
       if (!children) {
         return [];
       }
       return children.map((child) => {
-        const childrenValues = buildTree(child.id);
+        const childPrimaryKey = getNodePrimaryKey(child);
+        const cycleStartIndex = pathIndex.get(String(childPrimaryKey));
+        if (cycleStartIndex !== void 0) {
+          throw new Error((0, import_cycle_detection.formatTreeCycleError)(collection.name, [...path.slice(cycleStartIndex), childPrimaryKey]));
+        }
+        pathIndex.set(String(childPrimaryKey), path.length);
+        path.push(childPrimaryKey);
+        const childrenValues = buildTree(childPrimaryKey, path, pathIndex);
+        path.pop();
+        pathIndex.delete(String(childPrimaryKey));
         if (childrenValues.length > 0) {
           child.setDataValue(childrenKey, childrenValues);
         }
@@ -132,8 +143,8 @@ class AdjacencyListRepository extends import_database.Repository {
       });
     }
     for (const root of rootNodes) {
-      const rootId = root[primaryKey];
-      const children = buildTree(rootId);
+      const rootId = getNodePrimaryKey(root);
+      const children = buildTree(rootId, [rootId], /* @__PURE__ */ new Map([[String(rootId), 0]]));
       if (children.length > 0) {
         root.setDataValue(childrenKey, children);
       }

package/dist/server/cycle-detection.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export type TreeNodeKey = string | number;
+export declare function findCyclePath(path: TreeNodeKey[], nodeKey: TreeNodeKey): TreeNodeKey[] | null;
+export declare function formatTreeCycleError(collectionName: string, cyclePath: TreeNodeKey[]): string;

package/dist/server/cycle-detection.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cycle_detection_exports = {};
+__export(cycle_detection_exports, {
+  findCyclePath: () => findCyclePath,
+  formatTreeCycleError: () => formatTreeCycleError
+});
+module.exports = __toCommonJS(cycle_detection_exports);
+function findCyclePath(path, nodeKey) {
+  const nodeKeyString = String(nodeKey);
+  const cycleStartIndex = path.findIndex((pathNodeKey) => String(pathNodeKey) === nodeKeyString);
+  if (cycleStartIndex === -1) {
+    return null;
+  }
+  return [...path.slice(cycleStartIndex), nodeKey];
+}
+function formatTreeCycleError(collectionName, cyclePath) {
+  return `Cycle detected in ${collectionName}: ${cyclePath.join(" -> ")}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findCyclePath,
+  formatTreeCycleError
+});

package/dist/server/plugin.d.ts

@@ -11,6 +11,7 @@ declare class PluginCollectionTreeServer extends Plugin {
     beforeLoad(): Promise<void>;
     private defineTreePathCollection;
     private getTreePath;
+    private validateTreeParent;
     private updateTreePath;
 }
 export default PluginCollectionTreeServer;

package/dist/server/plugin.js

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(plugin_exports);
 var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
+var import_cycle_detection = require("./cycle-detection");
 var import_tree_collection = require("./tree-collection");
 class PluginCollectionTreeServer extends import_server.Plugin {
   async beforeLoad() {
@@ -138,13 +139,28 @@ class PluginCollectionTreeServer extends import_server.Plugin {
               transaction: options2.transaction
             });
           });
-          this.db.on(`${collection.name}.beforeSave`, async (model) => {
-            var _a;
+          this.db.on(`${collection.name}.beforeSave`, async (model, options2) => {
+            var _a, _b;
             const tk = collection.filterTargetKey;
             const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
-            if (model.get(tk) && model.get(parentForeignKey) === model.get(tk)) {
+            const nodePrimaryKey = model.get(tk);
+            const parentPrimaryKey = model.get(parentForeignKey);
+            if (nodePrimaryKey !== null && nodePrimaryKey !== void 0 && parentPrimaryKey !== null && parentPrimaryKey !== void 0 && String(parentPrimaryKey) === String(nodePrimaryKey)) {
               throw new Error("Cannot set itself as the parent node");
             }
+            if (nodePrimaryKey === null || nodePrimaryKey === void 0 || parentPrimaryKey === null || parentPrimaryKey === void 0) {
+              return;
+            }
+            const isParentChanged = model.isNewRecord || typeof model.changed === "function" && Boolean(model.changed(parentForeignKey)) || ((_b = model["_changed"]) == null ? void 0 : _b.has(parentForeignKey));
+            if (!isParentChanged) {
+              return;
+            }
+            await this.validateTreeParent({
+              collection,
+              nodePrimaryKey,
+              parentPrimaryKey,
+              transaction: options2 == null ? void 0 : options2.transaction
+            });
           });
           this.db.on("collections.afterDestroy", async (collection2, { transaction }) => {
             const name2 = `main_${collection2.get("name")}_path`;
@@ -224,6 +240,35 @@ class PluginCollectionTreeServer extends import_server.Plugin {
     }
     return path;
   }
+  async validateTreeParent({
+    collection,
+    nodePrimaryKey,
+    parentPrimaryKey,
+    transaction
+  }) {
+    var _a;
+    const tk = collection.filterTargetKey;
+    const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
+    const path = [nodePrimaryKey];
+    let currentParentPrimaryKey = parentPrimaryKey;
+    while (currentParentPrimaryKey !== null && currentParentPrimaryKey !== void 0) {
+      if ((0, import_cycle_detection.findCyclePath)(path, currentParentPrimaryKey)) {
+        throw new Error("Cannot set a descendant node as the parent node");
+      }
+      path.push(currentParentPrimaryKey);
+      const parent = await this.app.db.getRepository(collection.name).findOne({
+        fields: [tk, parentForeignKey],
+        filter: {
+          [tk]: currentParentPrimaryKey
+        },
+        transaction
+      });
+      if (!parent) {
+        return;
+      }
+      currentParentPrimaryKey = parent.get(parentForeignKey);
+    }
+  }
   async updateTreePath(model, collection, pathCollectionName, transaction) {
     const tk = collection.filterTargetKey;
     let path = `/${model.get(tk)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "2.1.0-beta.37",
+  "version": "2.1.0-beta.40",
   "displayName": "Collection: Tree",
   "displayName.ru-RU": "Древовидная Коллекция",
   "displayName.zh-CN": "数据表：树",
@@ -17,5 +17,5 @@
     "@nocobase/test": "2.x"
   },
   "license": "Apache-2.0",
-  "gitHead": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae"
+  "gitHead": "36e906138f6305723abbef676a61006058feb5ea"
 }