Merge pull request #245 from VisActor/feat/export-sankey-makeHierarchicNodes

Feat/export sankey make hierarchic nodes

Author: xile611

common/changes/@visactor/vlayouts/feat-export-sankey-makeHierarchicNodes_2025-07-29-11-23.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "feat: export function makeHierarchicNodes about sankey\n\n",
+      "type": "none",
+      "packageName": "@visactor/vlayouts"
+    }
+  ],
+  "packageName": "@visactor/vlayouts",
+  "email": "[email protected]"
+}

packages/vlayouts/src/sankey/hierarchy.ts

@@ -1,5 +1,6 @@
-import { isNil } from '@visactor/vutils';
-import type { HierarchyNodeDatum } from './interface';
+import { isNil, toValidNumber } from '@visactor/vutils';
+
+import type { HierarchyNodeDatum, SankeyLinkDatum, SankeyLinkElement, SankeyNodeElement } from './interface';
 
 export const calculateNodeValue = (subTree: HierarchyNodeDatum[]) => {
   let sum = 0;
@@ -17,3 +18,56 @@ export const calculateNodeValue = (subTree: HierarchyNodeDatum[]) => {
 
   return sum;
 };
+
+export function makeHierarchicNodes(
+  originalNodes: HierarchyNodeDatum[],
+  nodeKeyFunc: (node: HierarchyNodeDatum) => string,
+  nodes: SankeyNodeElement[] = [],
+  nodeMap: Record<string | number, SankeyNodeElement> = {},
+  originalLinks?: (SankeyLinkDatum & { parents?: SankeyNodeElement[] })[]
+) {
+  calculateNodeValue(originalNodes);
+
+  const doSubTree = (subTree: HierarchyNodeDatum[], depth: number, parents?: SankeyNodeElement[]) => {
+    subTree.forEach((node, index) => {
+      const nodeKey = nodeKeyFunc
+        ? nodeKeyFunc(node)
+        : parents
+        ? `${parents[parents.length - 1].key}-${index}`
+        : `${depth}-${index}`;
+      const nodeValue: number = (isNil(node.value) ? 0 : toValidNumber(node.value)) as number;
+
+      if (nodeMap[nodeKey]) {
+        nodeMap[nodeKey].value = undefined;
+      } else {
+        const nodeElement: SankeyNodeElement = {
+          depth,
+          datum: node,
+          index: index,
+          key: nodeKey,
+          value: nodeValue,
+          sourceLinks: [] as SankeyLinkElement[],
+          targetLinks: [] as SankeyLinkElement[]
+        };
+
+        nodeMap[nodeKey] = nodeElement;
+        nodes.push(nodeElement);
+      }
+      if (parents && originalLinks) {
+        originalLinks.push({
+          source: parents[parents.length - 1].key,
+          target: nodeKey,
+          value: nodeValue,
+          parents
+        });
+      }
+
+      if (node.children && node.children.length) {
+        doSubTree(node.children, depth + 1, parents ? parents.concat([nodeMap[nodeKey]]) : [nodeMap[nodeKey]]);
+      }
+    });
+  };
+
+  doSubTree(originalNodes, 0, null);
+  return nodes;
+}

packages/vlayouts/src/sankey/layout.ts

@@ -12,7 +12,7 @@ import {
   pickWithout,
   toValidNumber
 } from '@visactor/vutils';
-import { calculateNodeValue } from './hierarchy';
+import { makeHierarchicNodes } from './hierarchy';
 import type {
   SankeyData,
   SankeyOptions,
@@ -249,49 +249,8 @@ export class SankeyLayout {
     const linkMap: Record<string | number, SankeyLinkElement> = {};
     const originalLinks: (SankeyLinkDatum & { parents?: SankeyNodeElement[] })[] = [];
 
-    calculateNodeValue(originalNodes);
+    makeHierarchicNodes(originalNodes, this._getNodeKey, nodes, nodeMap, originalLinks);
 
-    const doSubTree = (subTree: HierarchyNodeDatum[], depth: number, parents?: SankeyNodeElement[]) => {
-      subTree.forEach((node, index) => {
-        const nodeKey = this._getNodeKey
-          ? this._getNodeKey(node)
-          : parents
-          ? `${parents[parents.length - 1].key}-${index}`
-          : `${depth}-${index}`;
-        const nodeValue = isNil(node.value) ? 0 : toValidNumber(node.value);
-
-        if (nodeMap[nodeKey]) {
-          nodeMap[nodeKey].value = undefined;
-        } else {
-          const nodeElement: SankeyNodeElement = {
-            depth,
-            datum: node,
-            index: index,
-            key: nodeKey,
-            value: nodeValue,
-            sourceLinks: [] as SankeyLinkElement[],
-            targetLinks: [] as SankeyLinkElement[]
-          };
-
-          nodeMap[nodeKey] = nodeElement;
-          nodes.push(nodeElement);
-        }
-        if (parents) {
-          originalLinks.push({
-            source: parents[parents.length - 1].key,
-            target: nodeKey,
-            value: nodeValue,
-            parents
-          });
-        }
-
-        if (node.children && node.children.length) {
-          doSubTree(node.children, depth + 1, parents ? parents.concat([nodeMap[nodeKey]]) : [nodeMap[nodeKey]]);
-        }
-      });
-    };
-
-    doSubTree(originalNodes, 0, null);
     originalLinks.forEach((link, index) => {
       const key = `${link.source}-${link.target}`;
       const linkDatum = pickWithout(link, ['parents']);