GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

refactor: remove some any types from render()

Browse Source 
This let's us confirm that the types we're passing to `insertNode()` are
valid.
This commit is contained in:
Alois Klink 2024-10-18 00:18:27 +09:00
parent 62fd359c0e
commit 16a5fc05d6
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
packages/mermaid-layout-elk/src/render.ts
View File

@ -3,6 +3,14 @@ import ELK from 'elkjs/lib/elk.bundled.js';
import type { InternalHelpers, LayoutData, RenderOptions, SVG, SVGGroup } from 'mermaid'; import type { InternalHelpers, LayoutData, RenderOptions, SVG, SVGGroup } from 'mermaid';
import { type TreeData, findCommonAncestor } from './find-common-ancestor.js'; import { type TreeData, findCommonAncestor } from './find-common-ancestor.js';
type Node = LayoutData['nodes'][0];
interface NodeWithVertex extends Omit<Node, 'domId'> {
children?: unknown[];
labelData?: any;
domId?: Node['domId'] | SVGGroup | d3.Selection<SVGAElement, unknown, Element | null, unknown>;
}
export const render = async ( export const render = async (
data4Layout: LayoutData, data4Layout: LayoutData,
svg: SVG, svg: SVG,
@ -24,27 +32,37 @@ export const render = async (
const nodeDb: Record<string, any> = {}; const nodeDb: Record<string, any> = {};
const clusterDb: Record<string, any> = {}; const clusterDb: Record<string, any> = {};
const addVertex = async (nodeEl: any, graph: { children: any[] }, nodeArr: any, node: any) => { const addVertex = async (
nodeEl: SVGGroup,
graph: { children: NodeWithVertex[] },
nodeArr: Node[],
node: Node
) => {
const labelData: any = { width: 0, height: 0 }; const labelData: any = { width: 0, height: 0 };
let boundingBox;
const child = {
...node,
};
graph.children.push(child);
nodeDb[node.id] = child;
const config = getConfig(); const config = getConfig();
// Add the element to the DOM // Add the element to the DOM
if (!node.isGroup) { if (!node.isGroup) {
const child: NodeWithVertex = {
...node,
};
graph.children.push(child);
nodeDb[node.id] = child;
const childNodeEl = await insertNode(nodeEl, node, { config, dir: node.dir }); const childNodeEl = await insertNode(nodeEl, node, { config, dir: node.dir });
boundingBox = childNodeEl.node().getBBox(); const boundingBox = childNodeEl.node()!.getBBox();
child.domId = childNodeEl; child.domId = childNodeEl;
child.width = boundingBox.width; child.width = boundingBox.width;
child.height = boundingBox.height; child.height = boundingBox.height;
} else { } else {
// A subgraph // A subgraph
child.children = []; const child: NodeWithVertex & { children: NodeWithVertex[] } = {
...node,
children: [],
};
graph.children.push(child);
nodeDb[node.id] = child;
await addVertices(nodeEl, nodeArr, child, node.id); await addVertices(nodeEl, nodeArr, child, node.id);
if (node.label) { if (node.label) {
@ -68,28 +86,16 @@ export const render = async (
}; };
const addVertices = async function ( const addVertices = async function (
nodeEl: any, nodeEl: SVGGroup,
nodeArr: any[], nodeArr: Node[],
graph: { graph: { children: NodeWithVertex[] },
id: string; parentId?: string
layoutOptions: {
'elk.hierarchyHandling': string;
'elk.algorithm': any;
'nodePlacement.strategy': any;
'elk.layered.mergeEdges': any;
'elk.direction': string;
'spacing.baseValue': number;
};
children: never[];
edges: never[];
},
parentId?: undefined
) { ) {
const siblings = nodeArr.filter((node: { parentId: any }) => node.parentId === parentId); const siblings = nodeArr.filter((node) => node?.parentId === parentId);
log.info('addVertices APA12', siblings, parentId); log.info('addVertices APA12', siblings, parentId);
// Iterate through each item in the vertex object (containing all the vertices found) in the graph definition // Iterate through each item in the vertex object (containing all the vertices found) in the graph definition
await Promise.all( await Promise.all(
siblings.map(async (node: any) => { siblings.map(async (node) => {
await addVertex(nodeEl, graph, nodeArr, node); await addVertex(nodeEl, graph, nodeArr, node);
}) })
); );