@pierre/diffs 1.3.0-beta.4 → 1.3.0-beta.6

package/dist/components/VirtualizedFileDiff.js

@@ -1,14 +1,14 @@
-import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
+import "../constants.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
 import { areOptionsEqual } from "../utils/areOptionsEqual.js";
 import { computeVirtualFileMetrics, getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
+import { FILE_ANNOTATION_DOM_KEY, includesFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
 import { getExpandedRegion, getLeadingHunkSeparatorLayout, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout } from "../utils/virtualDiffLayout.js";
 import { computeEstimatedDiffHeights } from "../utils/computeEstimatedDiffHeights.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { FileDiff } from "./FileDiff.js";
-
 //#region src/components/VirtualizedFileDiff.ts
 const LAYOUT_CHECKPOINT_INTERVAL = 5e3;
 let instanceId = -1;
@@ -23,7 +23,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 		estimatedSplitHeight: void 0,
 		estimatedUnifiedHeight: void 0,
 		checkpoints: [],
-		totalLines: 0
+		totalLines: 0,
+		fileAnnotationHeight: 0
 	};
 	isVisible = false;
 	isSetup = false;
@@ -42,6 +43,30 @@ var VirtualizedFileDiff = class extends FileDiff {
 		this.metrics = nextMetrics;
 		this.resetLayoutCache({ includeEstimatedHeights: true });
 	}
+	setLineAnnotations(lineAnnotations) {
+		if (this.syncLineAnnotations(lineAnnotations)) this.resetLayoutCache({ includeEstimatedHeights: false });
+	}
+	syncLineAnnotations(lineAnnotations) {
+		if (lineAnnotations == null || lineAnnotations === this.lineAnnotations || lineAnnotations.length === 0 && this.lineAnnotations.length === 0) return false;
+		super.setLineAnnotations(lineAnnotations);
+		return true;
+	}
+	setFileAnnotationHeight(nextHeight) {
+		const previousHeight = this.cache.fileAnnotationHeight;
+		if (nextHeight === previousHeight) return false;
+		this.cache.fileAnnotationHeight = nextHeight;
+		this.cache.measuredHeightDeltaTotal += nextHeight - previousHeight;
+		return true;
+	}
+	hasFileAnnotations(fileDiff = this.fileDiff) {
+		if (fileDiff == null || !includesFileAnnotations(this.lineAnnotations)) return false;
+		return this.lineAnnotations.some((annotation) => {
+			if (annotation.lineNumber !== 0) return false;
+			if (fileDiff.type === "new") return annotation.side === "additions";
+			if (fileDiff.type === "deleted") return annotation.side === "deletions";
+			return true;
+		});
+	}
 	getLineHeight(lineIndex, hasMetadataLine = false) {
 		return this.getEstimatedLineHeight(hasMetadataLine) + (this.cache.heightDeltas.get(lineIndex) ?? 0);
 	}
@@ -69,6 +94,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	resetLayoutCache({ forceSimpleRecompute = false, includeEstimatedHeights = false } = {}) {
 		this.layoutDirty = true;
+		this.cache.fileAnnotationHeight = 0;
 		if (this.cache.heightDeltas.size > 0) this.cache.heightDeltas.clear();
 		if (this.cache.measuredHeightDeltaTotal !== 0) this.cache.measuredHeightDeltaTotal = 0;
 		if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
@@ -92,6 +118,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (overflow === "scroll" && this.lineAnnotations.length === 0 && !this.isResizeDebuggingEnabled()) return hasHeightChange;
 		const diffStyle = this.getDiffStyle();
 		const codeGroups = diffStyle === "split" ? [this.codeDeletions, this.codeAdditions] : [this.codeUnified];
+		const hasFileAnnotations = this.hasFileAnnotations(this.fileDiff);
+		if (this.renderRange != null && hasFileAnnotations && shouldRenderFileAnnotations(this.renderRange)) {
+			const nextFileAnnotationHeight = measureFileAnnotationHeight(codeGroups) ?? 0;
+			if (this.setFileAnnotationHeight(nextFileAnnotationHeight)) hasHeightChange = true;
+		} else if (!hasFileAnnotations && this.setFileAnnotationHeight(0)) hasHeightChange = true;
 		for (const codeGroup of codeGroups) {
 			if (codeGroup == null) continue;
 			const content = codeGroup.children[1];
@@ -125,9 +156,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (dirty) this.top = this.getVirtualizedTop();
 		return this.render();
 	};
-	prepareCodeViewItem(fileDiff, top, reset) {
+	prepareCodeViewItem(fileDiff, top, reset, lineAnnotations) {
 		const targetChanged = !areDiffTargetsEqual(this.fileDiff, fileDiff);
-		let shouldResetLayoutCache = reset?.resetDiffLayoutCache === true || targetChanged;
+		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
+		let shouldResetLayoutCache = reset?.resetDiffLayoutCache === true || targetChanged || annotationsChanged;
 		let includeEstimatedHeights = targetChanged || reset?.resetDiffLayoutCache === true && reset.includeEstimatedDiffHeights;
 		if (reset?.metrics != null) {
 			this.metrics = computeVirtualFileMetrics(reset.metrics);
@@ -146,18 +178,19 @@ var VirtualizedFileDiff = class extends FileDiff {
 		return this.height;
 	}
 	getLinePosition(lineNumber, side = "additions") {
-		if (this.fileDiff == null) return;
+		if (this.fileDiff == null || lineNumber < 1) return;
 		const targetLineIndexes = this.getLineIndex(lineNumber, side);
 		if (targetLineIndexes == null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = 1 } = this.options;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
 		const targetLineIndex = diffStyle === "split" ? targetLineIndexes[1] : targetLineIndexes[0];
 		this.approximateLayoutCheckpoints();
+		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const checkpoint = this.getLayoutCheckpointBeforeLineIndex(targetLineIndex);
-		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = checkpoint?.top ?? headerRegion + this.cache.fileAnnotationHeight;
 		if (collapsed) return {
-			top,
+			top: headerRegion,
 			height: 0
 		};
 		let position;
@@ -221,13 +254,13 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	getNumericScrollAnchor(localViewportTop) {
 		if (this.fileDiff == null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = 1 } = this.options;
 		if (collapsed) return;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
 		this.approximateLayoutCheckpoints();
 		const checkpoint = this.getLayoutCheckpointBeforeTop(localViewportTop);
-		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader) + this.cache.fileAnnotationHeight;
 		let anchor;
 		iterateOverDiff({
 			diff: this.fileDiff,
@@ -374,7 +407,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			return;
 		}
 		if (this.cache.estimatedSplitHeight != null && this.cache.estimatedUnifiedHeight != null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const { splitHeight, unifiedHeight } = computeEstimatedDiffHeights({
 			fileDiff: this.fileDiff,
 			metrics: this.metrics,
@@ -397,9 +430,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 		});
 		else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
 	}
-	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false,...props } = {}) {
+	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false, lineAnnotations, ...props } = {}) {
 		const { forceRenderOverride, isSetup } = this;
 		this.forceRenderOverride = void 0;
+		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
+		if (annotationsChanged) this.resetLayoutCache({ includeEstimatedHeights: false });
 		this.fileDiff ??= fileDiff ?? (oldFile != null && newFile != null ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
 		fileContainer = this.getOrCreateFileContainer(fileContainer);
 		if (this.fileDiff == null) {
@@ -428,7 +463,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 			renderRange,
 			oldFile,
 			newFile,
-			forceRender: forceRenderOverride ?? forceRender,
+			lineAnnotations,
+			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged,
 			...props
 		});
 	}
@@ -462,13 +498,13 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	approximateLayoutCheckpoints() {
 		if (this.cache.checkpoints.length > 0 || this.fileDiff == null || this.fileDiff.hunks.length === 0 || this.options.collapsed === true) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const finalHunkIndex = this.fileDiff.hunks.length - 1;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
 		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
 		const heightDeltaPrefix = createHeightDeltaPrefix(this.cache.heightDeltas);
-		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader) + this.cache.fileAnnotationHeight;
 		let renderedLineIndex = 0;
 		const processRows = ({ rowCount, startLineIndex, preSeparatorHeight = 0, postSeparatorHeight = 0, metadataOffsets = [] }) => {
 			if (rowCount <= 0) return;
@@ -590,7 +626,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			for (const hunk of fileDiff.hunks) count += diffStyle === "split" ? hunk.splitLineCount : hunk.unifiedLineCount;
 			return count;
 		}
-		const { expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
 		for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
 			const hunkCount = diffStyle === "split" ? hunk.splitLineCount : hunk.unifiedLineCount;
@@ -616,7 +652,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		return count;
 	}
 	computeRenderRangeFromWindow(fileDiff, fileTop, { top, bottom }) {
-		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const { hunkLineCount, lineHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
@@ -624,6 +660,12 @@ var VirtualizedFileDiff = class extends FileDiff {
 		let lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : this.getExpandedLineCount(fileDiff, diffStyle);
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const paddingBottom = fileDiff.hunks.length > 0 ? getVirtualFilePaddingBottom(this.metrics) : 0;
+		const { fileAnnotationHeight } = this.cache;
+		const codeRegionTop = headerRegion + fileAnnotationHeight;
+		const codeHeight = Math.max(0, fileHeight - headerRegion - fileAnnotationHeight - paddingBottom);
+		const hasFileAnnotations = this.hasFileAnnotations(fileDiff);
+		const fileAnnotationTop = fileTop + headerRegion;
+		const measuredFileAnnotationVisible = fileAnnotationHeight > 0 && hasFileAnnotations && fileAnnotationTop < bottom && fileAnnotationTop + fileAnnotationHeight > top;
 		if (fileTop < top - fileHeight || fileTop > bottom) return {
 			startingLine: 0,
 			totalLines: 0,
@@ -645,7 +687,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const hunkOffsets = [];
 		const viewportCenter = (top + bottom) / 2;
 		const checkpoint = this.getLayoutCheckpointBeforeTop(Math.max(0, top - fileTop - totalLines * lineHeight * 2), hunkLineCount);
-		let absoluteLineTop = fileTop + (checkpoint?.top ?? headerRegion);
+		let absoluteLineTop = fileTop + (checkpoint?.top ?? codeRegionTop);
 		let currentLine = checkpoint?.renderedLineIndex ?? 0;
 		let firstVisibleHunk;
 		let centerHunk;
@@ -670,18 +712,18 @@ var VirtualizedFileDiff = class extends FileDiff {
 				const isAtHunkBoundary = currentLine % hunkLineCount === 0;
 				const currentHunk = Math.floor(currentLine / hunkLineCount);
 				if (isAtHunkBoundary) {
-					hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + headerRegion + gapAdjustment);
+					hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + codeRegionTop + gapAdjustment);
 					if (overflowCounter != null) {
 						if (overflowCounter <= 0) return true;
 						overflowCounter--;
 					}
 				}
-				const lineHeight$1 = this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
-				if (absoluteLineTop > top - lineHeight$1 && absoluteLineTop < bottom) firstVisibleHunk ??= currentHunk;
-				if (centerHunk == null && absoluteLineTop + lineHeight$1 > viewportCenter) centerHunk = currentHunk;
+				const lineHeight = this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
+				if (absoluteLineTop > top - lineHeight && absoluteLineTop < bottom) firstVisibleHunk ??= currentHunk;
+				if (centerHunk == null && absoluteLineTop + lineHeight > viewportCenter) centerHunk = currentHunk;
 				if (overflowCounter == null && absoluteLineTop >= bottom && isAtHunkBoundary) overflowCounter = overflowHunks;
 				currentLine++;
-				absoluteLineTop += lineHeight$1;
+				absoluteLineTop += lineHeight;
 				if (collapsedAfter > 0) absoluteLineTop += getTrailingHunkSeparatorLayout({
 					type: hunkSeparators,
 					metrics: this.metrics
@@ -689,7 +731,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 				return false;
 			}
 		});
-		if (firstVisibleHunk == null) return {
+		if (firstVisibleHunk == null) if (measuredFileAnnotationVisible) {
+			firstVisibleHunk = 0;
+			centerHunk = 0;
+		} else return {
 			startingLine: 0,
 			totalLines: 0,
 			bufferBefore: 0,
@@ -701,16 +746,32 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));
 		const startingLine = startHunk * hunkLineCount;
 		const clampedTotalLines = idealStartHunk < 0 ? totalLines + idealStartHunk * hunkLineCount : totalLines;
-		const bufferBefore = hunkOffsets[startHunk] ?? 0;
+		const codeBufferBefore = hunkOffsets[startHunk] ?? 0;
+		const bufferBefore = startingLine === 0 ? 0 : fileAnnotationHeight + codeBufferBefore;
 		const finalHunkIndex = startHunk + clampedTotalLines / hunkLineCount;
+		const bufferAfter = finalHunkIndex < hunkOffsets.length ? codeHeight - hunkOffsets[finalHunkIndex] : codeHeight - (absoluteLineTop - fileTop - codeRegionTop);
 		return {
 			startingLine,
 			totalLines: clampedTotalLines,
 			bufferBefore,
-			bufferAfter: finalHunkIndex < hunkOffsets.length ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - paddingBottom : fileHeight - (absoluteLineTop - fileTop) - paddingBottom
+			bufferAfter: Math.max(0, bufferAfter)
 		};
 	}
 };
+function measureFileAnnotationHeight(codeGroups) {
+	let height;
+	for (const codeGroup of codeGroups) {
+		if (codeGroup == null) continue;
+		const content = codeGroup.children[1];
+		if (!(content instanceof HTMLElement)) continue;
+		for (const child of content.children) {
+			if (!(child instanceof HTMLElement)) continue;
+			if (child.dataset.lineAnnotation !== FILE_ANNOTATION_DOM_KEY) continue;
+			height = Math.max(height ?? 0, child.getBoundingClientRect().height);
+		}
+	}
+	return height;
+}
 function createHeightDeltaPrefix(heightDeltas) {
 	const entries = Array.from(heightDeltas).sort((a, b) => a[0] - b[0]);
 	const lineIndexes = [];
@@ -766,10 +827,10 @@ function getHunkMetadataOffsets({ diffStyle, hunk, rowCount }) {
 	return offsets;
 }
 function hasDiffLayoutOptionChanged(previousOptions, nextOptions) {
-	return (previousOptions.diffStyle ?? "split") !== (nextOptions.diffStyle ?? "split") || (previousOptions.overflow ?? "scroll") !== (nextOptions.overflow ?? "scroll") || (previousOptions.collapsed ?? false) !== (nextOptions.collapsed ?? false) || (previousOptions.disableLineNumbers ?? false) !== (nextOptions.disableLineNumbers ?? false) || (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.diffIndicators ?? "bars") !== (nextOptions.diffIndicators ?? "bars") || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) || previousOptions.unsafeCSS !== nextOptions.unsafeCSS;
+	return (previousOptions.diffStyle ?? "split") !== (nextOptions.diffStyle ?? "split") || (previousOptions.overflow ?? "scroll") !== (nextOptions.overflow ?? "scroll") || (previousOptions.collapsed ?? false) !== (nextOptions.collapsed ?? false) || (previousOptions.disableLineNumbers ?? false) !== (nextOptions.disableLineNumbers ?? false) || (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.diffIndicators ?? "bars") !== (nextOptions.diffIndicators ?? "bars") || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? 1) !== (nextOptions.collapsedContextThreshold ?? 1) || previousOptions.unsafeCSS !== nextOptions.unsafeCSS;
 }
 function hasDiffEstimateOptionChanged(previousOptions, nextOptions) {
-	return (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD);
+	return (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? 1) !== (nextOptions.collapsedContextThreshold ?? 1);
 }
 function getOptionHunkSeparatorType(hunkSeparators) {
 	return typeof hunkSeparators === "function" ? "custom" : hunkSeparators ?? "line-info";
@@ -778,7 +839,7 @@ function parseLineIndex(lineIndexAttr, diffStyle) {
 	const [unifiedIndex, splitIndex] = lineIndexAttr.split(",").map(Number);
 	return diffStyle === "split" ? splitIndex : unifiedIndex;
 }
-
 //#endregion
 export { VirtualizedFileDiff };
+
 //# sourceMappingURL=VirtualizedFileDiff.js.map