@flowgram.ai/free-auto-layout-plugin 0.2.2 → 0.2.3

package/dist/esm/index.js

@@ -2083,10 +2083,13 @@ import { definePluginCreator } from "@flowgram.ai/core";
 import { inject, injectable } from "inversify";
 import {
   WorkflowDocument,
-  WorkflowNodeLinesData
+  WorkflowNodeLinesData as WorkflowNodeLinesData2
 } from "@flowgram.ai/free-layout-core";
 
 // src/layout/store.ts
+import {
+  WorkflowNodeLinesData
+} from "@flowgram.ai/free-layout-core";
 import { FlowNodeBaseType, FlowNodeTransformData } from "@flowgram.ai/document";
 var LayoutStore = class {
   constructor() {
@@ -2118,7 +2121,8 @@ var LayoutStore = class {
   }
   /** 创建布局数据 */
   createStore(params) {
-    const { nodes, edges } = params;
+    const { nodes, edges, container } = params;
+    this.container = container;
     const layoutNodes = this.createLayoutNodes(nodes);
     const layoutEdges = this.createEdgesStore(edges);
     const virtualEdges = this.createVirtualEdges(params);
@@ -2258,27 +2262,37 @@ var LayoutStore = class {
     this.nodes.forEach((node) => {
       nodeIdList.push(node.id);
     });
-    const sameFromEdges = /* @__PURE__ */ new Map();
     this.edges.forEach((edge) => {
       nodeIdList.push(edge.to);
-      if (edge.entity.info.fromPort) {
-        const edgesForFrom = sameFromEdges.get(edge.from) || [];
-        sameFromEdges.set(edge.from, [...edgesForFrom, edge]);
-      }
     });
-    sameFromEdges.forEach((edges, from) => {
-      const sortedEdges = edges.sort((a, b) => {
-        const aPort = a.entity.fromPort;
-        const bPort = b.entity.fromPort;
+    const visited = /* @__PURE__ */ new Set();
+    const visit = (node) => {
+      if (visited.has(node.id)) {
+        return;
+      }
+      visited.add(node.id);
+      nodeIdList.push(node.id);
+      node.blocks.forEach((child) => {
+        visit(child);
+      });
+      const { outputLines } = node.getData(WorkflowNodeLinesData);
+      const sortedLines = outputLines.sort((a, b) => {
+        const aPort = a.fromPort;
+        const bPort = b.fromPort;
         if (aPort && bPort) {
           return aPort.point.y - bPort.point.y;
         }
         return 0;
       });
-      sortedEdges.forEach((edge) => {
-        nodeIdList.push(edge.to);
+      sortedLines.forEach((line) => {
+        const { to } = line;
+        if (!to) {
+          return;
+        }
+        visit(to);
       });
-    });
+    };
+    visit(this.container);
     const uniqueNodeIds = nodeIdList.reduceRight((acc, nodeId) => {
       if (!acc.includes(nodeId)) {
         acc.unshift(nodeId);
@@ -2566,13 +2580,13 @@ var AutoLayoutService = class {
     const edges = this.getNodesAllLines(nodes);
     await Promise.all(nodes.map(async (child) => this.layoutNode(child, options)));
     const layout2 = new Layout();
-    layout2.init({ nodes, edges }, options);
+    layout2.init({ nodes, edges, container: node }, options);
     layout2.layout();
     await layout2.position();
   }
   getNodesAllLines(nodes) {
     const lines = nodes.map((node) => {
-      const linesData = node.getData(WorkflowNodeLinesData);
+      const linesData = node.getData(WorkflowNodeLinesData2);
       const outputLines = linesData.outputLines.filter(Boolean);
       const inputLines = linesData.inputLines.filter(Boolean);
       return [...outputLines, ...inputLines];