Files
backnotprop__plannotator/packages/ui/components/Viewer.codeBlockHighlightSwap.test.tsx
Michael Ramos c08b188812 perf(ui): single Shiki highlighter, palette-matched code blocks, drop highlight.js (#1218)
* perf(build): stub out the dead Oniguruma WASM in every bundle

@pierre/diffs picks its Shiki engine with a runtime ternary:

    engine: preferredHighlighter === "shiki-wasm"
      ? createOnigurumaEngine(import("shiki/wasm"))
      : createJavaScriptRegexEngine()

Plannotator pins `preferredHighlighter: 'shiki-js'` (and Pierre's own
default is 'shiki-js'), so the Oniguruma branch never executes. Because
the choice is a runtime ternary, bundlers keep the `import("shiki/wasm")`
edge anyway and inline `@shikijs/engine-oniguruma/wasm-inlined`, a
~622 KB base64 blob, into the single-file HTML builds. The review app
paid for it twice: once on the main thread (via
`highlighter/shared_highlighter.js`) and once inside the `?worker&inline`
Pierre worker.

Alias `shiki/wasm` to a stub that throws if it is ever reached. Wired via
`resolve.alias` rather than a plugin because `resolve.alias` is shared
with Vite's worker build and `plugins` are not.

Highlighting output is unchanged: the JS regex engine was already the one
doing the work. Opting back into 'shiki-wasm' now fails loudly instead of
silently costing every user a megabyte of dead bytes.

    apps/review/dist/index.html  19,424,646 -> 18,180,545  (-1,244,101 raw / -463,348 gzip)
    apps/hook/dist/index.html    23,032,467 -> 22,410,416    (-622,051 raw / -233,485 gzip)

* perf(ui): consolidate code highlighting onto Shiki, drop highlight.js

The app shipped two highlighters. Shiki already tokenised the code-review
diff pane (via @pierre/diffs, JavaScript regex engine); highlight.js
separately coloured markdown fences and review suggestion snippets at
~982 KB minified for a full build of ~190 grammars. That second
highlighter is now gone.

Every call site moves onto `packages/ui/utils/codeHighlight.ts`, a thin
wrapper over Pierre's SHARED Shiki instance:

  CodeBlock, Viewer, PlanCleanDiffView   markdown fences
  InlineMarkdown                          code-file hover preview
  HighlightedCode                         review suggestion snippets

Reusing Pierre's instance rather than standing up a second fine-grained
one is deliberate. Pierre imports Shiki's full bundle, so every grammar
and theme is ALREADY inlined in the single-file builds: a separate
highlighter with a curated language list would have duplicated a subset
of bytes that are already there. Sharing costs nothing, gives every
language Shiki bundles instead of a shortlist, and — the point of the
change — guarantees fences resolve the exact same theme the diff pane
resolves.

Theming. `SHIKI_THEME_MAP` / `resolveSyntaxTheme` move from
`packages/review-editor/hooks/usePierreTheme.ts` to
`packages/ui/utils/syntaxTheme.ts`; usePierreTheme re-exports them, so
the review editor's imports are unchanged. `useFenceTheme()` feeds the
components and re-highlights on palette or mode change. Code blocks now
follow the active palette across all ~52 themes in both light and dark,
instead of always rendering github-dark and relying on hand-written
`.hljs-*` override stacks to stay legible. Those stacks are deleted:
`packages/editor/index.css`'s light-mode token palette, and
`colorblind.css`'s hand-tuned tokens which existed to APPROXIMATE
@pierre/theme's protanopia-deuteranopia themes that are now simply used.

Behaviour held fixed:

  - Language-less fences stay plain text (#1212). No auto-detection
    anywhere, including the hover preview, which previously called
    `hljs.highlightAuto`. `HighlightedCode` derives its language from
    the caller's file path; an unknown extension renders plain.
  - `applyHighlight(el, ...)` keeps the imperative `hljs.highlightElement`
    DOM contract the annotation layer reaches into, and writes plain text
    at final size first so async highlighting causes no layout shift.
    Already-attached grammars highlight synchronously — no flicker on
    cached highlights.
  - It also verifies the rendered text is byte-identical to the source
    and falls back to plain otherwise, because annotations address code
    blocks by text offset.
  - `@plannotator/ui`'s public API is unchanged: the highlighter is a
    module-level default like the package's other seams, no new props.

The `hljs` class on fenced `<code>` becomes `pn-code` (it is a
structural hook for blockTargeting, vim navigation and print.css, and it
named a library we no longer ship). `language-*` stays.

    apps/review/dist/index.html  18,180,545 -> 17,270,889  (-909,656 raw / -291,921 gzip)
    apps/hook/dist/index.html    22,410,416 -> 21,704,434  (-705,982 raw / -238,096 gzip)

Verified the diff pane is untouched: the rendered Pierre shadow-DOM
markup is byte-for-byte identical between an origin/main build and this
one (SHA-256 aa1ee88a…).

* fix(ui): strip stray NUL bytes from the code-highlight source

Two U+0000 bytes slipped into comments in the previous commit, which made
git treat the file as binary. Replaced with spaces; no behaviour change.

* fix(ui): keep code-block annotation marks across highlight swaps

Fenced code is annotated by hand: one `<mark data-bind-id>` inside the
`<code>` element, which `applyHighlight` also owns. Every highlight swap
(palette change, dark/light toggle, or the first async grammar attach
after load) replaces that element's children, so the mark was silently
wiped and nothing put it back. Annotation state, the sidebar panel and
exports were unaffected; the loss was purely visual, and deterministic.

`applyHighlight` now publishes every write through `onCodeHighlightSwap`,
synchronously, immediately after it. `Viewer` subscribes and re-paints the
fence's mark, so a swapped block ends up with BOTH the new theme's tokens
and its annotation. The shared painter (`paintCodeBlockMark`) moves the
token spans into the mark instead of flattening them to text, so creating
an annotation no longer costs a block its colours either.

Being driven by the swap also fixes the cousin race by ordering rather
than timing: share/draft restore runs on a timer after load, and on a slow
machine the first async swap could land after it and wipe the restored
marks per block. A restore that painted before the swap is now
re-established in the same task the swap ran in, and one that runs after
finds the mark already there.

Removal tombstones the id before re-highlighting, because the host drops
the annotation from state a tick later — without it the swap listener
would paint the just-removed annotation back in, and a fence carrying a
second annotation would end up bare.

Also closes the named gap in the WASM coverage: entry-assets only grepped
source, so a future @pierre/diffs bump could reintroduce the inlined blob
through a different import specifier unnoticed. It now greps the built
`apps/{review,hook}/dist/index.html` for the base64 WASM magic, skipping
on an unbuilt checkout and running for real in the CI job that builds the
bundles.
2026-08-05 21:54:40 -07:00

329 lines
12 KiB
TypeScript

/**
* A code-block annotation mark must survive every syntax-highlight swap.
*
* Fenced code is annotated by hand — one `<mark data-bind-id>` inside the
* `<code>` element — while `applyHighlight` owns that same element's children.
* Every swap (palette change, dark/light toggle, or the first async grammar
* attach after load) replaces those children, so without the swap listener in
* `Viewer` the mark is silently wiped and never comes back.
*
* Both tests assert the SAME pair of facts after the swap: the mark is still
* there, AND the tokens carry the new theme's colours. Getting one without the
* other is the bug in either direction.
*
* `@pierre/diffs` is stood in for through `__setCodeHighlightModuleForTests`,
* which keeps Shiki's full bundle out of the test and — more importantly —
* lets the second test decide EXACTLY when the async swap lands relative to the
* restore it races. That ordering is a released promise, never a sleep.
*/
import { afterEach, describe, expect, test } from 'bun:test';
import React from 'react';
import { createRoot, type Root } from 'react-dom/client';
import { act } from 'react';
import { AnnotationType, type Annotation, type Block } from '../types';
import {
__resetCodeHighlightCacheForTests,
__setCodeHighlightModuleForTests,
} from '../utils/codeHighlight';
const hasDom = typeof document !== 'undefined';
// Viewer pulls in @plannotator/web-highlighter, whose UMD bundle reads `window`
// at module-eval time. Import lazily so this file loads under the DOM-less
// default `bun test` run.
const viewerMod = hasDom ? await import('./Viewer') : null;
const Viewer = viewerMod?.Viewer as typeof import('./Viewer')['Viewer'];
type ViewerHandle = import('./Viewer').ViewerHandle;
const themeMod = hasDom ? await import('./ThemeProvider') : null;
const ThemeProvider = themeMod?.ThemeProvider as typeof import('./ThemeProvider')['ThemeProvider'];
const useTheme = themeMod?.useTheme as typeof import('./ThemeProvider')['useTheme'];
const CODE = 'const archived = true;';
const codeBlocks: Block[] = [
{ id: 'code-1', type: 'code', content: CODE, language: 'typescript', order: 0, startLine: 1 },
];
/** One distinctive colour per Shiki theme, so "did the tokens re-theme?" is a
* string match rather than a guess. */
const TOKEN_COLOR: Record<string, string> = {
'github-dark': '#79c0ff',
'github-light': '#0550ae',
'kanagawa-wave': '#7e9cd8',
};
/**
* Stand-in for `@pierre/diffs`. `attach` decides when a (lang, theme) pair
* becomes available: `'immediate'` resolves on the microtask queue, `'gated'`
* hands back a release function so a test can hold the async swap open.
*/
function fakePierre(attach: 'immediate' | 'gated'): {
mod: typeof import('@pierre/diffs');
release: () => void;
} {
const pending: Array<() => void> = [];
const mod = {
getSharedHighlighter: () =>
attach === 'immediate'
? Promise.resolve(undefined)
: new Promise((resolve) => pending.push(() => resolve(undefined))),
getHighlighterIfLoaded: () => ({
codeToTokens: (code: string, { theme }: { theme: string }) => ({
// One token per line reproduces the source byte-for-byte, which is what
// `highlightToHtml` insists on before it will emit markup at all.
tokens: code
.split('\n')
.map((line) => [{ content: line, color: TOKEN_COLOR[theme] ?? '#ffffff' }]),
}),
}),
};
return {
mod: mod as unknown as typeof import('@pierre/diffs'),
release: () => {
const waiting = pending.splice(0);
waiting.forEach((resolve) => resolve());
},
};
}
/** A whole-fence annotation, the shape `applyCodeBlockAnnotation` produces. */
function codeBlockAnnotation(id: string, type: AnnotationType): Annotation {
return {
id,
blockId: 'code-1',
startOffset: 0,
endOffset: CODE.length,
type,
originalText: CODE,
createdA: Date.now(),
};
}
let root: Root | null = null;
let host: HTMLElement | null = null;
let keySeq = 0;
interface Controls {
setColorTheme: (theme: string) => void;
viewer: ViewerHandle | null;
removeAnnotation: (id: string) => void;
}
const controls: Controls = {
setColorTheme: () => {},
viewer: null,
removeAnnotation: () => {},
};
const Harness: React.FC<{ initial: Annotation[] }> = ({ initial }) => {
const [annotations, setAnnotations] = React.useState<Annotation[]>(initial);
const theme = useTheme();
const viewerRef = React.useRef<ViewerHandle>(null);
React.useEffect(() => {
controls.setColorTheme = theme.setColorTheme;
controls.viewer = viewerRef.current;
// Mirrors App's removeAnnotation: strip the highlight, then drop it from
// state. The two happen in that order, one tick apart.
controls.removeAnnotation = (id: string) => {
viewerRef.current?.removeHighlight(id);
setAnnotations((prev) => prev.filter((a) => a.id !== id));
};
});
return (
<Viewer
ref={viewerRef}
blocks={codeBlocks}
markdown={`\`\`\`typescript\n${CODE}\n\`\`\``}
annotations={annotations}
onAddAnnotation={(annotation) => setAnnotations((prev) => [...prev, annotation])}
onSelectAnnotation={() => {}}
selectedAnnotationId={null}
mode="redline"
inputMethod="pinpoint"
taterMode={false}
disableCodePathValidation
/>
);
};
async function mountHarness(initial: Annotation[] = []): Promise<void> {
host = document.createElement('div');
document.body.appendChild(host);
await act(async () => {
root = createRoot(host!);
root.render(
// A fresh storage key per mount: ThemeProvider persists the palette, and
// a leftover cookie would otherwise decide the starting theme.
<ThemeProvider
defaultTheme="dark"
defaultColorTheme="github"
colorThemeStorageKey={`plannotator-color-theme-swap-test-${++keySeq}`}
storageKey={`plannotator-theme-swap-test-${keySeq}`}
>
<Harness initial={initial} />
</ThemeProvider>,
);
});
}
/** Let queued microtasks (the highlighter attach + its swap) run. */
async function flush(): Promise<void> {
await act(async () => {
await Promise.resolve();
await Promise.resolve();
});
}
function codeEl(): HTMLElement {
const el = document.querySelector<HTMLElement>('[data-block-id="code-1"] code');
if (!el) throw new Error('fenced code block did not render');
return el;
}
function tokenColors(): string[] {
return Array.from(codeEl().querySelectorAll<HTMLElement>('span[style]')).map(
(span) => span.getAttribute('style') ?? '',
);
}
afterEach(async () => {
if (root) {
await act(async () => {
root!.unmount();
});
root = null;
}
host?.remove();
host = null;
controls.viewer = null;
controls.setColorTheme = () => {};
controls.removeAnnotation = () => {};
if (hasDom) document.body.innerHTML = '';
__resetCodeHighlightCacheForTests();
});
describe('code-block annotations across highlight swaps', () => {
test.skipIf(!hasDom)('a palette change re-themes the tokens and keeps the mark', async () => {
const { mod } = fakePierre('immediate');
__setCodeHighlightModuleForTests(mod);
await mountHarness();
await flush();
// Baseline: the fence is highlighted in the github-dark palette.
expect(tokenColors().join(' ')).toContain(TOKEN_COLOR['github-dark']);
// Annotate the whole fence (pinpoint + redline is the code-block path).
const block = document.querySelector<HTMLElement>('[data-block-id="code-1"]')!;
await act(async () => {
block.dispatchEvent(new MouseEvent('mouseover', { bubbles: true }));
block.dispatchEvent(new MouseEvent('click', { bubbles: true }));
});
const mark = codeEl().querySelector<HTMLElement>('mark[data-bind-id]');
expect(mark).not.toBeNull();
expect(mark!.textContent).toBe(CODE);
// Switch the palette. This is the reported repro.
await act(async () => {
controls.setColorTheme('kanagawa-wave');
});
await flush();
const after = codeEl();
// Both facts, together: the mark is still there...
const survivor = after.querySelector<HTMLElement>('mark[data-bind-id]');
expect(survivor).not.toBeNull();
expect(survivor!.textContent).toBe(CODE);
expect(after.textContent).toBe(CODE);
// ...and the tokens moved to the new theme.
const styles = tokenColors().join(' ');
expect(styles).toContain(TOKEN_COLOR['kanagawa-wave']);
expect(styles).not.toContain(TOKEN_COLOR['github-dark']);
});
test.skipIf(!hasDom)(
'an async swap that lands after a share/draft restore does not wipe it',
async () => {
// The cousin bug: restore fires on a timer after load, and on a slow
// machine the FIRST async highlight swap can land after it. Held open
// explicitly here so the ordering is decided by the test, not by luck.
const { mod, release } = fakePierre('gated');
__setCodeHighlightModuleForTests(mod);
const restored: Annotation = {
id: 'codeblock-restored',
blockId: 'code-1',
startOffset: 0,
endOffset: CODE.length,
type: AnnotationType.DELETION,
originalText: CODE,
createdA: Date.now(),
};
await mountHarness([restored]);
await flush();
// The swap is still pending: the fence is plain and unmarked.
expect(tokenColors()).toEqual([]);
expect(codeEl().querySelector('mark[data-bind-id]')).toBeNull();
// Restore runs first — exactly what App does on a share/draft load.
await act(async () => {
controls.viewer?.applySharedAnnotations([restored]);
});
expect(codeEl().querySelector(`[data-bind-id="${restored.id}"]`)).not.toBeNull();
// Now let the swap land on top of the restored mark.
await act(async () => {
release();
});
await flush();
const after = codeEl();
expect(after.querySelector(`[data-bind-id="${restored.id}"]`)).not.toBeNull();
expect(after.textContent).toBe(CODE);
expect(tokenColors().join(' ')).toContain(TOKEN_COLOR['github-dark']);
},
);
test.skipIf(!hasDom)('removal is honoured even though it re-highlights the block', async () => {
// Removing an annotation re-highlights the fence on its way out, and the
// host only drops it from state on the NEXT tick — so for one tick the
// swap listener sees a list that still names the annotation whose mark was
// just deleted. It must not be the one painted back in.
const { mod } = fakePierre('immediate');
__setCodeHighlightModuleForTests(mod);
const older = codeBlockAnnotation('codeblock-older', AnnotationType.COMMENT);
const newer = codeBlockAnnotation('codeblock-newer', AnnotationType.DELETION);
await mountHarness([older, newer]);
await flush();
// Two annotations, one fence: the later one owns the mark, exactly as it
// does when a block is annotated twice.
expect(codeEl().querySelector('mark[data-bind-id]')?.getAttribute('data-bind-id'))
.toBe(newer.id);
await act(async () => {
controls.removeAnnotation(newer.id);
});
await flush();
// The removed one is gone, and the fence falls back to the annotation that
// is still on it rather than being left bare.
const after = codeEl();
expect(after.querySelector(`[data-bind-id="${newer.id}"]`)).toBeNull();
expect(after.querySelector(`[data-bind-id="${older.id}"]`)).not.toBeNull();
expect(after.textContent).toBe(CODE);
// And a later palette change — after the tombstone has been retired —
// still honours the removal.
await act(async () => {
controls.setColorTheme('kanagawa-wave');
});
await flush();
expect(codeEl().querySelector(`[data-bind-id="${newer.id}"]`)).toBeNull();
expect(codeEl().querySelector(`[data-bind-id="${older.id}"]`)).not.toBeNull();
expect(tokenColors().join(' ')).toContain(TOKEN_COLOR['kanagawa-wave']);
});
});