@tooee/renderers 0.9.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../src/mermaid.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,eAAe,CAAC;AAGvD,UAAU,0BAA0B;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,GAC/C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,GAAG,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1F,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,KAAK,CAAC,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,CAAC;CACrB;AAaD;;;GAGG;AACH,eAAO,MAAM,cAAc,UAAkC,MAAM,KAAG,OAErE,CAAC;AA4EF,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,UAAoC,MAAM,KAAG,cAqBzE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,WAC3B,MAAM,YACL,oBAAoB,KAC5B,mBAiCF,CAAC"}
1
+ {"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../src/mermaid.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,eAAe,CAAC;AAGvD,UAAU,0BAA0B;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,GAC/C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,GAAG,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1F,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,KAAK,CAAC,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,CAAC;CACrB;AAcD;;;GAGG;AACH,eAAO,MAAM,cAAc,UAAkC,MAAM,KAAG,OAErE,CAAC;AA0IF,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,UAAoC,MAAM,KAAG,cAqBzE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,WAC3B,MAAM,YACL,oBAAoB,KAC5B,mBAiCF,CAAC"}
package/dist/mermaid.js CHANGED
@@ -7,6 +7,7 @@ import { parseColor, StyledText } from "@opentui/core";
7
7
  const MAX_SOURCE_LENGTH = 20_000;
8
8
  const MAX_SOURCE_LINES = 300;
9
9
  const MAX_FLOWCHART_EDGES = 32;
10
+ const MIN_UNSAFE_CYCLIC_FAN_DEGREE = 3;
10
11
  // oxlint-disable-next-line no-control-regex -- ANSI SGR sequences start with the ESC control character
11
12
  const SGR_SEQUENCE = /\u001B\[(?<params>[0-9;]*)m/gu;
12
13
  /**
@@ -16,13 +17,55 @@ const SGR_SEQUENCE = /\u001B\[(?<params>[0-9;]*)m/gu;
16
17
  export const isMermaidFence = function isMermaidFence(lang) {
17
18
  return (lang ?? "").trim().split(/\s+/u)[0]?.toLowerCase() === "mermaid";
18
19
  };
20
+ const hasDirectedPath = function hasDirectedPath(adjacency, source, target) {
21
+ const pending = [...(adjacency.get(source) ?? [])];
22
+ const visited = new Set([source]);
23
+ while (pending.length > 0) {
24
+ const node = pending.pop();
25
+ if (node === undefined) {
26
+ continue;
27
+ }
28
+ if (node === target) {
29
+ return true;
30
+ }
31
+ if (visited.has(node)) {
32
+ continue;
33
+ }
34
+ visited.add(node);
35
+ pending.push(...(adjacency.get(node) ?? []));
36
+ }
37
+ return false;
38
+ };
39
+ const hasUnsafeCyclicFanTopology = function hasUnsafeCyclicFanTopology(edges) {
40
+ const adjacency = new Map();
41
+ const incomingDegree = new Map();
42
+ const outgoingDegree = new Map();
43
+ for (const edge of edges) {
44
+ const targets = adjacency.get(edge.source) ?? new Set();
45
+ targets.add(edge.target);
46
+ adjacency.set(edge.source, targets);
47
+ incomingDegree.set(edge.target, (incomingDegree.get(edge.target) ?? 0) + 1);
48
+ outgoingDegree.set(edge.source, (outgoingDegree.get(edge.source) ?? 0) + 1);
49
+ }
50
+ const fanInNodes = [...incomingDegree]
51
+ .filter(([, degree]) => degree >= MIN_UNSAFE_CYCLIC_FAN_DEGREE)
52
+ .map(([node]) => node);
53
+ const fanOutNodes = [...outgoingDegree]
54
+ .filter(([, degree]) => degree >= MIN_UNSAFE_CYCLIC_FAN_DEGREE)
55
+ .map(([node]) => node);
56
+ return fanInNodes.some((fanIn) => fanOutNodes.some((fanOut) => hasDirectedPath(adjacency, fanIn, fanOut) && hasDirectedPath(adjacency, fanOut, fanIn)));
57
+ };
19
58
  const exceedsSynchronousRenderBudget = function exceedsSynchronousRenderBudget(source) {
20
59
  if (source.length > MAX_SOURCE_LENGTH || source.split("\n").length > MAX_SOURCE_LINES) {
21
60
  return true;
22
61
  }
23
62
  const firstLine = source.trimStart().split(/[;\n]/u)[0]?.trim().toLowerCase() ?? "";
24
63
  const isFlowchart = /^(?:flowchart|graph|statediagram(?:-v2)?)\b/u.test(firstLine);
25
- return isFlowchart && parseMermaid(source).edges.length > MAX_FLOWCHART_EDGES;
64
+ if (!isFlowchart) {
65
+ return false;
66
+ }
67
+ const { edges } = parseMermaid(source);
68
+ return edges.length > MAX_FLOWCHART_EDGES || hasUnsafeCyclicFanTopology(edges);
26
69
  };
27
70
  const appendStyledChunk = function appendStyledChunk(chunks, text, fg) {
28
71
  if (text.length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"mermaid.js","sourceRoot":"","sources":["../src/mermaid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA8BvD,oFAAoF;AACpF,mFAAmF;AACnF,gFAAgF;AAChF,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,uGAAuG;AACvG,MAAM,YAAY,GAAG,+BAA+B,CAAC;AAErD;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,cAAc,CAAC,IAAa;IACjE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,SAAS,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,SAAS,8BAA8B,CAC5E,MAAc;IAEd,IAAI,MAAM,CAAC,MAAM,GAAG,iBAAiB,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,gBAAgB,EAAE,CAAC;QACtF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;IACpF,MAAM,WAAW,GAAG,8CAA8C,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEnF,OAAO,WAAW,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,mBAAmB,CAAC;AAChF,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,SAAS,iBAAiB,CAClD,MAAmB,EACnB,IAAY,EACZ,EAAW;IAEX,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAc,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACnD,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAClC,KAAK,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,SAAS,SAAS,CAAC,SAAiB;IACpD,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,CAAC,CAAC,CAAC,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,SAAS,oBAAoB,CACxD,MAAgB,EAChB,SAA6B;IAE7B,IAAI,EAAE,GAAG,SAAS,CAAC;IAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAExB,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAChC,EAAE,GAAG,SAAS,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,KAAK,KAAK,EAAE,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAExB,IACE,CAAC,KAAK,IAAI;gBACV,CAAC,KAAK,SAAS;gBACf,CAAC,KAAK,IAAI;gBACV,CAAC,KAAK,SAAS;gBACf,CAAC,KAAK,IAAI;gBACV,CAAC,KAAK,SAAS,EACf,CAAC;gBACD,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;qBAC3E,QAAQ,CAAC,EAAE,CAAC;qBACZ,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;gBACtB,CAAC,IAAI,CAAC,CAAC;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,+EAA+E;AAC/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,SAAS,gBAAgB,CAAC,KAAa;IACrE,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,SAA6B,CAAC;IAElC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3C,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9C,SAAS,IAAI,OAAO,CAAC;QAErB,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QACnF,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,SAAS,IAAI,IAAI,CAAC;IAElB,OAAO,EAAE,OAAO,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC9D,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAS,wBAAwB,CACvE,MAAc,EACd,OAAO,GAAyB,EAAE;IAElC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC;QACH,IAAI,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE,oEAAoE;gBAC7E,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,kBAAkB;aAC3B,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC;QACrC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE;YAC1C,SAAS,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;YACjD,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,OAAO,EAAE,qCAAqC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QACxF,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/D,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,cAAc;SACvB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"mermaid.js","sourceRoot":"","sources":["../src/mermaid.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tooee/renderers",
3
- "version": "0.9.0",
3
+ "version": "0.9.1",
4
4
  "description": "Content renderers (markdown, code, text, table) for Tooee",
5
5
  "keywords": [
6
6
  "cli",
@@ -45,11 +45,11 @@
45
45
  "typecheck": "tsc --noEmit"
46
46
  },
47
47
  "dependencies": {
48
- "@tooee/commands": "0.9.0",
49
- "@tooee/fuzzy": "0.9.0",
50
- "@tooee/layout": "0.9.0",
51
- "@tooee/marks": "0.9.0",
52
- "@tooee/themes": "0.9.0",
48
+ "@tooee/commands": "0.9.1",
49
+ "@tooee/fuzzy": "0.9.1",
50
+ "@tooee/layout": "0.9.1",
51
+ "@tooee/marks": "0.9.1",
52
+ "@tooee/themes": "0.9.1",
53
53
  "@xstate/store": "^4",
54
54
  "@xstate/store-react": "^2",
55
55
  "beautiful-mermaid": "^1.1.3",
package/src/mermaid.ts CHANGED
@@ -36,6 +36,7 @@ export interface AnsiStyledText {
36
36
  const MAX_SOURCE_LENGTH = 20_000;
37
37
  const MAX_SOURCE_LINES = 300;
38
38
  const MAX_FLOWCHART_EDGES = 32;
39
+ const MIN_UNSAFE_CYCLIC_FAN_DEGREE = 3;
39
40
 
40
41
  // oxlint-disable-next-line no-control-regex -- ANSI SGR sequences start with the ESC control character
41
42
  const SGR_SEQUENCE = /\u001B\[(?<params>[0-9;]*)m/gu;
@@ -48,6 +49,63 @@ export const isMermaidFence = function isMermaidFence(lang?: string): boolean {
48
49
  return (lang ?? "").trim().split(/\s+/u)[0]?.toLowerCase() === "mermaid";
49
50
  };
50
51
 
52
+ const hasDirectedPath = function hasDirectedPath(
53
+ adjacency: Map<string, Set<string>>,
54
+ source: string,
55
+ target: string,
56
+ ): boolean {
57
+ const pending = [...(adjacency.get(source) ?? [])];
58
+ const visited = new Set<string>([source]);
59
+
60
+ while (pending.length > 0) {
61
+ const node = pending.pop();
62
+ if (node === undefined) {
63
+ continue;
64
+ }
65
+ if (node === target) {
66
+ return true;
67
+ }
68
+ if (visited.has(node)) {
69
+ continue;
70
+ }
71
+
72
+ visited.add(node);
73
+ pending.push(...(adjacency.get(node) ?? []));
74
+ }
75
+
76
+ return false;
77
+ };
78
+
79
+ const hasUnsafeCyclicFanTopology = function hasUnsafeCyclicFanTopology(
80
+ edges: ReturnType<typeof parseMermaid>["edges"],
81
+ ): boolean {
82
+ const adjacency = new Map<string, Set<string>>();
83
+ const incomingDegree = new Map<string, number>();
84
+ const outgoingDegree = new Map<string, number>();
85
+
86
+ for (const edge of edges) {
87
+ const targets = adjacency.get(edge.source) ?? new Set<string>();
88
+ targets.add(edge.target);
89
+ adjacency.set(edge.source, targets);
90
+ incomingDegree.set(edge.target, (incomingDegree.get(edge.target) ?? 0) + 1);
91
+ outgoingDegree.set(edge.source, (outgoingDegree.get(edge.source) ?? 0) + 1);
92
+ }
93
+
94
+ const fanInNodes = [...incomingDegree]
95
+ .filter(([, degree]) => degree >= MIN_UNSAFE_CYCLIC_FAN_DEGREE)
96
+ .map(([node]) => node);
97
+ const fanOutNodes = [...outgoingDegree]
98
+ .filter(([, degree]) => degree >= MIN_UNSAFE_CYCLIC_FAN_DEGREE)
99
+ .map(([node]) => node);
100
+
101
+ return fanInNodes.some((fanIn) =>
102
+ fanOutNodes.some(
103
+ (fanOut) =>
104
+ hasDirectedPath(adjacency, fanIn, fanOut) && hasDirectedPath(adjacency, fanOut, fanIn),
105
+ ),
106
+ );
107
+ };
108
+
51
109
  const exceedsSynchronousRenderBudget = function exceedsSynchronousRenderBudget(
52
110
  source: string,
53
111
  ): boolean {
@@ -58,7 +116,12 @@ const exceedsSynchronousRenderBudget = function exceedsSynchronousRenderBudget(
58
116
  const firstLine = source.trimStart().split(/[;\n]/u)[0]?.trim().toLowerCase() ?? "";
59
117
  const isFlowchart = /^(?:flowchart|graph|statediagram(?:-v2)?)\b/u.test(firstLine);
60
118
 
61
- return isFlowchart && parseMermaid(source).edges.length > MAX_FLOWCHART_EDGES;
119
+ if (!isFlowchart) {
120
+ return false;
121
+ }
122
+
123
+ const { edges } = parseMermaid(source);
124
+ return edges.length > MAX_FLOWCHART_EDGES || hasUnsafeCyclicFanTopology(edges);
62
125
  };
63
126
 
64
127
  const appendStyledChunk = function appendStyledChunk(