nodes/PBandDev-comfyui-node-organizer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Fix regression for grouped nodes and update tests

Browse Source
This commit is contained in:
pbanddev
2026-01-08 06:23:51 -06:00
parent 4fde89320e
commit ac11c889a6
23 changed files with 2845 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CLAUDE.md
+8 -6
View File
@@ -55,6 +55,7 @@ Use docs-mcp server for ComfyUI API reference.
6. `bin-pack.ts` - FFDH algorithm for multi-column packing
7. `positioning.ts` - Assign coordinates, place disconnected nodes, restore reroutes
8. `groups.ts` - Resize groups to fit members
9. `layout-utils.ts` - Shared functions for internal edge detection and member layer assignment
**Configuration** in `types.ts`:
- `maxColumns`: 0=auto, 1=vertical stack, 2+=fixed columns
@@ -64,29 +65,30 @@ Use docs-mcp server for ComfyUI API reference.
**Key design decisions**:
- `compactVertically` excludes groups from max height (prevents Y explosion)
- `positionGroupContents` uses translation (preserves relative positions)
- Group height uses bounding box (not sum of heights)
- Group dimensions are layer-aware: width = sum of layer widths, height = max of layer heights (for groups with internal connections)
- `resolveGroupOverlaps` detects and shifts overlapping groups using minimal direction (up/down/right)
- `assignNodeYPositions` tracks reserved Y regions to prevent node/group overlap within layers
- **Idempotency**: Layout is a pure function of topology + sizes; overlap resolution decoupled from node.pos writes
## Testing
**Vitest-based regression testing** in `tests/`:
- `tests/fixtures/` - 4 workflow JSONs (nested-groups, complex-parallel, simple-dag, nested-wrapper)
- `tests/helpers.ts` - Fixture loader, workflow→LGraph converter
- `tests/invariants.ts` - 5 reusable assertions:
- `tests/helpers.ts` - Fixture loader, workflow→LGraph converter, cloneGraph
- `tests/invariants.ts` - 6 reusable assertions:
- `assertNoOverlaps` - AABB collision detection
- `assertNodesInsideGroups` - nodes stay in groups
- `assertFiniteCoordinates` - no NaN/Infinity
- `assertTopologicalOrder` - DAG order preserved
- `assertIdempotent` - stable after multiple runs
- `assertGroupMembershipPreserved` - nodes originally in groups remain in groups
- `tests/integration/layout.test.ts` - Main regression tests
**Known issues** (skipped tests, documented for future fixes):
- `complex-parallel.json`: 22 entities move on second run (non-idempotent)
**Coverage**: 70% line threshold, excludes `src/index.ts` (ComfyUI runtime) and `src/layout/reroute-collapse.ts` (no fixtures)
All 4 fixtures pass all invariants including idempotency.
## CI/CD
`.github/workflows/publish_action.yaml` - Manual dispatch workflow that:
coverage/clover.xml
+861 -831
View File
File diff suppressed because it is too large Load Diff
coverage/coverage-final.json
+10 -9
View File
File diff suppressed because one or more lines are too long
coverage/index.html
+18 -18
View File
@@ -23,30 +23,30 @@
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">80.87% </span>
<span class="strong">81.19% </span>
<span class="quiet">Statements</span>
<span class='fraction'>816/1009</span>
<span class='fraction'>842/1037</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">62.24% </span>
<span class="strong">62.04% </span>
<span class="quiet">Branches</span>
<span class='fraction'>361/580</span>
<span class='fraction'>371/598</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">86.2% </span>
<span class="strong">86.66% </span>
<span class="quiet">Functions</span>
<span class='fraction'>75/87</span>
<span class='fraction'>78/90</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">83.49% </span>
<span class="strong">83.75% </span>
<span class="quiet">Lines</span>
<span class='fraction'>769/921</span>
<span class='fraction'>794/948</span>
</div>
@@ -95,17 +95,17 @@
<tr>
<td class="file high" data-value="src/layout"><a href="src/layout/index.html">src/layout</a></td>
<td data-value="81.08" class="pic high">
<td data-value="81.4" class="pic high">
<div class="chart"><div class="cover-fill" style="width: 81%"></div><div class="cover-empty" style="width: 19%"></div></div>
</td>
<td data-value="81.08" class="pct high">81.08%</td>
<td data-value="999" class="abs high">810/999</td>
<td data-value="62.41" class="pct medium">62.41%</td>
<td data-value="572" class="abs medium">357/572</td>
<td data-value="85.88" class="pct high">85.88%</td>
<td data-value="85" class="abs high">73/85</td>
<td data-value="83.75" class="pct high">83.75%</td>
<td data-value="911" class="abs high">763/911</td>
<td data-value="81.4" class="pct high">81.4%</td>
<td data-value="1027" class="abs high">836/1027</td>
<td data-value="62.2" class="pct medium">62.2%</td>
<td data-value="590" class="abs medium">367/590</td>
<td data-value="86.36" class="pct high">86.36%</td>
<td data-value="88" class="abs high">76/88</td>
<td data-value="84" class="pct high">84%</td>
<td data-value="938" class="abs high">788/938</td>
</tr>
</tbody>
@@ -116,7 +116,7 @@
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="prettify.js"></script>
<script>
coverage/src/debug.ts.html
+5 -5
View File
@@ -97,13 +97,13 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">516x</span>
<span class="cline-any cline-yes">624x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">516x</span>
<span class="cline-any cline-yes">624x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">516x</span>
<span class="cline-any cline-yes">624x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -111,7 +111,7 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">516x</span>
<span class="cline-any cline-yes">624x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -148,7 +148,7 @@ export function debugLog(message: string, ...args: unknown[]): void {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../prettify.js"></script>
<script>
coverage/src/index.html
+1 -1
View File
@@ -101,7 +101,7 @@
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../prettify.js"></script>
<script>
coverage/src/layout/bin-pack.ts.html
+43 -43
View File
@@ -316,18 +316,18 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">205x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">205x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">23x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -335,15 +335,15 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -354,25 +354,25 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">23x</span>
<span class="cline-any cline-yes">23x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">43x</span>
<span class="cline-any cline-yes">43x</span>
<span class="cline-any cline-yes">43x</span>
<span class="cline-any cline-yes">23x</span>
<span class="cline-any cline-yes">52x</span>
<span class="cline-any cline-yes">52x</span>
<span class="cline-any cline-yes">52x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">43x</span>
<span class="cline-any cline-yes">52x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">43x</span>
<span class="cline-any cline-yes">52x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">23x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -444,32 +444,32 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">172x</span>
<span class="cline-any cline-yes">224x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -478,24 +478,24 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">172x</span>
<span class="cline-any cline-yes">186x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-yes">224x</span>
<span class="cline-any cline-yes">245x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">172x</span>
<span class="cline-any cline-yes">224x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">182x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -511,7 +511,7 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { PackedRow, LayoutConfig } from "./types";
&nbsp;
@@ -745,7 +745,7 @@ export function getPackedWidth(rows: PackedRow[]): number {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/graph-builder.ts.html
+378 -189
View File
@@ -23,30 +23,30 @@
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">72.05% </span>
<span class="strong">74.29% </span>
<span class="quiet">Statements</span>
<span class='fraction'>165/229</span>
<span class='fraction'>185/249</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">59.33% </span>
<span class="strong">59.87% </span>
<span class="quiet">Branches</span>
<span class='fraction'>89/150</span>
<span class='fraction'>97/162</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">76.92% </span>
<span class="strong">81.25% </span>
<span class="quiet">Functions</span>
<span class='fraction'>10/13</span>
<span class='fraction'>13/16</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">75.96% </span>
<span class="strong">78.07% </span>
<span class="quiet">Lines</span>
<span class='fraction'>158/208</span>
<span class='fraction'>178/228</span>
</div>
@@ -565,7 +565,70 @@
<a name='L500'></a><a href='#L500'>500</a>
<a name='L501'></a><a href='#L501'>501</a>
<a name='L502'></a><a href='#L502'>502</a>
<a name='L503'></a><a href='#L503'>503</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<a name='L503'></a><a href='#L503'>503</a>
<a name='L504'></a><a href='#L504'>504</a>
<a name='L505'></a><a href='#L505'>505</a>
<a name='L506'></a><a href='#L506'>506</a>
<a name='L507'></a><a href='#L507'>507</a>
<a name='L508'></a><a href='#L508'>508</a>
<a name='L509'></a><a href='#L509'>509</a>
<a name='L510'></a><a href='#L510'>510</a>
<a name='L511'></a><a href='#L511'>511</a>
<a name='L512'></a><a href='#L512'>512</a>
<a name='L513'></a><a href='#L513'>513</a>
<a name='L514'></a><a href='#L514'>514</a>
<a name='L515'></a><a href='#L515'>515</a>
<a name='L516'></a><a href='#L516'>516</a>
<a name='L517'></a><a href='#L517'>517</a>
<a name='L518'></a><a href='#L518'>518</a>
<a name='L519'></a><a href='#L519'>519</a>
<a name='L520'></a><a href='#L520'>520</a>
<a name='L521'></a><a href='#L521'>521</a>
<a name='L522'></a><a href='#L522'>522</a>
<a name='L523'></a><a href='#L523'>523</a>
<a name='L524'></a><a href='#L524'>524</a>
<a name='L525'></a><a href='#L525'>525</a>
<a name='L526'></a><a href='#L526'>526</a>
<a name='L527'></a><a href='#L527'>527</a>
<a name='L528'></a><a href='#L528'>528</a>
<a name='L529'></a><a href='#L529'>529</a>
<a name='L530'></a><a href='#L530'>530</a>
<a name='L531'></a><a href='#L531'>531</a>
<a name='L532'></a><a href='#L532'>532</a>
<a name='L533'></a><a href='#L533'>533</a>
<a name='L534'></a><a href='#L534'>534</a>
<a name='L535'></a><a href='#L535'>535</a>
<a name='L536'></a><a href='#L536'>536</a>
<a name='L537'></a><a href='#L537'>537</a>
<a name='L538'></a><a href='#L538'>538</a>
<a name='L539'></a><a href='#L539'>539</a>
<a name='L540'></a><a href='#L540'>540</a>
<a name='L541'></a><a href='#L541'>541</a>
<a name='L542'></a><a href='#L542'>542</a>
<a name='L543'></a><a href='#L543'>543</a>
<a name='L544'></a><a href='#L544'>544</a>
<a name='L545'></a><a href='#L545'>545</a>
<a name='L546'></a><a href='#L546'>546</a>
<a name='L547'></a><a href='#L547'>547</a>
<a name='L548'></a><a href='#L548'>548</a>
<a name='L549'></a><a href='#L549'>549</a>
<a name='L550'></a><a href='#L550'>550</a>
<a name='L551'></a><a href='#L551'>551</a>
<a name='L552'></a><a href='#L552'>552</a>
<a name='L553'></a><a href='#L553'>553</a>
<a name='L554'></a><a href='#L554'>554</a>
<a name='L555'></a><a href='#L555'>555</a>
<a name='L556'></a><a href='#L556'>556</a>
<a name='L557'></a><a href='#L557'>557</a>
<a name='L558'></a><a href='#L558'>558</a>
<a name='L559'></a><a href='#L559'>559</a>
<a name='L560'></a><a href='#L560'>560</a>
<a name='L561'></a><a href='#L561'>561</a>
<a name='L562'></a><a href='#L562'>562</a>
<a name='L563'></a><a href='#L563'>563</a>
<a name='L564'></a><a href='#L564'>564</a>
<a name='L565'></a><a href='#L565'>565</a>
<a name='L566'></a><a href='#L566'>566</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -594,7 +657,8 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">60x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -628,18 +692,18 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -648,40 +712,40 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">346x</span>
<span class="cline-any cline-yes">272x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">462x</span>
<span class="cline-any cline-yes">364x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">50x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -690,15 +754,15 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -709,33 +773,33 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -744,25 +808,25 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -772,95 +836,83 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">1074x</span>
<span class="cline-any cline-yes">144x</span>
<span class="cline-any cline-yes">132x</span>
<span class="cline-any cline-yes">132x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">1533x</span>
<span class="cline-any cline-yes">203x</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">128x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">161x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">44x</span>
<span class="cline-any cline-yes">44x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">68x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -868,32 +920,34 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">59x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">73x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">214x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">301x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">214x</span>
<span class="cline-any cline-yes">301x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">214x</span>
<span class="cline-any cline-yes">301x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">104x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">104x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">50x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">50x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -911,8 +965,8 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">110x</span>
<span class="cline-any cline-yes">110x</span>
<span class="cline-any cline-yes">147x</span>
<span class="cline-any cline-yes">147x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -932,16 +986,16 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -950,56 +1004,56 @@
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">231x</span>
<span class="cline-any cline-yes">231x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">88x</span>
<span class="cline-any cline-yes">88x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">140x</span>
<span class="cline-any cline-yes">140x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">64x</span>
<span class="cline-any cline-yes">64x</span>
<span class="cline-any cline-yes">64x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">270x</span>
<span class="cline-any cline-yes">270x</span>
<span class="cline-any cline-yes">378x</span>
<span class="cline-any cline-yes">378x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">270x</span>
<span class="cline-any cline-yes">270x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">378x</span>
<span class="cline-any cline-yes">378x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">270x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">378x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -1043,7 +1097,7 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -1061,11 +1115,83 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">480x</span>
<span class="cline-any cline-yes">480x</span>
<span class="cline-any cline-yes">54x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">480x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">7x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">91x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">91x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-yes">77x</span>
<span class="cline-any cline-yes">77x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-yes">49x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">21x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">721x</span>
<span class="cline-any cline-yes">721x</span>
<span class="cline-any cline-yes">63x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">721x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type {
LGraph,
@@ -1080,6 +1206,7 @@
import { DEFAULT_CONFIG } from "./types";
import { classifyNodes } from "./node-classifier";
import { findRerouteChains, getRerouteNodeIds, getVirtualEdges } from "./reroute-collapse";
import { getInternalEdges, assignMemberLayers } from "./layout-utils";
import { debugLog } from "../debug";
&nbsp;
/**
@@ -1282,6 +1409,7 @@ export function buildLayoutGraph(
&nbsp;
// Fourth pass: Assign nodes to their INNERMOST containing group
// A node belongs only to the deepest group that contains it
// Membership is determined from original workflow positions (user's design intent)
const nodeToGroup = new Map&lt;number, LayoutGroup&gt;();
&nbsp;
for (const [nodeId, node] of allNodes) {
@@ -1325,29 +1453,15 @@ export function buildLayoutGraph(
// Process from deepest to shallowest
for (let depth = maxDepth; depth &gt;= 0; depth--) {
for (const layoutGroup of groupsByDepth[depth]) {
let totalWidth = 0;
let totalHeight = 0;
// Calculate dimensions based on internal structure
const { width: memberWidth, height: memberHeight } = calculateGroupMemberDimensions(
layoutGroup,
allNodes,
fullConfig
);
&nbsp;
// Use bounding box of member positions (more accurate than summing heights)
let minY = Infinity;
let maxY = -Infinity;
let hasMembers = false;
&nbsp;
for (const nodeId of layoutGroup.memberIds) {
const node = allNodes.get(nodeId);
<span class="missing-if-branch" title="if path not taken" >I</span>if (!node) <span class="cstat-no" title="statement not covered" >continue;</span>
hasMembers = true;
const w = node.size?.[0] ?? <span class="branch-1 cbranch-no" title="branch not covered" >200;</span>
const h = node.size?.[1] ?? <span class="branch-1 cbranch-no" title="branch not covered" >100;</span>
const ny = node.pos?.[1] ?? <span class="branch-1 cbranch-no" title="branch not covered" >0;</span>
totalWidth = Math.max(totalWidth, w);
minY = Math.min(minY, ny);
maxY = Math.max(maxY, ny + h);
}
&nbsp;
if (hasMembers &amp;&amp; minY !== Infinity) {
totalHeight = maxY - minY;
}
let totalWidth = memberWidth;
let totalHeight = memberHeight;
&nbsp;
// Include child groups (already calculated in previous iterations)
// Child groups add to height below members
@@ -1356,6 +1470,9 @@ export function buildLayoutGraph(
totalWidth = Math.max(totalWidth, child.width);
childGroupsHeight += child.height + fullConfig.verticalGap;
}
if (memberHeight &gt; 0 &amp;&amp; childGroupsHeight &gt; 0) {
totalHeight += fullConfig.verticalGap; // Gap between members and children
}
totalHeight += childGroupsHeight;
&nbsp;
// Add padding and title
@@ -1559,6 +1676,78 @@ export function buildLayoutGraph(
};
}
&nbsp;
/**
* Calculate group member dimensions based on internal structure
* For groups with internal connections: uses layer-aware sizing (width = sum of layer widths, height = max layer height)
* For groups without internal connections: uses simple vertical stacking (width = max, height = sum)
*/
function calculateGroupMemberDimensions(
layoutGroup: LayoutGroup,
allNodes: Map&lt;number, LGraphNode&gt;,
config: LayoutConfig
): { width: number; height: number } {
const memberNodes = [...layoutGroup.memberIds]
.map((id) =&gt; allNodes.get(id))
.filter((n): n is LGraphNode =&gt; n !== undefined);
&nbsp;
if (memberNodes.length === 0) {
return { width: 0, height: 0 };
}
&nbsp;
// Check for internal connections between members
const edges = getInternalEdges(layoutGroup.memberIds, allNodes);
&nbsp;
if (edges.length &gt; 0) {
// Has internal layers - calculate per-layer dimensions
const layers = assignMemberLayers(layoutGroup.memberIds, edges, allNodes);
let totalWidth = 0;
let maxHeight = 0;
&nbsp;
for (const layer of layers) {
<span class="missing-if-branch" title="if path not taken" >I</span>if (layer.length === 0) <span class="cstat-no" title="statement not covered" >continue;</span>
&nbsp;
let layerMaxWidth = 0;
let layerHeight = 0;
&nbsp;
for (const node of layer) {
layerMaxWidth = Math.max(layerMaxWidth, node.size?.[0] ?? <span class="branch-1 cbranch-no" title="branch not covered" >200)</span>;
layerHeight += (node.size?.[1] ?? <span class="branch-1 cbranch-no" title="branch not covered" >100) + c</span>onfig.verticalGap;
}
&nbsp;
// Remove trailing gap
<span class="missing-if-branch" title="else path not taken" >E</span>if (layerHeight &gt; 0) {
layerHeight -= config.verticalGap;
}
&nbsp;
totalWidth += layerMaxWidth + config.horizontalGap;
maxHeight = Math.max(maxHeight, layerHeight);
}
&nbsp;
// Remove trailing gap
<span class="missing-if-branch" title="else path not taken" >E</span>if (totalWidth &gt; 0) {
totalWidth -= config.horizontalGap;
}
&nbsp;
return { width: totalWidth, height: maxHeight };
} else {
// No internal connections - simple vertical stacking
let maxWidth = 0;
let totalHeight = 0;
&nbsp;
for (const node of memberNodes) {
maxWidth = Math.max(maxWidth, node.size?.[0] ?? <span class="branch-1 cbranch-no" title="branch not covered" >200)</span>;
totalHeight += (node.size?.[1] ?? <span class="branch-1 cbranch-no" title="branch not covered" >100) + c</span>onfig.verticalGap;
}
&nbsp;
// Remove trailing gap
<span class="missing-if-branch" title="else path not taken" >E</span>if (totalHeight &gt; 0) {
totalHeight -= config.verticalGap;
}
&nbsp;
return { width: maxWidth, height: totalHeight };
}
}
&nbsp;
/**
* Get the top-level group (root of hierarchy) for a given group
*/
@@ -1576,7 +1765,7 @@ function getTopLevelGroup(group: LayoutGroup): LayoutGroup {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/groups.ts.html
+56 -56
View File
@@ -221,88 +221,88 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">44x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">120x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -316,31 +316,31 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -349,8 +349,8 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">74x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -511,7 +511,7 @@ function updateGroupBounds(
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/index.html
+43 -28
View File
@@ -23,30 +23,30 @@
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">81.08% </span>
<span class="strong">81.4% </span>
<span class="quiet">Statements</span>
<span class='fraction'>810/999</span>
<span class='fraction'>836/1027</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">62.41% </span>
<span class="strong">62.2% </span>
<span class="quiet">Branches</span>
<span class='fraction'>357/572</span>
<span class='fraction'>367/590</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">85.88% </span>
<span class="strong">86.36% </span>
<span class="quiet">Functions</span>
<span class='fraction'>73/85</span>
<span class='fraction'>76/88</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">83.75% </span>
<span class="strong">84% </span>
<span class="quiet">Lines</span>
<span class='fraction'>763/911</span>
<span class='fraction'>788/938</span>
</div>
@@ -95,17 +95,17 @@
<tr>
<td class="file medium" data-value="graph-builder.ts"><a href="graph-builder.ts.html">graph-builder.ts</a></td>
<td data-value="72.05" class="pic medium">
<div class="chart"><div class="cover-fill" style="width: 72%"></div><div class="cover-empty" style="width: 28%"></div></div>
<td data-value="74.29" class="pic medium">
<div class="chart"><div class="cover-fill" style="width: 74%"></div><div class="cover-empty" style="width: 26%"></div></div>
</td>
<td data-value="72.05" class="pct medium">72.05%</td>
<td data-value="229" class="abs medium">165/229</td>
<td data-value="59.33" class="pct medium">59.33%</td>
<td data-value="150" class="abs medium">89/150</td>
<td data-value="76.92" class="pct medium">76.92%</td>
<td data-value="13" class="abs medium">10/13</td>
<td data-value="75.96" class="pct medium">75.96%</td>
<td data-value="208" class="abs medium">158/208</td>
<td data-value="74.29" class="pct medium">74.29%</td>
<td data-value="249" class="abs medium">185/249</td>
<td data-value="59.87" class="pct medium">59.87%</td>
<td data-value="162" class="abs medium">97/162</td>
<td data-value="81.25" class="pct high">81.25%</td>
<td data-value="16" class="abs high">13/16</td>
<td data-value="78.07" class="pct medium">78.07%</td>
<td data-value="228" class="abs medium">178/228</td>
</tr>
<tr>
@@ -153,6 +153,21 @@
<td data-value="48" class="abs high">46/48</td>
</tr>
<tr>
<td class="file high" data-value="layout-utils.ts"><a href="layout-utils.ts.html">layout-utils.ts</a></td>
<td data-value="94.64" class="pic high">
<div class="chart"><div class="cover-fill" style="width: 94%"></div><div class="cover-empty" style="width: 6%"></div></div>
</td>
<td data-value="94.64" class="pct high">94.64%</td>
<td data-value="56" class="abs high">53/56</td>
<td data-value="69.44" class="pct medium">69.44%</td>
<td data-value="36" class="abs medium">25/36</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="3" class="abs high">3/3</td>
<td data-value="98.11" class="pct high">98.11%</td>
<td data-value="53" class="abs high">52/53</td>
</tr>
<tr>
<td class="file medium" data-value="node-classifier.ts"><a href="node-classifier.ts.html">node-classifier.ts</a></td>
<td data-value="69.44" class="pic medium">
@@ -185,17 +200,17 @@
<tr>
<td class="file high" data-value="positioning.ts"><a href="positioning.ts.html">positioning.ts</a></td>
<td data-value="86.44" class="pic high">
<div class="chart"><div class="cover-fill" style="width: 86%"></div><div class="cover-empty" style="width: 14%"></div></div>
<td data-value="84.93" class="pic high">
<div class="chart"><div class="cover-fill" style="width: 84%"></div><div class="cover-empty" style="width: 16%"></div></div>
</td>
<td data-value="86.44" class="pct high">86.44%</td>
<td data-value="413" class="abs high">357/413</td>
<td data-value="66" class="pct medium">66%</td>
<td data-value="250" class="abs medium">165/250</td>
<td data-value="84.93" class="pct high">84.93%</td>
<td data-value="365" class="abs high">310/365</td>
<td data-value="64.54" class="pct medium">64.54%</td>
<td data-value="220" class="abs medium">142/220</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="30" class="abs high">30/30</td>
<td data-value="89.09" class="pct high">89.09%</td>
<td data-value="376" class="abs high">335/376</td>
<td data-value="27" class="abs high">27/27</td>
<td data-value="87.27" class="pct high">87.27%</td>
<td data-value="330" class="abs high">288/330</td>
</tr>
<tr>
@@ -221,7 +236,7 @@
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/index.ts.html
+22 -22
View File
@@ -198,12 +198,12 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -213,52 +213,52 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">25x</span>
<span class="cline-any cline-yes">31x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -379,7 +379,7 @@ export { DEFAULT_CONFIG } from "./types";
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/layer-assign.ts.html
+47 -47
View File
@@ -173,99 +173,99 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">46x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">63x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">46x</span>
<span class="cline-any cline-yes">63x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">142x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">196x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { LayoutState, LayoutNode, Layer } from "./types";
&nbsp;
@@ -376,7 +376,7 @@ export function assignLayers(state: LayoutState): void {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/layout-utils.ts.html
+442
View File
@@ -0,0 +1,442 @@
<!doctype html>
<html lang="en">
<head>
<title>Code coverage report for src/layout/layout-utils.ts</title>
<meta charset="utf-8" />
<link rel="stylesheet" href="../../prettify.css" />
<link rel="stylesheet" href="../../base.css" />
<link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type='text/css'>
.coverage-summary .sorter {
background-image: url(../../sort-arrow-sprite.png);
}
</style>
</head>
<body>
<div class='wrapper'>
<div class='pad1'>
<h1><a href="../../index.html">All files</a> / <a href="index.html">src/layout</a> layout-utils.ts</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">94.64% </span>
<span class="quiet">Statements</span>
<span class='fraction'>53/56</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">69.44% </span>
<span class="quiet">Branches</span>
<span class='fraction'>25/36</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Functions</span>
<span class='fraction'>3/3</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">98.11% </span>
<span class="quiet">Lines</span>
<span class='fraction'>52/53</span>
</div>
</div>
<p class="quiet">
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
</p>
<template id="filterTemplate">
<div class="quiet">
Filter:
<input type="search" id="fileSearch">
</div>
</template>
</div>
<div class='status-line high'></div>
<pre><table class="coverage">
<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
<a name='L2'></a><a href='#L2'>2</a>
<a name='L3'></a><a href='#L3'>3</a>
<a name='L4'></a><a href='#L4'>4</a>
<a name='L5'></a><a href='#L5'>5</a>
<a name='L6'></a><a href='#L6'>6</a>
<a name='L7'></a><a href='#L7'>7</a>
<a name='L8'></a><a href='#L8'>8</a>
<a name='L9'></a><a href='#L9'>9</a>
<a name='L10'></a><a href='#L10'>10</a>
<a name='L11'></a><a href='#L11'>11</a>
<a name='L12'></a><a href='#L12'>12</a>
<a name='L13'></a><a href='#L13'>13</a>
<a name='L14'></a><a href='#L14'>14</a>
<a name='L15'></a><a href='#L15'>15</a>
<a name='L16'></a><a href='#L16'>16</a>
<a name='L17'></a><a href='#L17'>17</a>
<a name='L18'></a><a href='#L18'>18</a>
<a name='L19'></a><a href='#L19'>19</a>
<a name='L20'></a><a href='#L20'>20</a>
<a name='L21'></a><a href='#L21'>21</a>
<a name='L22'></a><a href='#L22'>22</a>
<a name='L23'></a><a href='#L23'>23</a>
<a name='L24'></a><a href='#L24'>24</a>
<a name='L25'></a><a href='#L25'>25</a>
<a name='L26'></a><a href='#L26'>26</a>
<a name='L27'></a><a href='#L27'>27</a>
<a name='L28'></a><a href='#L28'>28</a>
<a name='L29'></a><a href='#L29'>29</a>
<a name='L30'></a><a href='#L30'>30</a>
<a name='L31'></a><a href='#L31'>31</a>
<a name='L32'></a><a href='#L32'>32</a>
<a name='L33'></a><a href='#L33'>33</a>
<a name='L34'></a><a href='#L34'>34</a>
<a name='L35'></a><a href='#L35'>35</a>
<a name='L36'></a><a href='#L36'>36</a>
<a name='L37'></a><a href='#L37'>37</a>
<a name='L38'></a><a href='#L38'>38</a>
<a name='L39'></a><a href='#L39'>39</a>
<a name='L40'></a><a href='#L40'>40</a>
<a name='L41'></a><a href='#L41'>41</a>
<a name='L42'></a><a href='#L42'>42</a>
<a name='L43'></a><a href='#L43'>43</a>
<a name='L44'></a><a href='#L44'>44</a>
<a name='L45'></a><a href='#L45'>45</a>
<a name='L46'></a><a href='#L46'>46</a>
<a name='L47'></a><a href='#L47'>47</a>
<a name='L48'></a><a href='#L48'>48</a>
<a name='L49'></a><a href='#L49'>49</a>
<a name='L50'></a><a href='#L50'>50</a>
<a name='L51'></a><a href='#L51'>51</a>
<a name='L52'></a><a href='#L52'>52</a>
<a name='L53'></a><a href='#L53'>53</a>
<a name='L54'></a><a href='#L54'>54</a>
<a name='L55'></a><a href='#L55'>55</a>
<a name='L56'></a><a href='#L56'>56</a>
<a name='L57'></a><a href='#L57'>57</a>
<a name='L58'></a><a href='#L58'>58</a>
<a name='L59'></a><a href='#L59'>59</a>
<a name='L60'></a><a href='#L60'>60</a>
<a name='L61'></a><a href='#L61'>61</a>
<a name='L62'></a><a href='#L62'>62</a>
<a name='L63'></a><a href='#L63'>63</a>
<a name='L64'></a><a href='#L64'>64</a>
<a name='L65'></a><a href='#L65'>65</a>
<a name='L66'></a><a href='#L66'>66</a>
<a name='L67'></a><a href='#L67'>67</a>
<a name='L68'></a><a href='#L68'>68</a>
<a name='L69'></a><a href='#L69'>69</a>
<a name='L70'></a><a href='#L70'>70</a>
<a name='L71'></a><a href='#L71'>71</a>
<a name='L72'></a><a href='#L72'>72</a>
<a name='L73'></a><a href='#L73'>73</a>
<a name='L74'></a><a href='#L74'>74</a>
<a name='L75'></a><a href='#L75'>75</a>
<a name='L76'></a><a href='#L76'>76</a>
<a name='L77'></a><a href='#L77'>77</a>
<a name='L78'></a><a href='#L78'>78</a>
<a name='L79'></a><a href='#L79'>79</a>
<a name='L80'></a><a href='#L80'>80</a>
<a name='L81'></a><a href='#L81'>81</a>
<a name='L82'></a><a href='#L82'>82</a>
<a name='L83'></a><a href='#L83'>83</a>
<a name='L84'></a><a href='#L84'>84</a>
<a name='L85'></a><a href='#L85'>85</a>
<a name='L86'></a><a href='#L86'>86</a>
<a name='L87'></a><a href='#L87'>87</a>
<a name='L88'></a><a href='#L88'>88</a>
<a name='L89'></a><a href='#L89'>89</a>
<a name='L90'></a><a href='#L90'>90</a>
<a name='L91'></a><a href='#L91'>91</a>
<a name='L92'></a><a href='#L92'>92</a>
<a name='L93'></a><a href='#L93'>93</a>
<a name='L94'></a><a href='#L94'>94</a>
<a name='L95'></a><a href='#L95'>95</a>
<a name='L96'></a><a href='#L96'>96</a>
<a name='L97'></a><a href='#L97'>97</a>
<a name='L98'></a><a href='#L98'>98</a>
<a name='L99'></a><a href='#L99'>99</a>
<a name='L100'></a><a href='#L100'>100</a>
<a name='L101'></a><a href='#L101'>101</a>
<a name='L102'></a><a href='#L102'>102</a>
<a name='L103'></a><a href='#L103'>103</a>
<a name='L104'></a><a href='#L104'>104</a>
<a name='L105'></a><a href='#L105'>105</a>
<a name='L106'></a><a href='#L106'>106</a>
<a name='L107'></a><a href='#L107'>107</a>
<a name='L108'></a><a href='#L108'>108</a>
<a name='L109'></a><a href='#L109'>109</a>
<a name='L110'></a><a href='#L110'>110</a>
<a name='L111'></a><a href='#L111'>111</a>
<a name='L112'></a><a href='#L112'>112</a>
<a name='L113'></a><a href='#L113'>113</a>
<a name='L114'></a><a href='#L114'>114</a>
<a name='L115'></a><a href='#L115'>115</a>
<a name='L116'></a><a href='#L116'>116</a>
<a name='L117'></a><a href='#L117'>117</a>
<a name='L118'></a><a href='#L118'>118</a>
<a name='L119'></a><a href='#L119'>119</a>
<a name='L120'></a><a href='#L120'>120</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-yes">490x</span>
<span class="cline-any cline-yes">406x</span>
<span class="cline-any cline-yes">462x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">350x</span>
<span class="cline-any cline-yes">308x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { LGraphNode } from "./types";
&nbsp;
/**
* Get internal edges between group members by examining node connections
* Returns array of [sourceId, targetId] pairs where both are in the group
*/
export function getInternalEdges(
memberIds: Set&lt;number&gt;,
allNodes: Map&lt;number, LGraphNode&gt;
): Array&lt;[number, number]&gt; {
const edges: Array&lt;[number, number]&gt; = [];
&nbsp;
// Build a map of linkId -&gt; sourceNodeId for all member outputs
const linkToSource = new Map&lt;number, number&gt;();
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
<span class="missing-if-branch" title="if path not taken" >I</span>if (!node?.outputs) <span class="cstat-no" title="statement not covered" >continue;</span>
&nbsp;
for (const output of node.outputs) {
if (output.links) {
for (const linkId of output.links) {
linkToSource.set(linkId, memberId);
}
}
}
}
&nbsp;
// Check each member's inputs to find internal connections
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
<span class="missing-if-branch" title="if path not taken" >I</span>if (!node?.inputs) <span class="cstat-no" title="statement not covered" >continue;</span>
&nbsp;
for (const input of node.inputs) {
if (input.link !== null &amp;&amp; input.link !== undefined) {
const sourceId = linkToSource.get(input.link);
if (sourceId !== undefined &amp;&amp; memberIds.has(sourceId)) {
edges.push([sourceId, memberId]);
}
}
}
}
&nbsp;
return edges;
}
&nbsp;
/**
* Assign layers to group members using longest-path algorithm
* Returns members grouped by layer (index 0 = sources)
*/
export function assignMemberLayers(
memberIds: Set&lt;number&gt;,
edges: Array&lt;[number, number]&gt;,
allNodes: Map&lt;number, LGraphNode&gt;
): LGraphNode[][] {
// Build adjacency and in-degree
const successors = new Map&lt;number, number[]&gt;();
const inDegree = new Map&lt;number, number&gt;();
&nbsp;
for (const id of memberIds) {
successors.set(id, []);
inDegree.set(id, 0);
}
&nbsp;
for (const [source, target] of edges) {
successors.get(source)!.push(target);
inDegree.set(target, (inDegree.get(target) ?? <span class="branch-1 cbranch-no" title="branch not covered" >0) + 1</span>);
}
&nbsp;
// Longest-path layer assignment via topological sort
const nodeLayer = new Map&lt;number, number&gt;();
const queue: number[] = [];
&nbsp;
// Start with sources (in-degree 0)
for (const id of memberIds) {
if ((inDegree.get(id) ?? <span class="branch-1 cbranch-no" title="branch not covered" >0) === 0</span>) {
queue.push(id);
nodeLayer.set(id, 0);
}
}
&nbsp;
while (queue.length &gt; 0) {
const current = queue.shift()!;
const currentLayer = nodeLayer.get(current) ?? <span class="branch-1 cbranch-no" title="branch not covered" >0;</span>
&nbsp;
for (const succ of successors.get(current) ?? <span class="branch-1 cbranch-no" title="branch not covered" >[]) {</span>
// Update successor layer to max of current paths
const succLayer = nodeLayer.get(succ) ?? 0;
nodeLayer.set(succ, Math.max(succLayer, currentLayer + 1));
&nbsp;
// Decrease in-degree and add to queue when all predecessors processed
const newInDegree = (inDegree.get(succ) ?? <span class="branch-1 cbranch-no" title="branch not covered" >1) - 1</span>;
inDegree.set(succ, newInDegree);
<span class="missing-if-branch" title="else path not taken" >E</span>if (newInDegree === 0) {
queue.push(succ);
}
}
}
&nbsp;
// Handle any unvisited nodes (cycles or disconnected)
for (const id of memberIds) {
<span class="missing-if-branch" title="if path not taken" >I</span>if (!nodeLayer.has(id)) {
<span class="cstat-no" title="statement not covered" > nodeLayer.set(id, 0);</span>
}
}
&nbsp;
// Group by layer
const maxLayer = Math.max(...nodeLayer.values(), 0);
const layers: LGraphNode[][] = Array.from({ length: maxLayer + 1 }, () =&gt; []);
&nbsp;
for (const id of memberIds) {
const node = allNodes.get(id);
<span class="missing-if-branch" title="else path not taken" >E</span>if (node) {
const layer = nodeLayer.get(id) ?? <span class="branch-1 cbranch-no" title="branch not covered" >0;</span>
layers[layer].push(node);
}
}
&nbsp;
return layers;
}
&nbsp;</pre></td></tr></table></pre>
<div class='push'></div><!-- for sticky footer -->
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
window.onload = function () {
prettyPrint();
};
</script>
<script src="../../sorter.js"></script>
<script src="../../block-navigation.js"></script>
</body>
</html>
coverage/src/layout/node-classifier.ts.html
+25 -25
View File
@@ -151,9 +151,9 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -174,52 +174,52 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">294x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-yes">420x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">273x</span>
<span class="cline-any cline-yes">214x</span>
<span class="cline-any cline-yes">374x</span>
<span class="cline-any cline-yes">301x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">59x</span>
<span class="cline-any cline-yes">73x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { LGraph, LLink, ClassifiedNodes } from "./types";
import { debugLog } from "../debug";
@@ -307,7 +307,7 @@ export function classifyNodes(graph: LGraph): ClassifiedNodes {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/ordering.ts.html
+79 -79
View File
@@ -266,30 +266,30 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">24x</span>
<span class="cline-any cline-yes">30x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">32x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">32x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -302,12 +302,12 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">118x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">160x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-yes">217x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -322,31 +322,31 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">22x</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">204x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-yes">280x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">128x</span>
<span class="cline-any cline-yes">128x</span>
<span class="cline-any cline-yes">128x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-yes">175x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -356,31 +356,31 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">26x</span>
<span class="cline-any cline-yes">26x</span>
<span class="cline-any cline-yes">26x</span>
<span class="cline-any cline-yes">26x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-yes">42x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">114x</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">154x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">96x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -393,33 +393,33 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">10x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">10x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">14x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">80x</span>
<span class="cline-any cline-yes">80x</span>
<span class="cline-any cline-yes">80x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-yes">189x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">119x</span>
<span class="cline-any cline-yes">119x</span>
<span class="cline-any cline-yes">119x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">66x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">98x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">18x</span>
<span class="cline-any cline-yes">28x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
@@ -427,31 +427,31 @@
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">36x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">56x</span>
<span class="cline-any cline-yes">56x</span>
<span class="cline-any cline-yes">56x</span>
<span class="cline-any cline-yes">56x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">84x</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">126x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">48x</span>
<span class="cline-any cline-yes">70x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { LayoutState, Layer, LayoutNode } from "./types";
&nbsp;
@@ -655,7 +655,7 @@ function sweepBackward(
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
coverage/src/layout/positioning.ts.html
+413 -707
View File
File diff suppressed because it is too large Load Diff
coverage/src/layout/types.ts.html
+1 -1
View File
@@ -859,7 +859,7 @@ export interface LayoutResult {
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2026-01-08T00:23:20.319Z
at 2026-01-08T01:41:46.105Z
</div>
<script src="../../prettify.js"></script>
<script>
src/layout/graph-builder.ts
+85 -22
View File
@@ -11,6 +11,7 @@ import type {
import { DEFAULT_CONFIG } from "./types";
import { classifyNodes } from "./node-classifier";
import { findRerouteChains, getRerouteNodeIds, getVirtualEdges } from "./reroute-collapse";
import { getInternalEdges, assignMemberLayers } from "./layout-utils";
import { debugLog } from "../debug";
/**
@@ -213,6 +214,7 @@ export function buildLayoutGraph(
// Fourth pass: Assign nodes to their INNERMOST containing group
// A node belongs only to the deepest group that contains it
// Membership is determined from original workflow positions (user's design intent)
const nodeToGroup = new Map<number, LayoutGroup>();
for (const [nodeId, node] of allNodes) {
@@ -256,29 +258,15 @@ export function buildLayoutGraph(
// Process from deepest to shallowest
for (let depth = maxDepth; depth >= 0; depth--) {
for (const layoutGroup of groupsByDepth[depth]) {
let totalWidth = 0;
let totalHeight = 0;
// Calculate dimensions based on internal structure
const { width: memberWidth, height: memberHeight } = calculateGroupMemberDimensions(
layoutGroup,
allNodes,
fullConfig
);
// Use bounding box of member positions (more accurate than summing heights)
let minY = Infinity;
let maxY = -Infinity;
let hasMembers = false;
for (const nodeId of layoutGroup.memberIds) {
const node = allNodes.get(nodeId);
if (!node) continue;
hasMembers = true;
const w = node.size?.[0] ?? 200;
const h = node.size?.[1] ?? 100;
const ny = node.pos?.[1] ?? 0;
totalWidth = Math.max(totalWidth, w);
minY = Math.min(minY, ny);
maxY = Math.max(maxY, ny + h);
}
if (hasMembers && minY !== Infinity) {
totalHeight = maxY - minY;
}
let totalWidth = memberWidth;
let totalHeight = memberHeight;
// Include child groups (already calculated in previous iterations)
// Child groups add to height below members
@@ -287,6 +275,9 @@ export function buildLayoutGraph(
totalWidth = Math.max(totalWidth, child.width);
childGroupsHeight += child.height + fullConfig.verticalGap;
}
if (memberHeight > 0 && childGroupsHeight > 0) {
totalHeight += fullConfig.verticalGap; // Gap between members and children
}
totalHeight += childGroupsHeight;
// Add padding and title
@@ -490,6 +481,78 @@ export function buildLayoutGraph(
};
}
/**
* Calculate group member dimensions based on internal structure
* For groups with internal connections: uses layer-aware sizing (width = sum of layer widths, height = max layer height)
* For groups without internal connections: uses simple vertical stacking (width = max, height = sum)
*/
function calculateGroupMemberDimensions(
layoutGroup: LayoutGroup,
allNodes: Map<number, LGraphNode>,
config: LayoutConfig
): { width: number; height: number } {
const memberNodes = [...layoutGroup.memberIds]
.map((id) => allNodes.get(id))
.filter((n): n is LGraphNode => n !== undefined);
if (memberNodes.length === 0) {
return { width: 0, height: 0 };
}
// Check for internal connections between members
const edges = getInternalEdges(layoutGroup.memberIds, allNodes);
if (edges.length > 0) {
// Has internal layers - calculate per-layer dimensions
const layers = assignMemberLayers(layoutGroup.memberIds, edges, allNodes);
let totalWidth = 0;
let maxHeight = 0;
for (const layer of layers) {
if (layer.length === 0) continue;
let layerMaxWidth = 0;
let layerHeight = 0;
for (const node of layer) {
layerMaxWidth = Math.max(layerMaxWidth, node.size?.[0] ?? 200);
layerHeight += (node.size?.[1] ?? 100) + config.verticalGap;
}
// Remove trailing gap
if (layerHeight > 0) {
layerHeight -= config.verticalGap;
}
totalWidth += layerMaxWidth + config.horizontalGap;
maxHeight = Math.max(maxHeight, layerHeight);
}
// Remove trailing gap
if (totalWidth > 0) {
totalWidth -= config.horizontalGap;
}
return { width: totalWidth, height: maxHeight };
} else {
// No internal connections - simple vertical stacking
let maxWidth = 0;
let totalHeight = 0;
for (const node of memberNodes) {
maxWidth = Math.max(maxWidth, node.size?.[0] ?? 200);
totalHeight += (node.size?.[1] ?? 100) + config.verticalGap;
}
// Remove trailing gap
if (totalHeight > 0) {
totalHeight -= config.verticalGap;
}
return { width: maxWidth, height: totalHeight };
}
}
/**
* Get the top-level group (root of hierarchy) for a given group
*/
src/layout/layout-utils.ts
+119
View File
@@ -0,0 +1,119 @@
import type { LGraphNode } from "./types";
/**
* Get internal edges between group members by examining node connections
* Returns array of [sourceId, targetId] pairs where both are in the group
*/
export function getInternalEdges(
memberIds: Set<number>,
allNodes: Map<number, LGraphNode>
): Array<[number, number]> {
const edges: Array<[number, number]> = [];
// Build a map of linkId -> sourceNodeId for all member outputs
const linkToSource = new Map<number, number>();
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
if (!node?.outputs) continue;
for (const output of node.outputs) {
if (output.links) {
for (const linkId of output.links) {
linkToSource.set(linkId, memberId);
}
}
}
}
// Check each member's inputs to find internal connections
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
if (!node?.inputs) continue;
for (const input of node.inputs) {
if (input.link !== null && input.link !== undefined) {
const sourceId = linkToSource.get(input.link);
if (sourceId !== undefined && memberIds.has(sourceId)) {
edges.push([sourceId, memberId]);
}
}
}
}
return edges;
}
/**
* Assign layers to group members using longest-path algorithm
* Returns members grouped by layer (index 0 = sources)
*/
export function assignMemberLayers(
memberIds: Set<number>,
edges: Array<[number, number]>,
allNodes: Map<number, LGraphNode>
): LGraphNode[][] {
// Build adjacency and in-degree
const successors = new Map<number, number[]>();
const inDegree = new Map<number, number>();
for (const id of memberIds) {
successors.set(id, []);
inDegree.set(id, 0);
}
for (const [source, target] of edges) {
successors.get(source)!.push(target);
inDegree.set(target, (inDegree.get(target) ?? 0) + 1);
}
// Longest-path layer assignment via topological sort
const nodeLayer = new Map<number, number>();
const queue: number[] = [];
// Start with sources (in-degree 0)
for (const id of memberIds) {
if ((inDegree.get(id) ?? 0) === 0) {
queue.push(id);
nodeLayer.set(id, 0);
}
}
while (queue.length > 0) {
const current = queue.shift()!;
const currentLayer = nodeLayer.get(current) ?? 0;
for (const succ of successors.get(current) ?? []) {
// Update successor layer to max of current paths
const succLayer = nodeLayer.get(succ) ?? 0;
nodeLayer.set(succ, Math.max(succLayer, currentLayer + 1));
// Decrease in-degree and add to queue when all predecessors processed
const newInDegree = (inDegree.get(succ) ?? 1) - 1;
inDegree.set(succ, newInDegree);
if (newInDegree === 0) {
queue.push(succ);
}
}
}
// Handle any unvisited nodes (cycles or disconnected)
for (const id of memberIds) {
if (!nodeLayer.has(id)) {
nodeLayer.set(id, 0);
}
}
// Group by layer
const maxLayer = Math.max(...nodeLayer.values(), 0);
const layers: LGraphNode[][] = Array.from({ length: maxLayer + 1 }, () => []);
for (const id of memberIds) {
const node = allNodes.get(id);
if (node) {
const layer = nodeLayer.get(id) ?? 0;
layers[layer].push(node);
}
}
return layers;
}
src/layout/positioning.ts
+72 -170
View File
@@ -12,12 +12,15 @@ interface LayoutEntity {
y: number;
width: number;
height: number;
initialX: number; // Original position before overlap resolution
initialY: number; // Original position before overlap resolution
group?: LGraphGroup;
node?: LGraphNode;
layoutGroup?: LayoutGroup;
}
import { packNodesIntoRows, getPackedWidth } from "./bin-pack";
import { restoreReroutePositions } from "./reroute-collapse";
import { getInternalEdges, assignMemberLayers } from "./layout-utils";
import { debugLog } from "../debug";
/** Title bar height for groups */
@@ -335,124 +338,6 @@ export function applyPositions(state: LayoutState): void {
}
}
/**
* Get internal edges between group members by examining node connections
* Returns array of [sourceId, targetId] pairs where both are in the group
*/
function getInternalEdges(
memberIds: Set<number>,
allNodes: Map<number, LGraphNode>
): Array<[number, number]> {
const edges: Array<[number, number]> = [];
// Build a map of linkId -> sourceNodeId for all member outputs
const linkToSource = new Map<number, number>();
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
if (!node?.outputs) continue;
for (const output of node.outputs) {
if (output.links) {
for (const linkId of output.links) {
linkToSource.set(linkId, memberId);
}
}
}
}
// Check each member's inputs to find internal connections
for (const memberId of memberIds) {
const node = allNodes.get(memberId);
if (!node?.inputs) continue;
for (const input of node.inputs) {
if (input.link !== null && input.link !== undefined) {
const sourceId = linkToSource.get(input.link);
if (sourceId !== undefined && memberIds.has(sourceId)) {
edges.push([sourceId, memberId]);
}
}
}
}
return edges;
}
/**
* Assign layers to group members using longest-path algorithm
* Returns members grouped by layer (index 0 = sources)
*/
function assignMemberLayers(
memberIds: Set<number>,
edges: Array<[number, number]>,
allNodes: Map<number, LGraphNode>
): LGraphNode[][] {
// Build adjacency and in-degree
const successors = new Map<number, number[]>();
const inDegree = new Map<number, number>();
for (const id of memberIds) {
successors.set(id, []);
inDegree.set(id, 0);
}
for (const [source, target] of edges) {
successors.get(source)!.push(target);
inDegree.set(target, (inDegree.get(target) ?? 0) + 1);
}
// Longest-path layer assignment via topological sort
const nodeLayer = new Map<number, number>();
const queue: number[] = [];
// Start with sources (in-degree 0)
for (const id of memberIds) {
if ((inDegree.get(id) ?? 0) === 0) {
queue.push(id);
nodeLayer.set(id, 0);
}
}
while (queue.length > 0) {
const current = queue.shift()!;
const currentLayer = nodeLayer.get(current) ?? 0;
for (const succ of successors.get(current) ?? []) {
// Update successor layer to max of current paths
const succLayer = nodeLayer.get(succ) ?? 0;
nodeLayer.set(succ, Math.max(succLayer, currentLayer + 1));
// Decrease in-degree and add to queue when all predecessors processed
const newInDegree = (inDegree.get(succ) ?? 1) - 1;
inDegree.set(succ, newInDegree);
if (newInDegree === 0) {
queue.push(succ);
}
}
}
// Handle any unvisited nodes (cycles or disconnected)
for (const id of memberIds) {
if (!nodeLayer.has(id)) {
nodeLayer.set(id, 0);
}
}
// Group by layer
const maxLayer = Math.max(...nodeLayer.values(), 0);
const layers: LGraphNode[][] = Array.from({ length: maxLayer + 1 }, () => []);
for (const id of memberIds) {
const node = allNodes.get(id);
if (node) {
const layer = nodeLayer.get(id) ?? 0;
layers[layer].push(node);
}
}
return layers;
}
/**
* Re-layout group contents using proper Sugiyama-style layout for connected members
* or bin packing for disconnected members
@@ -653,14 +538,18 @@ function collectEntities(state: LayoutState): LayoutEntity[] {
// Add top-level groups (high priority - they anchor)
for (const lg of groups ?? []) {
if (lg.parentGroup) continue; // Skip nested, handled with parent
const x = lg.group.pos?.[0] ?? 0;
const y = lg.group.pos?.[1] ?? 0;
entities.push({
id: `group_${lg.group.title ?? entities.length}`,
type: "group",
priority: 100,
x: lg.group.pos?.[0] ?? 0,
y: lg.group.pos?.[1] ?? 0,
x,
y,
width: lg.group.size?.[0] ?? 0,
height: lg.group.size?.[1] ?? 0,
initialX: x,
initialY: y,
group: lg.group,
layoutGroup: lg,
});
@@ -672,14 +561,18 @@ function collectEntities(state: LayoutState): LayoutEntity[] {
if (node.flags?.pinned || node.locked) continue;
const isDisconnected = disconnectedNodes?.has(nodeId) ?? false;
const x = node.pos?.[0] ?? 0;
const y = node.pos?.[1] ?? 0;
entities.push({
id: `node_${nodeId}`,
type: "node",
priority: isDisconnected ? 10 : 50,
x: node.pos?.[0] ?? 0,
y: node.pos?.[1] ?? 0,
x,
y,
width: node.size?.[0] ?? 200,
height: node.size?.[1] ?? 100,
initialX: x,
initialY: y,
node,
});
}
@@ -687,48 +580,16 @@ function collectEntities(state: LayoutState): LayoutEntity[] {
return entities;
}
/**
* Apply position shift to an entity (group or node)
* For groups, also shifts all member nodes and child groups
*/
function applyEntityShift(
entity: LayoutEntity,
dx: number,
dy: number,
allNodes: Map<number, LGraphNode>
): void {
if (entity.type === "group" && entity.group && entity.layoutGroup) {
// Shift group position
if (entity.group.pos) {
entity.group.pos[0] += dx;
entity.group.pos[1] += dy;
}
// Shift all member nodes
for (const nodeId of entity.layoutGroup.memberIds) {
const node = allNodes.get(nodeId);
if (node?.pos) {
node.pos[0] += dx;
node.pos[1] += dy;
}
}
// Shift child groups recursively
shiftChildGroups(entity.layoutGroup, dx, dy, allNodes);
} else if (entity.type === "node" && entity.node?.pos) {
entity.node.pos[0] += dx;
entity.node.pos[1] += dy;
}
}
/**
* Scanline overlap resolution for X-axis (push right)
* Entities are sorted by X, overlapping entities are pushed right
* Higher priority entities anchor, lower priority pushed
* Only updates entity.x/y - does NOT modify node.pos (deferred to applyFinalPositions)
* Returns true if any entity was moved
*/
function scanlineResolveX(
entities: LayoutEntity[],
config: LayoutConfig,
allNodes: Map<number, LGraphNode>
config: LayoutConfig
): boolean {
let anyChanged = false;
let iterations = 0;
@@ -739,8 +600,8 @@ function scanlineResolveX(
changed = false;
iterations++;
// Sort by X position, then by priority (higher priority = earlier in sort)
entities.sort((a, b) => a.x - b.x || b.priority - a.priority);
// Sort by X position, then priority, then ID (deterministic)
entities.sort((a, b) => a.x - b.x || b.priority - a.priority || a.id.localeCompare(b.id));
for (let i = 0; i < entities.length; i++) {
const anchor = entities[i];
@@ -757,10 +618,9 @@ function scanlineResolveX(
// Check X overlap
const requiredX = anchor.x + anchor.width + config.horizontalGap;
if (pushed.x < requiredX) {
// Overlap! Push entity j to the right
// Overlap! Push entity j to the right (entity only, not node.pos)
const dx = requiredX - pushed.x;
pushed.x = requiredX;
applyEntityShift(pushed, dx, 0, allNodes);
changed = true;
anyChanged = true;
debugLog(`Scanline X: ${pushed.id} right ${dx.toFixed(0)}px (avoid ${anchor.id})`);
@@ -779,12 +639,12 @@ function scanlineResolveX(
* Scanline overlap resolution for Y-axis (push down)
* Entities are sorted by Y, overlapping entities are pushed down
* Higher priority entities anchor, lower priority pushed
* Only updates entity.x/y - does NOT modify node.pos (deferred to applyFinalPositions)
* Returns true if any entity was moved
*/
function scanlineResolveY(
entities: LayoutEntity[],
config: LayoutConfig,
allNodes: Map<number, LGraphNode>
config: LayoutConfig
): boolean {
let anyChanged = false;
let iterations = 0;
@@ -795,8 +655,8 @@ function scanlineResolveY(
changed = false;
iterations++;
// Sort by Y position, then by priority (higher priority = earlier)
entities.sort((a, b) => a.y - b.y || b.priority - a.priority);
// Sort by Y position, then priority, then ID (deterministic)
entities.sort((a, b) => a.y - b.y || b.priority - a.priority || a.id.localeCompare(b.id));
for (let i = 0; i < entities.length; i++) {
const anchor = entities[i];
@@ -813,10 +673,9 @@ function scanlineResolveY(
// Check Y overlap
const requiredY = anchor.y + anchor.height + config.verticalGap;
if (pushed.y < requiredY) {
// Overlap! Push entity j down
// Overlap! Push entity j down (entity only, not node.pos)
const dy = requiredY - pushed.y;
pushed.y = requiredY;
applyEntityShift(pushed, 0, dy, allNodes);
changed = true;
anyChanged = true;
debugLog(`Scanline Y: ${pushed.id} down ${dy.toFixed(0)}px (avoid ${anchor.id})`);
@@ -876,10 +735,50 @@ function shiftChildGroups(
}
}
/**
* Apply final entity positions to node.pos after scanline resolution
* Calculates deltas from initial positions and applies to groups/nodes
*/
function applyFinalPositions(
entities: LayoutEntity[],
allNodes: Map<number, LGraphNode>
): void {
for (const entity of entities) {
const dx = entity.x - entity.initialX;
const dy = entity.y - entity.initialY;
// Skip if no movement
if (Math.abs(dx) < 0.01 && Math.abs(dy) < 0.01) continue;
if (entity.type === "group" && entity.group && entity.layoutGroup) {
// Set group's final position
if (entity.group.pos) {
entity.group.pos[0] = entity.x;
entity.group.pos[1] = entity.y;
}
// Shift all member nodes by the same delta
for (const nodeId of entity.layoutGroup.memberIds) {
const node = allNodes.get(nodeId);
if (node?.pos) {
node.pos[0] += dx;
node.pos[1] += dy;
}
}
// Shift child groups recursively
shiftChildGroups(entity.layoutGroup, dx, dy, allNodes);
} else if (entity.type === "node" && entity.node?.pos) {
// Set node's final position
entity.node.pos[0] = entity.x;
entity.node.pos[1] = entity.y;
}
}
}
/**
* Unified overlap resolution using scanline algorithm
* Uses priority-based monotonic pushing (right/down only) to prevent oscillation
* Groups have highest priority and anchor in place
* Idempotent: decouples entity tracking from node.pos writes
*/
export function resolveAllOverlaps(state: LayoutState): void {
const { allNodes, config } = state;
@@ -891,11 +790,14 @@ export function resolveAllOverlaps(state: LayoutState): void {
return;
}
// Pass 1: X-axis (left-to-right pushing)
scanlineResolveX(entities, config, allNodes);
// Pass 1: X-axis (left-to-right pushing) - updates entity.x only
scanlineResolveX(entities, config);
// Pass 2: Y-axis (top-to-bottom pushing)
scanlineResolveY(entities, config, allNodes);
// Pass 2: Y-axis (top-to-bottom pushing) - updates entity.y only
scanlineResolveY(entities, config);
// Pass 3: Apply final positions to node.pos
applyFinalPositions(entities, allNodes);
debugLog(`Overlap resolution: ${entities.length} entities processed`);
}
test_idempotent.mjs
+47
View File
@@ -0,0 +1,47 @@
import { readFileSync } from 'fs';
// Load fixture
const fixtureData = JSON.parse(readFileSync('./tests/fixtures/complex-parallel.json', 'utf-8'));
// Convert to LGraph format
const nodes = fixtureData.nodes.map((n) => ({
id: n.id,
type: n.type,
title: n.title ?? n.type,
pos: [...n.pos],
size: [...n.size],
inputs: n.inputs?.map((i) => ({ name: i.name, type: i.type, link: i.link })) ?? [],
outputs: n.outputs?.map((o) => ({ name: o.name, type: o.type, links: o.links ? [...o.links] : null })) ?? [],
flags: n.flags ? { ...n.flags } : undefined,
locked: n.locked,
order: n.order,
}));
const links = new Map();
for (const [linkId, originId, originSlot, targetId, targetSlot, type] of fixtureData.links) {
links.set(linkId, {
id: linkId,
origin_id: originId,
origin_slot: originSlot,
target_id: targetId,
target_slot: targetSlot,
type,
});
}
const groups = (fixtureData.groups ?? []).map((g, idx) => ({
id: g.id ?? idx,
title: g.title,
pos: [g.bounding[0], g.bounding[1]],
size: [g.bounding[2], g.bounding[3]],
}));
const graph = { _nodes: nodes, _groups: groups, links };
// Import the layout function from dist
const layoutModule = await import('./dist/index.js');
// Get the layoutGraph function - it's exported with a different name since it's minified
// But we can see from the HTML that the export is Re
console.log('Module exports:', Object.keys(layoutModule));
tests/integration/layout.test.ts
+24 -6
View File
@@ -1,5 +1,5 @@
import { describe, it, beforeEach, expect } from "vitest";
import { loadFixture } from "../helpers";
import { loadFixture, cloneGraph } from "../helpers";
import { layoutGraph } from "../../src/layout/index";
import {
assertNoOverlaps,
@@ -7,6 +7,7 @@ import {
assertFiniteCoordinates,
assertTopologicalOrder,
assertIdempotent,
assertGroupMembershipPreserved,
} from "../invariants";
import type { LGraph } from "../../src/layout/types";
@@ -20,24 +21,24 @@ describe("layoutGraph regression tests", () => {
"simple-dag.json", // 7 nodes, no groups, basic txt2img DAG
"nested-groups.json", // Nested groups with node inside inner group
"nested-wrapper.json", // Group Wrapper containing nested groups
"complex-parallel.json", // 26 nodes, parallel KSampler High/Low, 5 groups
];
// Fixtures with known issues (documented for future fixes)
// These use test.skip() to document expected failures
const knownIssueFixtures = [
{
name: "complex-parallel.json",
issues: ["idempotent"], // 22 entities move on second run (149px movements)
},
const knownIssueFixtures: Array<{ name: string; issues: string[] }> = [
// All fixtures now pass - keeping array for future regression tracking
];
// Test passing fixtures with all invariants
for (const fixture of passingFixtures) {
describe(fixture, () => {
let graph: LGraph;
let originalGraph: LGraph;
beforeEach(() => {
graph = loadFixture(fixture);
originalGraph = cloneGraph(graph); // Capture state before layout
layoutGraph(graph);
});
@@ -60,6 +61,10 @@ describe("layoutGraph regression tests", () => {
it("is idempotent (stable after multiple runs)", () => {
assertIdempotent(graph);
});
it("preserves group membership", () => {
assertGroupMembershipPreserved(originalGraph, graph);
});
});
}
@@ -67,9 +72,11 @@ describe("layoutGraph regression tests", () => {
for (const { name, issues } of knownIssueFixtures) {
describe(name, () => {
let graph: LGraph;
let originalGraph: LGraph;
beforeEach(() => {
graph = loadFixture(name);
originalGraph = cloneGraph(graph);
layoutGraph(graph);
});
@@ -106,6 +113,17 @@ describe("layoutGraph regression tests", () => {
assertIdempotent(graph);
});
}
// Skip membership test if known issue
if (issues.includes("membership")) {
it.skip("preserves group membership (KNOWN ISSUE)", () => {
assertGroupMembershipPreserved(originalGraph, graph);
});
} else {
it("preserves group membership", () => {
assertGroupMembershipPreserved(originalGraph, graph);
});
}
});
}
});
tests/invariants.ts
+46
View File
@@ -304,3 +304,49 @@ export function assertIdempotent(graph: LGraph): void {
expect(differences, `Layout is not idempotent: ${differences.length} entities moved`).toEqual([]);
}
/**
* Assert that nodes which were inside groups before layout remain inside their groups after
* This catches regressions where layout breaks group containment
* Must be called with graph state BEFORE and AFTER layout
*/
export function assertGroupMembershipPreserved(
originalGraph: LGraph,
layoutGraph: LGraph
): void {
const errors: string[] = [];
// Get which nodes were inside which groups BEFORE layout
const beforeMembership = getNodesInsideGroups(originalGraph);
// For each node that was in a group, verify it's still in that group after layout
for (const [nodeId, originalGroup] of beforeMembership) {
const node = layoutGraph._nodes.find((n) => n.id === nodeId);
const group = layoutGraph._groups.find((g) => g.id === originalGroup.id);
if (!node || !group) continue;
// Check if node is still fully inside the group
const nodeRight = node.pos[0] + node.size[0];
const nodeBottom = node.pos[1] + node.size[1];
const groupRight = group.pos[0] + group.size[0];
const groupBottom = group.pos[1] + group.size[1];
if (
node.pos[0] < group.pos[0] ||
node.pos[1] < group.pos[1] ||
nodeRight > groupRight ||
nodeBottom > groupBottom
) {
errors.push(
`Node ${nodeId} (${node.title}) was in group "${originalGroup.title}" but is now outside: ` +
`node [${node.pos[0].toFixed(0)}, ${node.pos[1].toFixed(0)}] vs group [${group.pos[0].toFixed(0)}, ${group.pos[1].toFixed(0)}, ${group.size[0].toFixed(0)}, ${group.size[1].toFixed(0)}]`
);
}
}
expect(
errors,
`Found ${errors.length} nodes that moved outside their original groups`
).toEqual([]);
}