@pierre/diffs 1.1.0-beta.6 → 1.1.0-beta.8

package/dist/worker/worker.js

@@ -4,6 +4,7 @@ import { diffChars, diffWordsWithSpace } from "diff";
 import { transformerStyleToClass } from "@shikijs/transformers";
 
 //#region src/constants.ts
+const SPLIT_WITH_NEWLINES = /(?<=\n)/;
 const DEFAULT_THEMES = {
 	dark: "pierre-dark",
 	light: "pierre-light"
@@ -74,14 +75,6 @@ function createTextNodeElement(value) {
 		value
 	};
 }
-function createHastElement({ tagName, children = [], properties = {} }) {
-	return {
-		type: "element",
-		tagName,
-		properties,
-		children
-	};
-}
 function findCodeElement(nodes) {
 	let firstChild = nodes.children[0];
 	while (firstChild != null) {
@@ -104,30 +97,13 @@ function processLine(node, line, state) {
 		});
 		throw new Error(errorMessage);
 	}
-	node.tagName = "span";
-	node.properties["data-column-content"] = "";
+	node.tagName = "div";
+	node.properties["data-line"] = lineInfo.lineNumber;
+	node.properties["data-alt-line"] = lineInfo.altLineNumber;
+	node.properties["data-line-type"] = lineInfo.type;
+	node.properties["data-line-index"] = lineInfo.lineIndex;
 	if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
-	return createHastElement({
-		tagName: "div",
-		children: [createHastElement({
-			tagName: "span",
-			children: [createHastElement({
-				tagName: "span",
-				children: [{
-					type: "text",
-					value: `${lineInfo.lineNumber}`
-				}],
-				properties: { "data-line-number-content": "" }
-			})],
-			properties: { "data-column-number": "" }
-		}), node],
-		properties: {
-			"data-line": lineInfo.lineNumber,
-			"data-alt-line": lineInfo.altLineNumber,
-			"data-line-type": lineInfo.type,
-			"data-line-index": lineInfo.lineIndex
-		}
-	});
+	return node;
 }
 
 //#endregion
@@ -668,16 +644,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk,
 						collapsedBefore: 0,
 						collapsedAfter: 0,
-						unifiedDeletionLineIndex: unifiedLineIndex$1 + index,
-						unifiedAdditionLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						deletionLineIndex: deletionLineIndex$1 + index,
-						additionLineIndex: additionLineIndex$1 + index,
-						deletionLineNumber: deletionLineNumber$1 + index,
-						additionLineNumber: additionLineNumber$1 + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
 					})) break hunkIterator;
 				} else state.incrementCounts(1, 1);
 				index++;
@@ -696,16 +677,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk,
 						collapsedBefore: getPendingCollapsed(),
 						collapsedAfter: 0,
-						unifiedDeletionLineIndex: unifiedLineIndex$1 + index,
-						unifiedAdditionLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						deletionLineIndex: deletionLineIndex$1 + index,
-						additionLineIndex: additionLineIndex$1 + index,
-						deletionLineNumber: deletionLineNumber$1 + index,
-						additionLineNumber: additionLineNumber$1 + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
 					})) break hunkIterator;
 				} else state.incrementCounts(1, 1);
 				index++;
@@ -737,16 +723,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 								hunk,
 								collapsedBefore: getPendingCollapsed(),
 								collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
-								unifiedDeletionLineIndex: unifiedRowIndex,
-								unifiedAdditionLineIndex: unifiedRowIndex,
-								splitLineIndex: splitRowIndex,
-								deletionLineIndex: deletionLineIndex + index,
-								additionLineIndex: additionLineIndex + index,
-								deletionLineNumber: deletionLineNumber + index,
-								additionLineNumber: additionLineNumber + index,
 								type: "context",
-								noEOFCRAddition: isLastLine && hunk.noEOFCRAdditions,
-								noEOFCRDeletion: isLastLine && hunk.noEOFCRDeletions
+								deletionLine: {
+									lineNumber: deletionLineNumber + index,
+									lineIndex: deletionLineIndex + index,
+									noEOFCR: isLastLine && hunk.noEOFCRDeletions,
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex
+								},
+								additionLine: {
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex,
+									lineIndex: additionLineIndex + index,
+									lineNumber: additionLineNumber + index,
+									noEOFCR: isLastLine && hunk.noEOFCRAdditions
+								}
 							})) break hunkIterator;
 						} else state.incrementCounts(1, 1);
 						index++;
@@ -811,16 +802,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk: void 0,
 						collapsedBefore: 0,
 						collapsedAfter: isLastLine ? collapsedLines : 0,
-						unifiedDeletionLineIndex: unifiedLineIndex + index,
-						unifiedAdditionLineIndex: unifiedLineIndex + index,
-						splitLineIndex: splitLineIndex + index,
-						additionLineIndex: additionLineIndex + index,
-						deletionLineIndex: deletionLineIndex + index,
-						additionLineNumber: additionLineNumber + index,
-						deletionLineNumber: deletionLineNumber + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber + index,
+							lineIndex: deletionLineIndex + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index,
+							lineIndex: additionLineIndex + index,
+							lineNumber: additionLineNumber + index,
+							noEOFCR: false
+						}
 					})) break hunkIterator;
 				} else state.incrementCounts(1, 1);
 				index++;
@@ -899,37 +895,56 @@ function getChangeIterationRanges(state, content, diffStyle) {
 	return merged;
 }
 function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, diffStyle, index, unifiedLineIndex, splitLineIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, content, isLastContent, unifiedCount, splitCount }) {
-	if (diffStyle === "unified") return {
+	const unifiedDeletionLineIndex = index < content.deletions ? unifiedLineIndex + index : void 0;
+	const unifiedAdditionLineIndex = diffStyle === "unified" ? index >= content.deletions ? unifiedLineIndex + index : void 0 : index < content.additions ? unifiedLineIndex + content.deletions + index : void 0;
+	const resolvedSplitLineIndex = diffStyle === "unified" ? splitLineIndex + (index < content.deletions ? index : index - content.deletions) : splitLineIndex + index;
+	const deletionLineIndexValue = index < content.deletions ? deletionLineIndex + index : void 0;
+	const deletionLineNumberValue = index < content.deletions ? deletionLineNumber + index : void 0;
+	const additionLineIndexValue = diffStyle === "unified" ? index >= content.deletions ? additionLineIndex + (index - content.deletions) : void 0 : index < content.additions ? additionLineIndex + index : void 0;
+	const additionLineNumberValue = diffStyle === "unified" ? index >= content.deletions ? additionLineNumber + (index - content.deletions) : void 0 : index < content.additions ? additionLineNumber + index : void 0;
+	const noEOFCRDeletion = diffStyle === "unified" ? isLastContent && index === content.deletions - 1 && hunk.noEOFCRDeletions : isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions;
+	const noEOFCRAddition = diffStyle === "unified" ? isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions : isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions;
+	const deletionLine = deletionLineIndexValue != null && deletionLineNumberValue != null && unifiedDeletionLineIndex != null ? {
+		lineNumber: deletionLineNumberValue,
+		lineIndex: deletionLineIndexValue,
+		noEOFCR: noEOFCRDeletion,
+		unifiedLineIndex: unifiedDeletionLineIndex,
+		splitLineIndex: resolvedSplitLineIndex
+	} : void 0;
+	const additionLine = additionLineIndexValue != null && additionLineNumberValue != null && unifiedAdditionLineIndex != null ? {
+		unifiedLineIndex: unifiedAdditionLineIndex,
+		splitLineIndex: resolvedSplitLineIndex,
+		lineIndex: additionLineIndexValue,
+		lineNumber: additionLineNumberValue,
+		noEOFCR: noEOFCRAddition
+	} : void 0;
+	if (deletionLine == null && additionLine != null) return {
+		type: "change",
+		hunkIndex,
+		hunk,
+		collapsedAfter,
+		collapsedBefore,
+		deletionLine: void 0,
+		additionLine
+	};
+	else if (deletionLine != null && additionLine == null) return {
 		type: "change",
 		hunkIndex,
 		hunk,
 		collapsedAfter,
 		collapsedBefore,
-		unifiedDeletionLineIndex: index < content.deletions ? unifiedLineIndex + index : void 0,
-		unifiedAdditionLineIndex: index >= content.deletions ? unifiedLineIndex + index : void 0,
-		splitLineIndex: splitLineIndex + (index < content.deletions ? index : index - content.deletions),
-		additionLineIndex: index >= content.deletions ? additionLineIndex + (index - content.deletions) : void 0,
-		additionLineNumber: index >= content.deletions ? additionLineNumber + (index - content.deletions) : void 0,
-		deletionLineIndex: index < content.deletions ? deletionLineIndex + index : void 0,
-		deletionLineNumber: index < content.deletions ? deletionLineNumber + index : void 0,
-		noEOFCRDeletion: isLastContent && index === content.deletions - 1 && hunk.noEOFCRDeletions,
-		noEOFCRAddition: isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions
+		deletionLine,
+		additionLine: void 0
 	};
+	if (deletionLine == null || additionLine == null) throw new Error("iterateOverDiff: missing change line data");
 	return {
 		type: "change",
 		hunkIndex,
 		hunk,
 		collapsedAfter,
 		collapsedBefore,
-		unifiedDeletionLineIndex: index < content.deletions ? unifiedLineIndex + index : void 0,
-		unifiedAdditionLineIndex: index < content.additions ? unifiedLineIndex + content.deletions + index : void 0,
-		splitLineIndex: splitLineIndex + index,
-		additionLineIndex: index < content.additions ? additionLineIndex + index : void 0,
-		additionLineNumber: index < content.additions ? additionLineNumber + index : void 0,
-		deletionLineIndex: index < content.deletions ? deletionLineIndex + index : void 0,
-		deletionLineNumber: index < content.deletions ? deletionLineNumber + index : void 0,
-		noEOFCRDeletion: isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions,
-		noEOFCRAddition: isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions
+		deletionLine,
+		additionLine
 	};
 }
 
@@ -965,8 +980,8 @@ function pushOrJoinSpan({ item, arr, enableJoin, isNeutral = false, isLastItem =
 
 //#endregion
 //#region src/utils/renderDiffWithHighlighter.ts
-const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
-function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+const DEFAULT_PLAIN_TEXT_OPTIONS$1 = { forcePlainText: false };
+function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = DEFAULT_PLAIN_TEXT_OPTIONS$1) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -1019,33 +1034,34 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 		totalLines,
 		expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,
 		collapsedContextThreshold,
-		callback: ({ hunkIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, unifiedAdditionLineIndex, unifiedDeletionLineIndex, splitLineIndex, type }) => {
+		callback: ({ hunkIndex, additionLine, deletionLine, type }) => {
 			const bucket = getBucketForHunk(hunkIndex);
-			if (type === "change" && lineDiffType !== "none" && additionLineIndex != null && deletionLineIndex != null) computeLineDiffDecorations({
-				additionLine: diff.additionLines[additionLineIndex],
-				deletionLine: diff.deletionLines[deletionLineIndex],
+			const splitLineIndex = additionLine != null ? additionLine.splitLineIndex : deletionLine.splitLineIndex;
+			if (type === "change" && additionLine != null && deletionLine != null) computeLineDiffDecorations({
+				additionLine: diff.additionLines[additionLine.lineIndex],
+				deletionLine: diff.deletionLines[deletionLine.lineIndex],
 				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);
+			if (deletionLine != null) {
+				appendContent(diff.deletionLines[deletionLine.lineIndex], deletionLine.lineIndex, 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}`
+					lineNumber: deletionLine.lineNumber,
+					altLineNumber: type === "change" ? void 0 : additionLine.lineNumber ?? void 0,
+					lineIndex: `${deletionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
-			if (additionLineIndex != null && additionLineNumber != null && unifiedAdditionLineIndex != null) {
-				appendContent(diff.additionLines[additionLineIndex], additionLineIndex, bucket.additionSegments, bucket.additionContent);
+			if (additionLine != null) {
+				appendContent(diff.additionLines[additionLine.lineIndex], additionLine.lineIndex, 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}`
+					lineNumber: additionLine.lineNumber,
+					altLineNumber: type === "change" ? void 0 : deletionLine.lineNumber ?? void 0,
+					lineIndex: `${additionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
 		}
@@ -1212,9 +1228,78 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 	};
 }
 
+//#endregion
+//#region src/utils/iterateOverFile.ts
+/**
+* Iterates over lines in a file with optional windowing support.
+*
+* Similar to `iterateOverDiff` but simplified for linear file content.
+* Supports viewport windowing for virtualization scenarios.
+*
+* @param props - Configuration for iteration
+* @param props.lines - Pre-split array of lines (use splitFileContents() to create from string)
+* @param props.startingLine - Optional starting line index (0-based, default: 0)
+* @param props.totalLines - Optional max lines to iterate (default: Infinity)
+* @param props.callback - Callback invoked for each line in the window.
+*                         Return `true` to stop iteration early.
+*
+* @example
+* ```typescript
+* const lines = splitFileContents('line1\nline2\nline3');
+* iterateOverFile({
+*   lines,
+*   startingLine: 0,
+*   totalLines: 10,
+*   callback: ({ lineIndex, lineNumber, content, isLastLine }) => {
+*     console.log(`Line ${lineNumber}: ${content}`);
+*     if (content.includes('stop')) return true; // Stop iteration
+*   }
+* });
+* ```
+*/
+function iterateOverFile({ lines, startingLine = 0, totalLines = Infinity, callback }) {
+	const len = Math.min(startingLine + totalLines, lines.length);
+	const lastLineIndex = (() => {
+		const lastLine = lines.at(-1);
+		if (lastLine === "" || lastLine === "\n" || lastLine === "\r\n" || lastLine === "\r") return Math.max(0, lines.length - 2);
+		return lines.length - 1;
+	})();
+	for (let lineIndex = startingLine; lineIndex < len; lineIndex++) {
+		const isLastLine = lineIndex === lastLineIndex;
+		if (callback({
+			lineIndex,
+			lineNumber: lineIndex + 1,
+			content: lines[lineIndex],
+			isLastLine
+		}) === true || isLastLine) break;
+	}
+}
+
+//#endregion
+//#region src/utils/splitFileContents.ts
+/**
+* Splits file contents into lines using the same logic as diff parsing.
+* - Preserves trailing newlines on each line
+*
+* @param contents - The raw file contents string
+* @returns Array of lines with newlines preserved
+*/
+function splitFileContents(contents) {
+	return contents !== "" ? contents.split(SPLIT_WITH_NEWLINES) : [];
+}
+
 //#endregion
 //#region src/utils/renderFileWithHighlighter.ts
-function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, forcePlainText = false) {
+const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
+function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+	if (forcePlainText) {
+		startingLine ??= 0;
+		totalLines ??= Infinity;
+	} else {
+		startingLine = 0;
+		totalLines = Infinity;
+	}
+	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const { state, transformers } = createTransformerWithState();
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
 	const baseThemeType = (() => {
@@ -1226,8 +1311,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 	});
 	state.lineInfo = (shikiLineNumber) => ({
 		type: "context",
-		lineIndex: shikiLineNumber - 1,
-		lineNumber: shikiLineNumber
+		lineIndex: shikiLineNumber - 1 + startingLine,
+		lineNumber: shikiLineNumber + startingLine
 	});
 	const hastConfig = (() => {
 		if (typeof theme === "string") return {
@@ -1247,12 +1332,27 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			tokenizeMaxLineLength
 		};
 	})();
+	const highlightedLines = getLineNodes(highlighter$1.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
+	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
+	if (isWindowedHighlight) code.push(...highlightedLines);
 	return {
-		code: getLineNodes(highlighter$1.codeToHast(cleanLastNewline(file.contents), hastConfig)),
+		code,
 		themeStyles,
 		baseThemeType
 	};
 }
+function extractWindowedFileContent(lines, startingLine, totalLines) {
+	let windowContent = "";
+	iterateOverFile({
+		lines,
+		startingLine,
+		totalLines,
+		callback({ content }) {
+			windowContent += content;
+		}
+	});
+	return windowContent;
+}
 
 //#endregion
 //#region src/worker/worker.ts