@pierre/diffs 1.5.2 → 1.6.0-beta.1

package/dist/utils/renderFileWithHighlighter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderFileWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"mappings":";;iBAqBgB,0BACd,MAAM,cACN,aAAa,oBACX,OAAO,uBAAuB,uBAAuB,qBAErD,gBACA,cACA,YACA,UACC,4BACF"}
+{"version":3,"file":"renderFileWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"mappings":";;;iBAmBgB,0BACd,MAAM,cACN,aAAa,oBACX,OAAO,uBAAuB,uBAAuB,qBAErD,gBACA,aACA,cACA,YACA,UACC,4BACF"}

package/dist/utils/renderFileWithHighlighter.js

@@ -1,13 +1,12 @@
 import { linesFromFileContents } from "./computeFileOffsets.js";
 import { getFiletypeFromFileName } from "./getFiletypeFromFileName.js";
 import { appendItems } from "./appendItems.js";
-import { createTransformerWithState } from "./createTransformerWithState.js";
-import { formatCSSVariablePrefix } from "./formatCSSVariablePrefix.js";
 import { getHighlighterThemeStyles } from "./getHighlighterThemeStyles.js";
-import { getLineNodes } from "./getLineNodes.js";
+import { getTokenOptions } from "./getTokenOptions.js";
+import { renderTokenLines } from "./renderTokenLines.js";
 //#region src/utils/renderFileWithHighlighter.ts
 const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
-function renderFileWithHighlighter(file, highlighter, { theme, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+function renderFileWithHighlighter(file, highlighter, { theme, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, lazyLineAST = false, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -16,7 +15,7 @@ function renderFileWithHighlighter(file, highlighter, { theme, tokenizeMaxLineLe
 		totalLines = Infinity;
 	}
 	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
-	const { state, transformers } = createTransformerWithState(useTokenTransformer);
+	const state = { lineInfo: [] };
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
 	const baseThemeType = typeof theme === "string" ? highlighter.getTheme(theme).type : void 0;
 	const themeStyles = getHighlighterThemeStyles({
@@ -28,27 +27,12 @@ function renderFileWithHighlighter(file, highlighter, { theme, tokenizeMaxLineLe
 		lineIndex: shikiLineNumber - 1 + startingLine,
 		lineNumber: shikiLineNumber + startingLine
 	});
-	const hastConfig = (() => {
-		if (typeof theme === "string") return {
-			lang,
-			theme,
-			transformers,
-			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token"),
-			tokenizeMaxLineLength,
-			tokenizeTimeLimit: 0
-		};
-		return {
-			lang,
-			themes: theme,
-			transformers,
-			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token"),
-			tokenizeMaxLineLength,
-			tokenizeTimeLimit: 0
-		};
-	})();
-	const highlightedLines = getLineNodes(highlighter.codeToHast(normalizeHighlightLineEndings(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents), hastConfig));
+	const highlightedLines = renderTokenLines(highlighter.codeToTokens(normalizeHighlightLineEndings(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents), getTokenOptions(lang, theme, tokenizeMaxLineLength)).tokens, {
+		state,
+		useTokenTransformer,
+		lazyLineAST: lazyLineAST && !forcePlainText && !useTokenTransformer,
+		cacheHtmlStyles: highlighter.name === "highlights"
+	});
 	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
 	if (isWindowedHighlight) appendItems(code, highlightedLines);
 	return {

package/dist/utils/renderFileWithHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderFileWithHighlighter.js","names":[],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"sourcesContent":["import type {\n  CodeToHastOptions,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  ForceFilePlainTextOptions,\n  RenderFileOptions,\n  ThemedFileResult,\n} from '../types';\nimport { appendItems } from './appendItems';\nimport { linesFromFileContents } from './computeFileOffsets';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderFileWithHighlighter(\n  file: FileContents,\n  highlighter: DiffsHighlighter,\n  { theme, tokenizeMaxLineLength, useTokenTransformer }: RenderFileOptions,\n  {\n    forcePlainText,\n    startingLine,\n    totalLines,\n    lines,\n  }: ForceFilePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedFileResult {\n  if (forcePlainText) {\n    startingLine ??= 0;\n    totalLines ??= Infinity;\n  } else {\n    // If we aren't forcing plain text, then we intentionally do not support\n    // ranges for highlighting as that could break the syntax highlighting, we\n    // we override any values that may have been passed in.  Maybe one day we\n    // warn about this?\n    startingLine = 0;\n    totalLines = Infinity;\n  }\n  const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n  const { state, transformers } =\n    createTransformerWithState(useTokenTransformer);\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType =\n    typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\n  const themeStyles = getHighlighterThemeStyles({\n    theme,\n    highlighter,\n  });\n  state.lineInfo = (shikiLineNumber: number) => ({\n    type: 'context',\n    lineIndex: shikiLineNumber - 1 + startingLine,\n    lineNumber: shikiLineNumber + startingLine,\n  });\n  // tokenizeTimeLimit: 0 disables shiki's silent 500ms-per-line tokenization\n  // abort. When it trips (slow devices, cold JS-regex-engine compile), the\n  // rest of the line collapses to the enclosing scope's color — and since\n  // dual-theme rendering tokenizes per theme, the first (dark) pass can smear\n  // while the warm second (light) pass stays correct. Pathological content is\n  // already guarded by tokenizeMaxLineLength, which renders long lines plain.\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    if (typeof theme === 'string') {\n      return {\n        lang,\n        theme,\n        transformers,\n        defaultColor: false,\n        cssVariablePrefix: formatCSSVariablePrefix('token'),\n        tokenizeMaxLineLength,\n        tokenizeTimeLimit: 0,\n      };\n    }\n    return {\n      lang,\n      themes: theme,\n      transformers,\n      defaultColor: false,\n      cssVariablePrefix: formatCSSVariablePrefix('token'),\n      tokenizeMaxLineLength,\n      tokenizeTimeLimit: 0,\n    };\n  })();\n  const highlightedLines = getLineNodes(\n    highlighter.codeToHast(\n      normalizeHighlightLineEndings(\n        isWindowedHighlight\n          ? extractWindowedFileContent(\n              lines ?? linesFromFileContents(file.contents),\n              startingLine,\n              totalLines\n            )\n          : file.contents\n      ),\n      hastConfig\n    )\n  );\n\n  // Create sparse array for windowed rendering\n  const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;\n  if (isWindowedHighlight) {\n    appendItems(code, highlightedLines);\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\n// Shiki does not treat a lone carriage return as a line break. Normalize only\n// the text sent to the highlighter so its output stays aligned with the file\n// model while the original document retains its line endings.\nfunction normalizeHighlightLineEndings(contents: string): string {\n  return contents.replace(/\\r(?!\\n)/g, '\\n');\n}\n\nfunction extractWindowedFileContent(\n  lines: string[],\n  startingLine: number,\n  totalLines: number\n): string {\n  if (lines.length === 0) {\n    return '';\n  }\n  const endLine = Math.min(startingLine + totalLines, lines.length);\n  return lines.slice(startingLine, endLine).join('');\n}\n"],"mappings":";;;;;;;;AAiBA,MAAM,6BAAwD,EAC5D,gBAAgB,MAClB;AAEA,SAAgB,0BACd,MACA,aACA,EAAE,OAAO,uBAAuB,uBAChC,EACE,gBACA,cACA,YACA,UAC6B,4BACb;CAClB,IAAI,gBAAgB;EAClB,iBAAiB;EACjB,eAAe;CACjB,OAAO;EAKL,eAAe;EACf,aAAa;CACf;CACA,MAAM,sBAAsB,eAAe,KAAK,aAAa;CAC7D,MAAM,EAAE,OAAO,iBACb,2BAA2B,mBAAmB;CAChD,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,IAAI;CACnD,MAAM,gBACJ,OAAO,UAAU,WAAW,YAAY,SAAS,KAAK,CAAC,CAAC,OAAO,KAAA;CACjE,MAAM,cAAc,0BAA0B;EAC5C;EACA;CACF,CAAC;CACD,MAAM,YAAY,qBAA6B;EAC7C,MAAM;EACN,WAAW,kBAAkB,IAAI;EACjC,YAAY,kBAAkB;CAChC;CAOA,MAAM,oBAAwD;EAC5D,IAAI,OAAO,UAAU,UACnB,OAAO;GACL;GACA;GACA;GACA,cAAc;GACd,mBAAmB,wBAAwB,OAAO;GAClD;GACA,mBAAmB;EACrB;EAEF,OAAO;GACL;GACA,QAAQ;GACR;GACA,cAAc;GACd,mBAAmB,wBAAwB,OAAO;GAClD;GACA,mBAAmB;EACrB;CACF,EAAA,CAAG;CACH,MAAM,mBAAmB,aACvB,YAAY,WACV,8BACE,sBACI,2BACE,SAAS,sBAAsB,KAAK,QAAQ,GAC5C,cACA,UACF,IACA,KAAK,QACX,GACA,UACF,CACF;CAGA,MAAM,OAAO,sBAAsB,IAAI,MAAM,YAAY,IAAI;CAC7D,IAAI,qBACF,YAAY,MAAM,gBAAgB;CAGpC,OAAO;EAAE;EAAM;EAAa;CAAc;AAC5C;AAKA,SAAS,8BAA8B,UAA0B;CAC/D,OAAO,SAAS,QAAQ,aAAa,IAAI;AAC3C;AAEA,SAAS,2BACP,OACA,cACA,YACQ;CACR,IAAI,MAAM,WAAW,GACnB,OAAO;CAET,MAAM,UAAU,KAAK,IAAI,eAAe,YAAY,MAAM,MAAM;CAChE,OAAO,MAAM,MAAM,cAAc,OAAO,CAAC,CAAC,KAAK,EAAE;AACnD"}
+{"version":3,"file":"renderFileWithHighlighter.js","names":[],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"sourcesContent":["import type {\n  DiffsHighlighter,\n  FileContents,\n  ForceFilePlainTextOptions,\n  RenderFileOptions,\n  SharedRenderState,\n  ThemedFileResult,\n} from '../types';\nimport { appendItems } from './appendItems';\nimport { linesFromFileContents } from './computeFileOffsets';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getTokenOptions } from './getTokenOptions';\nimport { renderTokenLines } from './renderTokenLines';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderFileWithHighlighter(\n  file: FileContents,\n  highlighter: DiffsHighlighter,\n  { theme, tokenizeMaxLineLength, useTokenTransformer }: RenderFileOptions,\n  {\n    forcePlainText,\n    lazyLineAST = false,\n    startingLine,\n    totalLines,\n    lines,\n  }: ForceFilePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedFileResult {\n  if (forcePlainText) {\n    startingLine ??= 0;\n    totalLines ??= Infinity;\n  } else {\n    // Tokenization must include preceding lines to preserve lexical state.\n    startingLine = 0;\n    totalLines = Infinity;\n  }\n  const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n  const state: SharedRenderState = { lineInfo: [] };\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType =\n    typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\n  const themeStyles = getHighlighterThemeStyles({\n    theme,\n    highlighter,\n  });\n  state.lineInfo = (shikiLineNumber: number) => ({\n    type: 'context',\n    lineIndex: shikiLineNumber - 1 + startingLine,\n    lineNumber: shikiLineNumber + startingLine,\n  });\n  const highlightedLines = renderTokenLines(\n    highlighter.codeToTokens(\n      normalizeHighlightLineEndings(\n        isWindowedHighlight\n          ? extractWindowedFileContent(\n              lines ?? linesFromFileContents(file.contents),\n              startingLine,\n              totalLines\n            )\n          : file.contents\n      ),\n      getTokenOptions(lang, theme, tokenizeMaxLineLength)\n    ).tokens,\n    {\n      state,\n      useTokenTransformer,\n      lazyLineAST: lazyLineAST && !forcePlainText && !useTokenTransformer,\n      cacheHtmlStyles: highlighter.name === 'highlights',\n    }\n  );\n\n  // Create sparse array for windowed rendering\n  const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;\n  if (isWindowedHighlight) {\n    appendItems(code, highlightedLines);\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\n// Shiki does not treat a lone carriage return as a line break. Normalize only\n// the text sent to the highlighter so its output stays aligned with the file\n// model while the original document retains its line endings.\nfunction normalizeHighlightLineEndings(contents: string): string {\n  return contents.replace(/\\r(?!\\n)/g, '\\n');\n}\n\nfunction extractWindowedFileContent(\n  lines: string[],\n  startingLine: number,\n  totalLines: number\n): string {\n  if (lines.length === 0) {\n    return '';\n  }\n  const endLine = Math.min(startingLine + totalLines, lines.length);\n  return lines.slice(startingLine, endLine).join('');\n}\n"],"mappings":";;;;;;;AAeA,MAAM,6BAAwD,EAC5D,gBAAgB,MAClB;AAEA,SAAgB,0BACd,MACA,aACA,EAAE,OAAO,uBAAuB,uBAChC,EACE,gBACA,cAAc,OACd,cACA,YACA,UAC6B,4BACb;CAClB,IAAI,gBAAgB;EAClB,iBAAiB;EACjB,eAAe;CACjB,OAAO;EAEL,eAAe;EACf,aAAa;CACf;CACA,MAAM,sBAAsB,eAAe,KAAK,aAAa;CAC7D,MAAM,QAA2B,EAAE,UAAU,CAAC,EAAE;CAChD,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,IAAI;CACnD,MAAM,gBACJ,OAAO,UAAU,WAAW,YAAY,SAAS,KAAK,CAAC,CAAC,OAAO,KAAA;CACjE,MAAM,cAAc,0BAA0B;EAC5C;EACA;CACF,CAAC;CACD,MAAM,YAAY,qBAA6B;EAC7C,MAAM;EACN,WAAW,kBAAkB,IAAI;EACjC,YAAY,kBAAkB;CAChC;CACA,MAAM,mBAAmB,iBACvB,YAAY,aACV,8BACE,sBACI,2BACE,SAAS,sBAAsB,KAAK,QAAQ,GAC5C,cACA,UACF,IACA,KAAK,QACX,GACA,gBAAgB,MAAM,OAAO,qBAAqB,CACpD,CAAC,CAAC,QACF;EACE;EACA;EACA,aAAa,eAAe,CAAC,kBAAkB,CAAC;EAChD,iBAAiB,YAAY,SAAS;CACxC,CACF;CAGA,MAAM,OAAO,sBAAsB,IAAI,MAAM,YAAY,IAAI;CAC7D,IAAI,qBACF,YAAY,MAAM,gBAAgB;CAGpC,OAAO;EAAE;EAAM;EAAa;CAAc;AAC5C;AAKA,SAAS,8BAA8B,UAA0B;CAC/D,OAAO,SAAS,QAAQ,aAAa,IAAI;AAC3C;AAEA,SAAS,2BACP,OACA,cACA,YACQ;CACR,IAAI,MAAM,WAAW,GACnB,OAAO;CAET,MAAM,UAAU,KAAK,IAAI,eAAe,YAAY,MAAM,MAAM;CAChE,OAAO,MAAM,MAAM,cAAc,OAAO,CAAC,CAAC,KAAK,EAAE;AACnD"}

package/dist/utils/renderTokenLines.d.ts

@@ -0,0 +1,17 @@
+import { ElementContent } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
+import { DecorationItem, ThemedToken } from "../highlighter/types.js";
+import { SharedRenderState } from "../types.js";
+//#region src/utils/renderTokenLines.d.ts
+interface RenderTokenLinesOptions {
+  lazyLineAST?: boolean;
+  cacheHtmlStyles?: boolean;
+  state?: SharedRenderState;
+  useTokenTransformer?: boolean;
+  mergeWhitespaces?: 'never' | 'always';
+  decorations?: DecorationItem[];
+  lineOffsets?: number[];
+}
+declare function renderTokenLines(lines: ThemedToken[][], { state, lazyLineAST, cacheHtmlStyles, useTokenTransformer, mergeWhitespaces, decorations, lineOffsets }: RenderTokenLinesOptions): ElementContent[];
+//#endregion
+export { renderTokenLines };
+//# sourceMappingURL=renderTokenLines.d.ts.map

package/dist/utils/renderTokenLines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderTokenLines.d.ts","names":[],"sources":["../../src/utils/renderTokenLines.ts"],"mappings":";;;;UAQU;EACR;EACA;EACA,QAAQ;EACR;EACA;EACA,cAAc;EACd;;iBAsBc,iBACd,OAAO,mBAEL,OACA,aACA,iBACA,qBACA,kBACA,aACA,eACC,0BACF"}

package/dist/utils/renderTokenLines.js

@@ -0,0 +1,246 @@
+import { processLine } from "./processLine.js";
+import { setDeferredArrayItem } from "./setDeferredArrayItem.js";
+import { tokenStyle } from "./tokenStyle.js";
+import { wrapTokenFragments } from "./wrapTokenFragments.js";
+//#region src/utils/renderTokenLines.ts
+function renderTokenLines(lines, { state, lazyLineAST = false, cacheHtmlStyles = false, useTokenTransformer = false, mergeWhitespaces = "always", decorations = [], lineOffsets = [] }) {
+	let decorationsByLine;
+	for (const decoration of decorations) {
+		const byLine = decorationsByLine ??= /* @__PURE__ */ new Map();
+		const normalized = {
+			...decoration,
+			start: getDecorationPosition(decoration.start, lineOffsets),
+			end: getDecorationPosition(decoration.end, lineOffsets)
+		};
+		const lastLine = Math.min(normalized.end.line, lines.length - 1);
+		for (let line = normalized.start.line; line <= lastLine; line++) {
+			let spans = byLine.get(line);
+			if (spans == null) byLine.set(line, spans = []);
+			spans.push(normalized);
+		}
+	}
+	const renderLine = (tokens, lineIndex) => {
+		let normalized;
+		if (useTokenTransformer || mergeWhitespaces !== "never") {
+			let pendingWhitespace = "";
+			let whitespaceOffset = 0;
+			for (let i = 0; i < tokens.length; i++) {
+				let token = tokens[i];
+				if (useTokenTransformer) {
+					const content = token.content.trim();
+					if (content !== "" && content !== token.content) {
+						normalized ??= tokens.slice(0, i);
+						const start = token.content.indexOf(content);
+						if (start > 0) normalized.push({
+							content: token.content.slice(0, start),
+							offset: token.offset
+						});
+						normalized.push({
+							...token,
+							content,
+							offset: token.offset + start
+						});
+						const end = start + content.length;
+						if (end < token.content.length) normalized.push({
+							content: token.content.slice(end),
+							offset: token.offset + end
+						});
+						continue;
+					}
+				} else {
+					const decoratedWhitespace = ((token.fontStyle ?? 0) & 12) !== 0;
+					if (!decoratedWhitespace && /^\s+$/.test(token.content) && i < tokens.length - 1) {
+						normalized ??= tokens.slice(0, i);
+						if (pendingWhitespace === "") whitespaceOffset = token.offset;
+						pendingWhitespace += token.content;
+						continue;
+					}
+					if (pendingWhitespace !== "" && normalized != null) {
+						if (decoratedWhitespace) normalized.push({
+							content: pendingWhitespace,
+							offset: whitespaceOffset
+						});
+						else token = {
+							...token,
+							content: pendingWhitespace + token.content,
+							offset: whitespaceOffset
+						};
+						pendingWhitespace = "";
+					}
+				}
+				normalized?.push(token);
+			}
+		}
+		normalized ??= tokens;
+		const line = {
+			type: "element",
+			tagName: state == null ? "span" : "div",
+			properties: state == null ? { class: "line" } : {},
+			children: []
+		};
+		const spans = decorationsByLine?.get(lineIndex);
+		const column = spans == null ? appendTokens(line, normalized, useTokenTransformer, cacheHtmlStyles) : appendDecoratedTokens(line, normalized, spans, lineIndex, useTokenTransformer, cacheHtmlStyles);
+		if (useTokenTransformer && column === 0) line.children.push({
+			type: "element",
+			tagName: "br",
+			properties: {},
+			children: []
+		});
+		if (useTokenTransformer && spans != null) wrapTokenFragments(line);
+		return state == null ? line : processLine(line, lineIndex + 1, state);
+	};
+	if (!lazyLineAST) return lines.map(renderLine);
+	const rows = new Array(lines.length);
+	for (let index = 0; index < lines.length; index++) {
+		const tokens = lines[index];
+		setDeferredArrayItem(rows, index, () => renderLine(tokens, index));
+	}
+	return rows;
+}
+function appendTokens(line, tokens, useTokenTransformer, cacheHtmlStyles) {
+	let column = 0;
+	for (const token of tokens) {
+		if (token.content === "") continue;
+		line.children.push(createTokenSpan(token, tokenStyle(token, cacheHtmlStyles), token.content, column, useTokenTransformer));
+		column += token.content.length;
+	}
+	return column;
+}
+function appendDecoratedTokens(line, tokens, spans, lineIndex, useTokenTransformer, cacheHtmlStyles) {
+	if (spans.length > 1) spans.sort((a, b) => {
+		if (a.start.line !== b.start.line) return a.start.line - b.start.line;
+		if (a.start.character !== b.start.character) return a.start.character - b.start.character;
+		if (a.end.line !== b.end.line) return b.end.line - a.end.line;
+		return b.end.character - a.end.character;
+	});
+	const lineLength = tokens.reduce((length, token) => length + token.content.length, 0);
+	const boundaries = [];
+	for (let order = 0; order < spans.length; order++) {
+		const decoration = spans[order];
+		const range = {
+			decoration,
+			order,
+			from: decoration.start.line === lineIndex ? decoration.start.character : 0,
+			to: decoration.end.line === lineIndex ? decoration.end.character : lineLength
+		};
+		boundaries.push({
+			position: Math.max(0, Math.min(range.from, lineLength)),
+			range,
+			start: true
+		}, {
+			position: Math.max(0, Math.min(range.to, lineLength)),
+			range,
+			start: false
+		});
+	}
+	boundaries.sort((a, b) => a.position - b.position);
+	const active = [];
+	const decorationStack = [];
+	let boundaryIndex = 0;
+	const updateActive = (range, add) => {
+		let low = 0;
+		let high = active.length;
+		while (low < high) {
+			const middle = low + high >>> 1;
+			if (active[middle].order < range.order) low = middle + 1;
+			else high = middle;
+		}
+		if (add) active.splice(low, 0, range);
+		else if (active[low] === range) active.splice(low, 1);
+	};
+	const getParent = () => {
+		let parent = line;
+		let depth = 0;
+		for (const range of active) {
+			if (decorationStack[depth]?.range !== range) {
+				decorationStack.length = depth;
+				const wrapper = {
+					type: "element",
+					tagName: "span",
+					properties: { ...range.decoration.properties },
+					children: []
+				};
+				parent.children.push(wrapper);
+				decorationStack.push({
+					range,
+					node: wrapper
+				});
+			}
+			parent = decorationStack[depth++].node;
+		}
+		decorationStack.length = depth;
+		return parent;
+	};
+	let parent = line;
+	const advanceBoundary = (position) => {
+		const first = boundaryIndex;
+		while (boundaries[boundaryIndex]?.position === position) boundaryIndex++;
+		let hasMarker = false;
+		for (let i = first; i < boundaryIndex; i++) {
+			const { range, start } = boundaries[i];
+			if (!start && range.from !== range.to && position < lineLength) updateActive(range, false);
+		}
+		for (let i = first; i < boundaryIndex; i++) {
+			const { range, start } = boundaries[i];
+			if (start && range.from <= position && range.to >= position && (range.to > position || range.from === position || position === lineLength)) {
+				updateActive(range, true);
+				if (range.from === range.to) hasMarker = true;
+			}
+		}
+		if (hasMarker) {
+			getParent();
+			for (let i = first; i < boundaryIndex; i++) {
+				const { range, start } = boundaries[i];
+				if (start && range.from === range.to) updateActive(range, false);
+			}
+		}
+		if (position < lineLength) parent = getParent();
+	};
+	let column = 0;
+	for (const token of tokens) {
+		if (token.content === "") continue;
+		const start = column;
+		const end = start + token.content.length;
+		const style = tokenStyle(token, cacheHtmlStyles);
+		while (column < end) {
+			if (boundaries[boundaryIndex]?.position === column) advanceBoundary(column);
+			const to = Math.min(end, boundaries[boundaryIndex]?.position ?? end);
+			parent.children.push(createTokenSpan(token, style, column === start && to === end ? token.content : token.content.slice(column - start, to - start), start, useTokenTransformer));
+			column = to;
+		}
+	}
+	if (boundaries[boundaryIndex]?.position === column) advanceBoundary(column);
+	return column;
+}
+function createTokenSpan(token, style, text, start, useTokenTransformer) {
+	const properties = token.htmlAttrs != null ? { ...token.htmlAttrs } : {};
+	if (style !== "") properties.style = style;
+	if (useTokenTransformer) properties["data-char"] = start;
+	return {
+		type: "element",
+		tagName: "span",
+		properties,
+		children: [{
+			type: "text",
+			value: text
+		}]
+	};
+}
+function getDecorationPosition(position, lineOffsets) {
+	if (typeof position !== "number") return position;
+	let low = 0;
+	let high = lineOffsets.length;
+	while (low + 1 < high) {
+		const middle = low + high >>> 1;
+		if (lineOffsets[middle] <= position) low = middle;
+		else high = middle;
+	}
+	return {
+		line: low,
+		character: position - (lineOffsets[low] ?? 0)
+	};
+}
+//#endregion
+export { renderTokenLines };
+
+//# sourceMappingURL=renderTokenLines.js.map

package/dist/utils/renderTokenLines.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderTokenLines.js","names":[],"sources":["../../src/utils/renderTokenLines.ts"],"sourcesContent":["import type { Element, ElementContent, Properties } from 'hast';\n\nimport type { DecorationItem, SharedRenderState, ThemedToken } from '../types';\nimport { processLine } from './processLine';\nimport { setDeferredArrayItem } from './setDeferredArrayItem';\nimport { tokenStyle } from './tokenStyle';\nimport { wrapTokenFragments } from './wrapTokenFragments';\n\ninterface RenderTokenLinesOptions {\n  lazyLineAST?: boolean;\n  cacheHtmlStyles?: boolean;\n  state?: SharedRenderState;\n  useTokenTransformer?: boolean;\n  mergeWhitespaces?: 'never' | 'always';\n  decorations?: DecorationItem[];\n  lineOffsets?: number[];\n}\n\ninterface LineDecoration extends Omit<DecorationItem, 'start' | 'end'> {\n  start: { line: number; character: number };\n  end: { line: number; character: number };\n}\n\n// from/to are columns within this line; order preserves outer-to-inner nesting.\ninterface LineDecorationRange {\n  decoration: LineDecoration;\n  order: number;\n  from: number;\n  to: number;\n}\n\ninterface DecorationBoundary {\n  position: number;\n  range: LineDecorationRange;\n  start: boolean;\n}\n\nexport function renderTokenLines(\n  lines: ThemedToken[][],\n  {\n    state,\n    lazyLineAST = false,\n    cacheHtmlStyles = false,\n    useTokenTransformer = false,\n    mergeWhitespaces = 'always',\n    decorations = [],\n    lineOffsets = [],\n  }: RenderTokenLinesOptions\n): ElementContent[] {\n  let decorationsByLine: Map<number, LineDecoration[]> | undefined;\n  for (const decoration of decorations) {\n    const byLine = (decorationsByLine ??= new Map());\n    const normalized: LineDecoration = {\n      ...decoration,\n      start: getDecorationPosition(decoration.start, lineOffsets),\n      end: getDecorationPosition(decoration.end, lineOffsets),\n    };\n    const lastLine = Math.min(normalized.end.line, lines.length - 1);\n    for (let line = normalized.start.line; line <= lastLine; line++) {\n      let spans = byLine.get(line);\n      if (spans == null) byLine.set(line, (spans = []));\n      spans.push(normalized);\n    }\n  }\n  const renderLine = (tokens: ThemedToken[], lineIndex: number) => {\n    let normalized: ThemedToken[] | undefined;\n    if (useTokenTransformer || mergeWhitespaces !== 'never') {\n      let pendingWhitespace = '';\n      let whitespaceOffset = 0;\n      for (let i = 0; i < tokens.length; i++) {\n        let token = tokens[i];\n        if (useTokenTransformer) {\n          const content = token.content.trim();\n          if (content !== '' && content !== token.content) {\n            normalized ??= tokens.slice(0, i);\n            const start = token.content.indexOf(content);\n            if (start > 0)\n              normalized.push({\n                content: token.content.slice(0, start),\n                offset: token.offset,\n              });\n            normalized.push({\n              ...token,\n              content,\n              offset: token.offset + start,\n            });\n            const end = start + content.length;\n            if (end < token.content.length)\n              normalized.push({\n                content: token.content.slice(end),\n                offset: token.offset + end,\n              });\n            continue;\n          }\n        } else {\n          const decoratedWhitespace = ((token.fontStyle ?? 0) & 12) !== 0;\n          if (\n            !decoratedWhitespace &&\n            /^\\s+$/.test(token.content) &&\n            i < tokens.length - 1\n          ) {\n            normalized ??= tokens.slice(0, i);\n            if (pendingWhitespace === '') whitespaceOffset = token.offset;\n            pendingWhitespace += token.content;\n            continue;\n          }\n          if (pendingWhitespace !== '' && normalized != null) {\n            if (decoratedWhitespace)\n              normalized.push({\n                content: pendingWhitespace,\n                offset: whitespaceOffset,\n              });\n            else\n              token = {\n                ...token,\n                content: pendingWhitespace + token.content,\n                offset: whitespaceOffset,\n              };\n            pendingWhitespace = '';\n          }\n        }\n        normalized?.push(token);\n      }\n    }\n    normalized ??= tokens;\n    const line: Element = {\n      type: 'element',\n      tagName: state == null ? 'span' : 'div',\n      properties: state == null ? { class: 'line' } : {},\n      children: [],\n    };\n    const spans = decorationsByLine?.get(lineIndex);\n    const column =\n      spans == null\n        ? appendTokens(line, normalized, useTokenTransformer, cacheHtmlStyles)\n        : appendDecoratedTokens(\n            line,\n            normalized,\n            spans,\n            lineIndex,\n            useTokenTransformer,\n            cacheHtmlStyles\n          );\n    if (useTokenTransformer && column === 0) {\n      line.children.push({\n        type: 'element',\n        tagName: 'br',\n        properties: {},\n        children: [],\n      });\n    }\n    // Undecorated tokens already have one span per editor position.\n    if (useTokenTransformer && spans != null) wrapTokenFragments(line);\n    return state == null ? line : processLine(line, lineIndex + 1, state);\n  };\n  if (!lazyLineAST) return lines.map(renderLine);\n  const rows: ElementContent[] = new Array(lines.length);\n  for (let index = 0; index < lines.length; index++) {\n    // Warning: capture one line, not `lines`; unbuilt rows would keep every\n    // line's tokens alive.\n    const tokens = lines[index];\n    setDeferredArrayItem(rows, index, () => renderLine(tokens, index));\n  }\n  return rows;\n}\n\n// Returns the line length in UTF-16 code units.\nfunction appendTokens(\n  line: Element,\n  tokens: ThemedToken[],\n  useTokenTransformer: boolean,\n  cacheHtmlStyles: boolean\n): number {\n  let column = 0;\n  for (const token of tokens) {\n    if (token.content === '') continue;\n    line.children.push(\n      createTokenSpan(\n        token,\n        tokenStyle(token, cacheHtmlStyles),\n        token.content,\n        column,\n        useTokenTransformer\n      )\n    );\n    column += token.content.length;\n  }\n  return column;\n}\n\n// Visit sorted boundaries once to avoid scanning every decoration per token.\n// Emit empty ranges before text at the same position.\nfunction appendDecoratedTokens(\n  line: Element,\n  tokens: ThemedToken[],\n  spans: LineDecoration[],\n  lineIndex: number,\n  useTokenTransformer: boolean,\n  cacheHtmlStyles: boolean\n): number {\n  // Open outer ranges first, regardless of their order in the input.\n  if (spans.length > 1)\n    spans.sort((a, b) => {\n      if (a.start.line !== b.start.line) return a.start.line - b.start.line;\n      if (a.start.character !== b.start.character)\n        return a.start.character - b.start.character;\n      if (a.end.line !== b.end.line) return b.end.line - a.end.line;\n      return b.end.character - a.end.character;\n    });\n  const lineLength = tokens.reduce(\n    (length, token) => length + token.content.length,\n    0\n  );\n  const boundaries: DecorationBoundary[] = [];\n  for (let order = 0; order < spans.length; order++) {\n    const decoration = spans[order];\n    const range: LineDecorationRange = {\n      decoration,\n      order,\n      from:\n        decoration.start.line === lineIndex ? decoration.start.character : 0,\n      to:\n        decoration.end.line === lineIndex\n          ? decoration.end.character\n          : lineLength,\n    };\n    boundaries.push(\n      {\n        position: Math.max(0, Math.min(range.from, lineLength)),\n        range,\n        start: true,\n      },\n      {\n        position: Math.max(0, Math.min(range.to, lineLength)),\n        range,\n        start: false,\n      }\n    );\n  }\n  boundaries.sort((a, b) => a.position - b.position);\n  const active: LineDecorationRange[] = [];\n  const decorationStack: { range: LineDecorationRange; node: Element }[] = [];\n  let boundaryIndex = 0;\n\n  // Keep the same outer-to-inner order even when decorations cross each other.\n  const updateActive = (range: LineDecorationRange, add: boolean): void => {\n    let low = 0;\n    let high = active.length;\n    while (low < high) {\n      const middle = (low + high) >>> 1;\n      if (active[middle].order < range.order) low = middle + 1;\n      else high = middle;\n    }\n    if (add) active.splice(low, 0, range);\n    else if (active[low] === range) active.splice(low, 1);\n  };\n\n  // Reuse wrappers across tokens so a continuous range stays in one element.\n  const getParent = (): Element => {\n    let parent = line;\n    let depth = 0;\n    for (const range of active) {\n      if (decorationStack[depth]?.range !== range) {\n        decorationStack.length = depth;\n        const wrapper: Element = {\n          type: 'element',\n          tagName: 'span',\n          properties: { ...range.decoration.properties },\n          children: [],\n        };\n        parent.children.push(wrapper);\n        decorationStack.push({ range, node: wrapper });\n      }\n      parent = decorationStack[depth++].node;\n    }\n    decorationStack.length = depth;\n    return parent;\n  };\n\n  let parent = line;\n\n  // Markers belong inside ranges starting here, except at the line end,\n  // where they belong inside ranges ending here.\n  const advanceBoundary = (position: number): void => {\n    const first = boundaryIndex;\n    while (boundaries[boundaryIndex]?.position === position) boundaryIndex++;\n    let hasMarker = false;\n    for (let i = first; i < boundaryIndex; i++) {\n      const { range, start } = boundaries[i];\n      if (!start && range.from !== range.to && position < lineLength)\n        updateActive(range, false);\n    }\n    for (let i = first; i < boundaryIndex; i++) {\n      const { range, start } = boundaries[i];\n      if (\n        start &&\n        range.from <= position &&\n        range.to >= position &&\n        (range.to > position ||\n          range.from === position ||\n          position === lineLength)\n      ) {\n        updateActive(range, true);\n        if (range.from === range.to) hasMarker = true;\n      }\n    }\n    if (hasMarker) {\n      getParent();\n      for (let i = first; i < boundaryIndex; i++) {\n        const { range, start } = boundaries[i];\n        if (start && range.from === range.to) updateActive(range, false);\n      }\n    }\n    if (position < lineLength) parent = getParent();\n  };\n\n  let column = 0;\n  for (const token of tokens) {\n    if (token.content === '') continue;\n    const start = column;\n    const end = start + token.content.length;\n    const style = tokenStyle(token, cacheHtmlStyles);\n    while (column < end) {\n      if (boundaries[boundaryIndex]?.position === column)\n        advanceBoundary(column);\n      const to = Math.min(end, boundaries[boundaryIndex]?.position ?? end);\n      parent.children.push(\n        createTokenSpan(\n          token,\n          style,\n          column === start && to === end\n            ? token.content\n            : token.content.slice(column - start, to - start),\n          start,\n          useTokenTransformer\n        )\n      );\n      column = to;\n    }\n  }\n  if (boundaries[boundaryIndex]?.position === column) advanceBoundary(column);\n  return column;\n}\n\n// data-char must retain the original token column when decorations split it.\nfunction createTokenSpan(\n  token: ThemedToken,\n  style: string,\n  text: string,\n  start: number,\n  useTokenTransformer: boolean\n): Element {\n  const properties: Properties =\n    token.htmlAttrs != null ? { ...token.htmlAttrs } : {};\n  if (style !== '') properties.style = style;\n  if (useTokenTransformer) properties['data-char'] = start;\n  return {\n    type: 'element',\n    tagName: 'span',\n    properties,\n    children: [{ type: 'text', value: text }],\n  };\n}\n\n// Convert absolute UTF-16 offsets to the line coordinates used by decorations.\nfunction getDecorationPosition(\n  position: DecorationItem['start'],\n  lineOffsets: number[]\n): { line: number; character: number } {\n  if (typeof position !== 'number') return position;\n  let low = 0;\n  let high = lineOffsets.length;\n  while (low + 1 < high) {\n    const middle = (low + high) >>> 1;\n    if (lineOffsets[middle] <= position) low = middle;\n    else high = middle;\n  }\n  return { line: low, character: position - (lineOffsets[low] ?? 0) };\n}\n"],"mappings":"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"}

package/dist/utils/resolvePreferredHighlighter.d.ts

@@ -0,0 +1,13 @@
+import { HighlighterTypes } from "../types.js";
+//#region src/utils/resolvePreferredHighlighter.d.ts
+/**
+ * Undefined lets the caller use the active type or the default.
+ */
+declare function resolvePreferredHighlighter(workerManager: {
+  getPreferredHighlighter(): HighlighterTypes;
+} | undefined, options: {
+  preferredHighlighter?: HighlighterTypes | undefined;
+}): HighlighterTypes | undefined;
+//#endregion
+export { resolvePreferredHighlighter };
+//# sourceMappingURL=resolvePreferredHighlighter.d.ts.map

package/dist/utils/resolvePreferredHighlighter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvePreferredHighlighter.d.ts","names":[],"sources":["../../src/utils/resolvePreferredHighlighter.ts"],"mappings":";;;;;iBAKgB,4BACd;EAAiB,2BAA2B;eAC5C;EAAW,uBAAuB;IACjC"}

package/dist/utils/resolvePreferredHighlighter.js

@@ -0,0 +1,11 @@
+//#region src/utils/resolvePreferredHighlighter.ts
+/**
+* Undefined lets the caller use the active type or the default.
+*/
+function resolvePreferredHighlighter(workerManager, options) {
+	return workerManager?.getPreferredHighlighter() ?? options.preferredHighlighter;
+}
+//#endregion
+export { resolvePreferredHighlighter };
+
+//# sourceMappingURL=resolvePreferredHighlighter.js.map

package/dist/utils/resolvePreferredHighlighter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvePreferredHighlighter.js","names":[],"sources":["../../src/utils/resolvePreferredHighlighter.ts"],"sourcesContent":["import type { HighlighterTypes } from '../types';\n\n/**\n * Undefined lets the caller use the active type or the default.\n */\nexport function resolvePreferredHighlighter(\n  workerManager: { getPreferredHighlighter(): HighlighterTypes } | undefined,\n  options: { preferredHighlighter?: HighlighterTypes | undefined }\n): HighlighterTypes | undefined {\n  return (\n    workerManager?.getPreferredHighlighter() ?? options.preferredHighlighter\n  );\n}\n"],"mappings":";;;;AAKA,SAAgB,4BACd,eACA,SAC8B;CAC9B,OACE,eAAe,wBAAwB,KAAK,QAAQ;AAExD"}

package/dist/utils/setDeferredArrayItem.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/setDeferredArrayItem.d.ts
+declare function setDeferredArrayItem<T>(array: T[], index: number, create: () => T): void;
+//#endregion
+export { setDeferredArrayItem };
+//# sourceMappingURL=setDeferredArrayItem.d.ts.map

package/dist/utils/setDeferredArrayItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setDeferredArrayItem.d.ts","names":[],"sources":["../../src/utils/setDeferredArrayItem.ts"],"mappings":";iBAAgB,qBAAqB,GACnC,OAAO,KACP,eACA,cAAc"}

package/dist/utils/setDeferredArrayItem.js

@@ -0,0 +1,39 @@
+//#region src/utils/setDeferredArrayItem.ts
+function setDeferredArrayItem(array, index, create) {
+	let initialized = false;
+	let cached;
+	Object.defineProperty(array, index, {
+		configurable: true,
+		enumerable: true,
+		get() {
+			if (!initialized) {
+				cached = create();
+				initialized = true;
+			}
+			if (Object.getOwnPropertyDescriptor(array, index)?.configurable === true) Object.defineProperty(array, index, {
+				configurable: true,
+				enumerable: true,
+				writable: true,
+				value: cached
+			});
+			return cached;
+		},
+		set(value) {
+			if (Object.getOwnPropertyDescriptor(array, index)?.configurable === true) Object.defineProperty(array, index, {
+				configurable: true,
+				enumerable: true,
+				writable: true,
+				value
+			});
+			else if (Object.isFrozen(array)) throw new TypeError(`Cannot assign to read only array index '${index}'`);
+			else {
+				cached = value;
+				initialized = true;
+			}
+		}
+	});
+}
+//#endregion
+export { setDeferredArrayItem };
+
+//# sourceMappingURL=setDeferredArrayItem.js.map

package/dist/utils/setDeferredArrayItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setDeferredArrayItem.js","names":[],"sources":["../../src/utils/setDeferredArrayItem.ts"],"sourcesContent":["export function setDeferredArrayItem<T>(\n  array: T[],\n  index: number,\n  create: () => T\n): void {\n  let initialized = false;\n  let cached: T;\n  Object.defineProperty(array, index, {\n    configurable: true,\n    enumerable: true,\n    get() {\n      if (!initialized) {\n        cached = create();\n        initialized = true;\n      }\n      if (\n        Object.getOwnPropertyDescriptor(array, index)?.configurable === true\n      ) {\n        Object.defineProperty(array, index, {\n          configurable: true,\n          enumerable: true,\n          writable: true,\n          value: cached,\n        });\n      }\n      return cached;\n    },\n    set(value: T) {\n      if (\n        Object.getOwnPropertyDescriptor(array, index)?.configurable === true\n      ) {\n        Object.defineProperty(array, index, {\n          configurable: true,\n          enumerable: true,\n          writable: true,\n          value,\n        });\n      } else if (Object.isFrozen(array)) {\n        throw new TypeError(\n          `Cannot assign to read only array index '${index}'`\n        );\n      } else {\n        cached = value;\n        initialized = true;\n      }\n    },\n  });\n}\n"],"mappings":";AAAA,SAAgB,qBACd,OACA,OACA,QACM;CACN,IAAI,cAAc;CAClB,IAAI;CACJ,OAAO,eAAe,OAAO,OAAO;EAClC,cAAc;EACd,YAAY;EACZ,MAAM;GACJ,IAAI,CAAC,aAAa;IAChB,SAAS,OAAO;IAChB,cAAc;GAChB;GACA,IACE,OAAO,yBAAyB,OAAO,KAAK,CAAC,EAAE,iBAAiB,MAEhE,OAAO,eAAe,OAAO,OAAO;IAClC,cAAc;IACd,YAAY;IACZ,UAAU;IACV,OAAO;GACT,CAAC;GAEH,OAAO;EACT;EACA,IAAI,OAAU;GACZ,IACE,OAAO,yBAAyB,OAAO,KAAK,CAAC,EAAE,iBAAiB,MAEhE,OAAO,eAAe,OAAO,OAAO;IAClC,cAAc;IACd,YAAY;IACZ,UAAU;IACV;GACF,CAAC;QACI,IAAI,OAAO,SAAS,KAAK,GAC9B,MAAM,IAAI,UACR,2CAA2C,MAAM,EACnD;QACK;IACL,SAAS;IACT,cAAc;GAChB;EACF;CACF,CAAC;AACH"}

package/dist/utils/tokenStyle.d.ts

@@ -0,0 +1,7 @@
+import { ThemedToken } from "../highlighter/types.js";
+import "../types.js";
+//#region src/utils/tokenStyle.d.ts
+declare function tokenStyle(token: ThemedToken, cacheHtmlStyle: boolean): string;
+//#endregion
+export { tokenStyle };
+//# sourceMappingURL=tokenStyle.d.ts.map

package/dist/utils/tokenStyle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenStyle.d.ts","names":[],"sources":["../../src/utils/tokenStyle.ts"],"mappings":";;;iBAMgB,WACd,OAAO,aACP"}

package/dist/utils/tokenStyle.js

@@ -0,0 +1,28 @@
+//#region src/utils/tokenStyle.ts
+const htmlStyleCache = /* @__PURE__ */ new WeakMap();
+function tokenStyle(token, cacheHtmlStyle) {
+	const { htmlStyle } = token;
+	if (htmlStyle != null) {
+		let style = cacheHtmlStyle ? htmlStyleCache.get(htmlStyle) : void 0;
+		if (style == null) {
+			style = "";
+			for (const name in htmlStyle) style += `${style === "" ? "" : ";"}${name}:${htmlStyle[name]}`;
+			if (cacheHtmlStyle) htmlStyleCache.set(htmlStyle, style);
+		}
+		return style;
+	}
+	let style = token.color != null ? `color:${token.color}` : "";
+	if (token.bgColor != null) style += `;background-color:${token.bgColor}`;
+	if (token.fontStyle != null) {
+		if ((token.fontStyle & 1) !== 0) style += ";font-style:italic";
+		if ((token.fontStyle & 2) !== 0) style += ";font-weight:bold";
+		const underline = (token.fontStyle & 4) !== 0;
+		const strikethrough = (token.fontStyle & 8) !== 0;
+		if (underline || strikethrough) style += `;text-decoration:${underline ? "underline" : ""}${underline && strikethrough ? " " : ""}${strikethrough ? "line-through" : ""}`;
+	}
+	return style.replace(/^;/, "");
+}
+//#endregion
+export { tokenStyle };
+
+//# sourceMappingURL=tokenStyle.js.map

package/dist/utils/tokenStyle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenStyle.js","names":[],"sources":["../../src/utils/tokenStyle.ts"],"sourcesContent":["import type { ThemedToken } from '../types';\n\n// Warning: cache only tokens from Highlights, which reuses htmlStyle objects.\n// Shiki creates one per token, so caching them adds a WeakMap entry per token.\nconst htmlStyleCache = new WeakMap<Record<string, string>, string>();\n\nexport function tokenStyle(\n  token: ThemedToken,\n  cacheHtmlStyle: boolean\n): string {\n  const { htmlStyle } = token;\n  if (htmlStyle != null) {\n    let style = cacheHtmlStyle ? htmlStyleCache.get(htmlStyle) : undefined;\n    if (style == null) {\n      style = '';\n      for (const name in htmlStyle) {\n        style += `${style === '' ? '' : ';'}${name}:${htmlStyle[name]}`;\n      }\n      if (cacheHtmlStyle) htmlStyleCache.set(htmlStyle, style);\n    }\n    return style;\n  }\n  let style = token.color != null ? `color:${token.color}` : '';\n  if (token.bgColor != null) style += `;background-color:${token.bgColor}`;\n  if (token.fontStyle != null) {\n    if ((token.fontStyle & 1) !== 0) style += ';font-style:italic';\n    if ((token.fontStyle & 2) !== 0) style += ';font-weight:bold';\n    const underline = (token.fontStyle & 4) !== 0;\n    const strikethrough = (token.fontStyle & 8) !== 0;\n    if (underline || strikethrough)\n      style += `;text-decoration:${underline ? 'underline' : ''}${underline && strikethrough ? ' ' : ''}${strikethrough ? 'line-through' : ''}`;\n  }\n  return style.replace(/^;/, '');\n}\n"],"mappings":";AAIA,MAAM,iCAAiB,IAAI,QAAwC;AAEnE,SAAgB,WACd,OACA,gBACQ;CACR,MAAM,EAAE,cAAc;CACtB,IAAI,aAAa,MAAM;EACrB,IAAI,QAAQ,iBAAiB,eAAe,IAAI,SAAS,IAAI,KAAA;EAC7D,IAAI,SAAS,MAAM;GACjB,QAAQ;GACR,KAAK,MAAM,QAAQ,WACjB,SAAS,GAAG,UAAU,KAAK,KAAK,MAAM,KAAK,GAAG,UAAU;GAE1D,IAAI,gBAAgB,eAAe,IAAI,WAAW,KAAK;EACzD;EACA,OAAO;CACT;CACA,IAAI,QAAQ,MAAM,SAAS,OAAO,SAAS,MAAM,UAAU;CAC3D,IAAI,MAAM,WAAW,MAAM,SAAS,qBAAqB,MAAM;CAC/D,IAAI,MAAM,aAAa,MAAM;EAC3B,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,MAAM,aAAa,MAAM,YAAY,OAAO;EAC5C,MAAM,iBAAiB,MAAM,YAAY,OAAO;EAChD,IAAI,aAAa,eACf,SAAS,oBAAoB,YAAY,cAAc,KAAK,aAAa,gBAAgB,MAAM,KAAK,gBAAgB,iBAAiB;CACzI;CACA,OAAO,MAAM,QAAQ,MAAM,EAAE;AAC/B"}

package/dist/utils/tokensToHtml.d.ts

@@ -0,0 +1,8 @@
+import { CodeToHtmlOptions, TokensResult } from "../highlighter/types.js";
+import "../types.js";
+//#region src/utils/tokensToHtml.d.ts
+/** Serialize highlighted tokens without loading a backend's HTML renderer. */
+declare function tokensToHtml(source: string, result: TokensResult, options: CodeToHtmlOptions, cacheHtmlStyles: boolean): string;
+//#endregion
+export { tokensToHtml };
+//# sourceMappingURL=tokensToHtml.d.ts.map

package/dist/utils/tokensToHtml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokensToHtml.d.ts","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"mappings":";;;;iBAOgB,aACd,gBACA,QAAQ,cACR,SAAS,mBACT"}

package/dist/utils/tokensToHtml.js

@@ -0,0 +1,45 @@
+import { hastToHtml } from "./hastToHtml.js";
+import { renderTokenLines } from "./renderTokenLines.js";
+//#region src/utils/tokensToHtml.ts
+/** Serialize highlighted tokens without loading a backend's HTML renderer. */
+function tokensToHtml(source, result, options, cacheHtmlStyles) {
+	const lineOffsets = [0];
+	if (options.decorations?.some((item) => typeof item.start === "number" || typeof item.end === "number") === true) for (let index = source.indexOf("\n"); index !== -1; index = source.indexOf("\n", index + 1)) lineOffsets.push(index + 1);
+	const code = {
+		type: "element",
+		tagName: "code",
+		properties: {},
+		children: []
+	};
+	const lines = renderTokenLines(result.tokens, {
+		decorations: options.decorations,
+		mergeWhitespaces: options.mergeWhitespaces,
+		lineOffsets,
+		cacheHtmlStyles
+	});
+	for (let i = 0; i < lines.length; i++) {
+		if (i > 0) code.children.push({
+			type: "text",
+			value: "\n"
+		});
+		code.children.push(lines[i]);
+	}
+	const root = {
+		type: "root",
+		children: [{
+			type: "element",
+			tagName: "pre",
+			properties: {
+				class: "diffs",
+				style: result.rootStyle === false ? void 0 : result.rootStyle ?? [result.fg != null ? `color:${result.fg}` : "", result.bg != null ? `background-color:${result.bg}` : ""].filter(Boolean).join(";"),
+				tabIndex: 0
+			},
+			children: [code]
+		}]
+	};
+	return hastToHtml(root);
+}
+//#endregion
+export { tokensToHtml };
+
+//# sourceMappingURL=tokensToHtml.js.map

package/dist/utils/tokensToHtml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokensToHtml.js","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"sourcesContent":["import type { Element, Root } from 'hast';\n\nimport type { CodeToHtmlOptions, TokensResult } from '../types';\nimport { hastToHtml } from './hastToHtml';\nimport { renderTokenLines } from './renderTokenLines';\n\n/** Serialize highlighted tokens without loading a backend's HTML renderer. */\nexport function tokensToHtml(\n  source: string,\n  result: TokensResult,\n  options: CodeToHtmlOptions,\n  cacheHtmlStyles: boolean\n): string {\n  const lineOffsets = [0];\n  if (\n    options.decorations?.some(\n      (item) => typeof item.start === 'number' || typeof item.end === 'number'\n    ) === true\n  ) {\n    for (\n      let index = source.indexOf('\\n');\n      index !== -1;\n      index = source.indexOf('\\n', index + 1)\n    )\n      lineOffsets.push(index + 1);\n  }\n  const code: Element = {\n    type: 'element',\n    tagName: 'code',\n    properties: {},\n    children: [],\n  };\n  const lines = renderTokenLines(result.tokens, {\n    decorations: options.decorations,\n    mergeWhitespaces: options.mergeWhitespaces,\n    lineOffsets,\n    cacheHtmlStyles,\n  });\n  for (let i = 0; i < lines.length; i++) {\n    if (i > 0) code.children.push({ type: 'text', value: '\\n' });\n    code.children.push(lines[i]);\n  }\n  const root: Root = {\n    type: 'root',\n    children: [\n      {\n        type: 'element',\n        tagName: 'pre',\n        properties: {\n          class: 'diffs',\n          style:\n            result.rootStyle === false\n              ? undefined\n              : (result.rootStyle ??\n                [\n                  result.fg != null ? `color:${result.fg}` : '',\n                  result.bg != null ? `background-color:${result.bg}` : '',\n                ]\n                  .filter(Boolean)\n                  .join(';')),\n          tabIndex: 0,\n        },\n        children: [code],\n      },\n    ],\n  };\n  return hastToHtml(root);\n}\n"],"mappings":";;;;AAOA,SAAgB,aACd,QACA,QACA,SACA,iBACQ;CACR,MAAM,cAAc,CAAC,CAAC;CACtB,IACE,QAAQ,aAAa,MAClB,SAAS,OAAO,KAAK,UAAU,YAAY,OAAO,KAAK,QAAQ,QAClE,MAAM,MAEN,KACE,IAAI,QAAQ,OAAO,QAAQ,IAAI,GAC/B,UAAU,IACV,QAAQ,OAAO,QAAQ,MAAM,QAAQ,CAAC,GAEtC,YAAY,KAAK,QAAQ,CAAC;CAE9B,MAAM,OAAgB;EACpB,MAAM;EACN,SAAS;EACT,YAAY,CAAC;EACb,UAAU,CAAC;CACb;CACA,MAAM,QAAQ,iBAAiB,OAAO,QAAQ;EAC5C,aAAa,QAAQ;EACrB,kBAAkB,QAAQ;EAC1B;EACA;CACF,CAAC;CACD,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,IAAI,IAAI,GAAG,KAAK,SAAS,KAAK;GAAE,MAAM;GAAQ,OAAO;EAAK,CAAC;EAC3D,KAAK,SAAS,KAAK,MAAM,EAAE;CAC7B;CACA,MAAM,OAAa;EACjB,MAAM;EACN,UAAU,CACR;GACE,MAAM;GACN,SAAS;GACT,YAAY;IACV,OAAO;IACP,OACE,OAAO,cAAc,QACjB,KAAA,IACC,OAAO,aACR,CACE,OAAO,MAAM,OAAO,SAAS,OAAO,OAAO,IAC3C,OAAO,MAAM,OAAO,oBAAoB,OAAO,OAAO,EACxD,CAAC,CACE,OAAO,OAAO,CAAC,CACf,KAAK,GAAG;IACjB,UAAU;GACZ;GACA,UAAU,CAAC,IAAI;EACjB,CACF;CACF;CACA,OAAO,WAAW,IAAI;AACxB"}