@pierre/diffs 1.3.0-beta.1 → 1.3.0-beta.3

package/dist/utils/iterateOverDiff.js

@@ -1,5 +1,5 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
-import { getExpandedRegion } from "./virtualDiffLayout.js";
+import { getExpandedRegion, getTrailingExpandedRegion } from "./virtualDiffLayout.js";
 
 //#region src/utils/iterateOverDiff.ts
 function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
@@ -11,12 +11,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		collapsedContextThreshold
 	});
 	const state = {
-		finalHunk: diff.hunks.at(-1),
 		viewportStart: startingLine,
 		viewportEnd: startingLine + totalLines,
 		isWindowedHighlight: startingLine > 0 || totalLines < Infinity,
 		splitCount: iterationStart.splitCount,
 		unifiedCount: iterationStart.unifiedCount,
+		finalHunkIndex: diff.hunks.length - 1,
 		shouldBreak() {
 			if (!state.isWindowedHighlight) return false;
 			const breakUnified = state.unifiedCount >= startingLine + totalLines;
@@ -69,31 +69,24 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			hunkIndex,
 			collapsedContextThreshold
 		});
-		const trailingRegion = (() => {
-			if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) return;
-			const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
-			const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
-			if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
-			const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
-			return getExpandedRegion({
-				isPartial: diff.isPartial,
-				rangeSize: trailingRangeSize,
-				expandedHunks,
-				hunkIndex: diff.hunks.length,
-				collapsedContextThreshold
-			});
-		})();
+		const trailingRegion = hunkIndex === state.finalHunkIndex ? getTrailingExpandedRegion({
+			fileDiff: diff,
+			hunkIndex,
+			expandedHunks,
+			collapsedContextThreshold,
+			errorPrefix: "iterateOverDiff"
+		}) : void 0;
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
 			if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) return 0;
 			if (diffStyle === "unified") return unifiedLineIndex$1 === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
 			return splitLineIndex$1 === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
 		}
-		function getPendingCollapsed() {
-			if (leadingRegion.collapsedLines === 0) return 0;
-			const value = leadingRegion.collapsedLines;
-			leadingRegion.collapsedLines = 0;
-			return value;
+		let consumedCollapsed = leadingRegion.collapsedLines === 0;
+		function consumePendingCollapsed() {
+			if (consumedCollapsed) return 0;
+			consumedCollapsed = true;
+			return leadingRegion.collapsedLines;
 		}
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.rangeSize;
@@ -102,81 +95,63 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			let additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.rangeSize;
 			let deletionLineNumber$1 = hunk.deletionStart - leadingRegion.rangeSize;
 			let additionLineNumber$1 = hunk.additionStart - leadingRegion.rangeSize;
-			const [startIndex, endIndex] = getEqualLineIterationRange(state, leadingRegion.fromStart, diffStyle);
-			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-			let index = startIndex;
-			while (index < leadingRegion.fromStart) {
-				if (index >= endIndex) {
-					state.incrementCounts(leadingRegion.fromStart - index, leadingRegion.fromStart - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					if (state.emit({
-						hunkIndex,
-						hunk,
-						collapsedBefore: 0,
-						collapsedAfter: 0,
-						type: "context-expanded",
-						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++;
-			}
+			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
+				return state.emit({
+					hunkIndex,
+					hunk,
+					collapsedBefore: 0,
+					collapsedAfter: 0,
+					type: "context-expanded",
+					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;
 			unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex$1 = hunk.splitLineStart - leadingRegion.fromEnd;
 			deletionLineIndex$1 = hunk.deletionLineIndex - leadingRegion.fromEnd;
 			additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.fromEnd;
 			deletionLineNumber$1 = hunk.deletionStart - leadingRegion.fromEnd;
 			additionLineNumber$1 = hunk.additionStart - leadingRegion.fromEnd;
-			const [fromEndStartIndex, fromEndEndIndex] = getEqualLineIterationRange(state, leadingRegion.fromEnd, diffStyle);
-			if (fromEndStartIndex > 0) state.incrementCounts(fromEndStartIndex, fromEndStartIndex);
-			index = fromEndStartIndex;
-			while (index < leadingRegion.fromEnd) {
-				if (index >= fromEndEndIndex) {
-					state.incrementCounts(leadingRegion.fromEnd - index, leadingRegion.fromEnd - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					if (state.emit({
-						hunkIndex,
-						hunk,
-						collapsedBefore: getPendingCollapsed(),
-						collapsedAfter: 0,
-						type: "context-expanded",
-						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++;
-			}
+			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
+				return state.emit({
+					hunkIndex,
+					hunk,
+					collapsedBefore: consumePendingCollapsed(),
+					collapsedAfter: 0,
+					type: "context-expanded",
+					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
+					}
+				});
+			}, () => {
+				consumePendingCollapsed();
+			})) break hunkIterator;
 		} else {
 			state.incrementCounts(expandedLineCount, expandedLineCount);
-			getPendingCollapsed();
+			consumePendingCollapsed();
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
@@ -190,45 +165,37 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			const isLastContent = content === lastContent;
 			if (content.type === "context") {
 				if (!state.shouldSkip(content.lines, content.lines)) {
-					const [startIndex, endIndex] = getEqualLineIterationRange(state, content.lines, diffStyle);
-					if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-					let index = startIndex;
-					while (index < content.lines) {
-						if (index >= endIndex) {
-							state.incrementCounts(content.lines - index, content.lines - index);
-							break;
-						}
-						if (state.isInWindow(0, 0)) {
-							const isLastLine = isLastContent && index === content.lines - 1;
-							const unifiedRowIndex = unifiedLineIndex + index;
-							const splitRowIndex = splitLineIndex + index;
-							if (state.emit({
-								hunkIndex,
-								hunk,
-								collapsedBefore: getPendingCollapsed(),
-								collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
-								type: "context",
-								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++;
-					}
+					if (walkContextLines(state, content.lines, diffStyle, (index) => {
+						const isLastLine = isLastContent && index === content.lines - 1;
+						const unifiedRowIndex = unifiedLineIndex + index;
+						const splitRowIndex = splitLineIndex + index;
+						return state.emit({
+							hunkIndex,
+							hunk,
+							collapsedBefore: consumePendingCollapsed(),
+							collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
+							type: "context",
+							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
+							}
+						});
+					}, () => {
+						consumePendingCollapsed();
+					})) break hunkIterator;
 				} else {
 					state.incrementCounts(content.lines, content.lines);
-					getPendingCollapsed();
+					consumePendingCollapsed();
 				}
 				unifiedLineIndex += content.lines;
 				splitLineIndex += content.lines;
@@ -241,12 +208,13 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 				const unifiedCount = content.deletions + content.additions;
 				if (!state.shouldSkip(unifiedCount, splitCount)) {
 					const iterationRanges = getChangeIterationRanges(state, content, diffStyle);
+					if ((iterationRanges[0]?.[0] ?? 0) > 0) consumePendingCollapsed();
 					for (const [rangeStart, rangeEnd] of iterationRanges) for (let index = rangeStart; index < rangeEnd; index++) {
 						const collapsedAfter = getTrailingCollapsedAfter(unifiedLineIndex + index, diffStyle === "unified" ? splitLineIndex + (index < content.deletions ? index : index - content.deletions) : splitLineIndex + index);
 						if (state.emit(getChangeLineData({
 							hunkIndex,
 							hunk,
-							collapsedBefore: getPendingCollapsed(),
+							collapsedBefore: consumePendingCollapsed(),
 							collapsedAfter,
 							diffStyle,
 							index,
@@ -263,7 +231,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						}), true)) break hunkIterator;
 					}
 				}
-				getPendingCollapsed();
+				consumePendingCollapsed();
 				state.incrementCounts(unifiedCount, splitCount);
 				unifiedLineIndex += unifiedCount;
 				splitLineIndex += splitCount;
@@ -276,41 +244,30 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (trailingRegion != null) {
 			const { collapsedLines, fromStart, fromEnd } = trailingRegion;
 			const len = fromStart + fromEnd;
-			const [startIndex, endIndex] = getEqualLineIterationRange(state, len, diffStyle);
-			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-			let index = startIndex;
-			while (index < len) {
-				if (state.shouldBreak()) break hunkIterator;
-				if (index >= endIndex) {
-					state.incrementCounts(len - index, len - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					const isLastLine = index === len - 1;
-					if (state.emit({
-						hunkIndex: diff.hunks.length,
-						hunk: void 0,
-						collapsedBefore: 0,
-						collapsedAfter: isLastLine ? collapsedLines : 0,
-						type: "context-expanded",
-						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++;
-			}
+			if (walkContextLines(state, len, diffStyle, (index) => {
+				const isLastLine = index === len - 1;
+				return state.emit({
+					hunkIndex: diff.hunks.length,
+					hunk: void 0,
+					collapsedBefore: 0,
+					collapsedAfter: isLastLine ? collapsedLines : 0,
+					type: "context-expanded",
+					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
+					}
+				});
+			}, void 0, () => state.shouldBreak())) break hunkIterator;
 		}
 	}
 }
@@ -375,15 +332,14 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 		const leadingCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		splitCount += leadingCount + hunk.splitLineCount;
 		unifiedCount += leadingCount + hunk.unifiedLineCount;
-		if (index === finalHunkIndex && hasFinalCollapsedHunk(diff)) {
-			const trailingRangeSize = getTrailingRangeSize(diff, hunk);
-			const trailingRegion = getExpandedRegion({
-				isPartial: diff.isPartial,
-				rangeSize: trailingRangeSize,
-				expandedHunks,
-				hunkIndex: diff.hunks.length,
-				collapsedContextThreshold
-			});
+		const trailingRegion = index === finalHunkIndex ? getTrailingExpandedRegion({
+			fileDiff: diff,
+			hunkIndex: index,
+			expandedHunks,
+			collapsedContextThreshold,
+			errorPrefix: "iterateOverDiff"
+		}) : void 0;
+		if (trailingRegion != null) {
 			const trailingCount = trailingRegion.fromStart + trailingRegion.fromEnd;
 			splitCount += trailingCount;
 			unifiedCount += trailingCount;
@@ -395,7 +351,7 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 	}
 	return prefixCounts;
 }
-function getEqualLineIterationRange(state, count, diffStyle) {
+function getContextLineIterationBounds(state, count, diffStyle) {
 	if (!state.isWindowedHighlight || count <= 0) return [0, count];
 	const ranges = [];
 	function pushRange(currentCount) {
@@ -415,16 +371,25 @@ function getEqualLineIterationRange(state, count, diffStyle) {
 	}
 	return [start, end];
 }
-function getTrailingRangeSize(diff, hunk) {
-	const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
-	const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
-	if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
-	return Math.min(additionRemaining, deletionRemaining);
-}
-function hasFinalCollapsedHunk(diff) {
-	const lastHunk = diff.hunks.at(-1);
-	if (lastHunk == null || diff.isPartial || diff.additionLines.length === 0 || diff.deletionLines.length === 0) return false;
-	return lastHunk.additionLineIndex + lastHunk.additionCount < diff.additionLines.length || lastHunk.deletionLineIndex + lastHunk.deletionCount < diff.deletionLines.length;
+function walkContextLines(state, count, diffStyle, callback, onSkippedStart, shouldBreak) {
+	const [startIndex, endIndex] = getContextLineIterationBounds(state, count, diffStyle);
+	if (startIndex > 0) {
+		state.incrementCounts(startIndex, startIndex);
+		onSkippedStart?.();
+	}
+	let index = startIndex;
+	while (index < count) {
+		if (shouldBreak?.() === true) return true;
+		if (index >= endIndex) {
+			state.incrementCounts(count - index, count - index);
+			break;
+		}
+		if (state.isInWindow(0, 0)) {
+			if (callback(index) === true) return true;
+		} else state.incrementCounts(1, 1);
+		index++;
+	}
+	return false;
 }
 function getChangeIterationRanges(state, content, diffStyle) {
 	if (!state.isWindowedHighlight) return [[0, diffStyle === "unified" ? content.deletions + content.additions : Math.max(content.deletions, content.additions)]];