From 4bc70b732560102d481110f4344b5a4c6776c335 Mon Sep 17 00:00:00 2001
From: Alois Klink <alois@aloisklink.com>
Date: Mon, 21 Oct 2024 22:06:30 +0900
Subject: [PATCH] refactor: use more standard types

See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1806473749
See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1808511738

Co-authored-by: saurabhg772244 <saurabh@mermaidchart.com>
---
 packages/mermaid-layout-elk/src/render.ts              |  2 +-
 .../src/rendering-util/rendering-elements/nodes.ts     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/mermaid-layout-elk/src/render.ts b/packages/mermaid-layout-elk/src/render.ts
index eddf2ce1a..901f76522 100644
--- a/packages/mermaid-layout-elk/src/render.ts
+++ b/packages/mermaid-layout-elk/src/render.ts
@@ -3,7 +3,7 @@ import ELK from 'elkjs/lib/elk.bundled.js';
 import type { InternalHelpers, LayoutData, RenderOptions, SVG, SVGGroup } from 'mermaid';
 import { type TreeData, findCommonAncestor } from './find-common-ancestor.js';
 
-type Node = LayoutData['nodes'][0];
+type Node = LayoutData['nodes'][number];
 
 interface NodeWithVertex extends Omit<Node, 'domId'> {
   children?: unknown[];
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/nodes.ts b/packages/mermaid/src/rendering-util/rendering-elements/nodes.ts
index 45e48beb3..071776df2 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/nodes.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/nodes.ts
@@ -1,7 +1,7 @@
 import { log } from '../../logger.js';
 import { shapes } from './shapes.js';
-import type { Node } from '../types.js';
-import type { MermaidConfig, SVGGroup } from '../../mermaid.js';
+import type { Node, ShapeRenderOptions } from '../types.js';
+import type { SVGGroup } from '../../mermaid.js';
 import type { D3Selection } from '../../types.js';
 import type { graphlib } from 'dagre-d3-es';
 
@@ -10,11 +10,7 @@ type NodeElement = D3Selection<SVGAElement> | Awaited<ReturnType<ShapeHandler>>;
 
 const nodeElems = new Map<string, NodeElement>();
 
-export async function insertNode(
-  elem: SVGGroup,
-  node: Node,
-  renderOptions: { config: MermaidConfig; dir: Node['dir'] }
-) {
+export async function insertNode(elem: SVGGroup, node: Node, renderOptions: ShapeRenderOptions) {
   let newEl: NodeElement | undefined;
   let el;