* fix(ui): a screen's steps read as clusters, and a link too far to follow is said in words The mobile app's /capture came back as a web: 100 boxes in a 1,227x5,588 ribbon, 113 lines drawn at rest crossing each other 652 times, each one running over about five other boxes' names. Measured, not guessed — three separate causes, very unequal. The region grouping had nothing to divide there (98 of 100 boxes take their region from one memoized component), so the picture fell back to a single 719px column. But the region dimension was not the lever. The lever was that `packRegions` packed every step of one distance onto shared rows and wrapped those rows at a fixed 720px, so a box and the thing it fires landed seven lines apart: 70 of the 113 lines joined boxes ONE step apart. That is what the crossings were made of. So a region is now packed as CLUSTERS — a step, then the steps it sets in motion on the line under it, stepped in — while the starting points that fire nothing still share a line, because a screen's handlers are siblings and giving each its own line turned a flat region into a column. A region's line width is earned rather than fixed (sqrt(total * pitch), clamped 720..2600), so a big screen comes out about as wide as it is tall. Clustering makes most links local but not all: a step reached from two places is drawn under whichever reached it first, so the other way in still crosses the picture. Those are now said in WORDS at both ends — `-> resumeInference` under the box that leads there, `<- CaptureView` under the box it arrives at, capped at three with `+N more` — rather than drawn. This is not a hiding: the link is stated, which says more than a line vanishing off the edge of the screen does, and selecting the box draws every one of its real lines exactly as before. It is the one at-rest cut that does not produce the "box that leads somewhere and draws nothing" every earlier cut produced. Also fixed while here, and predicted by the earlier region work: the in-region row relaxation had no cycle guard, so a region holding one loop pushed 65 of its boxes to rows 294-301 while the rest sat at 0-2. `forwardLinks` sets cycle-closing links aside first, as the order reading's `withoutBackEdges` already did. /capture: 1,227x5,588 -> 2,279x4,356, at-rest crossings 652 -> 1, lines-over-boxes 553 -> 26, with half the links still drawn as real lines and every quiet box still one the screen itself fires directly. The order reading is untouched (it keeps every line). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NTUFNN5bH3aPw2gi2LqbYD * fix(ui): a stub names its box without the mark the box wears for its kind `← ⇠ onCaptureProgress +2` reads as two arrows arguing: the stub already leads with a direction, and the box's own kind mark was competing with it. Verified in the live canvas. The box keeps its mark, where nothing competes. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NTUFNN5bH3aPw2gi2LqbYD * fix(ui): the screen's line into each of its parts stops sweeping the picture Audited all 51 screens of the mobile app on this branch. 96 lines — the screen's own stand-in line into each region — were 17% of everything drawn and caused 79% of every crossing left. A screen with ten regions tiles them into bands, so the line into a region two bands down travelled the height of the whole picture. Two causes, both fixed. The entry the line lands on was the walk's first member of the region; clustering moves a step that fires something BELOW the ones that fire nothing, so that box could sit lines down inside the region and the line had to reach past everything above it. It now lands on the box nearest the region's top-left that the screen actually leads to. And the stand-in line is no longer exempt from the stub rule — when the region is still too far to follow, the link is said in words like any other. The rest of the anchor's fan stays quiet as before: it is already stood in for. Across the 51 screens: crossings 47 -> 10, no screen above 10 (worst was 19, now 2); lines-over-boxes 236 -> 182; boxes with neither a line nor a word 150 -> 135. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NTUFNN5bH3aPw2gi2LqbYD * fix(ui): a screen's parts fill the canvas instead of squaring off into rows Audited the app's 28 regioned screens: the median canvas was 55% region and 45% nothing, and /home was 44% — 4,860px tall to hold about 2,160px of picture. The cause is that regions were tiled a row at a time with each row as tall as its tallest member, so one short region beside a tall one left the rest of that row blank, and a reader scrolls through the blank. Each region now goes as high as it can and then as far left as it can, over a skyline of what is already placed. Reading order is untouched: regions are still walked in the screen's own source order, so an earlier one is never pushed below a later one — a short one just tucks under another short one rather than waiting for the tall one beside it. Layering now comes from the finished geometry rather than a band counter, since once regions drop independently what a reader sees as one row IS one row. /home 4,860px -> 3,584px, aspect 0.59 -> 0.94. Tallest screen in the app 4,860 -> 4,356. Crossings 10 -> 13 across all 51 screens, still none above 10. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NTUFNN5bH3aPw2gi2LqbYD * fix(ui): the width a picture wraps at is tried, not estimated A region's line width came from sqrt(total * pitch) — the width at which total/width lines come out square. That estimate is wrong for how these pictures are drawn: a cluster spends lines on its own structure (a hub gets a line to itself, and what it fires starts another), so it undercounts a region's lines badly and wrapped /capture's 98 boxes into a 4,356px column. Laying a picture out is cheap and exact, so the widths are tried instead: layoutAt runs the whole pack at each of eight widths and the best finished canvas wins (~2ms for the model, all eight included). It has to be scored on the CANVAS, not per region — squaring each region off individually leaves fewer of them side by side, which took /home from 3,584px to 5,624px while every region looked better on its own. Also measured and rejected while here: dropping a region's CLUSTERS side by side the way the regions drop onto the canvas. Total height 42,084 -> 39,756px (-6%), but lines-over-boxes 120 -> 134 and crossings 5 -> 8, because two clusters side by side put each one's lines through the other. Height is cheap to scroll; a crossed line is what made this picture unreadable. The reasoning is recorded in the code so it is not re-tried blindly. Regions differ — they sit far enough apart that few lines run between them. Across the app's 51 screens: tallest picture 4,356 -> 3,796px, total height 45,744 -> 42,084px, lines-over-boxes 184 -> 120, crossings 13 -> 5, and no screen is a tall ribbon any more. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NTUFNN5bH3aPw2gi2LqbYD * stuff --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
132 lines
5.0 KiB
TypeScript
132 lines
5.0 KiB
TypeScript
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
||
import * as fs from 'node:fs';
|
||
import * as path from 'node:path';
|
||
import * as os from 'node:os';
|
||
import { CodeGraph } from '../src';
|
||
|
||
/**
|
||
* A JSX tag names ONE component, and the file it is written in says which:
|
||
* the one that file declares, or the one it imports. The synthesizer used to
|
||
* take the first node of that name in the whole graph, which is a coin flip as
|
||
* soon as a name repeats — and repeated component names are the norm, not the
|
||
* exception (`Section`, `Picker`, `FrameCard`, one per feature folder).
|
||
*
|
||
* Getting it wrong costs twice: the parent gains an edge to a component it
|
||
* never renders, and the component it DOES render is left with no caller, so
|
||
* every walk back from that subtree — Screens' navigation attribution,
|
||
* `getCallers`, an impact radius — dead-ends there. On an Expo app that showed
|
||
* up as a navigation standing alone on the Screens tab with no screen behind
|
||
* it, while the edge pointed at an unrelated card in another sheet.
|
||
*
|
||
* Each decoy here is deliberately named to sort BEFORE the right answer, so a
|
||
* first-match resolver picks it and the test fails.
|
||
*/
|
||
describe('JSX child disambiguation among same-named components', () => {
|
||
let dir: string;
|
||
let cg: any;
|
||
|
||
beforeEach(() => {
|
||
dir = fs.mkdtempSync(path.join(os.tmpdir(), 'jsx-child-'));
|
||
fs.writeFileSync(path.join(dir, 'package.json'), '{"dependencies":{"react":"^18.0.0"}}');
|
||
});
|
||
|
||
afterEach(() => {
|
||
cg?.close?.();
|
||
fs.rmSync(dir, { recursive: true, force: true });
|
||
});
|
||
|
||
const write = (rel: string, body: string) => {
|
||
const p = path.join(dir, rel);
|
||
fs.mkdirSync(path.dirname(p), { recursive: true });
|
||
fs.writeFileSync(p, body);
|
||
};
|
||
|
||
async function index() {
|
||
cg = await CodeGraph.init(dir, { silent: true });
|
||
await cg.indexAll();
|
||
return (cg as any).db.db;
|
||
}
|
||
|
||
/** The files a jsx-render edge out of `parent` points into. */
|
||
const rendersFrom = (db: any, parent: string): string[] =>
|
||
db
|
||
.prepare(
|
||
`SELECT t.file_path AS f FROM edges e
|
||
JOIN nodes s ON s.id = e.source
|
||
JOIN nodes t ON t.id = e.target
|
||
WHERE s.name = ? AND json_extract(e.metadata, '$.synthesizedBy') = 'jsx-render'
|
||
ORDER BY f`
|
||
)
|
||
.all(parent)
|
||
.map((r: any) => r.f);
|
||
|
||
it('follows the import when the same name is declared in another file', async () => {
|
||
write('a-decoy/card.tsx', `export function Card() { return <div>decoy</div>; }\n`);
|
||
write('real/card.tsx', `export function Card() { return <div>real</div>; }\n`);
|
||
write(
|
||
'grid.tsx',
|
||
`import { Card } from './real/card';
|
||
export function Grid() { return <div><Card /></div>; }
|
||
`
|
||
);
|
||
const db = await index();
|
||
expect(rendersFrom(db, 'Grid')).toEqual(['real/card.tsx']);
|
||
});
|
||
|
||
it('follows a tsconfig path alias the same way a relative import is followed', async () => {
|
||
fs.writeFileSync(
|
||
path.join(dir, 'tsconfig.json'),
|
||
JSON.stringify({ compilerOptions: { baseUrl: '.', paths: { '@/*': ['src/*'] } } })
|
||
);
|
||
write('src/a-decoy/row.tsx', `export function Row() { return <li>decoy</li>; }\n`);
|
||
write('src/real/row.tsx', `export function Row() { return <li>real</li>; }\n`);
|
||
write(
|
||
'src/list.tsx',
|
||
`import { Row } from '@/real/row';
|
||
export function List() { return <ul><Row /></ul>; }
|
||
`
|
||
);
|
||
const db = await index();
|
||
expect(rendersFrom(db, 'List')).toEqual(['src/real/row.tsx']);
|
||
});
|
||
|
||
it('prefers a component declared in the same file over a same-named import elsewhere', async () => {
|
||
write('a-decoy/pill.tsx', `export function Pill() { return <span>decoy</span>; }\n`);
|
||
write(
|
||
'toolbar.tsx',
|
||
`function Pill() { return <span>local</span>; }
|
||
export function Toolbar() { return <div><Pill /></div>; }
|
||
`
|
||
);
|
||
const db = await index();
|
||
expect(rendersFrom(db, 'Toolbar')).toEqual(['toolbar.tsx']);
|
||
});
|
||
|
||
it('prefers a JS component over a same-named class in the app’s native half', async () => {
|
||
// A React Native app: `<CaptureSettings/>` is the TS component the screen
|
||
// imports, never the Swift type that happens to share its name.
|
||
write('a-ios/CaptureSettings.swift', `class CaptureSettings {\n func sync() {}\n}\n`);
|
||
write('ui/capture-settings.tsx', `export function CaptureSettings() { return <div />; }\n`);
|
||
write(
|
||
'ui/overlay.tsx',
|
||
`import { CaptureSettings } from './capture-settings';
|
||
export function Overlay() { return <div><CaptureSettings /></div>; }
|
||
`
|
||
);
|
||
const db = await index();
|
||
expect(rendersFrom(db, 'Overlay')).toEqual(['ui/capture-settings.tsx']);
|
||
});
|
||
|
||
it('still links a name that appears exactly once', async () => {
|
||
write('only/badge.tsx', `export function Badge() { return <b>1</b>; }\n`);
|
||
write(
|
||
'header.tsx',
|
||
`import { Badge } from './only/badge';
|
||
export function Header() { return <h1><Badge /></h1>; }
|
||
`
|
||
);
|
||
const db = await index();
|
||
expect(rendersFrom(db, 'Header')).toEqual(['only/badge.tsx']);
|
||
});
|
||
});
|