@pierre/diffs 1.2.1 → 1.2.3

package/dist/worker/worker.js

@@ -710,6 +710,38 @@ function getLineNodes(nodes) {
 	throw new Error("getLineNodes: Unable to find children");
 }
 
+//#endregion
+//#region src/utils/virtualDiffLayout.ts
+function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
+	const normalizedRangeSize = Math.max(rangeSize, 0);
+	if (normalizedRangeSize === 0 || isPartial) return {
+		fromStart: 0,
+		fromEnd: 0,
+		rangeSize: normalizedRangeSize,
+		collapsedLines: normalizedRangeSize,
+		renderAll: false
+	};
+	if (expandedHunks === true || normalizedRangeSize <= collapsedContextThreshold) return {
+		fromStart: normalizedRangeSize,
+		fromEnd: 0,
+		rangeSize: normalizedRangeSize,
+		collapsedLines: 0,
+		renderAll: true
+	};
+	const region = expandedHunks?.get(hunkIndex);
+	const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), normalizedRangeSize);
+	const fromEnd = Math.min(Math.max(region?.fromEnd ?? 0, 0), normalizedRangeSize);
+	const expandedCount = fromStart + fromEnd;
+	const renderAll = expandedCount >= normalizedRangeSize;
+	return {
+		fromStart: renderAll ? normalizedRangeSize : fromStart,
+		fromEnd: renderAll ? 0 : fromEnd,
+		rangeSize: normalizedRangeSize,
+		collapsedLines: Math.max(normalizedRangeSize - expandedCount, 0),
+		renderAll
+	};
+}
+
 //#endregion
 //#region src/utils/iterateOverDiff.ts
 function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
@@ -772,14 +804,26 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		const hunk = diff.hunks[hunkIndex];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk index");
 		if (state.shouldBreak()) break;
-		const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, hunkIndex, collapsedContextThreshold);
+		const leadingRegion = getExpandedRegion({
+			isPartial: diff.isPartial,
+			rangeSize: hunk.collapsedBefore,
+			expandedHunks,
+			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(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length, collapsedContextThreshold);
+			return getExpandedRegion({
+				isPartial: diff.isPartial,
+				rangeSize: trailingRangeSize,
+				expandedHunks,
+				hunkIndex: diff.hunks.length,
+				collapsedContextThreshold
+			});
 		})();
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
@@ -1063,13 +1107,25 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 	for (let index = 0; index < diff.hunks.length; index++) {
 		const hunk = diff.hunks[index];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk summary index");
-		const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, index, collapsedContextThreshold);
+		const leadingRegion = getExpandedRegion({
+			isPartial: diff.isPartial,
+			rangeSize: hunk.collapsedBefore,
+			expandedHunks,
+			hunkIndex: index,
+			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(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length, collapsedContextThreshold);
+			const trailingRegion = getExpandedRegion({
+				isPartial: diff.isPartial,
+				rangeSize: trailingRangeSize,
+				expandedHunks,
+				hunkIndex: diff.hunks.length,
+				collapsedContextThreshold
+			});
 			const trailingCount = trailingRegion.fromStart + trailingRegion.fromEnd;
 			splitCount += trailingCount;
 			unifiedCount += trailingCount;
@@ -1107,32 +1163,6 @@ function getTrailingRangeSize(diff, hunk) {
 	if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
 	return Math.min(additionRemaining, deletionRemaining);
 }
-function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold) {
-	rangeSize = Math.max(rangeSize, 0);
-	if (rangeSize === 0 || isPartial) return {
-		fromStart: 0,
-		fromEnd: 0,
-		rangeSize,
-		collapsedLines: Math.max(rangeSize, 0)
-	};
-	if (expandedHunks === true || rangeSize <= collapsedContextThreshold) return {
-		fromStart: rangeSize,
-		fromEnd: 0,
-		rangeSize,
-		collapsedLines: 0
-	};
-	const region = expandedHunks?.get(hunkIndex);
-	const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), rangeSize);
-	const fromEnd = Math.min(Math.max(region?.fromEnd ?? 0, 0), rangeSize);
-	const expandedCount = fromStart + fromEnd;
-	const renderAll = expandedCount >= rangeSize;
-	return {
-		fromStart: renderAll ? rangeSize : fromStart,
-		fromEnd: renderAll ? 0 : fromEnd,
-		rangeSize,
-		collapsedLines: Math.max(rangeSize - expandedCount, 0)
-	};
-}
 function hasFinalCollapsedHunk(diff) {
 	const lastHunk = diff.hunks.at(-1);
 	if (lastHunk == null || diff.isPartial || diff.additionLines.length === 0 || diff.deletionLines.length === 0) return false;