@pierre/diffs 1.0.7 → 1.1.0-beta.1

package/dist/utils/renderDiffWithHighlighter.js

@@ -5,11 +5,21 @@ import { createTransformerWithState } from "./createTransformerWithState.js";
 import { formatCSSVariablePrefix } from "./formatCSSVariablePrefix.js";
 import { getHighlighterThemeStyles } from "./getHighlighterThemeStyles.js";
 import { getLineNodes } from "./getLineNodes.js";
+import { iterateOverDiff } from "./iterateOverDiff.js";
 import { createDiffSpanDecoration, pushOrJoinSpan } from "./parseDiffDecorations.js";
 import { diffChars, diffWordsWithSpace } from "diff";
 
 //#region src/utils/renderDiffWithHighlighter.ts
-function renderDiffWithHighlighter(diff, highlighter, options, forcePlainText = false) {
+const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
+function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+	if (forcePlainText) {
+		startingLine ??= 0;
+		totalLines ??= Infinity;
+	} else {
+		startingLine = 0;
+		totalLines = Infinity;
+	}
+	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const baseThemeType = (() => {
 		const theme = options.theme ?? DEFAULT_THEMES;
 		if (typeof theme === "string") return highlighter.getTheme(theme).type;
@@ -18,92 +28,120 @@ function renderDiffWithHighlighter(diff, highlighter, options, forcePlainText =
 		theme: options.theme,
 		highlighter
 	});
-	if (diff.newLines != null && diff.oldLines != null) {
-		const { oldContent, newContent, oldInfo, newInfo, oldDecorations, newDecorations } = processLines({
-			hunks: diff.hunks,
-			oldLines: diff.oldLines,
-			newLines: diff.newLines,
-			lineDiffType: options.lineDiffType
-		});
-		return {
-			code: renderTwoFiles({
-				oldFile: {
-					name: diff.prevName ?? diff.name,
-					contents: oldContent
-				},
-				oldInfo,
-				oldDecorations,
-				newFile: {
-					name: diff.name,
-					contents: newContent
-				},
-				newInfo,
-				newDecorations,
-				highlighter,
-				options,
-				languageOverride: forcePlainText ? "text" : diff.lang
-			}),
-			themeStyles,
-			baseThemeType
-		};
+	const lineDiffType = forcePlainText && !isWindowedHighlight && (diff.unifiedLineCount > 1e3 || diff.splitLineCount > 1e3) ? "none" : options.lineDiffType;
+	const code = {
+		deletionLines: [],
+		additionLines: []
+	};
+	const shouldGroupAll = !forcePlainText && !diff.isPartial;
+	const expandedHunksForIteration = forcePlainText ? expandedHunks : void 0;
+	const buckets = /* @__PURE__ */ new Map();
+	function getBucketForHunk(hunkIndex) {
+		const index = shouldGroupAll ? 0 : hunkIndex;
+		const bucket = buckets.get(index) ?? createBucket();
+		buckets.set(index, bucket);
+		return bucket;
 	}
-	const hunks = [];
-	let splitLineIndex = 0;
-	let unifiedLineIndex = 0;
-	for (const hunk of diff.hunks) {
-		const { oldContent, newContent, oldInfo, newInfo, oldDecorations, newDecorations, splitLineIndex: newSplitLineIndex, unifiedLineIndex: newUnifiedLineIndex } = processLines({
-			hunks: [hunk],
-			splitLineIndex,
-			unifiedLineIndex,
-			lineDiffType: options.lineDiffType
-		});
-		const oldFile = {
+	function appendContent(lineContent, lineIndex, segments, contentWrapper) {
+		if (isWindowedHighlight) {
+			let segment = segments.at(-1);
+			if (segment == null || segment.targetIndex + segment.count !== lineIndex) {
+				segment = {
+					targetIndex: lineIndex,
+					originalOffset: contentWrapper.length,
+					count: 0
+				};
+				segments.push(segment);
+			}
+			segment.count++;
+		}
+		contentWrapper.push(lineContent);
+	}
+	iterateOverDiff({
+		diff,
+		diffStyle: "both",
+		startingLine,
+		totalLines,
+		expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,
+		callback: ({ hunkIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, unifiedAdditionLineIndex, unifiedDeletionLineIndex, splitLineIndex, type }) => {
+			const bucket = getBucketForHunk(hunkIndex);
+			if (type === "change" && lineDiffType !== "none" && additionLineIndex != null && deletionLineIndex != null) computeLineDiffDecorations({
+				additionLine: diff.additionLines[additionLineIndex],
+				deletionLine: diff.deletionLines[deletionLineIndex],
+				deletionLineIndex: bucket.deletionContent.length,
+				additionLineIndex: bucket.additionContent.length,
+				deletionDecorations: bucket.deletionDecorations,
+				additionDecorations: bucket.additionDecorations,
+				lineDiffType
+			});
+			if (deletionLineIndex != null && deletionLineNumber != null && unifiedDeletionLineIndex != null) {
+				appendContent(diff.deletionLines[deletionLineIndex], deletionLineIndex, bucket.deletionSegments, bucket.deletionContent);
+				bucket.deletionInfo.push({
+					type: type === "change" ? "change-deletion" : type,
+					lineNumber: deletionLineNumber,
+					altLineNumber: type === "change" ? void 0 : additionLineNumber ?? void 0,
+					lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`
+				});
+			}
+			if (additionLineIndex != null && additionLineNumber != null && unifiedAdditionLineIndex != null) {
+				appendContent(diff.additionLines[additionLineIndex], additionLineIndex, bucket.additionSegments, bucket.additionContent);
+				bucket.additionInfo.push({
+					type: type === "change" ? "change-addition" : type,
+					lineNumber: additionLineNumber,
+					altLineNumber: type === "change" ? void 0 : deletionLineNumber ?? void 0,
+					lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`
+				});
+			}
+		}
+	});
+	for (const bucket of buckets.values()) {
+		if (bucket.deletionContent.length === 0 && bucket.additionContent.length === 0) continue;
+		const deletionFile = {
 			name: diff.prevName ?? diff.name,
-			contents: oldContent
+			contents: bucket.deletionContent.value
 		};
-		const newFile = {
+		const additionFile = {
 			name: diff.name,
-			contents: newContent
+			contents: bucket.additionContent.value
 		};
-		hunks.push(renderTwoFiles({
-			oldFile,
-			oldInfo,
-			oldDecorations,
-			newFile,
-			newInfo,
-			newDecorations,
+		const { deletionLines, additionLines } = renderTwoFiles({
+			deletionFile,
+			deletionInfo: bucket.deletionInfo,
+			deletionDecorations: bucket.deletionDecorations,
+			additionFile,
+			additionInfo: bucket.additionInfo,
+			additionDecorations: bucket.additionDecorations,
 			highlighter,
 			options,
 			languageOverride: forcePlainText ? "text" : diff.lang
-		}));
-		splitLineIndex = newSplitLineIndex;
-		unifiedLineIndex = newUnifiedLineIndex;
+		});
+		if (shouldGroupAll) {
+			code.deletionLines = deletionLines;
+			code.additionLines = additionLines;
+			continue;
+		}
+		if (bucket.deletionSegments.length > 0) for (const seg of bucket.deletionSegments) for (let i = 0; i < seg.count; i++) code.deletionLines[seg.targetIndex + i] = deletionLines[seg.originalOffset + i];
+		else code.deletionLines.push(...deletionLines);
+		if (bucket.additionSegments.length > 0) for (const seg of bucket.additionSegments) for (let i = 0; i < seg.count; i++) code.additionLines[seg.targetIndex + i] = additionLines[seg.originalOffset + i];
+		else code.additionLines.push(...additionLines);
 	}
 	return {
-		code: (() => {
-			if (hunks.length <= 1) {
-				const hunk = hunks[0] ?? {
-					oldLines: [],
-					newLines: []
-				};
-				if (hunk.newLines.length === 0 || hunk.oldLines.length === 0) return hunk;
-			}
-			return { hunks };
-		})(),
+		code,
 		themeStyles,
 		baseThemeType
 	};
 }
-function computeLineDiffDecorations({ oldLine, newLine, oldLineIndex, newLineIndex, oldDecorations, newDecorations, lineDiffType }) {
-	if (oldLine == null || newLine == null || lineDiffType === "none") return;
-	oldLine = cleanLastNewline(oldLine);
-	newLine = cleanLastNewline(newLine);
-	const lineDiff = lineDiffType === "char" ? diffChars(oldLine, newLine) : diffWordsWithSpace(oldLine, newLine);
+function computeLineDiffDecorations({ deletionLine, additionLine, deletionLineIndex, additionLineIndex, deletionDecorations, additionDecorations, lineDiffType }) {
+	if (deletionLine == null || additionLine == null || lineDiffType === "none") return;
+	deletionLine = cleanLastNewline(deletionLine);
+	additionLine = cleanLastNewline(additionLine);
+	const lineDiff = lineDiffType === "char" ? diffChars(deletionLine, additionLine) : diffWordsWithSpace(deletionLine, additionLine);
 	const deletionSpans = [];
 	const additionSpans = [];
 	const enableJoin = lineDiffType === "word-alt";
+	const lastItem = lineDiff.at(-1);
 	for (const item of lineDiff) {
-		const isLastItem = item === lineDiff[lineDiff.length - 1];
+		const isLastItem = item === lastItem;
 		if (!item.added && !item.removed) {
 			pushOrJoinSpan({
 				item,
@@ -134,8 +172,8 @@ function computeLineDiffDecorations({ oldLine, newLine, oldLineIndex, newLineInd
 	}
 	let spanIndex = 0;
 	for (const span of deletionSpans) {
-		if (span[0] === 1) oldDecorations.push(createDiffSpanDecoration({
-			line: oldLineIndex - 1,
+		if (span[0] === 1) deletionDecorations.push(createDiffSpanDecoration({
+			line: deletionLineIndex,
 			spanStart: spanIndex,
 			spanLength: span[1].length
 		}));
@@ -143,159 +181,43 @@ function computeLineDiffDecorations({ oldLine, newLine, oldLineIndex, newLineInd
 	}
 	spanIndex = 0;
 	for (const span of additionSpans) {
-		if (span[0] === 1) newDecorations.push(createDiffSpanDecoration({
-			line: newLineIndex - 1,
+		if (span[0] === 1) additionDecorations.push(createDiffSpanDecoration({
+			line: additionLineIndex,
 			spanStart: spanIndex,
 			spanLength: span[1].length
 		}));
 		spanIndex += span[1].length;
 	}
 }
-function processLines({ hunks, oldLines, newLines, splitLineIndex = 0, unifiedLineIndex = 0, lineDiffType }) {
-	const oldInfo = {};
-	const newInfo = {};
-	const oldDecorations = [];
-	const newDecorations = [];
-	let newLineIndex = 1;
-	let oldLineIndex = 1;
-	let newLineNumber = 1;
-	let oldLineNumber = 1;
-	let oldContent = "";
-	let newContent = "";
-	for (const hunk of hunks) {
-		while (oldLines != null && newLines != null && newLineIndex < hunk.additionStart && oldLineIndex < hunk.deletionStart) {
-			oldInfo[oldLineIndex] = {
-				type: "context-expanded",
-				lineNumber: oldLineNumber,
-				altLineNumber: newLineNumber,
-				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-			};
-			newInfo[newLineIndex] = {
-				type: "context-expanded",
-				lineNumber: newLineNumber,
-				altLineNumber: oldLineNumber,
-				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-			};
-			oldContent += oldLines[oldLineIndex - 1];
-			newContent += newLines[newLineIndex - 1];
-			oldLineIndex++;
-			newLineIndex++;
-			oldLineNumber++;
-			newLineNumber++;
-			splitLineIndex++;
-			unifiedLineIndex++;
-		}
-		oldLineNumber = hunk.deletionStart;
-		newLineNumber = hunk.additionStart;
-		for (const hunkContent of hunk.hunkContent) if (hunkContent.type === "context") for (const line of hunkContent.lines) {
-			oldInfo[oldLineIndex] = {
-				type: "context",
-				lineNumber: oldLineNumber,
-				altLineNumber: newLineNumber,
-				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-			};
-			newInfo[newLineIndex] = {
-				type: "context",
-				lineNumber: newLineNumber,
-				altLineNumber: oldLineNumber,
-				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-			};
-			oldContent += line;
-			newContent += line;
-			oldLineIndex++;
-			newLineIndex++;
-			newLineNumber++;
-			oldLineNumber++;
-			splitLineIndex++;
-			unifiedLineIndex++;
-		}
-		else {
-			const len = Math.max(hunkContent.additions.length, hunkContent.deletions.length);
-			let i = 0;
-			let _unifiedLineIndex = unifiedLineIndex;
-			while (i < len) {
-				const oldLine = hunkContent.deletions[i];
-				const newLine = hunkContent.additions[i];
-				computeLineDiffDecorations({
-					newLine,
-					oldLine,
-					oldLineIndex,
-					newLineIndex,
-					oldDecorations,
-					newDecorations,
-					lineDiffType
-				});
-				if (oldLine != null) {
-					oldInfo[oldLineIndex] = {
-						type: "change-deletion",
-						lineNumber: oldLineNumber,
-						lineIndex: `${_unifiedLineIndex},${splitLineIndex}`
-					};
-					oldContent += oldLine;
-					oldLineIndex++;
-					oldLineNumber++;
-				}
-				if (newLine != null) {
-					newInfo[newLineIndex] = {
-						type: "change-addition",
-						lineNumber: newLineNumber,
-						lineIndex: `${_unifiedLineIndex + hunkContent.deletions.length},${splitLineIndex}`
-					};
-					newContent += newLine;
-					newLineIndex++;
-					newLineNumber++;
-				}
-				splitLineIndex++;
-				_unifiedLineIndex++;
-				i++;
-			}
-			unifiedLineIndex += hunkContent.additions.length + hunkContent.deletions.length;
-		}
-		if (oldLines == null || newLines == null || hunk !== hunks[hunks.length - 1]) continue;
-		while (oldLineIndex <= oldLines.length || newLineIndex <= oldLines.length) {
-			const oldLine = oldLines[oldLineIndex - 1];
-			const newLine = newLines[newLineIndex - 1];
-			if (oldLine == null && newLine == null) break;
-			if (oldLine != null) {
-				oldInfo[oldLineIndex] = {
-					type: "context-expanded",
-					lineNumber: oldLineNumber,
-					altLineNumber: newLineNumber,
-					lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-				};
-				oldContent += oldLine;
-				oldLineIndex++;
-				oldLineNumber++;
-			}
-			if (newLine != null) {
-				newInfo[newLineIndex] = {
-					type: "context-expanded",
-					lineNumber: newLineNumber,
-					altLineNumber: oldLineNumber,
-					lineIndex: `${unifiedLineIndex},${splitLineIndex}`
-				};
-				newContent += newLine;
-				newLineIndex++;
-				newLineNumber++;
-			}
-			splitLineIndex++;
-			unifiedLineIndex++;
-		}
-	}
+function createBucket() {
 	return {
-		oldContent,
-		newContent,
-		oldInfo,
-		newInfo,
-		oldDecorations,
-		newDecorations,
-		splitLineIndex,
-		unifiedLineIndex
+		deletionContent: {
+			push(value) {
+				this.value += value;
+				this.length++;
+			},
+			value: "",
+			length: 0
+		},
+		additionContent: {
+			push(value) {
+				this.value += value;
+				this.length++;
+			},
+			value: "",
+			length: 0
+		},
+		deletionInfo: [],
+		additionInfo: [],
+		deletionDecorations: [],
+		additionDecorations: [],
+		deletionSegments: [],
+		additionSegments: []
 	};
 }
-function renderTwoFiles({ oldFile, newFile, oldInfo, newInfo, highlighter, oldDecorations, newDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES,...options } }) {
-	const oldLang = languageOverride ?? getFiletypeFromFileName(oldFile.name);
-	const newLang = languageOverride ?? getFiletypeFromFileName(newFile.name);
+function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES,...options } }) {
+	const deletionLang = languageOverride ?? getFiletypeFromFileName(deletionFile.name);
+	const additionLang = languageOverride ?? getFiletypeFromFileName(additionFile.name);
 	const { state, transformers } = createTransformerWithState();
 	const hastConfig = (() => {
 		return typeof themeOrThemes === "string" ? {
@@ -317,19 +239,19 @@ function renderTwoFiles({ oldFile, newFile, oldInfo, newInfo, highlighter, oldDe
 		};
 	})();
 	return {
-		oldLines: (() => {
-			if (oldFile.contents === "") return [];
-			hastConfig.lang = oldLang;
-			state.lineInfo = oldInfo;
-			hastConfig.decorations = oldDecorations;
-			return getLineNodes(highlighter.codeToHast(cleanLastNewline(oldFile.contents), hastConfig));
+		deletionLines: (() => {
+			if (deletionFile.contents === "") return [];
+			hastConfig.lang = deletionLang;
+			state.lineInfo = deletionInfo;
+			hastConfig.decorations = deletionDecorations;
+			return getLineNodes(highlighter.codeToHast(cleanLastNewline(deletionFile.contents), hastConfig));
 		})(),
-		newLines: (() => {
-			if (newFile.contents === "") return [];
-			hastConfig.lang = newLang;
-			hastConfig.decorations = newDecorations;
-			state.lineInfo = newInfo;
-			return getLineNodes(highlighter.codeToHast(cleanLastNewline(newFile.contents), hastConfig));
+		additionLines: (() => {
+			if (additionFile.contents === "") return [];
+			hastConfig.lang = additionLang;
+			hastConfig.decorations = additionDecorations;
+			state.lineInfo = additionInfo;
+			return getLineNodes(highlighter.codeToHast(cleanLastNewline(additionFile.contents), hastConfig));
 		})()
 	};
 }

package/dist/utils/renderDiffWithHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderDiffWithHighlighter.js","names":["hunks: RenderDiffFilesResult[]","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","oldInfo: Record<number, LineInfo | undefined>","newInfo: Record<number, LineInfo | undefined>","oldDecorations: DecorationItem[]","newDecorations: DecorationItem[]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n  CodeToHastOptions,\n  DecorationItem,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  FileDiffMetadata,\n  Hunk,\n  LineDiffTypes,\n  LineInfo,\n  RenderDiffFilesResult,\n  RenderDiffOptions,\n  SupportedLanguages,\n  ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport {\n  createDiffSpanDecoration,\n  pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nexport function renderDiffWithHighlighter(\n  diff: FileDiffMetadata,\n  highlighter: DiffsHighlighter,\n  options: RenderDiffOptions,\n  forcePlainText = false\n): ThemedDiffResult {\n  const baseThemeType = (() => {\n    const theme = options.theme ?? DEFAULT_THEMES;\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme: options.theme,\n    highlighter,\n  });\n  // If we've received a diff with both files\n  if (diff.newLines != null && diff.oldLines != null) {\n    const {\n      oldContent,\n      newContent,\n      oldInfo,\n      newInfo,\n      oldDecorations,\n      newDecorations,\n    } = processLines({\n      hunks: diff.hunks,\n      oldLines: diff.oldLines,\n      newLines: diff.newLines,\n      lineDiffType: options.lineDiffType,\n    });\n    const oldFile = {\n      name: diff.prevName ?? diff.name,\n      contents: oldContent,\n    };\n    const newFile = {\n      name: diff.name,\n      contents: newContent,\n    };\n    const code = renderTwoFiles({\n      oldFile,\n      oldInfo,\n      oldDecorations,\n\n      newFile,\n      newInfo,\n      newDecorations,\n\n      highlighter,\n      options,\n      languageOverride: forcePlainText ? 'text' : diff.lang,\n    });\n    return { code, themeStyles, baseThemeType };\n  }\n  const hunks: RenderDiffFilesResult[] = [];\n  let splitLineIndex = 0;\n  let unifiedLineIndex = 0;\n  for (const hunk of diff.hunks) {\n    const {\n      oldContent,\n      newContent,\n      oldInfo,\n      newInfo,\n      oldDecorations,\n      newDecorations,\n      splitLineIndex: newSplitLineIndex,\n      unifiedLineIndex: newUnifiedLineIndex,\n    } = processLines({\n      hunks: [hunk],\n      splitLineIndex,\n      unifiedLineIndex,\n      lineDiffType: options.lineDiffType,\n    });\n    const oldFile = {\n      name: diff.prevName ?? diff.name,\n      contents: oldContent,\n    };\n    const newFile = {\n      name: diff.name,\n      contents: newContent,\n    };\n    hunks.push(\n      renderTwoFiles({\n        oldFile,\n        oldInfo,\n        oldDecorations,\n\n        newFile,\n        newInfo,\n        newDecorations,\n\n        highlighter,\n        options,\n        languageOverride: forcePlainText ? 'text' : diff.lang,\n      })\n    );\n    splitLineIndex = newSplitLineIndex;\n    unifiedLineIndex = newUnifiedLineIndex;\n  }\n\n  const code = (() => {\n    if (hunks.length <= 1) {\n      const hunk = hunks[0] ?? { oldLines: [], newLines: [] };\n      if (hunk.newLines.length === 0 || hunk.oldLines.length === 0) {\n        return hunk;\n      }\n    }\n    return { hunks };\n  })();\n\n  return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n  oldLine: string | undefined;\n  newLine: string | undefined;\n  oldLineIndex: number;\n  newLineIndex: number;\n  oldDecorations: DecorationItem[];\n  newDecorations: DecorationItem[];\n  lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n  oldLine,\n  newLine,\n  oldLineIndex,\n  newLineIndex,\n  oldDecorations,\n  newDecorations,\n  lineDiffType,\n}: ProcessLineDiffProps) {\n  if (oldLine == null || newLine == null || lineDiffType === 'none') {\n    return;\n  }\n  oldLine = cleanLastNewline(oldLine);\n  newLine = cleanLastNewline(newLine);\n  // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n  // we also gotta make sure the diff parsing doesn't include the newline\n  // character that could be there...\n  const lineDiff =\n    lineDiffType === 'char'\n      ? diffChars(oldLine, newLine)\n      : diffWordsWithSpace(oldLine, newLine);\n  const deletionSpans: [0 | 1, string][] = [];\n  const additionSpans: [0 | 1, string][] = [];\n  const enableJoin = lineDiffType === 'word-alt';\n  for (const item of lineDiff) {\n    const isLastItem = item === lineDiff[lineDiff.length - 1];\n    if (!item.added && !item.removed) {\n      pushOrJoinSpan({\n        item,\n        arr: deletionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n      pushOrJoinSpan({\n        item,\n        arr: additionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n    } else if (item.removed) {\n      pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n    } else {\n      pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n    }\n  }\n  let spanIndex = 0;\n  for (const span of deletionSpans) {\n    if (span[0] === 1) {\n      oldDecorations.push(\n        createDiffSpanDecoration({\n          // Decoration indexes start at 0\n          line: oldLineIndex - 1,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n  spanIndex = 0;\n  for (const span of additionSpans) {\n    if (span[0] === 1) {\n      newDecorations.push(\n        createDiffSpanDecoration({\n          // Decoration indexes start at 0\n          line: newLineIndex - 1,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n}\n\ninterface ProcessLinesProps {\n  hunks: Hunk[];\n  oldLines?: string[];\n  newLines?: string[];\n  splitLineIndex?: number;\n  unifiedLineIndex?: number;\n  newLineIndex?: number;\n  oldLineIndex?: number;\n  lineDiffType: LineDiffTypes;\n}\n\nfunction processLines({\n  hunks,\n  oldLines,\n  newLines,\n  splitLineIndex = 0,\n  unifiedLineIndex = 0,\n  lineDiffType,\n}: ProcessLinesProps) {\n  const oldInfo: Record<number, LineInfo | undefined> = {};\n  const newInfo: Record<number, LineInfo | undefined> = {};\n  const oldDecorations: DecorationItem[] = [];\n  const newDecorations: DecorationItem[] = [];\n  let newLineIndex = 1;\n  let oldLineIndex = 1;\n  let newLineNumber = 1;\n  let oldLineNumber = 1;\n  let oldContent = '';\n  let newContent = '';\n  for (const hunk of hunks) {\n    // If there's content prior to the hunk, lets fill it up\n    while (\n      oldLines != null &&\n      newLines != null &&\n      newLineIndex < hunk.additionStart &&\n      oldLineIndex < hunk.deletionStart\n    ) {\n      oldInfo[oldLineIndex] = {\n        type: 'context-expanded',\n        lineNumber: oldLineNumber,\n        altLineNumber: newLineNumber,\n        lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n      };\n      newInfo[newLineIndex] = {\n        type: 'context-expanded',\n        lineNumber: newLineNumber,\n        altLineNumber: oldLineNumber,\n        lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n      };\n      oldContent += oldLines[oldLineIndex - 1];\n      newContent += newLines[newLineIndex - 1];\n      oldLineIndex++;\n      newLineIndex++;\n      oldLineNumber++;\n      newLineNumber++;\n      splitLineIndex++;\n      unifiedLineIndex++;\n    }\n    oldLineNumber = hunk.deletionStart;\n    newLineNumber = hunk.additionStart;\n\n    // Lets process the actual hunk content\n    for (const hunkContent of hunk.hunkContent) {\n      if (hunkContent.type === 'context') {\n        for (const line of hunkContent.lines) {\n          oldInfo[oldLineIndex] = {\n            type: 'context',\n            lineNumber: oldLineNumber,\n            altLineNumber: newLineNumber,\n            lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n          };\n          newInfo[newLineIndex] = {\n            type: 'context',\n            lineNumber: newLineNumber,\n            altLineNumber: oldLineNumber,\n            lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n          };\n          oldContent += line;\n          newContent += line;\n          oldLineIndex++;\n          newLineIndex++;\n          newLineNumber++;\n          oldLineNumber++;\n          splitLineIndex++;\n          unifiedLineIndex++;\n        }\n      } else {\n        const len = Math.max(\n          hunkContent.additions.length,\n          hunkContent.deletions.length\n        );\n        let i = 0;\n        // NOTE(amadeus): Since we iterate through deletions and additions\n        // simultaneously, we have to create a secondary iterator for\n        // unifiedLineIndex, and then when we're done, add the combined lengths\n        // of additions/deletions to the main variable\n        let _unifiedLineIndex = unifiedLineIndex;\n        while (i < len) {\n          const oldLine = hunkContent.deletions[i];\n          const newLine = hunkContent.additions[i];\n          computeLineDiffDecorations({\n            newLine,\n            oldLine,\n            oldLineIndex,\n            newLineIndex,\n            oldDecorations,\n            newDecorations,\n            lineDiffType,\n          });\n          if (oldLine != null) {\n            oldInfo[oldLineIndex] = {\n              type: 'change-deletion',\n              lineNumber: oldLineNumber,\n              lineIndex: `${_unifiedLineIndex},${splitLineIndex}`,\n            };\n            oldContent += oldLine;\n            oldLineIndex++;\n            oldLineNumber++;\n          }\n          if (newLine != null) {\n            newInfo[newLineIndex] = {\n              type: 'change-addition',\n              lineNumber: newLineNumber,\n              lineIndex: `${_unifiedLineIndex + hunkContent.deletions.length},${splitLineIndex}`,\n            };\n            newContent += newLine;\n            newLineIndex++;\n            newLineNumber++;\n          }\n          splitLineIndex++;\n          _unifiedLineIndex++;\n          i++;\n        }\n        unifiedLineIndex +=\n          hunkContent.additions.length + hunkContent.deletions.length;\n      }\n    }\n\n    if (\n      oldLines == null ||\n      newLines == null ||\n      hunk !== hunks[hunks.length - 1]\n    )\n      continue;\n    // If we are on the last hunk, we should fully iterate through the rest\n    // of the lines\n    while (oldLineIndex <= oldLines.length || newLineIndex <= oldLines.length) {\n      const oldLine = oldLines[oldLineIndex - 1];\n      const newLine = newLines[newLineIndex - 1];\n      if (oldLine == null && newLine == null) {\n        break;\n      }\n      if (oldLine != null) {\n        oldInfo[oldLineIndex] = {\n          type: 'context-expanded',\n          lineNumber: oldLineNumber,\n          altLineNumber: newLineNumber,\n          lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n        };\n        oldContent += oldLine;\n        oldLineIndex++;\n        oldLineNumber++;\n      }\n      if (newLine != null) {\n        newInfo[newLineIndex] = {\n          type: 'context-expanded',\n          lineNumber: newLineNumber,\n          altLineNumber: oldLineNumber,\n          lineIndex: `${unifiedLineIndex},${splitLineIndex}`,\n        };\n        newContent += newLine;\n        newLineIndex++;\n        newLineNumber++;\n      }\n      splitLineIndex++;\n      unifiedLineIndex++;\n    }\n  }\n  return {\n    oldContent,\n    newContent,\n    oldInfo,\n    newInfo,\n    oldDecorations,\n    newDecorations,\n    splitLineIndex,\n    unifiedLineIndex,\n  };\n}\n\ninterface RenderTwoFilesProps {\n  oldFile: FileContents;\n  newFile: FileContents;\n  oldInfo: Record<number, LineInfo | undefined>;\n  newInfo: Record<number, LineInfo | undefined>;\n  oldDecorations: DecorationItem[];\n  newDecorations: DecorationItem[];\n  options: RenderDiffOptions;\n  highlighter: DiffsHighlighter;\n  languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n  oldFile,\n  newFile,\n  oldInfo,\n  newInfo,\n  highlighter,\n  oldDecorations,\n  newDecorations,\n  languageOverride,\n  options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps) {\n  const oldLang = languageOverride ?? getFiletypeFromFileName(oldFile.name);\n  const newLang = languageOverride ?? getFiletypeFromFileName(newFile.name);\n  const { state, transformers } = createTransformerWithState();\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    return typeof themeOrThemes === 'string'\n      ? {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          theme: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        }\n      : {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          themes: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        };\n  })();\n\n  const oldLines = (() => {\n    if (oldFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = oldLang;\n    state.lineInfo = oldInfo;\n    hastConfig.decorations = oldDecorations;\n    return getLineNodes(\n      highlighter.codeToHast(cleanLastNewline(oldFile.contents), hastConfig)\n    );\n  })();\n  const newLines = (() => {\n    if (newFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = newLang;\n    hastConfig.decorations = newDecorations;\n    state.lineInfo = newInfo;\n    return getLineNodes(\n      highlighter.codeToHast(cleanLastNewline(newFile.contents), hastConfig)\n    );\n  })();\n\n  return { oldLines, newLines };\n}\n"],"mappings":"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"}
+{"version":3,"file":"renderDiffWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions","code: RenderDiffFilesResult","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n  CodeToHastOptions,\n  DecorationItem,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  FileDiffMetadata,\n  ForcePlainTextOptions,\n  LineDiffTypes,\n  LineInfo,\n  RenderDiffFilesResult,\n  RenderDiffOptions,\n  SupportedLanguages,\n  ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverDiff } from './iterateOverDiff';\nimport {\n  createDiffSpanDecoration,\n  pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderDiffWithHighlighter(\n  diff: FileDiffMetadata,\n  highlighter: DiffsHighlighter,\n  options: RenderDiffOptions,\n  {\n    forcePlainText,\n    startingLine,\n    totalLines,\n    expandedHunks,\n  }: ForcePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedDiffResult {\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 baseThemeType = (() => {\n    const theme = options.theme ?? DEFAULT_THEMES;\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme: options.theme,\n    highlighter,\n  });\n\n  // If we have a large file and we are rendering the WHOLE plain diff ast,\n  // then we should remove the lineDiffType to make sure things render quickly.\n  // For highlighted ASTs or windowed highlights, we should just inherit the\n  // setting\n  const lineDiffType =\n    forcePlainText &&\n    !isWindowedHighlight &&\n    (diff.unifiedLineCount > 1000 || diff.splitLineCount > 1000)\n      ? 'none'\n      : options.lineDiffType;\n\n  const code: RenderDiffFilesResult = {\n    deletionLines: [],\n    additionLines: [],\n  };\n\n  const shouldGroupAll = !forcePlainText && !diff.isPartial;\n  const expandedHunksForIteration = forcePlainText ? expandedHunks : undefined;\n  const buckets = new Map<number, RenderBucket>();\n  function getBucketForHunk(hunkIndex: number) {\n    const index = shouldGroupAll ? 0 : hunkIndex;\n    const bucket = buckets.get(index) ?? createBucket();\n    buckets.set(index, bucket);\n    return bucket;\n  }\n\n  function appendContent(\n    lineContent: string,\n    lineIndex: number,\n    segments: HighlightSegment[],\n    contentWrapper: FakeArrayType\n  ) {\n    if (isWindowedHighlight) {\n      let segment = segments.at(-1);\n      if (\n        segment == null ||\n        segment.targetIndex + segment.count !== lineIndex\n      ) {\n        segment = {\n          targetIndex: lineIndex,\n          originalOffset: contentWrapper.length,\n          count: 0,\n        };\n        segments.push(segment);\n      }\n      segment.count++;\n    }\n    contentWrapper.push(lineContent);\n  }\n\n  iterateOverDiff({\n    diff,\n    diffStyle: 'both',\n    startingLine,\n    totalLines,\n    expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,\n    callback: ({\n      hunkIndex,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLineNumber,\n      deletionLineNumber,\n      unifiedAdditionLineIndex,\n      unifiedDeletionLineIndex,\n      splitLineIndex,\n      type,\n    }) => {\n      const bucket = getBucketForHunk(hunkIndex);\n\n      if (\n        type === 'change' &&\n        lineDiffType !== 'none' &&\n        additionLineIndex != null &&\n        deletionLineIndex != null\n      ) {\n        computeLineDiffDecorations({\n          additionLine: diff.additionLines[additionLineIndex],\n          deletionLine: diff.deletionLines[deletionLineIndex],\n          deletionLineIndex: bucket.deletionContent.length,\n          additionLineIndex: bucket.additionContent.length,\n          deletionDecorations: bucket.deletionDecorations,\n          additionDecorations: bucket.additionDecorations,\n          lineDiffType,\n        });\n      }\n\n      if (\n        deletionLineIndex != null &&\n        deletionLineNumber != null &&\n        unifiedDeletionLineIndex != null\n      ) {\n        appendContent(\n          diff.deletionLines[deletionLineIndex],\n          deletionLineIndex,\n          bucket.deletionSegments,\n          bucket.deletionContent\n        );\n        bucket.deletionInfo.push({\n          type: type === 'change' ? 'change-deletion' : type,\n          lineNumber: deletionLineNumber,\n          altLineNumber:\n            type === 'change' ? undefined : (additionLineNumber ?? undefined),\n          lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`,\n        });\n      }\n\n      if (\n        additionLineIndex != null &&\n        additionLineNumber != null &&\n        unifiedAdditionLineIndex != null\n      ) {\n        appendContent(\n          diff.additionLines[additionLineIndex],\n          additionLineIndex,\n          bucket.additionSegments,\n          bucket.additionContent\n        );\n        bucket.additionInfo.push({\n          type: type === 'change' ? 'change-addition' : type,\n          lineNumber: additionLineNumber,\n          altLineNumber:\n            type === 'change' ? undefined : (deletionLineNumber ?? undefined),\n          lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`,\n        });\n      }\n    },\n  });\n\n  for (const bucket of buckets.values()) {\n    if (\n      bucket.deletionContent.length === 0 &&\n      bucket.additionContent.length === 0\n    ) {\n      continue;\n    }\n\n    const deletionFile = {\n      name: diff.prevName ?? diff.name,\n      contents: bucket.deletionContent.value,\n    };\n    const additionFile = {\n      name: diff.name,\n      contents: bucket.additionContent.value,\n    };\n    const { deletionLines, additionLines } = renderTwoFiles({\n      deletionFile,\n      deletionInfo: bucket.deletionInfo,\n      deletionDecorations: bucket.deletionDecorations,\n\n      additionFile,\n      additionInfo: bucket.additionInfo,\n      additionDecorations: bucket.additionDecorations,\n\n      highlighter,\n      options,\n      languageOverride: forcePlainText ? 'text' : diff.lang,\n    });\n\n    if (shouldGroupAll) {\n      code.deletionLines = deletionLines;\n      code.additionLines = additionLines;\n      continue;\n    }\n\n    if (bucket.deletionSegments.length > 0) {\n      for (const seg of bucket.deletionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.deletionLines[seg.targetIndex + i] =\n            deletionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.deletionLines.push(...deletionLines);\n    }\n    if (bucket.additionSegments.length > 0) {\n      for (const seg of bucket.additionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.additionLines[seg.targetIndex + i] =\n            additionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.additionLines.push(...additionLines);\n    }\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n  deletionLine: string | undefined;\n  additionLine: string | undefined;\n  deletionLineIndex: number;\n  additionLineIndex: number;\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n  deletionLine,\n  additionLine,\n  deletionLineIndex,\n  additionLineIndex,\n  deletionDecorations,\n  additionDecorations,\n  lineDiffType,\n}: ProcessLineDiffProps) {\n  if (deletionLine == null || additionLine == null || lineDiffType === 'none') {\n    return;\n  }\n  deletionLine = cleanLastNewline(deletionLine);\n  additionLine = cleanLastNewline(additionLine);\n  // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n  // we also gotta make sure the diff parsing doesn't include the newline\n  // character that could be there...\n  const lineDiff =\n    lineDiffType === 'char'\n      ? diffChars(deletionLine, additionLine)\n      : diffWordsWithSpace(deletionLine, additionLine);\n  const deletionSpans: [0 | 1, string][] = [];\n  const additionSpans: [0 | 1, string][] = [];\n  const enableJoin = lineDiffType === 'word-alt';\n  const lastItem = lineDiff.at(-1);\n  for (const item of lineDiff) {\n    const isLastItem = item === lastItem;\n    if (!item.added && !item.removed) {\n      pushOrJoinSpan({\n        item,\n        arr: deletionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n      pushOrJoinSpan({\n        item,\n        arr: additionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n    } else if (item.removed) {\n      pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n    } else {\n      pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n    }\n  }\n  let spanIndex = 0;\n  for (const span of deletionSpans) {\n    if (span[0] === 1) {\n      deletionDecorations.push(\n        createDiffSpanDecoration({\n          line: deletionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n  spanIndex = 0;\n  for (const span of additionSpans) {\n    if (span[0] === 1) {\n      additionDecorations.push(\n        createDiffSpanDecoration({\n          line: additionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n}\n\ninterface HighlightSegment {\n  // The where the highlighted region starts\n  originalOffset: number;\n  // Where to place the highlighted line in RenderDiffFilesResult\n  targetIndex: number;\n  // Number of highlighted lines\n  count: number;\n}\n\ninterface FakeArrayType {\n  push(value: string): void;\n  value: string;\n  length: number;\n}\n\ninterface RenderBucket {\n  deletionContent: FakeArrayType;\n  additionContent: FakeArrayType;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  deletionSegments: HighlightSegment[];\n  additionSegments: HighlightSegment[];\n}\n\nfunction createBucket(): RenderBucket {\n  return {\n    deletionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    additionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    deletionInfo: [],\n    additionInfo: [],\n    deletionDecorations: [],\n    additionDecorations: [],\n    deletionSegments: [],\n    additionSegments: [],\n  };\n}\n\ninterface RenderTwoFilesProps {\n  deletionFile: FileContents;\n  additionFile: FileContents;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  options: RenderDiffOptions;\n  highlighter: DiffsHighlighter;\n  languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n  deletionFile,\n  additionFile,\n  deletionInfo,\n  additionInfo,\n  highlighter,\n  deletionDecorations,\n  additionDecorations,\n  languageOverride,\n  options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps): RenderDiffFilesResult {\n  const deletionLang =\n    languageOverride ?? getFiletypeFromFileName(deletionFile.name);\n  const additionLang =\n    languageOverride ?? getFiletypeFromFileName(additionFile.name);\n  const { state, transformers } = createTransformerWithState();\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    return typeof themeOrThemes === 'string'\n      ? {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          theme: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        }\n      : {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          themes: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        };\n  })();\n\n  const deletionLines = (() => {\n    if (deletionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = deletionLang;\n    state.lineInfo = deletionInfo;\n    hastConfig.decorations = deletionDecorations;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(deletionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n  const additionLines = (() => {\n    if (additionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = additionLang;\n    hastConfig.decorations = additionDecorations;\n    state.lineInfo = additionInfo;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(additionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n\n  return { deletionLines, additionLines };\n}\n"],"mappings":"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"}

package/dist/utils/setWrapperNodeProps.d.ts

@@ -1,20 +1,16 @@
 import { PrePropertiesConfig } from "../types.js";
 
 //#region src/utils/setWrapperNodeProps.d.ts
-interface SetPreNodePropertiesProps extends PrePropertiesConfig {
-  pre: HTMLPreElement;
-}
-declare function setPreNodeProperties({
+declare function setPreNodeProperties(pre: HTMLPreElement, {
   diffIndicators,
   disableBackground,
   disableLineNumbers,
   overflow,
-  pre,
   split,
   themeStyles,
   themeType,
   totalLines
-}: SetPreNodePropertiesProps): HTMLPreElement;
+}: PrePropertiesConfig): HTMLPreElement;
 //#endregion
-export { SetPreNodePropertiesProps, setPreNodeProperties };
+export { setPreNodeProperties };
 //# sourceMappingURL=setWrapperNodeProps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.d.ts","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":[],"mappings":";;;UAEiB,yBAAA,SAAkC;OAC5C;AADP;AAIgB,iBAAA,oBAAA,CAAA;EAAA,cAAA;EAAA,iBAAA;EAAA,kBAAA;EAAA,QAAA;EAAA,GAAA;EAAA,KAAA;EAAA,WAAA;EAAA,SAAA;EAAA;AAAA,CAAA,EAUb,yBAVa,CAAA,EAUe,cAVf"}
+{"version":3,"file":"setWrapperNodeProps.d.ts","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":[],"mappings":";;;iBAEgB,oBAAA,MACT;;;;;;;;;GAUF,sBACF"}

package/dist/utils/setWrapperNodeProps.js

@@ -1,5 +1,5 @@
 //#region src/utils/setWrapperNodeProps.ts
-function setPreNodeProperties({ diffIndicators, disableBackground, disableLineNumbers, overflow, pre, split, themeStyles, themeType, totalLines }) {
+function setPreNodeProperties(pre, { diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
 	if (themeType === "system") delete pre.dataset.themeType;
 	else pre.dataset.themeType = themeType;
 	switch (diffIndicators) {

package/dist/utils/setWrapperNodeProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport interface SetPreNodePropertiesProps extends PrePropertiesConfig {\n  pre: HTMLPreElement;\n}\n\nexport function setPreNodeProperties({\n  diffIndicators,\n  disableBackground,\n  disableLineNumbers,\n  overflow,\n  pre,\n  split,\n  themeStyles,\n  themeType,\n  totalLines,\n}: SetPreNodePropertiesProps): HTMLPreElement {\n  if (themeType === 'system') {\n    delete pre.dataset.themeType;\n  } else {\n    pre.dataset.themeType = themeType;\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.dataset.indicators = diffIndicators;\n      break;\n    case 'none':\n      delete pre.dataset.indicators;\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.dataset.disableLineNumbers = '';\n  } else {\n    delete pre.dataset.disableLineNumbers;\n  }\n  if (disableBackground) {\n    delete pre.dataset.background;\n  } else {\n    pre.dataset.background = '';\n  }\n  pre.dataset.type = split ? 'split' : 'file';\n  pre.dataset.overflow = overflow;\n  pre.dataset.diffs = '';\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAMA,SAAgB,qBAAqB,EACnC,gBACA,mBACA,oBACA,UACA,KACA,OACA,aACA,WACA,cAC4C;AAC5C,KAAI,cAAc,SAChB,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,YAAY;AAE1B,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,QAAQ,aAAa;AACzB;EACF,KAAK;AACH,UAAO,IAAI,QAAQ;AACnB;;AAEJ,KAAI,mBACF,KAAI,QAAQ,qBAAqB;KAEjC,QAAO,IAAI,QAAQ;AAErB,KAAI,kBACF,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,aAAa;AAE3B,KAAI,QAAQ,OAAO,QAAQ,UAAU;AACrC,KAAI,QAAQ,WAAW;AACvB,KAAI,QAAQ,QAAQ;AACpB,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}
+{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (themeType === 'system') {\n    delete pre.dataset.themeType;\n  } else {\n    pre.dataset.themeType = themeType;\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.dataset.indicators = diffIndicators;\n      break;\n    case 'none':\n      delete pre.dataset.indicators;\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.dataset.disableLineNumbers = '';\n  } else {\n    delete pre.dataset.disableLineNumbers;\n  }\n  if (disableBackground) {\n    delete pre.dataset.background;\n  } else {\n    pre.dataset.background = '';\n  }\n  pre.dataset.type = split ? 'split' : 'file';\n  pre.dataset.overflow = overflow;\n  pre.dataset.diffs = '';\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,cAAc,SAChB,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,YAAY;AAE1B,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,QAAQ,aAAa;AACzB;EACF,KAAK;AACH,UAAO,IAAI,QAAQ;AACnB;;AAEJ,KAAI,mBACF,KAAI,QAAQ,qBAAqB;KAEjC,QAAO,IAAI,QAAQ;AAErB,KAAI,kBACF,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,aAAa;AAE3B,KAAI,QAAQ,OAAO,QAAQ,UAAU;AACrC,KAAI,QAAQ,WAAW;AACvB,KAAI,QAAQ,QAAQ;AACpB,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -1,4 +1,4 @@
-import { FileContents, FileDiffMetadata, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from "../types.js";
+import { FileContents, FileDiffMetadata, HunkExpansionRegion, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from "../types.js";
 import { DiffRendererInstance, FileRendererInstance, WorkerInitializationRenderOptions, WorkerPoolOptions, WorkerRenderingOptions, WorkerStats } from "./types.js";
 import LRUMapPkg from "lru_map";
 
@@ -22,8 +22,10 @@ declare class WorkerPoolManager {
   private themeSubscribers;
   private workersFailed;
   private instanceRequestMap;
+  private statSubscribers;
   private fileCache;
   private diffCache;
+  private _queuedBroadcast;
   constructor(options: WorkerPoolOptions, {
     langs,
     theme,
@@ -46,6 +48,10 @@ declare class WorkerPoolManager {
   private setRenderOptionsOnWorkers;
   subscribeToThemeChanges(instance: ThemeSubscriber): () => void;
   unsubscribeToThemeChanges(instance: ThemeSubscriber): void;
+  subscribeToStatChanges(callback: (stats: WorkerStats) => unknown): () => void;
+  private queueBroadcastStateChanges;
+  private _broadcastStateChanges;
+  cleanUpPendingTasks(instance: FileRendererInstance | DiffRendererInstance): void;
   isInitialized(): boolean;
   initialize(languages?: SupportedLanguages[]): Promise<void>;
   private initializeWorkers;
@@ -53,7 +59,7 @@ declare class WorkerPoolManager {
   highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
   getPlainFileAST(file: FileContents): ThemedFileResult | undefined;
   highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
-  getPlainDiffAST(diff: FileDiffMetadata): ThemedDiffResult | undefined;
+  getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true): ThemedDiffResult | undefined;
   terminate(): void;
   private terminateWorkers;
   getStats(): WorkerStats;
@@ -63,6 +69,7 @@ declare class WorkerPoolManager {
   private handleWorkerMessage;
   private _queuedDrain;
   private queueDrain;
+  private assignWorkerToTask;
   private executeTask;
   private getAvailableWorker;
   private generateRequestId;

package/dist/worker/WorkerPoolManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":["options: WorkerPoolOptions"],"sources":["../../src/worker/WorkerPoolManager.ts"],"sourcesContent":[],"mappings":";;;;;UAmDU,eAAA;aACG,SAAA,CAAU,eAAe;EAL/B,SAIG,EAEG,SAAA,CAAU,MAFb,CAAA,MAAA,EAE4B,gBAF5B,CAAA;;UAYA,eAAA,CAXa;EACe,QAAA,EAAA,EAAA,IAAA;;AAAf,cAcV,iBAAA,CAdU;EAAA,QAUb,OAAA;EAIV,QAAa,WAAA;EAkBQ,QAAA,aAAA;EAEf,QAAA,WAAA;EACA,QAAA,OAAA;EACA,QAAA,SAAA;EACA,QAAA,YAAA;EACC,QAAA,aAAA;EAYoB,QAAA,gBAAA;EAAe,QAAA,aAAA;EAMf,QAAA,kBAAA;EAAmB,QAAA,SAAA;EAM3B,QAAA,SAAA;EAcf,WAAA,CAAA,OAAA,EA5CiB,iBA4CjB,EAAA;IAAA,KAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAtCG,iCAsCH;EACA,aAAA,CAAA,CAAA,EAAA,OAAA;EACA,kBAAA,CAAA,IAAA,EA5BuB,YA4BvB,CAAA,EA5BsC,gBA4BtC,GAAA,SAAA;EACS,kBAAA,CAAA,IAAA,EAvBc,gBAuBd,CAAA,EAvBiC,gBAuBjC,GAAA,SAAA;EAAR,aAAA,CAAA,CAAA,EAjBc,eAiBd;EAAkC,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAoDb,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAKA,gBAAA,CAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAzDrB,OAyDqB,CAzDb,sBAyDa,CAAA,CAAA,EAzDa,OAyDb,CAAA,IAAA,CAAA;EA8CU,oBAAA,CAAA,CAAA,EAnDV,iBAmDU;EAOE,oBAAA,CAAA,CAAA,EArDZ,iBAqDY;EAQR,QAAA,yBAAA;EAA4B,uBAAA,CAAA,QAAA,EAftB,eAesB,CAAA,EAAA,GAAA,GAAA,IAAA;EA8H7B,yBAAA,CAAA,QAAA,EAtIS,eAsIT,CAAA,EAAA,IAAA;EAA4B,aAAA,CAAA,CAAA,EAAA,OAAA;EAIjC,UAAA,CAAA,SAAA,CAAA,EAlIM,kBAkIN,EAAA,CAAA,EAlIkC,OAkIlC,CAAA,IAAA,CAAA;EAAe,QAAA,iBAAA;EAczB,QAAA,UAAA;EACJ,gBAAA,CAAA,QAAA,EAnBmB,oBAmBnB,EAAA,IAAA,EAnB+C,YAmB/C,CAAA,EAAA,IAAA;EAKc,eAAA,CAAA,IAAA,EApBA,YAoBA,CAAA,EApBe,gBAoBf,GAAA,SAAA;EAAmB,gBAAA,CAAA,QAAA,EAN7B,oBAM6B,EAAA,IAAA,EALjC,gBAKiC,CAAA,EAAA,IAAA;EA8B7B,eAAA,CAAA,IAAA,EA9BU,gBA8BV,CAAA,EA9B6B,gBA8B7B,GAAA,SAAA;EAAA,SAAA,CAAA,CAAA,EAAA,IAAA;;cAAA"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":["options: WorkerPoolOptions"],"sources":["../../src/worker/WorkerPoolManager.ts"],"sourcesContent":[],"mappings":";;;;;UAqDU,eAAA;aACG,SAAA,CAAU,eAAe;EAL/B,SAIG,EAEG,SAAA,CAAU,MAFb,CAAA,MAAA,EAE4B,gBAF5B,CAAA;;UAYA,eAAA,CAXa;EACe,QAAA,EAAA,EAAA,IAAA;;AAAf,cAcV,iBAAA,CAdU;EAAA,QAUb,OAAA;EAIV,QAAa,WAAA;EAoBQ,QAAA,aAAA;EAEf,QAAA,WAAA;EACA,QAAA,OAAA;EACA,QAAA,SAAA;EACA,QAAA,YAAA;EACC,QAAA,aAAA;EAYoB,QAAA,gBAAA;EAAe,QAAA,aAAA;EAMf,QAAA,kBAAA;EAAmB,QAAA,eAAA;EAM3B,QAAA,SAAA;EAsBf,QAAA,SAAA;EACA,QAAA,gBAAA;EACA,WAAA,CAAA,OAAA,EAtDiB,iBAsDjB,EAAA;IAAA,KAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAhDG,iCAgDH;EACS,aAAA,CAAA,CAAA,EAAA,OAAA;EAAR,kBAAA,CAAA,IAAA,EArCsB,YAqCtB,CAAA,EArCqC,gBAqCrC,GAAA,SAAA;EAAkC,kBAAA,CAAA,IAAA,EA/BZ,gBA+BY,CAAA,EA/BO,gBA+BP,GAAA,SAAA;EAoDb,aAAA,CAAA,CAAA,EA7EP,eA6EO;EAKA,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAiDU,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EASE,gBAAA,CAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAnHjC,OAmHiC,CAnHzB,sBAmHyB,CAAA,CAAA,EAnHC,OAmHD,CAAA,IAAA,CAAA;EAMhB,oBAAA,CAAA,CAAA,EArEI,iBAqEJ;EA0BR,oBAAA,CAAA,CAAA,EA1FY,iBA0FZ;EAAuB,QAAA,yBAAA;EAoBP,uBAAA,CAAA,QAAA,EA7DM,eA6DN,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,yBAAA,CAAA,QAAA,EApDpB,eAoDoB,CAAA,EAAA,IAAA;EAoI7B,sBAAA,CAAA,QAAA,EAAA,CAAA,KAAA,EAlLP,WAkLO,EAAA,GAAA,OAAA,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,QAAA,0BAAA;EAoBjC,QAAA,sBAAA;EAAe,mBAAA,CAAA,QAAA,EA5KzB,oBA4KyB,GA5KF,oBA4KE,CAAA,EAAA,IAAA;EAczB,aAAA,CAAA,CAAA,EAAA,OAAA;EACJ,UAAA,CAAA,SAAA,CAAA,EAvKoB,kBAuKpB,EAAA,CAAA,EAvKgD,OAuKhD,CAAA,IAAA,CAAA;EAsBA,QAAA,iBAAA;EAGsB,QAAA,UAAA;EAAZ,gBAAA,CAAA,QAAA,EA5DS,oBA4DT,EAAA,IAAA,EA5DqC,YA4DrC,CAAA,EAAA,IAAA;EACf,eAAA,CAAA,IAAA,EAzCmB,YAyCnB,CAAA,EAzCkC,gBAyClC,GAAA,SAAA;EA+BS,gBAAA,CAAA,QAAA,EA1DA,oBA0DA,EAAA,IAAA,EAzDJ,gBAyDI,CAAA,EAAA,IAAA;EAAA,eAAA,CAAA,IAAA,EAnCJ,gBAmCI,EAAA,YAAA,EAAA,MAAA,EAAA,UAAA,EAAA,MAAA,EAAA,aAAA,CAAA,EAhCM,GAgCN,CAAA,MAAA,EAhCkB,mBAgClB,CAAA,GAAA,IAAA,CAAA,EA/BT,gBA+BS,GAAA,SAAA;;;cAAA"}