@react-x11/components 0.10.0 → 0.11.0

package/dist/terminal-output/index.js

@@ -27,13 +27,26 @@ import { useTheme } from 'react-x11';
 import { ansiPalette, parseAnsi } from '../ansi/index.js';
 import { registerRichText, RICHTEXT_ELEMENT, useLinkClicks, useSelectionMenu, } from '../richtext/index.js';
 import { codeBlockLook, codeBlockStyle, codeTextStyle, } from '../codeblock/index.js';
-import { documentRuns } from './runs.js';
+import { linesRuns } from './runs.js';
 import { hx } from './hx.js';
 import { useFontPrewarm } from '../internal/prewarm.js';
 const h = React.createElement;
 // The shared-module registration, at this component's own module scope — see
 // the note in `../richtext/node.ts`.
 registerRichText();
+/**
+ * Lines a block of output holds.
+ *
+ * The output is a column of blocks rather than one element, so an append
+ * lays out again the block it lands in and not the whole capture: one
+ * `<richtext>` for all of it was laid out whole for every line appended,
+ * 0.9 s an append at 20,000 lines. A block keeps its element while its lines
+ * are the same objects, which the parser shares from one snapshot to the
+ * next. Blocks start at multiples of this in the capture's own numbering,
+ * `truncated` counted in, so `maxLines` dropping lines off the top changes
+ * only the first block.
+ */
+const BLOCK_LINES = 256;
 function isDocument(source) {
     return (typeof source === 'object' &&
         source !== null &&
@@ -128,35 +141,88 @@ export function TerminalOutput(props) {
         foreground: colors?.foreground ?? look.color,
         background: colors?.background ?? String(theme.background ?? '#ffffff'),
     }), [colors, look.color, theme.background]);
-    const runs = React.useMemo(() => documentRuns(document, { family: look.family, size: look.size }, palette), [document, look.family, look.size, palette]);
-    const outputProps = {
-        runs,
-        style: codeTextStyle(look, wrap),
+    // Kept across renders while what a block is drawn with holds.
+    const blocks = React.useRef(null);
+    if (blocks.current?.look !== look ||
+        blocks.current.palette !== palette ||
+        blocks.current.wrap !== wrap ||
+        blocks.current.lineNumbers !== lineNumbers) {
+        blocks.current = { look, palette, wrap, lineNumbers, byIndex: new Map() };
+    }
+    const byIndex = blocks.current.byIndex;
+    const font = { family: look.family, size: look.size };
+    const outputStyle = codeTextStyle(look, wrap);
+    const gutterStyle = {
+        lineHeight: look.lineHeight,
+        textAlign: 'right',
     };
-    if (!wrap)
-        outputProps.wrap = false;
-    const lineCount = document.lines.length;
+    // The capture's own numbering: the first line shown is the one after
+    // every line `maxLines` has dropped.
+    const first = document.truncated;
+    const end = first + document.lines.length;
+    const outputs = [];
+    const gutters = [];
+    const kept = new Set();
+    for (let start = first - (first % BLOCK_LINES); start < end || outputs.length === 0; start += BLOCK_LINES) {
+        const index = start / BLOCK_LINES;
+        const from = Math.max(start, first) - first;
+        const to = Math.min(start + BLOCK_LINES, end) - first;
+        const lines = document.lines.slice(from, to);
+        let block = byIndex.get(index);
+        if (!block || !sameLines(block.lines, lines)) {
+            const outputProps = {
+                runs: linesRuns(lines, font, palette),
+                style: outputStyle,
+            };
+            if (!wrap)
+                outputProps.wrap = false;
+            block = {
+                lines,
+                output: h(RICHTEXT_ELEMENT, {
+                    key: index,
+                    ...outputProps,
+                }),
+                gutter: lineNumbers
+                    ? h(RICHTEXT_ELEMENT, {
+                        key: index,
+                        // The numbers are chrome, not text: `selectable={false}` keeps
+                        // them out of a drag and out of the copied text.
+                        selectable: false,
+                        runs: lines.map((_, i) => ({
+                            text: i === lines.length - 1
+                                ? `${first + from + i + 1}`
+                                : `${first + from + i + 1}\n`,
+                            family: look.family,
+                            size: look.size,
+                            color: look.dim,
+                        })),
+                        wrap: false,
+                        style: gutterStyle,
+                    })
+                    : null,
+            };
+            byIndex.set(index, block);
+        }
+        kept.add(index);
+        outputs.push(block.output);
+        if (block.gutter)
+            gutters.push(block.gutter);
+    }
+    for (const index of byIndex.keys()) {
+        if (!kept.has(index))
+            byIndex.delete(index);
+    }
+    // One column of numbers per column of output, block beside block: the
+    // same font and line height keep them in register.
     const gutter = lineNumbers
-        ? h(RICHTEXT_ELEMENT, {
-            // One richtext for all the numbers: same font, same line height, so
-            // it stays in register with the output beside it. `selectable={false}`
-            // is what keeps it out of a drag and out of the copied text.
-            selectable: false,
-            runs: Array.from({ length: lineCount }, (_, i) => ({
-                text: i === lineCount - 1 ? `${i + 1}` : `${i + 1}\n`,
-                family: look.family,
-                size: look.size,
-                color: look.dim,
-            })),
-            wrap: false,
+        ? hx('box', {
             style: {
-                lineHeight: look.lineHeight,
-                textAlign: 'right',
-                minWidth: Math.max(String(lineCount).length, 2) * Math.ceil(look.size * 0.62),
+                flexDirection: 'column',
+                minWidth: Math.max(String(end).length, 2) * Math.ceil(look.size * 0.62),
                 marginRight: look.padding,
                 flexShrink: 0,
             },
-        })
+        }, ...gutters)
         : null;
     const rootStyle = {
         ...codeBlockStyle(look),
@@ -179,6 +245,15 @@ export function TerminalOutput(props) {
         ...menu,
         ...links,
         'data-testname': props['data-testname'],
-    }, gutter, hx('box', { style: { overflow: 'scroll', flexDirection: 'column', flexGrow: 1 } }, h(RICHTEXT_ELEMENT, outputProps)));
+    }, gutter, hx('box', { style: { overflow: 'scroll', flexDirection: 'column', flexGrow: 1 } }, ...outputs));
+}
+/** Whether two runs of lines are the same objects, one for one. */
+function sameLines(a, b) {
+    if (a.length !== b.length)
+        return false;
+    for (let i = 0; i < a.length; i++)
+        if (a[i] !== b[i])
+            return false;
+    return true;
 }
 //# sourceMappingURL=index.js.map

package/dist/terminal-output/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/terminal-output/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/terminal-output/index.ts"],"names":[],"mappings":"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"}

package/dist/terminal-output/runs.d.ts

@@ -1,4 +1,4 @@
-import type { AnsiDocument, AnsiPalette, AnsiSpan } from '../ansi/index.js';
+import type { AnsiDocument, AnsiLine, AnsiPalette, AnsiSpan } from '../ansi/index.js';
 import type { TextRun } from '../richtext/index.js';
 /** The font a capture is set in. The palette is separate because it changes
  *  for a different reason — a theme flip rather than a size prop. */
@@ -24,4 +24,7 @@ export declare function spanRun(span: AnsiSpan, font: OutputFont, palette: AnsiP
  * terminal never drew.
  */
 export declare function documentRuns(document: AnsiDocument, font: OutputFont, palette: AnsiPalette): TextRun[];
+/** Some of a document's lines as runs, the way {@link documentRuns} makes
+ *  all of them: a block of `<TerminalOutput>`'s output. */
+export declare function linesRuns(lines: readonly AnsiLine[], font: OutputFont, palette: AnsiPalette): TextRun[];
 //# sourceMappingURL=runs.d.ts.map

package/dist/terminal-output/runs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../src/terminal-output/runs.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD;qEACqE;AACrE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAuBT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,EAAE,CAYX"}
+{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../src/terminal-output/runs.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD;qEACqE;AACrE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAuBT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,EAAE,CAEX;AAED;2DAC2D;AAC3D,wBAAgB,SAAS,CACvB,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,EAAE,CAWX"}

package/dist/terminal-output/runs.js

@@ -50,8 +50,12 @@ export function spanRun(span, font, palette) {
  * terminal never drew.
  */
 export function documentRuns(document, font, palette) {
+    return linesRuns(document.lines, font, palette);
+}
+/** Some of a document's lines as runs, the way {@link documentRuns} makes
+ *  all of them: a block of `<TerminalOutput>`'s output. */
+export function linesRuns(lines, font, palette) {
     const runs = [];
-    const { lines } = document;
     for (let i = 0; i < lines.length; i++) {
         for (const span of lines[i].spans) {
             if (span.text)

package/dist/terminal-output/runs.js.map

@@ -1 +1 @@
-{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../src/terminal-output/runs.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,4DAA4D;AAC5D,EAAE;AACF,2EAA2E;AAC3E,4EAA4E;AAC5E,kDAAkD;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CACrB,IAAc,EACd,IAAgB,EAChB,OAAoB;IAEpB,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,GAAG,GAAY;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,KAAK,EAAE,EAAE;KACV,CAAC;IACF,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI;QAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC;IACtC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc;YACjC,CAAC,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE;YAC5D,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IACtC,CAAC;IACD,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IACjC,IAAI,IAAI,CAAC,IAAI;QAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,QAAsB,EACtB,IAAgB,EAChB,OAAoB;IAEpB,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../src/terminal-output/runs.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,4DAA4D;AAC5D,EAAE;AACF,2EAA2E;AAC3E,4EAA4E;AAC5E,kDAAkD;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAgBrD;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CACrB,IAAc,EACd,IAAgB,EAChB,OAAoB;IAEpB,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,GAAG,GAAY;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,KAAK,EAAE,EAAE;KACV,CAAC;IACF,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI;QAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC;IACtC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc;YACjC,CAAC,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE;YAC5D,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IACtC,CAAC;IACD,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IACjC,IAAI,IAAI,CAAC,IAAI;QAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,QAAsB,EACtB,IAAgB,EAChB,OAAoB;IAEpB,OAAO,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAED;2DAC2D;AAC3D,MAAM,UAAU,SAAS,CACvB,KAA0B,EAC1B,IAAgB,EAChB,OAAoB;IAEpB,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-x11/components",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Components for react-x11 that do not belong in the core package",
   "keywords": [
     "react",

package/src/code/index.ts

@@ -17,21 +17,18 @@ import type { ReactElement } from 'react';
 import { useTheme } from 'react-x11';
 import type { Style } from 'react-x11/style';
 
-import {
-  registerRichText,
-  RICHTEXT_ELEMENT,
-  useSelectionMenu,
-} from '../richtext/index.js';
-import type { RichTextProps, TextRun } from '../richtext/index.js';
+import { registerRichText, useSelectionMenu } from '../richtext/index.js';
+import type { TextRun } from '../richtext/index.js';
 import {
   codeBlockLook,
-  codeBlockRuns,
+  CodeBlockRunCache,
   codeBlockStyle,
   codeTextStyle,
 } from '../codeblock/index.js';
 import type { Language, TokenStyles } from '../code-language/index.js';
 import { hx } from './hx.js';
 import { useFontPrewarm } from '../internal/prewarm.js';
+import { CodeGutter, CodeLines } from '../internal/codelines.js';
 
 const h = React.createElement;
 
@@ -107,39 +104,44 @@ export function Code(props: CodeProps): ReactElement {
   );
   useFontPrewarm(look.family);
 
+  // Kept between renders, so a source that changes at its end is tokenized
+  // again from the line that changed (`CodeBlockRunCache`).
+  const runCache = React.useRef<CodeBlockRunCache | null>(null);
+  runCache.current ??= new CodeBlockRunCache();
+  React.useEffect(() => () => runCache.current?.dispose(), []);
   const runs: TextRun[] = React.useMemo(
-    () => codeBlockRuns(source, look, { lang, language, resolveLanguage }),
+    () =>
+      runCache.current!.runs(source, look, { lang, language, resolveLanguage }),
     [source, lang, language, resolveLanguage, look],
   );
 
   const lineCount = React.useMemo(() => source.split('\n').length, [source]);
 
-  const codeProps: RichTextProps = { runs, style: codeTextStyle(look, wrap) };
-  if (!wrap) codeProps.wrap = false;
+  // In blocks of lines, so a change lays out the blocks it touches
+  // (`../internal/codelines.ts`).
+  const code = h(CodeLines, { runs, style: codeTextStyle(look, wrap), wrap });
 
   const gutter = lineNumbers
-    ? h(RICHTEXT_ELEMENT, {
-        // one richtext for all the numbers: same font, same line height, so
-        // it stays in register with the code beside it. `selectable={false}`
-        // is what keeps it out of a drag and out of the copied text — the
-        // numbering is chrome, and CSS spells that `user-select: none`.
-        selectable: false,
-        runs: Array.from({ length: lineCount }, (_, i) => ({
-          text: `${i + 1}\n`,
-          family: look.family,
-          size: look.size,
-          color: look.dim,
-        })),
-        wrap: false,
-        style: {
-          lineHeight: look.lineHeight,
-          textAlign: 'right',
-          minWidth:
-            Math.max(String(lineCount).length, 2) * Math.ceil(look.size * 0.62),
-          marginRight: look.padding,
-          flexShrink: 0,
+    ? hx(
+        'box',
+        {
+          style: {
+            flexDirection: 'column',
+            minWidth:
+              Math.max(String(lineCount).length, 2) *
+              Math.ceil(look.size * 0.62),
+            marginRight: look.padding,
+            flexShrink: 0,
+          },
         },
-      } as Record<string, unknown>)
+        // numbers in the same font and line height as the code, blocked the
+        // same way, so the two stay in register
+        h(CodeGutter, {
+          lines: lineCount,
+          run: { family: look.family, size: look.size, color: look.dim },
+          style: { lineHeight: look.lineHeight, textAlign: 'right' },
+        }),
+      )
     : null;
 
   const rootStyle: Style = {
@@ -170,7 +172,7 @@ export function Code(props: CodeProps): ReactElement {
     hx(
       'box',
       { style: { overflow: 'scroll', flexDirection: 'column', flexGrow: 1 } },
-      h(RICHTEXT_ELEMENT, codeProps as unknown as Record<string, unknown>),
+      code,
     ),
   );
 }

package/src/code-language/index.ts

@@ -34,7 +34,7 @@ export {
 } from './theme.js';
 
 export { languageForTag, tokenizeText } from './registry.js';
-export { codeRuns } from './runs.js';
+export { codeRuns, CodeRunCache } from './runs.js';
 export type { CodeRun, CodeRunOptions } from './runs.js';
 
 export { TOKEN_FALLBACK } from './types.js';

package/src/code-language/runs.ts

@@ -23,7 +23,7 @@
 // AGENTS.md on tree-shaking, and `textmate.ts` for the same shape.
 import { languageForTag, tokenizeText } from './registry.js';
 import { tokenStyleFor } from './theme.js';
-import type { Language, TokenStyles } from './types.js';
+import type { Language, Token, Tokenizer, TokenStyles } from './types.js';
 
 /** One styled run of code. Structurally a `<richtext>` run. */
 export interface CodeRun {
@@ -126,3 +126,113 @@ function push(
     out.push(run);
   }
 }
+
+/**
+ * `codeRuns`, kept between calls for a text that changes a little at a
+ * time: a fence being streamed, a source being appended to.
+ *
+ * One tokenizer lives as long as the cache. It is told which lines changed
+ * (`Tokenizer.edit`, the interface `<CodeEditor>` already drives) and asked
+ * again only for those and the lines after them its state has to walk
+ * through, and every other line keeps the runs it had. `codeRuns` tokenized
+ * the whole text afresh: at 5,000 lines, most of the time an appended line
+ * took on the client.
+ *
+ * The runs are the same text in the same colours `codeRuns` gives, cut a
+ * little differently: a line's runs never reach into the next, and each
+ * newline is a run of its own, so that a line keeps its runs while others
+ * change. `decorate` is applied to every run once, when it is made — the
+ * family and size a block of code is set in, say.
+ *
+ * Call `dispose()` when done with it: an engine may keep timers.
+ */
+export class CodeRunCache<R = CodeRun> {
+  private key: readonly unknown[] | null = null;
+  private tokenizer: Tokenizer | null = null;
+  private lines: string[] = [];
+  private tokens: (readonly Token[] | undefined)[] = [];
+  private lineRuns: (R[] | undefined)[] = [];
+  private newline: R | null = null;
+
+  constructor(
+    private readonly decorate: (run: CodeRun) => R = (run) => run as R,
+  ) {}
+
+  runs(text: string, tag: string, opts: CodeRunOptions): R[] {
+    if (text.length === 0)
+      return [this.decorate({ text: '', color: opts.color })];
+    const language =
+      opts.language ??
+      (tag ? (opts.resolveLanguage?.(tag) ?? languageForTag(tag)) : null);
+    if (!language) return [this.decorate({ text, color: opts.color })];
+
+    const key = [language, opts.styles, opts.color, opts.resolveToken];
+    if (!this.key || key.some((part, i) => part !== this.key![i])) {
+      this.dispose();
+      this.key = key;
+      this.lines = [];
+      this.tokens = [];
+      this.lineRuns = [];
+      this.newline = this.decorate({ text: '\n', color: opts.color });
+      this.tokenizer = language.createTokenizer({ invalidate: () => {} });
+      this.tokenizer.setLines(this.lines);
+    }
+    const tokenizer = this.tokenizer!;
+
+    // the lines the text shares with the last one, from the top: the edit
+    // is everything after them
+    const next = text.split('\n');
+    const lines = this.lines;
+    const shared = Math.min(lines.length, next.length);
+    let from = 0;
+    while (from < shared && lines[from] === next[from]) from++;
+    if (from < lines.length || from < next.length) {
+      const removed = lines.length - from;
+      const inserted = next.length - from;
+      lines.length = from;
+      for (let i = from; i < next.length; i++) lines.push(next[i]!);
+      tokenizer.edit({ fromLine: from, removed, inserted });
+      this.tokens.length = from;
+      this.lineRuns.length = from;
+    }
+
+    // Asked in order from the top, so a stream engine walks its frontier
+    // line by line and answers each exactly, never from a guess.
+    const out: R[] = [];
+    for (let i = 0; i < lines.length; i++) {
+      if (i > 0) out.push(this.newline!);
+      const tokens = tokenizer.lineTokens(i);
+      let runs = this.lineRuns[i];
+      if (!runs || this.tokens[i] !== tokens) {
+        runs = lineRuns(lines[i]!, tokens, opts).map(this.decorate);
+        this.lineRuns[i] = runs;
+        this.tokens[i] = tokens;
+      }
+      for (const run of runs) out.push(run);
+    }
+    return out;
+  }
+
+  dispose(): void {
+    this.tokenizer?.dispose?.();
+    this.tokenizer = null;
+    this.key = null;
+  }
+}
+
+/** One line's runs, as `codeRuns` makes them, up to its end. */
+function lineRuns(
+  line: string,
+  tokens: readonly Token[],
+  opts: CodeRunOptions,
+): CodeRun[] {
+  const out: CodeRun[] = [];
+  let at = 0;
+  for (const t of tokens) {
+    if (t.from > at) push(out, line.slice(at, t.from), undefined, opts);
+    push(out, line.slice(t.from, t.to), t.type, opts);
+    at = t.to;
+  }
+  if (at < line.length) push(out, line.slice(at), undefined, opts);
+  return out;
+}

package/src/codeblock/index.ts

@@ -15,7 +15,11 @@
 // A shared module, not a component: no element registration, no React, and
 // nothing imported from either of its consumers (a component never imports
 // another component).
-import { codeRuns, autoTokenStyles } from '../code-language/index.js';
+import {
+  codeRuns,
+  autoTokenStyles,
+  CodeRunCache,
+} from '../code-language/index.js';
 import type { Language, TokenStyles } from '../code-language/index.js';
 import type { TextRun } from '../richtext/index.js';
 import { tint } from 'react-x11/style';
@@ -130,6 +134,49 @@ export function codeBlockRuns(
   }).map((run) => ({ ...run, family: look.family, size: look.size }));
 }
 
+/**
+ * `codeBlockRuns` kept between calls, for a block of code that changes a
+ * little at a time — a fence being streamed, a source being appended to:
+ * the tokenizer is told which lines changed and the rest keep their runs
+ * (`CodeRunCache`). Call `dispose()` when done with it.
+ */
+export class CodeBlockRunCache {
+  private cache: CodeRunCache<TextRun> | null = null;
+  private family: string | undefined;
+  private size: number | undefined;
+
+  runs(
+    source: string,
+    look: CodeBlockLook,
+    options: CodeBlockRunOptions = {},
+  ): TextRun[] {
+    if (!this.cache || this.family !== look.family || this.size !== look.size) {
+      this.cache?.dispose();
+      const { family, size } = look;
+      this.family = family;
+      this.size = size;
+      this.cache = new CodeRunCache<TextRun>((run) => ({
+        ...run,
+        family,
+        size,
+      }));
+    }
+    const { lang = '', language, resolveLanguage, highlight = true } = options;
+    return this.cache.runs(source, highlight ? lang : '', {
+      styles: look.styles,
+      color: look.color,
+      ...(highlight && language ? { language } : null),
+      ...(highlight && resolveLanguage ? { resolveLanguage } : null),
+      resolveToken: look.resolveToken,
+    });
+  }
+
+  dispose(): void {
+    this.cache?.dispose();
+    this.cache = null;
+  }
+}
+
 /** The block's own box: fill, radius, padding. What surrounds it — a row
  *  with a gutter, a column in a document — is the component's. */
 export function codeBlockStyle(look: CodeBlockLook): Style {