@yalehwang/archguard 0.1.14 → 0.1.15
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.
- package/dist/cli/cache/diagram-manifest.d.ts.map +1 -1
- package/dist/cli/cache/diagram-manifest.js.map +1 -1
- package/dist/cli/commands/analyze.js +3 -1
- package/dist/cli/commands/analyze.js.map +1 -1
- package/dist/cli/commands/query.d.ts.map +1 -1
- package/dist/cli/commands/query.js +2 -2
- package/dist/cli/commands/query.js.map +1 -1
- package/dist/cli/config-loader.d.ts.map +1 -1
- package/dist/cli/config-loader.js +5 -1
- package/dist/cli/config-loader.js.map +1 -1
- package/dist/cli/mcp/analyze-tool.d.ts.map +1 -1
- package/dist/cli/mcp/analyze-tool.js +1 -4
- package/dist/cli/mcp/analyze-tool.js.map +1 -1
- package/dist/cli/mcp/mcp-server.d.ts.map +1 -1
- package/dist/cli/mcp/mcp-server.js +2 -2
- package/dist/cli/mcp/mcp-server.js.map +1 -1
- package/dist/cli/processors/arch-json-provider.js.map +1 -1
- package/dist/cli/processors/diagram-output-router.d.ts +1 -2
- package/dist/cli/processors/diagram-output-router.d.ts.map +1 -1
- package/dist/cli/processors/diagram-output-router.js +35 -67
- package/dist/cli/processors/diagram-output-router.js.map +1 -1
- package/dist/cli/processors/diagram-processor.d.ts.map +1 -1
- package/dist/cli/processors/diagram-processor.js +14 -17
- package/dist/cli/processors/diagram-processor.js.map +1 -1
- package/dist/cli/query/arch-index-builder.js +4 -4
- package/dist/cli/query/arch-index-builder.js.map +1 -1
- package/dist/cli/query/engine-loader.d.ts.map +1 -1
- package/dist/cli/query/engine-loader.js +7 -13
- package/dist/cli/query/engine-loader.js.map +1 -1
- package/dist/cli/query/query-engine.d.ts.map +1 -1
- package/dist/cli/query/query-engine.js +12 -16
- package/dist/cli/query/query-engine.js.map +1 -1
- package/dist/cli/utils/canonicalize-arch-json.d.ts.map +1 -1
- package/dist/cli/utils/canonicalize-arch-json.js +3 -1
- package/dist/cli/utils/canonicalize-arch-json.js.map +1 -1
- package/dist/cli/utils/default-scope-planner.js +1 -1
- package/dist/cli/utils/default-scope-planner.js.map +1 -1
- package/dist/cli/utils/project-structure-detector.d.ts.map +1 -1
- package/dist/cli/utils/project-structure-detector.js.map +1 -1
- package/dist/mermaid/grouper.js +4 -4
- package/dist/mermaid/grouper.js.map +1 -1
- package/dist/mermaid/post-process-svg.d.ts +3 -0
- package/dist/mermaid/post-process-svg.d.ts.map +1 -0
- package/dist/mermaid/post-process-svg.js +138 -0
- package/dist/mermaid/post-process-svg.js.map +1 -0
- package/dist/mermaid/render-worker-pool.d.ts +10 -2
- package/dist/mermaid/render-worker-pool.d.ts.map +1 -1
- package/dist/mermaid/render-worker-pool.js +56 -11
- package/dist/mermaid/render-worker-pool.js.map +1 -1
- package/dist/mermaid/render-worker.js +16 -2
- package/dist/mermaid/render-worker.js.map +1 -1
- package/dist/mermaid/renderer.d.ts +2 -1
- package/dist/mermaid/renderer.d.ts.map +1 -1
- package/dist/mermaid/renderer.js +13 -121
- package/dist/mermaid/renderer.js.map +1 -1
- package/dist/parser/archjson-aggregator.d.ts.map +1 -1
- package/dist/parser/archjson-aggregator.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-engine.js","sourceRoot":"","sources":["../../../src/cli/query/query-engine.ts"],"names":[],"mappings":"AA0BA,MAAM,OAAO,WAAW;IACd,QAAQ,CAAW;IACnB,KAAK,CAAY;IACjB,UAAU,CAAkB;IAC5B,SAAS,CAAsB;IAEvC,YAAY,OAA2B;QACrC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAErC,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"query-engine.js","sourceRoot":"","sources":["../../../src/cli/query/query-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonicalize-arch-json.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/canonicalize-arch-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAqD,MAAM,kBAAkB,CAAC;AAEpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"canonicalize-arch-json.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/canonicalize-arch-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAqD,MAAM,kBAAkB,CAAC;AAEpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAYjE"}
|
|
@@ -4,7 +4,9 @@ export function canonicalizeArchJson(archJson) {
|
|
|
4
4
|
sourceFiles: [...(archJson.sourceFiles ?? [])].sort(),
|
|
5
5
|
entities: [...(archJson.entities ?? [])].map(canonicalizeEntity).sort(compareEntity),
|
|
6
6
|
relations: [...(archJson.relations ?? [])].sort(compareRelation),
|
|
7
|
-
modules: archJson.modules
|
|
7
|
+
modules: archJson.modules
|
|
8
|
+
? [...archJson.modules].map(canonicalizeModule).sort(compareModule)
|
|
9
|
+
: undefined,
|
|
8
10
|
metrics: archJson.metrics ? canonicalizeMetrics(archJson.metrics) : archJson.metrics,
|
|
9
11
|
extensions: canonicalizeExtensions(archJson.extensions),
|
|
10
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonicalize-arch-json.js","sourceRoot":"","sources":["../../../src/cli/utils/canonicalize-arch-json.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,QAAkB;IACrD,OAAO;QACL,GAAG,QAAQ;QACX,WAAW,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QACrD,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACpF,SAAS,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"canonicalize-arch-json.js","sourceRoot":"","sources":["../../../src/cli/utils/canonicalize-arch-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ function createScopeDiagrams(scope, options) {
|
|
|
76
76
|
];
|
|
77
77
|
}
|
|
78
78
|
function selectScopeRoot(candidate, projectRoot) {
|
|
79
|
-
if (candidate.language === 'cpp'
|
|
79
|
+
if (candidate.language === 'cpp') {
|
|
80
80
|
return projectRoot;
|
|
81
81
|
}
|
|
82
82
|
return candidate.roots[0] ?? projectRoot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-scope-planner.js","sourceRoot":"","sources":["../../../src/cli/utils/default-scope-planner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"default-scope-planner.js","sourceRoot":"","sources":["../../../src/cli/utils/default-scope-planner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-structure-detector.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,eAAO,MAAM,yBAAyB,UAAiB,CAAC;AAuBxD,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAarE;AAWD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,EAA8B,GAC/C,OAAO,CAAC,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"project-structure-detector.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,eAAO,MAAM,yBAAyB,UAAiB,CAAC;AAuBxD,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAarE;AAWD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,EAA8B,GAC/C,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAQD,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,UAAU,GAAE,MAAM,EAA8B,GAC/C,OAAO,CAAC,OAAO,CAAC,CAiBlB;AA4CD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,aAAa,EAAE,CAAC,CAmE1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-structure-detector.js","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAGxD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,cAAc;IACd,MAAM;IACN,MAAM;IACN,OAAO;IACP,UAAU;IACV,WAAW;IACX,OAAO;IACP,MAAM;IACN,QAAQ;IACR,MAAM;IACN,KAAK;CACN,CAAC,CAAC;AAQH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,KAAK,MAAM,SAAS,IAAI,sBAAsB,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,UAAkB,EAClB,aAAuB,yBAAyB;IAGhD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEvD,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QACnC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QAC5C,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAGzC,MAAM,SAAS,GAAG,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"project-structure-detector.js","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"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"}
|
package/dist/mermaid/grouper.js
CHANGED
|
@@ -78,7 +78,7 @@ export class HeuristicGrouper {
|
|
|
78
78
|
: null;
|
|
79
79
|
const packageName = isPathBased
|
|
80
80
|
? entity.name.split('/')[0]
|
|
81
|
-
: javaModuleName ?? this.extractPackageName(entity.sourceLocation.file);
|
|
81
|
+
: (javaModuleName ?? this.extractPackageName(entity.sourceLocation.file));
|
|
82
82
|
if (!packageMap.has(packageName)) {
|
|
83
83
|
packageMap.set(packageName, []);
|
|
84
84
|
}
|
|
@@ -162,11 +162,11 @@ export class HeuristicGrouper {
|
|
|
162
162
|
const current = packages[i];
|
|
163
163
|
if (!current)
|
|
164
164
|
continue;
|
|
165
|
-
const isProtectedGroup = current.reasoning?.includes('/') ||
|
|
165
|
+
const isProtectedGroup = current.reasoning?.includes('/') ||
|
|
166
|
+
current.reasoning?.startsWith('Grouped by Maven module:');
|
|
166
167
|
if (current.entities.length <= threshold && !isProtectedGroup && i + 1 < packages.length) {
|
|
167
168
|
const next = packages[i + 1];
|
|
168
|
-
const nextIsProtectedGroup = next?.reasoning?.includes('/') ||
|
|
169
|
-
next?.reasoning?.startsWith('Grouped by Maven module:');
|
|
169
|
+
const nextIsProtectedGroup = next?.reasoning?.includes('/') || next?.reasoning?.startsWith('Grouped by Maven module:');
|
|
170
170
|
if (next && !skipIndices.has(i + 1) && !nextIsProtectedGroup) {
|
|
171
171
|
merged.push({
|
|
172
172
|
name: `${current.name} & ${next.name}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouper.js","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grouper.js","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"post-process-svg.d.ts","sourceRoot":"","sources":["../../src/mermaid/post-process-svg.ts"],"names":[],"mappings":"AAaA,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAwJpD;AAsBD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,GAAG,MAAM,CAWrF"}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
export function inlineEdgeStyles(svg) {
|
|
2
|
+
const extractCssProperty = (rulePattern, property) => {
|
|
3
|
+
const match = svg.match(rulePattern);
|
|
4
|
+
if (!match)
|
|
5
|
+
return '';
|
|
6
|
+
for (const decl of match[1].split(';')) {
|
|
7
|
+
const [rawProp, ...rawValueParts] = decl.split(':');
|
|
8
|
+
if (!rawProp || rawValueParts.length === 0)
|
|
9
|
+
continue;
|
|
10
|
+
if (rawProp.trim().toLowerCase() !== property)
|
|
11
|
+
continue;
|
|
12
|
+
const value = rawValueParts.join(':').trim();
|
|
13
|
+
if (value)
|
|
14
|
+
return value;
|
|
15
|
+
}
|
|
16
|
+
return '';
|
|
17
|
+
};
|
|
18
|
+
const flowchartLinkRuleMatch = svg.match(/\.flowchart-link[^{]*\{([^}]+)\}/);
|
|
19
|
+
let flowchartLinkFill = 'none';
|
|
20
|
+
let flowchartLinkStroke = '';
|
|
21
|
+
if (flowchartLinkRuleMatch) {
|
|
22
|
+
for (const decl of flowchartLinkRuleMatch[1].split(';')) {
|
|
23
|
+
const [rawProp, ...rawValueParts] = decl.split(':');
|
|
24
|
+
if (!rawProp || rawValueParts.length === 0)
|
|
25
|
+
continue;
|
|
26
|
+
const prop = rawProp.trim().toLowerCase();
|
|
27
|
+
const value = rawValueParts.join(':').trim();
|
|
28
|
+
if (!value)
|
|
29
|
+
continue;
|
|
30
|
+
if (prop === 'fill')
|
|
31
|
+
flowchartLinkFill = value;
|
|
32
|
+
if (prop === 'stroke')
|
|
33
|
+
flowchartLinkStroke = value;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const relationRuleMatch = svg.match(/\.relation[^{]*\{([^}]+)\}/);
|
|
37
|
+
let relationFill = 'none';
|
|
38
|
+
let relationStroke = '';
|
|
39
|
+
if (relationRuleMatch) {
|
|
40
|
+
for (const decl of relationRuleMatch[1].split(';')) {
|
|
41
|
+
const [rawProp, ...rawValueParts] = decl.split(':');
|
|
42
|
+
if (!rawProp || rawValueParts.length === 0)
|
|
43
|
+
continue;
|
|
44
|
+
const prop = rawProp.trim().toLowerCase();
|
|
45
|
+
const value = rawValueParts.join(':').trim();
|
|
46
|
+
if (!value)
|
|
47
|
+
continue;
|
|
48
|
+
if (prop === 'fill')
|
|
49
|
+
relationFill = value;
|
|
50
|
+
if (prop === 'stroke')
|
|
51
|
+
relationStroke = value;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
let result = svg.replace(/(<path\b[^>]*class="[^"]*\bflowchart-link\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
55
|
+
const hasFill = /\bfill\s*:/.test(style);
|
|
56
|
+
const hasStroke = /\bstroke\s*:/.test(style);
|
|
57
|
+
if (hasFill && (hasStroke || flowchartLinkStroke.length === 0))
|
|
58
|
+
return _;
|
|
59
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
60
|
+
const injected = [
|
|
61
|
+
!hasFill ? `fill:${flowchartLinkFill};` : '',
|
|
62
|
+
!hasStroke && flowchartLinkStroke ? `stroke:${flowchartLinkStroke};` : '',
|
|
63
|
+
].join('');
|
|
64
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}${injected}${post}`;
|
|
65
|
+
});
|
|
66
|
+
result = result.replace(/(<path\b[^>]*class="[^"]*\brelation\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
67
|
+
const hasFill = /\bfill\s*:/.test(style);
|
|
68
|
+
const hasStroke = /\bstroke\s*:/.test(style);
|
|
69
|
+
if (hasFill && (hasStroke || relationStroke.length === 0))
|
|
70
|
+
return _;
|
|
71
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
72
|
+
const injected = [
|
|
73
|
+
!hasFill ? `fill:${relationFill};` : '',
|
|
74
|
+
!hasStroke && relationStroke ? `stroke:${relationStroke};` : '',
|
|
75
|
+
].join('');
|
|
76
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}${injected}${post}`;
|
|
77
|
+
});
|
|
78
|
+
result = result.replace(/(<rect\b[^>]*class="[^"]*\bbackground\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
79
|
+
if (/\bfill\s*:/.test(style))
|
|
80
|
+
return _;
|
|
81
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
82
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}fill:none;${post}`;
|
|
83
|
+
});
|
|
84
|
+
const nodeRectRuleMatch = svg.match(/\.node\s+rect[^{]*\{([^}]+)\}/);
|
|
85
|
+
if (nodeRectRuleMatch) {
|
|
86
|
+
const nodeProps = nodeRectRuleMatch[1]
|
|
87
|
+
.split(';')
|
|
88
|
+
.map((p) => p.trim())
|
|
89
|
+
.filter((p) => p.length > 0)
|
|
90
|
+
.join(';');
|
|
91
|
+
if (nodeProps) {
|
|
92
|
+
result = result.replace(/(<rect\b[^>]*class="[^"]*\bbasic\b[^"]*\blabel-container\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
93
|
+
if (/\bfill\s*:/.test(style))
|
|
94
|
+
return _;
|
|
95
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
96
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}${nodeProps};${post}`;
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
const nodeTextAnchor = extractCssProperty(/\.node\s+\.label\s+text[^{]*\{([^}]+)\}/, 'text-anchor');
|
|
101
|
+
if (nodeTextAnchor) {
|
|
102
|
+
result = result.replace(/(<g\b[^>]*class="[^"]*\bnode\b[^"]*"[^>]*>[\s\S]*?<g\b[^>]*class="[^"]*\blabel\b[^"]*"[^>]*>[\s\S]*?<text\b[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
103
|
+
if (/\btext-anchor\s*:/.test(style))
|
|
104
|
+
return _;
|
|
105
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
106
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}text-anchor:${nodeTextAnchor};${post}`;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
const clusterTextAnchor = extractCssProperty(/\.cluster-label\s+text[^{]*\{([^}]+)\}/, 'text-anchor');
|
|
110
|
+
if (clusterTextAnchor) {
|
|
111
|
+
result = result.replace(/(<g\b[^>]*class="[^"]*\bcluster-label\b[^"]*"[^>]*>[\s\S]*?<text\b[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
112
|
+
if (/\btext-anchor\s*:/.test(style))
|
|
113
|
+
return _;
|
|
114
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
115
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}text-anchor:${clusterTextAnchor};${post}`;
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
return result;
|
|
119
|
+
}
|
|
120
|
+
function injectBackground(svg) {
|
|
121
|
+
const bg = 'white';
|
|
122
|
+
const styleMatch = svg.match(/<svg[^>]*style="([^"]*)"/);
|
|
123
|
+
if (styleMatch) {
|
|
124
|
+
return svg.replace(/(<svg[^>]*style=")([^"]*)(")/g, `$1$2; background-color: ${bg};$3`);
|
|
125
|
+
}
|
|
126
|
+
return svg.replace(/<svg/, `<svg style="background-color: ${bg};"`);
|
|
127
|
+
}
|
|
128
|
+
export function postProcessSVG(rawSvg, transparentBackground) {
|
|
129
|
+
const withEdgeStyles = inlineEdgeStyles(rawSvg);
|
|
130
|
+
if (transparentBackground) {
|
|
131
|
+
return withEdgeStyles;
|
|
132
|
+
}
|
|
133
|
+
if (/<svg[^>]*style="[^"]*background-color/.test(withEdgeStyles)) {
|
|
134
|
+
return withEdgeStyles;
|
|
135
|
+
}
|
|
136
|
+
return injectBackground(withEdgeStyles);
|
|
137
|
+
}
|
|
138
|
+
//# sourceMappingURL=post-process-svg.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"post-process-svg.js","sourceRoot":"","sources":["../../src/mermaid/post-process-svg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export interface WorkerInitData {
|
|
2
2
|
theme: string;
|
|
3
|
-
|
|
3
|
+
maxTextSize: number;
|
|
4
|
+
transparentBackground: boolean;
|
|
5
|
+
themeVariables?: Record<string, string>;
|
|
4
6
|
}
|
|
5
7
|
export interface RenderJob {
|
|
6
8
|
jobId: string;
|
|
@@ -19,8 +21,14 @@ export declare class MermaidRenderWorkerPool {
|
|
|
19
21
|
private idle;
|
|
20
22
|
private queue;
|
|
21
23
|
private pending;
|
|
24
|
+
private workerInFlight;
|
|
25
|
+
private workerRestarts;
|
|
26
|
+
private terminating;
|
|
27
|
+
private readonly MAX_RESTARTS;
|
|
22
28
|
constructor(poolSize: number, initData: WorkerInitData);
|
|
23
|
-
|
|
29
|
+
private spawnWorker;
|
|
30
|
+
start(): void;
|
|
31
|
+
private onWorkerExit;
|
|
24
32
|
render(job: Omit<RenderJob, 'jobId'>): Promise<RenderResult>;
|
|
25
33
|
private dispatch;
|
|
26
34
|
private onResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-worker-pool.d.ts","sourceRoot":"","sources":["../../src/mermaid/render-worker-pool.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,
|
|
1
|
+
{"version":3,"file":"render-worker-pool.d.ts","sourceRoot":"","sources":["../../src/mermaid/render-worker-pool.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAQD,qBAAa,uBAAuB;IAWhC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAX3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,OAAO,CAAgD;IAC/D,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAK;gBAGf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc;IAG3C,OAAO,CAAC,WAAW;IAenB,KAAK,IAAI,IAAI;IAMb,OAAO,CAAC,YAAY;IAsCpB,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAQ5D,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,QAAQ;IAgBV,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBjC"}
|
|
@@ -12,23 +12,64 @@ export class MermaidRenderWorkerPool {
|
|
|
12
12
|
idle = [];
|
|
13
13
|
queue = [];
|
|
14
14
|
pending = new Map();
|
|
15
|
+
workerInFlight = new Map();
|
|
16
|
+
workerRestarts = new Map();
|
|
17
|
+
terminating = false;
|
|
18
|
+
MAX_RESTARTS = 3;
|
|
15
19
|
constructor(poolSize, initData) {
|
|
16
20
|
this.poolSize = poolSize;
|
|
17
21
|
this.initData = initData;
|
|
18
22
|
}
|
|
19
|
-
|
|
23
|
+
spawnWorker() {
|
|
24
|
+
const w = new Worker(WORKER_FILE, {
|
|
25
|
+
workerData: this.initData,
|
|
26
|
+
execArgv: sanitizeWorkerExecArgv(process.execArgv),
|
|
27
|
+
resourceLimits: { maxOldGenerationSizeMb: 2048 },
|
|
28
|
+
});
|
|
29
|
+
w.on('message', (result) => this.onResult(w, result));
|
|
30
|
+
w.on('error', (err) => {
|
|
31
|
+
console.error(`[render-worker] worker error: ${err.message}`);
|
|
32
|
+
});
|
|
33
|
+
w.on('exit', (code) => this.onWorkerExit(w, code));
|
|
34
|
+
this.idle.push(w);
|
|
35
|
+
return w;
|
|
36
|
+
}
|
|
37
|
+
start() {
|
|
20
38
|
for (let i = 0; i < this.poolSize; i++) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
this.
|
|
30
|
-
|
|
39
|
+
this.workers.push(this.spawnWorker());
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
onWorkerExit(w, code) {
|
|
43
|
+
if (code === 0 || this.terminating)
|
|
44
|
+
return;
|
|
45
|
+
const jobId = this.workerInFlight.get(w);
|
|
46
|
+
if (jobId) {
|
|
47
|
+
const resolve = this.pending.get(jobId);
|
|
48
|
+
if (resolve) {
|
|
49
|
+
this.pending.delete(jobId);
|
|
50
|
+
resolve({ jobId, success: false, error: `Worker exited unexpectedly (code=${code})` });
|
|
51
|
+
}
|
|
52
|
+
this.workerInFlight.delete(w);
|
|
53
|
+
}
|
|
54
|
+
const idleIdx = this.idle.indexOf(w);
|
|
55
|
+
if (idleIdx !== -1)
|
|
56
|
+
this.idle.splice(idleIdx, 1);
|
|
57
|
+
const restarts = this.workerRestarts.get(w) ?? 0;
|
|
58
|
+
if (restarts < this.MAX_RESTARTS) {
|
|
59
|
+
console.warn(`[render-worker] worker exited (code=${code}), respawning (${restarts + 1}/${this.MAX_RESTARTS})`);
|
|
60
|
+
const replacement = this.spawnWorker();
|
|
61
|
+
this.workerRestarts.set(replacement, restarts + 1);
|
|
62
|
+
const idx = this.workers.indexOf(w);
|
|
63
|
+
if (idx !== -1)
|
|
64
|
+
this.workers[idx] = replacement;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
console.error(`[render-worker] worker reached max restarts (${this.MAX_RESTARTS}), not respawning`);
|
|
68
|
+
const idx = this.workers.indexOf(w);
|
|
69
|
+
if (idx !== -1)
|
|
70
|
+
this.workers.splice(idx, 1);
|
|
31
71
|
}
|
|
72
|
+
this.workerRestarts.delete(w);
|
|
32
73
|
}
|
|
33
74
|
render(job) {
|
|
34
75
|
const fullJob = { ...job, jobId: randomUUID() };
|
|
@@ -40,6 +81,7 @@ export class MermaidRenderWorkerPool {
|
|
|
40
81
|
dispatch(job) {
|
|
41
82
|
const worker = this.idle.pop();
|
|
42
83
|
if (worker) {
|
|
84
|
+
this.workerInFlight.set(worker, job.jobId);
|
|
43
85
|
worker.postMessage(job);
|
|
44
86
|
}
|
|
45
87
|
else {
|
|
@@ -47,6 +89,7 @@ export class MermaidRenderWorkerPool {
|
|
|
47
89
|
}
|
|
48
90
|
}
|
|
49
91
|
onResult(worker, result) {
|
|
92
|
+
this.workerInFlight.delete(worker);
|
|
50
93
|
const resolve = this.pending.get(result.jobId);
|
|
51
94
|
if (resolve) {
|
|
52
95
|
this.pending.delete(result.jobId);
|
|
@@ -54,6 +97,7 @@ export class MermaidRenderWorkerPool {
|
|
|
54
97
|
}
|
|
55
98
|
const next = this.queue.shift();
|
|
56
99
|
if (next) {
|
|
100
|
+
this.workerInFlight.set(worker, next.job.jobId);
|
|
57
101
|
worker.postMessage(next.job);
|
|
58
102
|
}
|
|
59
103
|
else {
|
|
@@ -61,6 +105,7 @@ export class MermaidRenderWorkerPool {
|
|
|
61
105
|
}
|
|
62
106
|
}
|
|
63
107
|
async terminate() {
|
|
108
|
+
this.terminating = true;
|
|
64
109
|
await Promise.all(this.workers.map((w) => w.terminate()));
|
|
65
110
|
for (const { job } of this.queue) {
|
|
66
111
|
const resolve = this.pending.get(job.jobId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-worker-pool.js","sourceRoot":"","sources":["../../src/mermaid/render-worker-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"render-worker-pool.js","sourceRoot":"","sources":["../../src/mermaid/render-worker-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { workerData, parentPort } from 'worker_threads';
|
|
2
2
|
import mermaid from 'isomorphic-mermaid';
|
|
3
|
+
import { postProcessSVG } from './post-process-svg.js';
|
|
3
4
|
const initData = workerData;
|
|
4
5
|
mermaid.initialize({
|
|
5
6
|
startOnLoad: false,
|
|
6
7
|
theme: (initData.theme ?? 'default'),
|
|
7
8
|
securityLevel: 'loose',
|
|
9
|
+
maxTextSize: initData.maxTextSize ?? 200000,
|
|
10
|
+
themeVariables: initData.themeVariables,
|
|
8
11
|
});
|
|
9
|
-
|
|
12
|
+
const handleMessage = async (job) => {
|
|
10
13
|
try {
|
|
11
|
-
const { svg } = await mermaid.render(job.jobId, job.mermaidCode);
|
|
14
|
+
const { svg: rawSvg } = await mermaid.render(job.jobId, job.mermaidCode);
|
|
15
|
+
const svg = postProcessSVG(rawSvg, initData.transparentBackground);
|
|
12
16
|
parentPort.postMessage({ jobId: job.jobId, success: true, svg });
|
|
13
17
|
}
|
|
14
18
|
catch (e) {
|
|
@@ -18,5 +22,15 @@ parentPort.on('message', async (job) => {
|
|
|
18
22
|
error: e instanceof Error ? e.message : String(e),
|
|
19
23
|
});
|
|
20
24
|
}
|
|
25
|
+
};
|
|
26
|
+
parentPort.on('message', (job) => {
|
|
27
|
+
handleMessage(job).catch((e) => {
|
|
28
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
29
|
+
parentPort.postMessage({
|
|
30
|
+
jobId: job.jobId,
|
|
31
|
+
success: false,
|
|
32
|
+
error: `Worker unhandled: ${msg}`,
|
|
33
|
+
});
|
|
34
|
+
});
|
|
21
35
|
});
|
|
22
36
|
//# sourceMappingURL=render-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["../../src/mermaid/render-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,OAAO,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["../../src/mermaid/render-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,MAAM,QAAQ,GAAG,UAA4B,CAAC;AAE9C,OAAO,CAAC,UAAU,CAAC;IACjB,WAAW,EAAE,KAAK;IAClB,KAAK,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,SAAS,CAMzB;IACV,aAAa,EAAE,OAAO;IACtB,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,MAAM;IAC3C,cAAc,EAAE,QAAQ,CAAC,cAAc;CACxC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,KAAK,EAAE,GAAc,EAAiB,EAAE;IAC5D,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QACnE,UAAU,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAyB,CAAC,CAAC;IAC1F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,UAAU,CAAC,WAAW,CAAC;YACrB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAEF,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAc,EAAE,EAAE;IAC1C,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,UAAU,CAAC,WAAW,CAAC;YACrB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,qBAAqB,GAAG,EAAE;SACX,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { MermaidRendererOptions, MermaidOutputPaths } from './types.js';
|
|
2
|
-
export
|
|
2
|
+
export { inlineEdgeStyles } from './post-process-svg.js';
|
|
3
3
|
export declare class IsomorphicMermaidRenderer {
|
|
4
4
|
private readonly options;
|
|
5
5
|
private initialized;
|
|
6
6
|
constructor(options?: Partial<MermaidRendererOptions>);
|
|
7
7
|
renderSVG(mermaidCode: string): Promise<string>;
|
|
8
|
+
renderSVGRaw(mermaidCode: string): Promise<string>;
|
|
8
9
|
renderPNG(mermaidCode: string, outputPath: string): Promise<void>;
|
|
9
10
|
convertSVGToPNG(svg: string, outputPath: string): Promise<void>;
|
|
10
11
|
renderAndSave(mermaidCode: string, paths: MermaidOutputPaths): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAMzD,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC;IAa/C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwC/C,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelD,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjE,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmD/D,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BlF,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,UAAU;IAOlB,UAAU,IAAI,sBAAsB;IAOpC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI;IA2B1D,OAAO,CAAC,oBAAoB;CAgC7B"}
|