@bendyline/squisq 1.5.2 → 2.0.0
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/README.md +63 -10
- package/dist/{Doc-BBVGq1_9.d.ts → Doc-ylqWKDc_.d.ts} +248 -37
- package/dist/{ImageEditDoc-FuyGtt6o.d.ts → ImageEditDoc-D828IXJ1.d.ts} +1 -1
- package/dist/annotationCoercion-Dr_DY9Hx.d.ts +86 -0
- package/dist/{chunk-VWUFZ6ZG.js → chunk-3E5F2XMR.js} +2 -29
- package/dist/chunk-3E5F2XMR.js.map +1 -0
- package/dist/chunk-4X3JQXNM.js +35 -0
- package/dist/chunk-4X3JQXNM.js.map +1 -0
- package/dist/{chunk-P3K7NLHF.js → chunk-5DKBFXPY.js} +31 -121
- package/dist/chunk-5DKBFXPY.js.map +1 -0
- package/dist/{chunk-DLXZMS5K.js → chunk-5J4HKRJF.js} +51 -3
- package/dist/chunk-5J4HKRJF.js.map +1 -0
- package/dist/chunk-5UYI3RJB.js +2503 -0
- package/dist/chunk-5UYI3RJB.js.map +1 -0
- package/dist/{chunk-BEQODJWV.js → chunk-66QO7XFB.js} +11 -291
- package/dist/chunk-66QO7XFB.js.map +1 -0
- package/dist/{chunk-KKNUBQ6Y.js → chunk-6PJRB2CF.js} +156 -91
- package/dist/chunk-6PJRB2CF.js.map +1 -0
- package/dist/{chunk-HWVFJAAH.js → chunk-AMIR72JP.js} +28 -10
- package/dist/chunk-AMIR72JP.js.map +1 -0
- package/dist/chunk-FVJUUTEM.js +74 -0
- package/dist/chunk-FVJUUTEM.js.map +1 -0
- package/dist/{chunk-5TYS5V3G.js → chunk-GF3BVNLU.js} +4127 -3538
- package/dist/chunk-GF3BVNLU.js.map +1 -0
- package/dist/{chunk-Q3ROPT5H.js → chunk-GZY66SDN.js} +1 -1
- package/dist/{chunk-Q3ROPT5H.js.map → chunk-GZY66SDN.js.map} +1 -1
- package/dist/chunk-JOQYPRDZ.js +127 -0
- package/dist/chunk-JOQYPRDZ.js.map +1 -0
- package/dist/{chunk-A4O7GIWE.js → chunk-LYNJEOAC.js} +10 -73
- package/dist/chunk-LYNJEOAC.js.map +1 -0
- package/dist/{chunk-LDQ2HJIX.js → chunk-PXLVXTLW.js} +252 -54
- package/dist/chunk-PXLVXTLW.js.map +1 -0
- package/dist/{chunk-TQWLI6S2.js → chunk-Q7LROV2H.js} +4 -2
- package/dist/{chunk-TQWLI6S2.js.map → chunk-Q7LROV2H.js.map} +1 -1
- package/dist/{chunk-T5UK6YOB.js → chunk-QTSJOY54.js} +60 -17
- package/dist/chunk-QTSJOY54.js.map +1 -0
- package/dist/chunk-QVANWDPH.js +2358 -0
- package/dist/chunk-QVANWDPH.js.map +1 -0
- package/dist/{chunk-GPLTCSXO.js → chunk-R2GC6RLD.js} +7 -7
- package/dist/chunk-R2GC6RLD.js.map +1 -0
- package/dist/chunk-R2YZTCLO.js +292 -0
- package/dist/chunk-R2YZTCLO.js.map +1 -0
- package/dist/chunk-S7A5D7ZJ.js +174 -0
- package/dist/chunk-S7A5D7ZJ.js.map +1 -0
- package/dist/chunk-T3TI7GSZ.js +884 -0
- package/dist/chunk-T3TI7GSZ.js.map +1 -0
- package/dist/{chunk-LTN6I7QW.js → chunk-TUWMK62B.js} +55 -4
- package/dist/chunk-TUWMK62B.js.map +1 -0
- package/dist/{chunk-IMSCRLLV.js → chunk-VR7UPJ7C.js} +35 -25
- package/dist/chunk-VR7UPJ7C.js.map +1 -0
- package/dist/doc/index.d.ts +2334 -5
- package/dist/doc/index.js +127 -33
- package/dist/generate/index.d.ts +7 -2
- package/dist/generate/index.js +1 -1
- package/dist/imageEdit/index.d.ts +9 -6
- package/dist/imageEdit/index.js +3 -3
- package/dist/index.d.ts +12 -10
- package/dist/index.js +246 -80
- package/dist/jsonForm/index.d.ts +7 -3
- package/dist/jsonForm/index.js +9 -4
- package/dist/markdown/index.d.ts +6 -70
- package/dist/markdown/index.js +13 -9
- package/dist/narration/index.d.ts +618 -0
- package/dist/narration/index.js +82 -0
- package/dist/recommend/index.d.ts +15 -1
- package/dist/recommend/index.js +2 -2
- package/dist/schemas/index.d.ts +28 -6
- package/dist/schemas/index.js +15 -13
- package/dist/spatial/index.d.ts +0 -1
- package/dist/spatial/index.js +1 -1
- package/dist/storage/index.js +1 -1
- package/dist/{themeLibrary-CehcJhzz.d.ts → themeLibrary-RjVgLpUi.d.ts} +10 -11
- package/dist/timing/index.js +5 -3
- package/dist/transform/index.d.ts +35 -24
- package/dist/transform/index.js +9 -10
- package/dist/{types-DlAZ7MW4.d.ts → types-BwMPl2CB.d.ts} +1 -1
- package/dist/{types-D98li1gV.d.ts → types-C4kiRn_k.d.ts} +3 -1
- package/dist/versions/index.d.ts +2 -1
- package/dist/versions/index.js +2 -2
- package/package.json +6 -6
- package/src/__tests__/applyNarrationTiming.test.ts +190 -0
- package/src/__tests__/applyRenderStyle.test.ts +3 -3
- package/src/__tests__/asciiDiagramBattle.test.ts +246 -0
- package/src/__tests__/asciiDiagramDetect.test.ts +162 -0
- package/src/__tests__/asciiDiagramMapping.test.ts +38 -0
- package/src/__tests__/asciiDiagramParse.test.ts +233 -0
- package/src/__tests__/asciiDiagramPipeline.test.ts +273 -0
- package/src/__tests__/asciiDiagramRender.test.ts +162 -0
- package/src/__tests__/asciiDiagramRepair.test.ts +84 -0
- package/src/__tests__/asciiTimelineDetect.test.ts +157 -0
- package/src/__tests__/asciiTimelineParse.test.ts +205 -0
- package/src/__tests__/asciiTimelinePipeline.test.ts +349 -0
- package/src/__tests__/asciiTimelineRender.test.ts +376 -0
- package/src/__tests__/attrTokens.test.ts +5 -0
- package/src/__tests__/contentContainer.test.ts +43 -0
- package/src/__tests__/customTemplatesFrontmatter.test.ts +0 -15
- package/src/__tests__/dataTable.test.ts +25 -15
- package/src/__tests__/diagramBlock.test.ts +3 -3
- package/src/__tests__/diagramText.test.ts +26 -0
- package/src/__tests__/docToMarkdownMedia.test.ts +83 -0
- package/src/__tests__/drawingBlock.test.ts +3 -3
- package/src/__tests__/fixtures/asciiDiagramBattle.ts +512 -0
- package/src/__tests__/fixtures/asciiDiagrams.ts +287 -0
- package/src/__tests__/fixtures/asciiTimelines.ts +35 -0
- package/src/__tests__/fixtures/treeviewFixtures.ts +243 -0
- package/src/__tests__/getLayers.test.ts +32 -18
- package/src/__tests__/getLayersFallback.test.ts +8 -8
- package/src/__tests__/imageEditVersions.test.ts +2 -0
- package/src/__tests__/jsonForm.pointer.test.ts +47 -1
- package/src/__tests__/layoutBlock.test.ts +3 -3
- package/src/__tests__/majorApiTypes.test.ts +18 -0
- package/src/__tests__/markdown.test.ts +41 -0
- package/src/__tests__/matchFontFamily.test.ts +114 -0
- package/src/__tests__/materializeBlockLayers.test.ts +135 -0
- package/src/__tests__/materializeTestUtils.ts +17 -0
- package/src/__tests__/narrationAlign.test.ts +150 -0
- package/src/__tests__/narrationFeatures.test.ts +71 -0
- package/src/__tests__/narrationNuclei.test.ts +45 -0
- package/src/__tests__/narrationPacing.test.ts +189 -0
- package/src/__tests__/narrationScript.test.ts +149 -0
- package/src/__tests__/narrationSessionRepro.test.ts +62 -0
- package/src/__tests__/narrationSidecar.test.ts +88 -0
- package/src/__tests__/narrationSyllables.test.ts +65 -0
- package/src/__tests__/narrationTestSignals.ts +167 -0
- package/src/__tests__/narrationVad.test.ts +66 -0
- package/src/__tests__/resolveDocTheme.test.ts +16 -2
- package/src/__tests__/rootExports.test.ts +18 -0
- package/src/__tests__/scopedContentContainer.test.ts +20 -0
- package/src/__tests__/shapeGeometry.test.ts +12 -0
- package/src/__tests__/templateAnnotationParse.test.ts +10 -0
- package/src/__tests__/templateInputs.test.ts +69 -0
- package/src/__tests__/templateMetadata.test.ts +2 -1
- package/src/__tests__/templates.test.ts +143 -17
- package/src/__tests__/themeCompile.test.ts +49 -22
- package/src/__tests__/transformProvenance.test.ts +160 -0
- package/src/__tests__/transformV2.test.ts +40 -14
- package/src/__tests__/treeviewBattle.test.ts +76 -0
- package/src/__tests__/treeviewDetect.test.ts +168 -0
- package/src/__tests__/treeviewParse.test.ts +118 -0
- package/src/__tests__/treeviewPipeline.test.ts +183 -0
- package/src/__tests__/treeviewRender.test.ts +91 -0
- package/src/__tests__/versions.test.ts +44 -0
- package/src/doc/applyNarrationTiming.ts +244 -0
- package/src/doc/asciiDiagram/chars.ts +210 -0
- package/src/doc/asciiDiagram/detect.ts +175 -0
- package/src/doc/asciiDiagram/index.ts +38 -0
- package/src/doc/asciiDiagram/mapping.ts +225 -0
- package/src/doc/asciiDiagram/parse.ts +1095 -0
- package/src/doc/asciiDiagram/render.ts +963 -0
- package/src/doc/asciiDiagram/repair.ts +400 -0
- package/src/doc/asciiDiagram/types.ts +65 -0
- package/src/doc/asciiTimeline/detect.ts +138 -0
- package/src/doc/asciiTimeline/index.ts +26 -0
- package/src/doc/asciiTimeline/mapping.ts +43 -0
- package/src/doc/asciiTimeline/parse.ts +870 -0
- package/src/doc/asciiTimeline/render.ts +427 -0
- package/src/doc/asciiTimeline/types.ts +73 -0
- package/src/doc/asciiTimeline/wrappedFlow.ts +427 -0
- package/src/doc/audioMapping.ts +60 -46
- package/src/doc/customTemplatesFrontmatter.ts +0 -41
- package/src/doc/docToMarkdown.ts +70 -2
- package/src/doc/index.ts +76 -4
- package/src/doc/markdownToDoc.ts +135 -1
- package/src/doc/materializeBlockLayers.ts +304 -0
- package/src/doc/mediaAnnotations.ts +20 -0
- package/src/doc/resolveDocTheme.ts +8 -7
- package/src/doc/templateInputs.ts +185 -2
- package/src/doc/templates/__tests__/customTemplateRegistry.test.ts +22 -8
- package/src/doc/templates/diagramBlock.ts +237 -38
- package/src/doc/templates/fallbackBlock.ts +1 -1
- package/src/doc/templates/index.ts +134 -279
- package/src/doc/templates/inputDescriptors.ts +20 -1
- package/src/doc/templates/metadata.ts +10 -0
- package/src/doc/templates/persistentLayers.ts +12 -126
- package/src/doc/templates/registry.ts +88 -0
- package/src/doc/templates/templateNames.ts +22 -0
- package/src/doc/templates/timelineBlock.ts +613 -0
- package/src/doc/templates/treeBlock.ts +131 -0
- package/src/doc/treeview/chars.ts +72 -0
- package/src/doc/treeview/detect.ts +145 -0
- package/src/doc/treeview/index.ts +30 -0
- package/src/doc/treeview/mapping.ts +95 -0
- package/src/doc/treeview/parse.ts +201 -0
- package/src/doc/treeview/render.ts +41 -0
- package/src/doc/treeview/types.ts +43 -0
- package/src/doc/utils/applyRenderStyle.ts +2 -9
- package/src/doc/utils/diagramText.ts +78 -0
- package/src/doc/utils/shapeGeometry.ts +67 -5
- package/src/doc/validate.ts +1 -1
- package/src/generate/templateMapper.ts +7 -0
- package/src/imageEdit/export.ts +6 -5
- package/src/imageEdit/versionPaths.ts +13 -26
- package/src/imageEdit/versions.ts +21 -100
- package/src/index.ts +1 -0
- package/src/internal/immutable.ts +58 -0
- package/src/jsonForm/index.ts +9 -1
- package/src/jsonForm/pointer.ts +68 -23
- package/src/markdown/attrTokens.ts +7 -5
- package/src/markdown/index.ts +1 -0
- package/src/markdown/stringify.ts +4 -9
- package/src/markdown/utils.ts +36 -14
- package/src/narration/align.ts +514 -0
- package/src/narration/features.ts +231 -0
- package/src/narration/index.ts +86 -0
- package/src/narration/nuclei.ts +118 -0
- package/src/narration/pacing.ts +211 -0
- package/src/narration/script.ts +239 -0
- package/src/narration/session.ts +100 -0
- package/src/narration/sidecar.ts +187 -0
- package/src/narration/syllables.ts +85 -0
- package/src/narration/trace.ts +50 -0
- package/src/narration/types.ts +299 -0
- package/src/narration/vad.ts +131 -0
- package/src/recommend/numberHighlight.ts +25 -0
- package/src/recommend/templates.ts +108 -12
- package/src/schemas/BlockTemplates.ts +156 -7
- package/src/schemas/Doc.ts +72 -9
- package/src/schemas/Media.ts +12 -2
- package/src/schemas/Theme.ts +45 -25
- package/src/schemas/Viewport.ts +2 -2
- package/src/schemas/fontStacks.ts +79 -0
- package/src/schemas/themeCompile.ts +15 -0
- package/src/schemas/themeConstants.ts +2 -0
- package/src/schemas/themeLibrary.ts +25 -19
- package/src/schemas/themeValidator.ts +1 -1
- package/src/spatial/Geohash.ts +0 -3
- package/src/storage/ContentContainer.ts +17 -9
- package/src/storage/ScopedContentContainer.ts +45 -15
- package/src/transform/applyTransform.ts +5 -5
- package/src/transform/index.ts +3 -1
- package/src/transform/registry.ts +169 -49
- package/src/transform/templateSelector.ts +21 -2
- package/src/transform/timingAllocator.ts +152 -21
- package/src/transform/types.ts +14 -1
- package/src/versions/gitignore.ts +34 -0
- package/src/versions/index.ts +2 -0
- package/src/versions/operations.ts +18 -104
- package/src/versions/paths.ts +13 -28
- package/src/versions/snapshotStore.ts +202 -0
- package/src/versions/types.ts +3 -1
- package/dist/chunk-5TYS5V3G.js.map +0 -1
- package/dist/chunk-A4O7GIWE.js.map +0 -1
- package/dist/chunk-BEQODJWV.js.map +0 -1
- package/dist/chunk-DLXZMS5K.js.map +0 -1
- package/dist/chunk-GPLTCSXO.js.map +0 -1
- package/dist/chunk-HWVFJAAH.js.map +0 -1
- package/dist/chunk-IMSCRLLV.js.map +0 -1
- package/dist/chunk-JELIRVDP.js +0 -24
- package/dist/chunk-JELIRVDP.js.map +0 -1
- package/dist/chunk-KKNUBQ6Y.js.map +0 -1
- package/dist/chunk-LDQ2HJIX.js.map +0 -1
- package/dist/chunk-LTN6I7QW.js.map +0 -1
- package/dist/chunk-P3K7NLHF.js.map +0 -1
- package/dist/chunk-T5UK6YOB.js.map +0 -1
- package/dist/chunk-UY7KGQ5R.js +0 -192
- package/dist/chunk-UY7KGQ5R.js.map +0 -1
- package/dist/chunk-VLJJHDAC.js +0 -218
- package/dist/chunk-VLJJHDAC.js.map +0 -1
- package/dist/chunk-VWUFZ6ZG.js.map +0 -1
- package/dist/story/index.d.ts +0 -1801
- package/dist/story/index.js +0 -279
- package/src/doc/getLayers.ts +0 -195
- /package/dist/{story → narration}/index.js.map +0 -0
|
@@ -0,0 +1,963 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ASCII diagram renderer: semantic nodes/edges → box-and-line art.
|
|
3
|
+
*
|
|
4
|
+
* Deterministic (no clock, no randomness; every iteration order is an
|
|
5
|
+
* explicit sort) and designed as a fixpoint partner for `parse.ts`:
|
|
6
|
+
*
|
|
7
|
+
* - `parseAsciiDiagram(renderAsciiDiagram(d))` preserves node ids, labels,
|
|
8
|
+
* containment, and the edge tuple set of `d`.
|
|
9
|
+
* - After one normalization cycle the output is byte-stable:
|
|
10
|
+
* `renderAsciiDiagram(parseAsciiDiagram(renderAsciiDiagram(d))) ===
|
|
11
|
+
* renderAsciiDiagram(d)`.
|
|
12
|
+
*
|
|
13
|
+
* Grid positions come from the nodes; container rects are DERIVED from
|
|
14
|
+
* their children each render (a container's own col/row are ignored), so
|
|
15
|
+
* moving children can never orphan them outside their box.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
import { ASCII_VOCAB, UNICODE_VOCAB, type StyleVocab } from './chars.js';
|
|
19
|
+
import type { AsciiDiagram, AsciiDiagramEdge, AsciiDiagramNode } from './types.js';
|
|
20
|
+
|
|
21
|
+
export interface RenderAsciiDiagramOptions {
|
|
22
|
+
/** Character vocabulary; defaults to the diagram's own detected style. */
|
|
23
|
+
style?: 'unicode' | 'ascii';
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
interface Rect {
|
|
27
|
+
r0: number;
|
|
28
|
+
c0: number;
|
|
29
|
+
r1: number;
|
|
30
|
+
c1: number;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
interface PlacedNode {
|
|
34
|
+
node: AsciiDiagramNode;
|
|
35
|
+
rect: Rect;
|
|
36
|
+
labelLines: string[];
|
|
37
|
+
isContainer: boolean;
|
|
38
|
+
depth: number;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const SIDE_MARGIN = 1; // blank cells kept between distinct sibling rects
|
|
42
|
+
|
|
43
|
+
export function renderAsciiDiagram(
|
|
44
|
+
diagram: AsciiDiagram,
|
|
45
|
+
options: RenderAsciiDiagramOptions = {},
|
|
46
|
+
): string {
|
|
47
|
+
const vocab = (options.style ?? diagram.style) === 'ascii' ? ASCII_VOCAB : UNICODE_VOCAB;
|
|
48
|
+
if (diagram.nodes.length === 0) return '';
|
|
49
|
+
|
|
50
|
+
const placed = layoutNodes(diagram.nodes, diagram.edges);
|
|
51
|
+
const canvas = new Canvas();
|
|
52
|
+
|
|
53
|
+
// Boxes: outermost containers first so children draw over their interior.
|
|
54
|
+
const drawOrder = [...placed.values()].sort(
|
|
55
|
+
(a, b) => a.depth - b.depth || a.rect.r0 - b.rect.r0 || a.rect.c0 - b.rect.c0,
|
|
56
|
+
);
|
|
57
|
+
for (const p of drawOrder) drawBox(canvas, p, vocab);
|
|
58
|
+
|
|
59
|
+
drawEdges(canvas, diagram.edges, placed, vocab);
|
|
60
|
+
|
|
61
|
+
return canvas.emit();
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// ---------------------------------------------------------------------------
|
|
65
|
+
// Layout
|
|
66
|
+
// ---------------------------------------------------------------------------
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Approximate per-side edge degree from the nodes' authored grid
|
|
70
|
+
* positions (same side logic as `pickSides`, run before final layout).
|
|
71
|
+
* Used to widen/heighten boxes so sibling attachments always land on
|
|
72
|
+
* distinct, gapped cells — adjacent attachments (`┬┬`) route into each
|
|
73
|
+
* other and collapse to one component on re-parse.
|
|
74
|
+
*/
|
|
75
|
+
function computeSideDegrees(
|
|
76
|
+
nodes: readonly AsciiDiagramNode[],
|
|
77
|
+
edges: readonly AsciiDiagramEdge[],
|
|
78
|
+
): Map<string, { top: number; bottom: number; left: number; right: number }> {
|
|
79
|
+
const byId = new Map(nodes.map((n) => [n.id, n]));
|
|
80
|
+
const deg = new Map<string, { top: number; bottom: number; left: number; right: number }>();
|
|
81
|
+
for (const n of nodes) deg.set(n.id, { top: 0, bottom: 0, left: 0, right: 0 });
|
|
82
|
+
const rectOf = (n: AsciiDiagramNode): Rect => ({
|
|
83
|
+
r0: n.row,
|
|
84
|
+
c0: n.col,
|
|
85
|
+
r1: n.row + n.hRows - 1,
|
|
86
|
+
c1: n.col + n.wCols - 1,
|
|
87
|
+
});
|
|
88
|
+
for (const e of edges) {
|
|
89
|
+
const s = byId.get(e.source);
|
|
90
|
+
const t = byId.get(e.target);
|
|
91
|
+
if (!s || !t || s === t) continue;
|
|
92
|
+
const { exit, enter } = pickSides(rectOf(s), rectOf(t));
|
|
93
|
+
deg.get(e.source)![exit]++;
|
|
94
|
+
deg.get(e.target)![enter]++;
|
|
95
|
+
}
|
|
96
|
+
return deg;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function layoutNodes(
|
|
100
|
+
nodes: readonly AsciiDiagramNode[],
|
|
101
|
+
edges: readonly AsciiDiagramEdge[],
|
|
102
|
+
): Map<string, PlacedNode> {
|
|
103
|
+
const byId = new Map<string, AsciiDiagramNode>();
|
|
104
|
+
for (const node of nodes) byId.set(node.id, node);
|
|
105
|
+
const sideDeg = computeSideDegrees(nodes, edges);
|
|
106
|
+
|
|
107
|
+
const childIds = new Map<string, string[]>();
|
|
108
|
+
const roots: string[] = [];
|
|
109
|
+
for (const node of nodes) {
|
|
110
|
+
if (node.containerId && byId.has(node.containerId) && node.containerId !== node.id) {
|
|
111
|
+
const list = childIds.get(node.containerId) ?? [];
|
|
112
|
+
list.push(node.id);
|
|
113
|
+
childIds.set(node.containerId, list);
|
|
114
|
+
} else {
|
|
115
|
+
roots.push(node.id);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
const placed = new Map<string, PlacedNode>();
|
|
120
|
+
|
|
121
|
+
const translateSubtree = (id: string, dRows: number, dCols: number): void => {
|
|
122
|
+
const p = placed.get(id);
|
|
123
|
+
if (p) p.rect = shiftRect(p.rect, dRows, dCols);
|
|
124
|
+
for (const childId of childIds.get(id) ?? []) translateSubtree(childId, dRows, dCols);
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
// Place a set of sibling units (each may be a whole subtree) without overlap.
|
|
128
|
+
const placeSiblings = (ids: string[], layoutUnit: (id: string) => Rect): Rect[] => {
|
|
129
|
+
const order = [...ids].sort((a, b) => {
|
|
130
|
+
const na = byId.get(a) as AsciiDiagramNode;
|
|
131
|
+
const nb = byId.get(b) as AsciiDiagramNode;
|
|
132
|
+
return na.row - nb.row || na.col - nb.col || na.id.localeCompare(nb.id);
|
|
133
|
+
});
|
|
134
|
+
const placedRects: Rect[] = [];
|
|
135
|
+
for (const id of order) {
|
|
136
|
+
let rect = layoutUnit(id);
|
|
137
|
+
// Greedy deterministic collision resolution: shift along the axis
|
|
138
|
+
// needing the smaller displacement (ties → down).
|
|
139
|
+
let guard = 0;
|
|
140
|
+
for (;;) {
|
|
141
|
+
const hit = placedRects.find((p) => overlapsWithMargin(rect, p, SIDE_MARGIN));
|
|
142
|
+
if (!hit || guard++ > 64) break;
|
|
143
|
+
const dxRight = hit.c1 + SIDE_MARGIN + 1 - rect.c0;
|
|
144
|
+
const dyDown = hit.r1 + SIDE_MARGIN + 1 - rect.r0;
|
|
145
|
+
if (dxRight < dyDown) {
|
|
146
|
+
translateSubtree(id, 0, dxRight);
|
|
147
|
+
rect = shiftRect(rect, 0, dxRight);
|
|
148
|
+
} else {
|
|
149
|
+
translateSubtree(id, dyDown, 0);
|
|
150
|
+
rect = shiftRect(rect, dyDown, 0);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
placedRects.push(rect);
|
|
154
|
+
}
|
|
155
|
+
return placedRects;
|
|
156
|
+
};
|
|
157
|
+
|
|
158
|
+
// Recursively size + place a subtree; returns its bounding rect.
|
|
159
|
+
const layoutSubtree = (id: string, depth: number): Rect => {
|
|
160
|
+
const node = byId.get(id) as AsciiDiagramNode;
|
|
161
|
+
const labelLines = node.label.length > 0 ? node.label.split('\n') : [];
|
|
162
|
+
const children = childIds.get(id) ?? [];
|
|
163
|
+
|
|
164
|
+
if (children.length === 0) {
|
|
165
|
+
const innerW = labelLines.reduce((w, l) => Math.max(w, l.length), 0);
|
|
166
|
+
// Attachment gap: a side with K edges needs ≥ 2K+1 inner cells so the
|
|
167
|
+
// spread (`from + round((i+1)*inner/(K+1))`) leaves a blank column
|
|
168
|
+
// between consecutive attachments and off the corners.
|
|
169
|
+
const deg = sideDeg.get(id) ?? { top: 0, bottom: 0, left: 0, right: 0 };
|
|
170
|
+
const horizDeg = Math.max(deg.top, deg.bottom);
|
|
171
|
+
const vertDeg = Math.max(deg.left, deg.right);
|
|
172
|
+
const wCols = Math.max(node.wCols, innerW + 4, 3, horizDeg > 0 ? 2 * horizDeg + 1 : 0);
|
|
173
|
+
const hRows = Math.max(
|
|
174
|
+
node.hRows,
|
|
175
|
+
labelLines.length + 2,
|
|
176
|
+
3,
|
|
177
|
+
vertDeg > 0 ? 2 * vertDeg + 1 : 0,
|
|
178
|
+
);
|
|
179
|
+
const rect: Rect = {
|
|
180
|
+
r0: node.row,
|
|
181
|
+
c0: node.col,
|
|
182
|
+
r1: node.row + hRows - 1,
|
|
183
|
+
c1: node.col + wCols - 1,
|
|
184
|
+
};
|
|
185
|
+
placed.set(id, { node, rect, labelLines, isContainer: false, depth });
|
|
186
|
+
return rect;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
// Container: children first, then derive our rect around them.
|
|
190
|
+
const childRects = placeSiblings(children, (childId) => layoutSubtree(childId, depth + 1));
|
|
191
|
+
const bbox = unionRects(childRects);
|
|
192
|
+
const extraRows = Math.max(0, labelLines.length - 1);
|
|
193
|
+
const titleLen = (labelLines[0] ?? '').length;
|
|
194
|
+
const rect: Rect = {
|
|
195
|
+
r0: bbox.r0 - 2 - extraRows,
|
|
196
|
+
c0: bbox.c0 - 2,
|
|
197
|
+
r1: bbox.r1 + 2,
|
|
198
|
+
c1: bbox.c1 + 2,
|
|
199
|
+
};
|
|
200
|
+
// Top border must host `── Title ──` with ≥1 line char each side.
|
|
201
|
+
const minW = titleLen > 0 ? titleLen + 6 : 3;
|
|
202
|
+
if (rect.c1 - rect.c0 + 1 < minW) rect.c1 = rect.c0 + minW - 1;
|
|
203
|
+
// Never shrink below the parsed size (visual stability for wide containers).
|
|
204
|
+
if (rect.c1 - rect.c0 + 1 < node.wCols) rect.c1 = rect.c0 + node.wCols - 1;
|
|
205
|
+
placed.set(id, { node, rect, labelLines, isContainer: true, depth });
|
|
206
|
+
return rect;
|
|
207
|
+
};
|
|
208
|
+
|
|
209
|
+
placeSiblings(roots, (id) => layoutSubtree(id, 0));
|
|
210
|
+
|
|
211
|
+
// Normalize into the positive quadrant (container margins can push past 0).
|
|
212
|
+
let minR = Infinity;
|
|
213
|
+
let minC = Infinity;
|
|
214
|
+
for (const p of placed.values()) {
|
|
215
|
+
minR = Math.min(minR, p.rect.r0);
|
|
216
|
+
minC = Math.min(minC, p.rect.c0);
|
|
217
|
+
}
|
|
218
|
+
const dR = minR < 0 ? -minR : 0;
|
|
219
|
+
const dC = minC < 0 ? -minC : 0;
|
|
220
|
+
if (dR > 0 || dC > 0) {
|
|
221
|
+
for (const p of placed.values()) p.rect = shiftRect(p.rect, dR, dC);
|
|
222
|
+
}
|
|
223
|
+
return placed;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
function overlapsWithMargin(a: Rect, b: Rect, margin: number): boolean {
|
|
227
|
+
return (
|
|
228
|
+
a.r0 - margin <= b.r1 && b.r0 - margin <= a.r1 && a.c0 - margin <= b.c1 && b.c0 - margin <= a.c1
|
|
229
|
+
);
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
function shiftRect(rect: Rect, dRows: number, dCols: number): Rect {
|
|
233
|
+
return { r0: rect.r0 + dRows, c0: rect.c0 + dCols, r1: rect.r1 + dRows, c1: rect.c1 + dCols };
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
function unionRects(rects: Rect[]): Rect {
|
|
237
|
+
return rects.reduce((acc, r) => ({
|
|
238
|
+
r0: Math.min(acc.r0, r.r0),
|
|
239
|
+
c0: Math.min(acc.c0, r.c0),
|
|
240
|
+
r1: Math.max(acc.r1, r.r1),
|
|
241
|
+
c1: Math.max(acc.c1, r.c1),
|
|
242
|
+
}));
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
// ---------------------------------------------------------------------------
|
|
246
|
+
// Canvas
|
|
247
|
+
// ---------------------------------------------------------------------------
|
|
248
|
+
|
|
249
|
+
type CellKind = 'empty' | 'border' | 'label' | 'line-h' | 'line-v' | 'turn' | 'arrow' | 'junction';
|
|
250
|
+
|
|
251
|
+
class Canvas {
|
|
252
|
+
private rows: string[][] = [];
|
|
253
|
+
private kinds: CellKind[][] = [];
|
|
254
|
+
|
|
255
|
+
private ensure(r: number, c: number): void {
|
|
256
|
+
while (this.rows.length <= r) {
|
|
257
|
+
this.rows.push([]);
|
|
258
|
+
this.kinds.push([]);
|
|
259
|
+
}
|
|
260
|
+
const row = this.rows[r];
|
|
261
|
+
const kindRow = this.kinds[r];
|
|
262
|
+
while (row.length <= c) {
|
|
263
|
+
row.push(' ');
|
|
264
|
+
kindRow.push('empty');
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
kindAt(r: number, c: number): CellKind {
|
|
269
|
+
return this.kinds[r]?.[c] ?? 'empty';
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
/** Unconditional write (boxes, labels, junction upgrades). */
|
|
273
|
+
set(r: number, c: number, ch: string, kind: CellKind): void {
|
|
274
|
+
if (r < 0 || c < 0) return;
|
|
275
|
+
this.ensure(r, c);
|
|
276
|
+
this.rows[r][c] = ch;
|
|
277
|
+
this.kinds[r][c] = kind;
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
/** Edge-aware write: respects borders, upgrades crossings, lets arrows win. */
|
|
281
|
+
drawEdgeCell(r: number, c: number, ch: string, kind: CellKind, vocab: StyleVocab): void {
|
|
282
|
+
if (r < 0 || c < 0) return;
|
|
283
|
+
this.ensure(r, c);
|
|
284
|
+
const existing = this.kinds[r][c];
|
|
285
|
+
if (existing === 'border' || existing === 'label' || existing === 'junction') return;
|
|
286
|
+
if (kind === 'arrow') {
|
|
287
|
+
this.rows[r][c] = ch;
|
|
288
|
+
this.kinds[r][c] = kind;
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
if (existing === 'arrow') return;
|
|
292
|
+
if (
|
|
293
|
+
(existing === 'line-h' && kind === 'line-v') ||
|
|
294
|
+
(existing === 'line-v' && kind === 'line-h')
|
|
295
|
+
) {
|
|
296
|
+
this.rows[r][c] = vocab.cross;
|
|
297
|
+
this.kinds[r][c] = 'turn';
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
if (existing === 'empty') {
|
|
301
|
+
this.rows[r][c] = ch;
|
|
302
|
+
this.kinds[r][c] = kind;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
emit(): string {
|
|
307
|
+
const lines = this.rows.map((row) => row.join('').replace(/\s+$/u, ''));
|
|
308
|
+
while (lines.length > 0 && lines[lines.length - 1] === '') lines.pop();
|
|
309
|
+
return lines.join('\n');
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
// ---------------------------------------------------------------------------
|
|
314
|
+
// Boxes
|
|
315
|
+
// ---------------------------------------------------------------------------
|
|
316
|
+
|
|
317
|
+
function drawBox(canvas: Canvas, p: PlacedNode, vocab: StyleVocab): void {
|
|
318
|
+
const { rect, labelLines, isContainer } = p;
|
|
319
|
+
const innerW = rect.c1 - rect.c0 - 1;
|
|
320
|
+
|
|
321
|
+
// Top border (containers embed their first label line as a title).
|
|
322
|
+
canvas.set(rect.r0, rect.c0, vocab.tl, 'border');
|
|
323
|
+
canvas.set(rect.r0, rect.c1, vocab.tr, 'border');
|
|
324
|
+
const title = isContainer && labelLines.length > 0 ? ` ${labelLines[0]} ` : null;
|
|
325
|
+
if (title && title.length <= innerW - 2) {
|
|
326
|
+
const left = Math.floor((innerW - title.length) / 2);
|
|
327
|
+
for (let i = 0; i < innerW; i++) {
|
|
328
|
+
const inTitle = i >= left && i < left + title.length;
|
|
329
|
+
const ch = inTitle ? title[i - left] : vocab.h;
|
|
330
|
+
canvas.set(rect.r0, rect.c0 + 1 + i, ch, inTitle ? 'label' : 'border');
|
|
331
|
+
}
|
|
332
|
+
} else {
|
|
333
|
+
for (let c = rect.c0 + 1; c <= rect.c1 - 1; c++) canvas.set(rect.r0, c, vocab.h, 'border');
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
// Bottom border + sides.
|
|
337
|
+
canvas.set(rect.r1, rect.c0, vocab.bl, 'border');
|
|
338
|
+
canvas.set(rect.r1, rect.c1, vocab.br, 'border');
|
|
339
|
+
for (let c = rect.c0 + 1; c <= rect.c1 - 1; c++) canvas.set(rect.r1, c, vocab.h, 'border');
|
|
340
|
+
for (let r = rect.r0 + 1; r <= rect.r1 - 1; r++) {
|
|
341
|
+
canvas.set(r, rect.c0, vocab.v, 'border');
|
|
342
|
+
canvas.set(r, rect.c1, vocab.v, 'border');
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
// Interior label lines: leaves get all lines (vertically centered),
|
|
346
|
+
// containers the lines after the embedded title, directly below the top.
|
|
347
|
+
const interiorLines = isContainer ? labelLines.slice(1) : labelLines;
|
|
348
|
+
if (interiorLines.length > 0) {
|
|
349
|
+
const innerH = rect.r1 - rect.r0 - 1;
|
|
350
|
+
const startRow = isContainer
|
|
351
|
+
? rect.r0 + 1
|
|
352
|
+
: rect.r0 + 1 + Math.max(0, Math.floor((innerH - interiorLines.length) / 2));
|
|
353
|
+
interiorLines.forEach((line, i) => {
|
|
354
|
+
const pad = Math.max(0, Math.floor((innerW - line.length) / 2));
|
|
355
|
+
for (let j = 0; j < line.length && pad + j < innerW; j++) {
|
|
356
|
+
canvas.set(startRow + i, rect.c0 + 1 + pad + j, line[j], 'label');
|
|
357
|
+
}
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
// ---------------------------------------------------------------------------
|
|
363
|
+
// Edges
|
|
364
|
+
// ---------------------------------------------------------------------------
|
|
365
|
+
|
|
366
|
+
type Side = 'top' | 'bottom' | 'left' | 'right';
|
|
367
|
+
|
|
368
|
+
interface RoutePlan {
|
|
369
|
+
edge: AsciiDiagramEdge;
|
|
370
|
+
sourceId: string;
|
|
371
|
+
targetId: string;
|
|
372
|
+
exitSide: Side;
|
|
373
|
+
enterSide: Side;
|
|
374
|
+
biDir: boolean;
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
function drawEdges(
|
|
378
|
+
canvas: Canvas,
|
|
379
|
+
edges: readonly AsciiDiagramEdge[],
|
|
380
|
+
placed: Map<string, PlacedNode>,
|
|
381
|
+
vocab: StyleVocab,
|
|
382
|
+
): void {
|
|
383
|
+
// Merge reciprocal directed pairs into single double-arrow lines.
|
|
384
|
+
const sorted = [...edges].sort(
|
|
385
|
+
(a, b) =>
|
|
386
|
+
a.source.localeCompare(b.source) ||
|
|
387
|
+
a.target.localeCompare(b.target) ||
|
|
388
|
+
(a.label ?? '').localeCompare(b.label ?? ''),
|
|
389
|
+
);
|
|
390
|
+
const skip = new Set<number>();
|
|
391
|
+
const plans: RoutePlan[] = [];
|
|
392
|
+
for (let i = 0; i < sorted.length; i++) {
|
|
393
|
+
if (skip.has(i)) continue;
|
|
394
|
+
const e = sorted[i];
|
|
395
|
+
if (!placed.has(e.source) || !placed.has(e.target)) continue;
|
|
396
|
+
let biDir = false;
|
|
397
|
+
if (e.directed) {
|
|
398
|
+
const j = sorted.findIndex(
|
|
399
|
+
(o, k) =>
|
|
400
|
+
k > i &&
|
|
401
|
+
!skip.has(k) &&
|
|
402
|
+
o.directed &&
|
|
403
|
+
o.source === e.target &&
|
|
404
|
+
o.target === e.source &&
|
|
405
|
+
(o.label ?? '') === (e.label ?? ''),
|
|
406
|
+
);
|
|
407
|
+
if (j >= 0) {
|
|
408
|
+
skip.add(j);
|
|
409
|
+
biDir = true;
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
const sides = pickSides(
|
|
413
|
+
(placed.get(e.source) as PlacedNode).rect,
|
|
414
|
+
(placed.get(e.target) as PlacedNode).rect,
|
|
415
|
+
);
|
|
416
|
+
plans.push({
|
|
417
|
+
edge: e,
|
|
418
|
+
sourceId: e.source,
|
|
419
|
+
targetId: e.target,
|
|
420
|
+
exitSide: sides.exit,
|
|
421
|
+
enterSide: sides.enter,
|
|
422
|
+
biDir,
|
|
423
|
+
});
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
const attachment = assignAttachments(plans, placed);
|
|
427
|
+
const sideLabelRequests: SideLabelRequest[] = [];
|
|
428
|
+
plans.forEach((plan, i) =>
|
|
429
|
+
routeEdge(canvas, plan, i, placed, attachment, vocab, (candidates, label) =>
|
|
430
|
+
sideLabelRequests.push({ candidates, label }),
|
|
431
|
+
),
|
|
432
|
+
);
|
|
433
|
+
|
|
434
|
+
// Side labels last, so they can never break another edge's line: each
|
|
435
|
+
// label lands beside the first candidate whose anchor is still a plain
|
|
436
|
+
// vertical and whose neighboring cells are all free — right side
|
|
437
|
+
// (`│ label`) preferred, left side (`label │`) as fallback.
|
|
438
|
+
for (const req of sideLabelRequests) {
|
|
439
|
+
let done = false;
|
|
440
|
+
for (const side of ['right', 'left'] as const) {
|
|
441
|
+
if (done) break;
|
|
442
|
+
for (const { row, col } of req.candidates) {
|
|
443
|
+
if (canvas.kindAt(row, col) !== 'line-v') continue;
|
|
444
|
+
const startCol = side === 'right' ? col + 2 : col - 1 - req.label.length;
|
|
445
|
+
if (startCol < 0) continue;
|
|
446
|
+
const gapCol = side === 'right' ? col + 1 : col - 1;
|
|
447
|
+
let free = canvas.kindAt(row, gapCol) === 'empty';
|
|
448
|
+
for (let i = 0; free && i < req.label.length; i++) {
|
|
449
|
+
if (canvas.kindAt(row, startCol + i) !== 'empty') free = false;
|
|
450
|
+
}
|
|
451
|
+
// Left-side runs must not merge into earlier art on their left.
|
|
452
|
+
if (free && side === 'left' && startCol > 0) {
|
|
453
|
+
free = canvas.kindAt(row, startCol - 1) === 'empty';
|
|
454
|
+
}
|
|
455
|
+
if (!free) continue;
|
|
456
|
+
for (let i = 0; i < req.label.length; i++) {
|
|
457
|
+
canvas.set(row, startCol + i, req.label[i], 'label');
|
|
458
|
+
}
|
|
459
|
+
done = true;
|
|
460
|
+
break;
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
}
|
|
464
|
+
}
|
|
465
|
+
|
|
466
|
+
interface SideLabelRequest {
|
|
467
|
+
/** Candidate anchor cells in preference order (middle-out per leg). */
|
|
468
|
+
candidates: Array<{ row: number; col: number }>;
|
|
469
|
+
label: string;
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
function pickSides(s: Rect, t: Rect): { exit: Side; enter: Side } {
|
|
473
|
+
if (t.r0 > s.r1) return { exit: 'bottom', enter: 'top' };
|
|
474
|
+
if (t.r1 < s.r0) return { exit: 'top', enter: 'bottom' };
|
|
475
|
+
if (t.c0 > s.c1) return { exit: 'right', enter: 'left' };
|
|
476
|
+
if (t.c1 < s.c0) return { exit: 'left', enter: 'right' };
|
|
477
|
+
// Overlapping / containment: connect the closest pair of parallel borders.
|
|
478
|
+
const gaps: Array<{ side: Side; gap: number }> = [
|
|
479
|
+
{ side: 'top', gap: Math.abs(s.r0 - t.r0) },
|
|
480
|
+
{ side: 'bottom', gap: Math.abs(t.r1 - s.r1) },
|
|
481
|
+
{ side: 'left', gap: Math.abs(s.c0 - t.c0) },
|
|
482
|
+
{ side: 'right', gap: Math.abs(t.c1 - s.c1) },
|
|
483
|
+
];
|
|
484
|
+
gaps.sort((a, b) => a.gap - b.gap);
|
|
485
|
+
return { exit: gaps[0].side, enter: gaps[0].side };
|
|
486
|
+
}
|
|
487
|
+
|
|
488
|
+
interface AttachmentSlot {
|
|
489
|
+
pos: number;
|
|
490
|
+
/** 0-based order within the (node, side) group + group size — used to
|
|
491
|
+
* stagger Z-route jog rows so parallel routes never touch (touching
|
|
492
|
+
* turns would merge into one component on re-parse). */
|
|
493
|
+
index: number;
|
|
494
|
+
count: number;
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
/** Deterministic per-(node, side) attachment positions, spread across the side. */
|
|
498
|
+
function assignAttachments(
|
|
499
|
+
plans: RoutePlan[],
|
|
500
|
+
placed: Map<string, PlacedNode>,
|
|
501
|
+
): Map<string, AttachmentSlot> {
|
|
502
|
+
interface Request {
|
|
503
|
+
key: string; // `${planIndex}:exit` | `${planIndex}:enter`
|
|
504
|
+
otherId: string;
|
|
505
|
+
}
|
|
506
|
+
const bySide = new Map<string, Request[]>();
|
|
507
|
+
plans.forEach((plan, i) => {
|
|
508
|
+
const exitKey = `${plan.sourceId}|${plan.exitSide}`;
|
|
509
|
+
const enterKey = `${plan.targetId}|${plan.enterSide}`;
|
|
510
|
+
bySide.set(exitKey, [
|
|
511
|
+
...(bySide.get(exitKey) ?? []),
|
|
512
|
+
{ key: `${i}:exit`, otherId: plan.targetId },
|
|
513
|
+
]);
|
|
514
|
+
bySide.set(enterKey, [
|
|
515
|
+
...(bySide.get(enterKey) ?? []),
|
|
516
|
+
{ key: `${i}:enter`, otherId: plan.sourceId },
|
|
517
|
+
]);
|
|
518
|
+
});
|
|
519
|
+
const result = new Map<string, AttachmentSlot>();
|
|
520
|
+
for (const [sideKey, list] of [...bySide.entries()].sort((a, b) => a[0].localeCompare(b[0]))) {
|
|
521
|
+
const [nodeId, side] = sideKey.split('|') as [string, Side];
|
|
522
|
+
const node = placed.get(nodeId) as PlacedNode;
|
|
523
|
+
list.sort((a, b) => {
|
|
524
|
+
const ra = (placed.get(a.otherId) as PlacedNode).rect;
|
|
525
|
+
const rb = (placed.get(b.otherId) as PlacedNode).rect;
|
|
526
|
+
return ra.r0 - rb.r0 || ra.c0 - rb.c0 || a.otherId.localeCompare(b.otherId);
|
|
527
|
+
});
|
|
528
|
+
const horizontal = side === 'top' || side === 'bottom';
|
|
529
|
+
const from = horizontal ? node.rect.c0 + 1 : node.rect.r0 + 1;
|
|
530
|
+
const to = horizontal ? node.rect.c1 - 1 : node.rect.r1 - 1;
|
|
531
|
+
const inner = Math.max(1, to - from + 1);
|
|
532
|
+
const k = list.length;
|
|
533
|
+
if (k === 1) {
|
|
534
|
+
// Single attachment lands on the side's center cell.
|
|
535
|
+
result.set(list[0].key, { pos: from + Math.floor((inner - 1) / 2), index: 0, count: 1 });
|
|
536
|
+
} else {
|
|
537
|
+
// Stride-2 centered placement guarantees a blank cell between
|
|
538
|
+
// consecutive attachments (min box sizing reserves the room), so
|
|
539
|
+
// sibling routes never share adjacent columns and collapse on
|
|
540
|
+
// re-parse. Span = 2k-1; clamp into the side if a tiny box can't fit.
|
|
541
|
+
const span = 2 * k - 1;
|
|
542
|
+
const start = from + Math.max(0, Math.floor((inner - span) / 2));
|
|
543
|
+
list.forEach((req, i) => {
|
|
544
|
+
result.set(req.key, { pos: Math.min(to, start + 2 * i), index: i, count: k });
|
|
545
|
+
});
|
|
546
|
+
}
|
|
547
|
+
}
|
|
548
|
+
return result;
|
|
549
|
+
}
|
|
550
|
+
|
|
551
|
+
function routeEdge(
|
|
552
|
+
canvas: Canvas,
|
|
553
|
+
plan: RoutePlan,
|
|
554
|
+
planIdx: number,
|
|
555
|
+
placed: Map<string, PlacedNode>,
|
|
556
|
+
attachment: Map<string, AttachmentSlot>,
|
|
557
|
+
vocab: StyleVocab,
|
|
558
|
+
deferSideLabel: (candidates: Array<{ row: number; col: number }>, label: string) => void,
|
|
559
|
+
): void {
|
|
560
|
+
const s = (placed.get(plan.sourceId) as PlacedNode).rect;
|
|
561
|
+
const t = (placed.get(plan.targetId) as PlacedNode).rect;
|
|
562
|
+
const exitSlot = attachment.get(`${planIdx}:exit`) as AttachmentSlot;
|
|
563
|
+
const enterSlot = attachment.get(`${planIdx}:enter`) as AttachmentSlot;
|
|
564
|
+
const exitPos = exitSlot.pos;
|
|
565
|
+
const enterPos = enterSlot.pos;
|
|
566
|
+
// Deterministic jog stagger: routes sharing a side (either end — fan-outs
|
|
567
|
+
// AND fan-ins) each get a distinct mid-line so their turns/segments can
|
|
568
|
+
// never touch or overlap on the same row/column.
|
|
569
|
+
const basis = enterSlot.count > exitSlot.count ? enterSlot : exitSlot;
|
|
570
|
+
const stagger = basis.index - Math.floor((basis.count - 1) / 2);
|
|
571
|
+
|
|
572
|
+
const junction = (r: number, c: number, side: Side): void => {
|
|
573
|
+
const ch =
|
|
574
|
+
side === 'top'
|
|
575
|
+
? vocab.stemUp
|
|
576
|
+
: side === 'bottom'
|
|
577
|
+
? vocab.stemDown
|
|
578
|
+
: side === 'left'
|
|
579
|
+
? vocab.stemLeft
|
|
580
|
+
: vocab.stemRight;
|
|
581
|
+
canvas.set(r, c, ch, 'junction');
|
|
582
|
+
};
|
|
583
|
+
|
|
584
|
+
const args: EdgeDrawArgs = {
|
|
585
|
+
canvas,
|
|
586
|
+
directed: plan.edge.directed,
|
|
587
|
+
biDir: plan.biDir,
|
|
588
|
+
label: plan.edge.label,
|
|
589
|
+
vocab,
|
|
590
|
+
junction,
|
|
591
|
+
stagger,
|
|
592
|
+
deferSideLabel,
|
|
593
|
+
};
|
|
594
|
+
|
|
595
|
+
if (plan.exitSide === 'bottom' && plan.enterSide === 'top') {
|
|
596
|
+
drawVertical(args, s, t, exitPos, enterPos, 1);
|
|
597
|
+
} else if (plan.exitSide === 'top' && plan.enterSide === 'bottom') {
|
|
598
|
+
drawVertical(args, s, t, exitPos, enterPos, -1);
|
|
599
|
+
} else if (plan.exitSide === 'right' && plan.enterSide === 'left') {
|
|
600
|
+
drawHorizontal(args, s, t, exitPos, enterPos, 1);
|
|
601
|
+
} else if (plan.exitSide === 'left' && plan.enterSide === 'right') {
|
|
602
|
+
drawHorizontal(args, s, t, exitPos, enterPos, -1);
|
|
603
|
+
} else {
|
|
604
|
+
drawNested(args, s, t, plan.exitSide);
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
|
|
608
|
+
interface EdgeDrawArgs {
|
|
609
|
+
canvas: Canvas;
|
|
610
|
+
directed: boolean;
|
|
611
|
+
biDir: boolean;
|
|
612
|
+
label: string | undefined;
|
|
613
|
+
vocab: StyleVocab;
|
|
614
|
+
junction: (r: number, c: number, side: Side) => void;
|
|
615
|
+
/** Jog offset for Z-routes so sibling routes never share a mid-line. */
|
|
616
|
+
stagger: number;
|
|
617
|
+
/** Queue a `│ label` placement for the deferred final pass. */
|
|
618
|
+
deferSideLabel: (candidates: Array<{ row: number; col: number }>, label: string) => void;
|
|
619
|
+
}
|
|
620
|
+
|
|
621
|
+
/** Order candidate rows middle-out so labels prefer a run's midpoint. */
|
|
622
|
+
function middleOut(from: number, to: number): number[] {
|
|
623
|
+
const lo = Math.min(from, to);
|
|
624
|
+
const hi = Math.max(from, to);
|
|
625
|
+
const rows: number[] = [];
|
|
626
|
+
for (let r = lo; r <= hi; r++) rows.push(r);
|
|
627
|
+
const mid = Math.floor((lo + hi) / 2);
|
|
628
|
+
return rows.sort((a, b) => Math.abs(a - mid) - Math.abs(b - mid) || a - b);
|
|
629
|
+
}
|
|
630
|
+
|
|
631
|
+
function clamp(value: number, lo: number, hi: number): number {
|
|
632
|
+
return Math.max(lo, Math.min(hi, value));
|
|
633
|
+
}
|
|
634
|
+
|
|
635
|
+
function drawVertical(
|
|
636
|
+
args: EdgeDrawArgs,
|
|
637
|
+
s: Rect,
|
|
638
|
+
t: Rect,
|
|
639
|
+
exitCol: number,
|
|
640
|
+
enterCol: number,
|
|
641
|
+
dir: 1 | -1,
|
|
642
|
+
): void {
|
|
643
|
+
const { canvas, directed, biDir, label, vocab, junction, stagger } = args;
|
|
644
|
+
// dir 1: exit bottom of s, enter top of t (t below); dir -1 mirrored.
|
|
645
|
+
const exitRow = dir === 1 ? s.r1 : s.r0;
|
|
646
|
+
const enterRow = dir === 1 ? t.r0 : t.r1;
|
|
647
|
+
const firstFree = exitRow + dir;
|
|
648
|
+
const lastFree = enterRow - dir;
|
|
649
|
+
const gap = (lastFree - firstFree) * dir + 1;
|
|
650
|
+
|
|
651
|
+
const drawV = (col: number, rA: number, rB: number): void => {
|
|
652
|
+
const lo = Math.min(rA, rB);
|
|
653
|
+
const hi = Math.max(rA, rB);
|
|
654
|
+
for (let r = lo; r <= hi; r++) canvas.drawEdgeCell(r, col, vocab.v, 'line-v', vocab);
|
|
655
|
+
};
|
|
656
|
+
|
|
657
|
+
const straightOk =
|
|
658
|
+
exitCol >= t.c0 + 1 && exitCol <= t.c1 - 1 && exitCol >= s.c0 + 1 && exitCol <= s.c1 - 1;
|
|
659
|
+
|
|
660
|
+
if (straightOk || gap < 2) {
|
|
661
|
+
// Straight (or no room to jog): one column, clamped onto both borders.
|
|
662
|
+
const sCol = clamp(exitCol, s.c0 + 1, s.c1 - 1);
|
|
663
|
+
const tCol = clamp(exitCol, t.c0 + 1, t.c1 - 1);
|
|
664
|
+
junction(exitRow, sCol, dir === 1 ? 'bottom' : 'top');
|
|
665
|
+
junction(enterRow, tCol, dir === 1 ? 'top' : 'bottom');
|
|
666
|
+
if (sCol === tCol && gap >= 1) {
|
|
667
|
+
drawV(sCol, firstFree, lastFree);
|
|
668
|
+
if (directed) {
|
|
669
|
+
canvas.drawEdgeCell(
|
|
670
|
+
lastFree,
|
|
671
|
+
sCol,
|
|
672
|
+
dir === 1 ? vocab.arrowDown : vocab.arrowUp,
|
|
673
|
+
'arrow',
|
|
674
|
+
vocab,
|
|
675
|
+
);
|
|
676
|
+
}
|
|
677
|
+
if (biDir && gap >= 2) {
|
|
678
|
+
canvas.drawEdgeCell(
|
|
679
|
+
firstFree,
|
|
680
|
+
sCol,
|
|
681
|
+
dir === 1 ? vocab.arrowUp : vocab.arrowDown,
|
|
682
|
+
'arrow',
|
|
683
|
+
vocab,
|
|
684
|
+
);
|
|
685
|
+
}
|
|
686
|
+
// `│ label` beside the run (deferred pass finds a free plain row).
|
|
687
|
+
if (label) {
|
|
688
|
+
args.deferSideLabel(
|
|
689
|
+
middleOut(firstFree, lastFree).map((row) => ({ row, col: sCol })),
|
|
690
|
+
label,
|
|
691
|
+
);
|
|
692
|
+
}
|
|
693
|
+
}
|
|
694
|
+
return;
|
|
695
|
+
}
|
|
696
|
+
|
|
697
|
+
// Z-route with a horizontal jog (also hosts the label when present).
|
|
698
|
+
// Sibling routes stagger their jog rows so turns never touch (touching
|
|
699
|
+
// turns would merge into one polyline on re-parse).
|
|
700
|
+
const midRow = clamp(
|
|
701
|
+
Math.floor((exitRow + enterRow) / 2) + stagger,
|
|
702
|
+
Math.min(firstFree, lastFree),
|
|
703
|
+
Math.max(firstFree, lastFree),
|
|
704
|
+
);
|
|
705
|
+
junction(exitRow, exitCol, dir === 1 ? 'bottom' : 'top');
|
|
706
|
+
junction(enterRow, enterCol, dir === 1 ? 'top' : 'bottom');
|
|
707
|
+
if (Math.abs(midRow - exitRow) >= 2) drawV(exitCol, firstFree, midRow - dir);
|
|
708
|
+
if (Math.abs(enterRow - midRow) >= 2) drawV(enterCol, midRow + dir, lastFree);
|
|
709
|
+
let labelEmbedded = false;
|
|
710
|
+
if (exitCol === enterCol) {
|
|
711
|
+
canvas.drawEdgeCell(midRow, exitCol, vocab.v, 'line-v', vocab);
|
|
712
|
+
} else {
|
|
713
|
+
const goingRight = enterCol > exitCol;
|
|
714
|
+
// Turn glyph names describe the corner's two open sides.
|
|
715
|
+
const exitTurn =
|
|
716
|
+
dir === 1
|
|
717
|
+
? goingRight
|
|
718
|
+
? vocab.turnUpRight
|
|
719
|
+
: vocab.turnUpLeft
|
|
720
|
+
: goingRight
|
|
721
|
+
? vocab.turnDownRight
|
|
722
|
+
: vocab.turnDownLeft;
|
|
723
|
+
const enterTurn =
|
|
724
|
+
dir === 1
|
|
725
|
+
? goingRight
|
|
726
|
+
? vocab.turnDownLeft
|
|
727
|
+
: vocab.turnDownRight
|
|
728
|
+
: goingRight
|
|
729
|
+
? vocab.turnUpLeft
|
|
730
|
+
: vocab.turnUpRight;
|
|
731
|
+
canvas.drawEdgeCell(midRow, exitCol, exitTurn, 'turn', vocab);
|
|
732
|
+
canvas.drawEdgeCell(midRow, enterCol, enterTurn, 'turn', vocab);
|
|
733
|
+
const lo = Math.min(exitCol, enterCol);
|
|
734
|
+
const hi = Math.max(exitCol, enterCol);
|
|
735
|
+
let segment: string[] = [];
|
|
736
|
+
for (let c = lo + 1; c <= hi - 1; c++) segment.push(vocab.h);
|
|
737
|
+
// `+ 4` (not `+ 2`): at least one line char must survive on each side
|
|
738
|
+
// of ` label `, or the re-parse bridge can't glue the run back together.
|
|
739
|
+
if (label && segment.length >= label.length + 4) {
|
|
740
|
+
const text = ` ${label} `;
|
|
741
|
+
const left = Math.floor((segment.length - text.length) / 2);
|
|
742
|
+
segment = segment.map((ch, i) => (i >= left && i < left + text.length ? text[i - left] : ch));
|
|
743
|
+
labelEmbedded = true;
|
|
744
|
+
}
|
|
745
|
+
segment.forEach((ch, i) => {
|
|
746
|
+
canvas.drawEdgeCell(midRow, lo + 1 + i, ch, ch === vocab.h ? 'line-h' : 'label', vocab);
|
|
747
|
+
});
|
|
748
|
+
}
|
|
749
|
+
if (directed) {
|
|
750
|
+
canvas.drawEdgeCell(
|
|
751
|
+
lastFree,
|
|
752
|
+
enterCol,
|
|
753
|
+
dir === 1 ? vocab.arrowDown : vocab.arrowUp,
|
|
754
|
+
'arrow',
|
|
755
|
+
vocab,
|
|
756
|
+
);
|
|
757
|
+
}
|
|
758
|
+
if (biDir) {
|
|
759
|
+
canvas.drawEdgeCell(
|
|
760
|
+
firstFree,
|
|
761
|
+
exitCol,
|
|
762
|
+
dir === 1 ? vocab.arrowUp : vocab.arrowDown,
|
|
763
|
+
'arrow',
|
|
764
|
+
vocab,
|
|
765
|
+
);
|
|
766
|
+
}
|
|
767
|
+
// Label that couldn't embed in the jog: queue a `│ label` placement
|
|
768
|
+
// beside a vertical leg (exit leg preferred — its cells are all plain;
|
|
769
|
+
// the deferred pass skips arrowhead/cross rows automatically).
|
|
770
|
+
if (label && !labelEmbedded) {
|
|
771
|
+
const candidates: Array<{ row: number; col: number }> = [];
|
|
772
|
+
if (exitCol === enterCol) {
|
|
773
|
+
for (const row of middleOut(firstFree, lastFree)) candidates.push({ row, col: exitCol });
|
|
774
|
+
} else {
|
|
775
|
+
const exitLegLen = (midRow - dir - firstFree) * dir + 1;
|
|
776
|
+
const enterLegLen = (lastFree - (midRow + dir)) * dir + 1;
|
|
777
|
+
if (exitLegLen >= 1) {
|
|
778
|
+
for (const row of middleOut(firstFree, midRow - dir)) {
|
|
779
|
+
candidates.push({ row, col: exitCol });
|
|
780
|
+
}
|
|
781
|
+
}
|
|
782
|
+
if (enterLegLen >= 1) {
|
|
783
|
+
for (const row of middleOut(midRow + dir, lastFree)) {
|
|
784
|
+
candidates.push({ row, col: enterCol });
|
|
785
|
+
}
|
|
786
|
+
}
|
|
787
|
+
}
|
|
788
|
+
if (candidates.length > 0) args.deferSideLabel(candidates, label);
|
|
789
|
+
}
|
|
790
|
+
}
|
|
791
|
+
|
|
792
|
+
function drawHorizontal(
|
|
793
|
+
args: EdgeDrawArgs,
|
|
794
|
+
s: Rect,
|
|
795
|
+
t: Rect,
|
|
796
|
+
exitRow: number,
|
|
797
|
+
enterRow: number,
|
|
798
|
+
dir: 1 | -1,
|
|
799
|
+
): void {
|
|
800
|
+
const { canvas, directed, biDir, label, vocab, junction } = args;
|
|
801
|
+
// dir 1: exit right of s, enter left of t (t to the right); dir -1 mirrored.
|
|
802
|
+
const exitCol = dir === 1 ? s.c1 : s.c0;
|
|
803
|
+
const enterCol = dir === 1 ? t.c0 : t.c1;
|
|
804
|
+
const firstFree = exitCol + dir;
|
|
805
|
+
const lastFree = enterCol - dir;
|
|
806
|
+
const gap = (lastFree - firstFree) * dir + 1;
|
|
807
|
+
|
|
808
|
+
const drawH = (row: number, cA: number, cB: number, hostLabel: boolean): void => {
|
|
809
|
+
const lo = Math.min(cA, cB);
|
|
810
|
+
const hi = Math.max(cA, cB);
|
|
811
|
+
let segment: string[] = [];
|
|
812
|
+
for (let c = lo; c <= hi; c++) segment.push(vocab.h);
|
|
813
|
+
if (hostLabel && label && segment.length >= label.length + 4) {
|
|
814
|
+
const text = ` ${label} `;
|
|
815
|
+
const left = Math.floor((segment.length - text.length) / 2);
|
|
816
|
+
segment = segment.map((ch, i) => (i >= left && i < left + text.length ? text[i - left] : ch));
|
|
817
|
+
}
|
|
818
|
+
segment.forEach((ch, i) => {
|
|
819
|
+
canvas.drawEdgeCell(row, lo + i, ch, ch === vocab.h ? 'line-h' : 'label', vocab);
|
|
820
|
+
});
|
|
821
|
+
};
|
|
822
|
+
|
|
823
|
+
const straightOk =
|
|
824
|
+
exitRow >= t.r0 + 1 && exitRow <= t.r1 - 1 && exitRow >= s.r0 + 1 && exitRow <= s.r1 - 1;
|
|
825
|
+
|
|
826
|
+
if (straightOk || gap < 2) {
|
|
827
|
+
const sRow = clamp(exitRow, s.r0 + 1, s.r1 - 1);
|
|
828
|
+
const tRow = clamp(exitRow, t.r0 + 1, t.r1 - 1);
|
|
829
|
+
junction(sRow, exitCol, dir === 1 ? 'right' : 'left');
|
|
830
|
+
junction(tRow, enterCol, dir === 1 ? 'left' : 'right');
|
|
831
|
+
if (sRow === tRow && gap >= 1) {
|
|
832
|
+
drawH(sRow, firstFree, lastFree, true);
|
|
833
|
+
if (directed) {
|
|
834
|
+
canvas.drawEdgeCell(
|
|
835
|
+
sRow,
|
|
836
|
+
lastFree,
|
|
837
|
+
dir === 1 ? vocab.arrowRight : vocab.arrowLeft,
|
|
838
|
+
'arrow',
|
|
839
|
+
vocab,
|
|
840
|
+
);
|
|
841
|
+
}
|
|
842
|
+
if (biDir && gap >= 2) {
|
|
843
|
+
canvas.drawEdgeCell(
|
|
844
|
+
sRow,
|
|
845
|
+
firstFree,
|
|
846
|
+
dir === 1 ? vocab.arrowLeft : vocab.arrowRight,
|
|
847
|
+
'arrow',
|
|
848
|
+
vocab,
|
|
849
|
+
);
|
|
850
|
+
}
|
|
851
|
+
}
|
|
852
|
+
return;
|
|
853
|
+
}
|
|
854
|
+
|
|
855
|
+
// Horizontal Z-route (staggered like the vertical case).
|
|
856
|
+
const midCol = clamp(
|
|
857
|
+
Math.floor((exitCol + enterCol) / 2) + args.stagger,
|
|
858
|
+
Math.min(firstFree, lastFree),
|
|
859
|
+
Math.max(firstFree, lastFree),
|
|
860
|
+
);
|
|
861
|
+
junction(exitRow, exitCol, dir === 1 ? 'right' : 'left');
|
|
862
|
+
junction(enterRow, enterCol, dir === 1 ? 'left' : 'right');
|
|
863
|
+
if (Math.abs(midCol - exitCol) >= 2) drawH(exitRow, firstFree, midCol - dir, true);
|
|
864
|
+
if (Math.abs(enterCol - midCol) >= 2) drawH(enterRow, midCol + dir, lastFree, false);
|
|
865
|
+
if (exitRow === enterRow) {
|
|
866
|
+
canvas.drawEdgeCell(exitRow, midCol, vocab.h, 'line-h', vocab);
|
|
867
|
+
} else {
|
|
868
|
+
const goingDown = enterRow > exitRow;
|
|
869
|
+
const exitTurn =
|
|
870
|
+
dir === 1
|
|
871
|
+
? goingDown
|
|
872
|
+
? vocab.turnDownLeft
|
|
873
|
+
: vocab.turnUpLeft
|
|
874
|
+
: goingDown
|
|
875
|
+
? vocab.turnDownRight
|
|
876
|
+
: vocab.turnUpRight;
|
|
877
|
+
const enterTurn =
|
|
878
|
+
dir === 1
|
|
879
|
+
? goingDown
|
|
880
|
+
? vocab.turnUpRight
|
|
881
|
+
: vocab.turnDownRight
|
|
882
|
+
: goingDown
|
|
883
|
+
? vocab.turnUpLeft
|
|
884
|
+
: vocab.turnDownLeft;
|
|
885
|
+
canvas.drawEdgeCell(exitRow, midCol, exitTurn, 'turn', vocab);
|
|
886
|
+
canvas.drawEdgeCell(enterRow, midCol, enterTurn, 'turn', vocab);
|
|
887
|
+
const lo = Math.min(exitRow, enterRow);
|
|
888
|
+
const hi = Math.max(exitRow, enterRow);
|
|
889
|
+
for (let r = lo + 1; r <= hi - 1; r++) {
|
|
890
|
+
canvas.drawEdgeCell(r, midCol, vocab.v, 'line-v', vocab);
|
|
891
|
+
}
|
|
892
|
+
}
|
|
893
|
+
if (directed) {
|
|
894
|
+
canvas.drawEdgeCell(
|
|
895
|
+
enterRow,
|
|
896
|
+
lastFree,
|
|
897
|
+
dir === 1 ? vocab.arrowRight : vocab.arrowLeft,
|
|
898
|
+
'arrow',
|
|
899
|
+
vocab,
|
|
900
|
+
);
|
|
901
|
+
}
|
|
902
|
+
if (biDir) {
|
|
903
|
+
canvas.drawEdgeCell(
|
|
904
|
+
exitRow,
|
|
905
|
+
firstFree,
|
|
906
|
+
dir === 1 ? vocab.arrowLeft : vocab.arrowRight,
|
|
907
|
+
'arrow',
|
|
908
|
+
vocab,
|
|
909
|
+
);
|
|
910
|
+
}
|
|
911
|
+
}
|
|
912
|
+
|
|
913
|
+
/** Containment / overlap: a short straight run between the closest parallel borders. */
|
|
914
|
+
function drawNested(args: EdgeDrawArgs, s: Rect, t: Rect, side: Side): void {
|
|
915
|
+
const { canvas, directed, vocab, junction } = args;
|
|
916
|
+
if (side === 'top' || side === 'bottom') {
|
|
917
|
+
const overlapLo = Math.max(s.c0 + 1, t.c0 + 1);
|
|
918
|
+
const overlapHi = Math.min(s.c1 - 1, t.c1 - 1);
|
|
919
|
+
if (overlapLo > overlapHi) return;
|
|
920
|
+
const col = Math.floor((overlapLo + overlapHi) / 2);
|
|
921
|
+
const sRow = side === 'top' ? s.r0 : s.r1;
|
|
922
|
+
const tRow = side === 'top' ? t.r0 : t.r1;
|
|
923
|
+
if (sRow === tRow) return;
|
|
924
|
+
junction(sRow, col, side);
|
|
925
|
+
junction(tRow, col, side);
|
|
926
|
+
const lo = Math.min(sRow, tRow);
|
|
927
|
+
const hi = Math.max(sRow, tRow);
|
|
928
|
+
for (let r = lo + 1; r <= hi - 1; r++) canvas.drawEdgeCell(r, col, vocab.v, 'line-v', vocab);
|
|
929
|
+
if (directed && hi - lo >= 2) {
|
|
930
|
+
const arrowRow = tRow > sRow ? tRow - 1 : tRow + 1;
|
|
931
|
+
canvas.drawEdgeCell(
|
|
932
|
+
arrowRow,
|
|
933
|
+
col,
|
|
934
|
+
tRow > sRow ? vocab.arrowDown : vocab.arrowUp,
|
|
935
|
+
'arrow',
|
|
936
|
+
vocab,
|
|
937
|
+
);
|
|
938
|
+
}
|
|
939
|
+
} else {
|
|
940
|
+
const overlapLo = Math.max(s.r0 + 1, t.r0 + 1);
|
|
941
|
+
const overlapHi = Math.min(s.r1 - 1, t.r1 - 1);
|
|
942
|
+
if (overlapLo > overlapHi) return;
|
|
943
|
+
const row = Math.floor((overlapLo + overlapHi) / 2);
|
|
944
|
+
const sCol = side === 'left' ? s.c0 : s.c1;
|
|
945
|
+
const tCol = side === 'left' ? t.c0 : t.c1;
|
|
946
|
+
if (sCol === tCol) return;
|
|
947
|
+
junction(row, sCol, side);
|
|
948
|
+
junction(row, tCol, side);
|
|
949
|
+
const lo = Math.min(sCol, tCol);
|
|
950
|
+
const hi = Math.max(sCol, tCol);
|
|
951
|
+
for (let c = lo + 1; c <= hi - 1; c++) canvas.drawEdgeCell(row, c, vocab.h, 'line-h', vocab);
|
|
952
|
+
if (directed && hi - lo >= 2) {
|
|
953
|
+
const arrowCol = tCol > sCol ? tCol - 1 : tCol + 1;
|
|
954
|
+
canvas.drawEdgeCell(
|
|
955
|
+
row,
|
|
956
|
+
arrowCol,
|
|
957
|
+
tCol > sCol ? vocab.arrowRight : vocab.arrowLeft,
|
|
958
|
+
'arrow',
|
|
959
|
+
vocab,
|
|
960
|
+
);
|
|
961
|
+
}
|
|
962
|
+
}
|
|
963
|
+
}
|