@flowgram.ai/free-layout-core 0.2.27 → 0.2.29

package/dist/esm/index.js

@@ -72,6 +72,34 @@ import { Rectangle as Rectangle6, SizeSchema } from "@flowgram.ai/utils";
 import { bindConfigEntity } from "@flowgram.ai/core";
 import { delay } from "@flowgram.ai/utils";
 
+// src/utils/build-group-json.ts
+import { FlowNodeBaseType } from "@flowgram.ai/document";
+var buildGroupJSON = (json) => {
+  const { nodes, edges } = json;
+  const groupJSONs = nodes.filter(
+    (nodeJSON) => nodeJSON.type === FlowNodeBaseType.GROUP
+  );
+  const nodeJSONMap = new Map(nodes.map((n) => [n.id, n]));
+  const groupNodeJSONs = groupJSONs.map((groupJSON) => {
+    const groupBlocks = (groupJSON.data.blockIDs ?? []).map((blockID) => nodeJSONMap.get(blockID)).filter(Boolean);
+    const groupEdges = edges?.filter(
+      (edge) => groupBlocks.some((block) => block.id === edge.sourceNodeID || block.id === edge.targetNodeID)
+    );
+    const groupNodeJSON = {
+      ...groupJSON,
+      blocks: groupBlocks,
+      edges: groupEdges
+    };
+    return groupNodeJSON;
+  });
+  const groupBlockSet = new Set(groupJSONs.map((groupJSON) => groupJSON.data.blockIDs).flat());
+  const processedNodes = nodes.filter((nodeJSON) => !groupBlockSet.has(nodeJSON.id)).concat(groupNodeJSONs);
+  return {
+    nodes: processedNodes,
+    edges
+  };
+};
+
 // src/utils/nanoid.ts
 import { nanoid as nanoidOrigin } from "nanoid";
 function nanoid(n) {
@@ -173,15 +201,16 @@ var WorkflowPortEntity = class extends Entity {
   }
   // 设置连线的错误态，外部应使用 validate 进行更新
   set hasError(hasError) {
-    this._hasError = hasError;
-    this._onErrorChangedEmitter.fire();
+    if (hasError !== this._hasError) {
+      this._hasError = hasError;
+      this._onErrorChangedEmitter.fire();
+    }
   }
   validate() {
     const anyLineHasError = this.allLines.some((line) => {
       if (line.disposed || line.isHidden) {
         return false;
       }
-      line.validateSelf();
       return line.hasError;
     });
     const isPortHasError = this.node.document.isErrorPort(this);
@@ -375,7 +404,6 @@ var WorkflowNodePortsData = class extends EntityData {
       port.allLines.forEach((line) => {
         line.validate();
       });
-      port.validate();
     });
   }
   /**
@@ -506,6 +534,9 @@ var _WorkflowNodeLinesData = class _WorkflowNodeLinesData extends EntityData2 {
   get outputLines() {
     return this.data.outputLines;
   }
+  get allLines() {
+    return this.data.inputLines.concat(this.data.outputLines);
+  }
   /**
    * 输入节点
    */
@@ -721,6 +752,14 @@ var _WorkflowLineEntity = class _WorkflowLineEntity extends Entity2 {
     if (opts.drawingTo) {
       this.isDrawing = true;
     }
+    this.onEntityChange(() => {
+      this.fromPort?.validate();
+      this.toPort?.validate();
+    });
+    this.onDispose(() => {
+      this.fromPort?.validate();
+      this.toPort?.validate();
+    });
   }
   /**
    * 转成线条 id
@@ -826,6 +865,7 @@ var _WorkflowLineEntity = class _WorkflowLineEntity extends Entity2 {
     if (this.toPort === toPort) {
       return;
     }
+    const prePort = this.toPort;
     if (toPort && toPort.portType === "input" && this.linesManager.canAddLine(this.fromPort, toPort, true)) {
       const { node, portID } = toPort;
       this._to = node;
@@ -838,6 +878,9 @@ var _WorkflowLineEntity = class _WorkflowLineEntity extends Entity2 {
       this.info.to = void 0;
       this.info.toPort = "";
     }
+    if (prePort) {
+      prePort.validate();
+    }
     this.fireChange();
   }
   /**
@@ -951,11 +994,12 @@ var _WorkflowLineEntity = class _WorkflowLineEntity extends Entity2 {
   }
   // 校验连线是否为错误态
   validate() {
-    const { fromPort, toPort } = this;
     this.validateSelf();
-    fromPort?.validate();
-    toPort?.validate();
   }
+  /**
+   * use `validate` instead
+   * @deprecated
+   */
   validateSelf() {
     const { fromPort, toPort } = this;
     if (fromPort) {
@@ -1185,7 +1229,7 @@ import {
   FlowNodeTransformData as FlowNodeTransformData6,
   FlowOperationBaseService
 } from "@flowgram.ai/document";
-import { FlowNodeBaseType as FlowNodeBaseType2 } from "@flowgram.ai/document";
+import { FlowNodeBaseType as FlowNodeBaseType3 } from "@flowgram.ai/document";
 import {
   CommandService,
   MouseTouchEvent,
@@ -1395,7 +1439,6 @@ var WorkflowLinesManager = class {
       }
       fromNode.removeLine(line);
       toNode?.removeLine(line);
-      line.validate();
     });
     line.onDispose(() => {
       if (available) {
@@ -1625,7 +1668,7 @@ import { Emitter as Emitter4 } from "@flowgram.ai/utils";
 import { NodeEngineContext } from "@flowgram.ai/form-core";
 import {
   FlowDocument,
-  FlowNodeBaseType,
+  FlowNodeBaseType as FlowNodeBaseType2,
   FlowNodeTransformData as FlowNodeTransformData5
 } from "@flowgram.ai/document";
 import {
@@ -1918,7 +1961,7 @@ var WorkflowDocument = class extends FlowDocument {
         toJSON: () => this.toNodeJSON(node)
       });
       node.onDispose(() => {
-        if (!node.parent || node.parent.flowNodeType === FlowNodeBaseType.ROOT) {
+        if (!node.parent || node.parent.flowNodeType === FlowNodeBaseType2.ROOT) {
           return;
         }
         const parentTransform = node.parent.getData(FlowNodeTransformData5);
@@ -2086,10 +2129,10 @@ var WorkflowDocument = class extends FlowDocument {
     );
   }
   getAllNodes() {
-    return this.entityManager.getEntities(WorkflowNodeEntity).filter((n) => n.id !== FlowNodeBaseType.ROOT);
+    return this.entityManager.getEntities(WorkflowNodeEntity).filter((n) => n.id !== FlowNodeBaseType2.ROOT);
   }
   getAllPorts() {
-    return this.entityManager.getEntities(WorkflowPortEntity).filter((p) => p.node.id !== FlowNodeBaseType.ROOT);
+    return this.entityManager.getEntities(WorkflowPortEntity).filter((p) => p.node.id !== FlowNodeBaseType2.ROOT);
   }
   /**
    * 获取画布中的非游离节点
@@ -2244,10 +2287,11 @@ var WorkflowDocument = class extends FlowDocument {
    */
   toJSON() {
     const rootJSON = this.toNodeJSON(this.root);
-    return {
+    const json = {
       nodes: rootJSON.blocks ?? [],
       edges: rootJSON.edges ?? []
     };
+    return json;
   }
   dispose() {
     super.dispose();
@@ -2259,10 +2303,11 @@ var WorkflowDocument = class extends FlowDocument {
   renderJSON(json, options) {
     const { parent = this.root, isClone = false } = options ?? {};
     const containerID = this.getNodeSubCanvas(parent)?.canvasNode.id ?? parent.id;
-    const nodes = json.nodes.map(
+    const processedJSON = buildGroupJSON(json);
+    const nodes = processedJSON.nodes.map(
       (nodeJSON) => this.createWorkflowNode(nodeJSON, isClone, containerID)
     );
-    const edges = json.edges.map((edge) => this.createWorkflowLine(edge, containerID)).filter(Boolean);
+    const edges = processedJSON.edges.map((edge) => this.createWorkflowLine(edge, containerID)).filter(Boolean);
     return { nodes, edges };
   }
   getNodeSubCanvas(node) {
@@ -2272,13 +2317,19 @@ var WorkflowDocument = class extends FlowDocument {
     return subCanvas;
   }
   getNodeChildren(node) {
-    if (!node) return [];
+    if (!node || node.flowNodeType === FlowNodeBaseType2.GROUP) return [];
     const subCanvas = this.getNodeSubCanvas(node);
-    const childrenWithCanvas = subCanvas ? subCanvas.canvasNode.collapsedChildren : node.collapsedChildren;
-    const children = childrenWithCanvas.filter((child) => {
+    const realChildren = subCanvas ? subCanvas.canvasNode.blocks : node.blocks;
+    const childrenWithoutSubCanvas = realChildren.filter((child) => {
       const childMeta = child.getNodeMeta();
       return !childMeta.subCanvas?.(node)?.isCanvas;
     }).filter(Boolean);
+    const children = childrenWithoutSubCanvas.map((child) => {
+      if (child.flowNodeType === FlowNodeBaseType2.GROUP) {
+        return [child, ...child.blocks];
+      }
+      return child;
+    }).flat();
     return children;
   }
   toLineJSON(line) {
@@ -2410,7 +2461,7 @@ var WorkflowDragService = class {
     }
     this.isDragging = true;
     const sameParent = this.childrenOfContainer(selectedNodes);
-    if (sameParent && sameParent.flowNodeType !== FlowNodeBaseType2.ROOT) {
+    if (sameParent && sameParent.flowNodeType !== FlowNodeBaseType3.ROOT) {
       selectedNodes = [sameParent];
     }
     let startPosition = this.getNodesPosition(selectedNodes);
@@ -2580,7 +2631,7 @@ var WorkflowDragService = class {
     if (!mousePos) {
       return { x: 0, y: 0 };
     }
-    if (!subNodeType || !containerNode || containerNode.flowNodeType === FlowNodeBaseType2.ROOT) {
+    if (!subNodeType || !containerNode || containerNode.flowNodeType === FlowNodeBaseType3.ROOT) {
       return mousePos;
     }
     const isParentEmpty = !containerNode.children || containerNode.children.length === 0;
@@ -3502,6 +3553,7 @@ export {
   WorkflowSelectService,
   WorkflowSimpleLineContribution,
   bindConfigEntity,
+  buildGroupJSON,
   compose,
   composeAsync,
   delay,