@pierre/diffs 1.1.0-beta.8 → 1.1.0

package/dist/renderers/DiffHunksRenderer.js

@@ -1,10 +1,10 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from "../constants.js";
+import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
 import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { areThemesAttached } from "../highlighter/themes/areThemesAttached.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
-import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { createAnnotationElement } from "../utils/createAnnotationElement.js";
 import { createContentColumn } from "../utils/createContentColumn.js";
 import { createFileHeaderElement } from "../utils/createFileHeaderElement.js";
@@ -66,14 +66,14 @@ var DiffHunksRenderer = class {
 		if (this.getOptionsWithDefaults().themeType === themeType) return;
 		this.mergeOptions({ themeType });
 	}
-	expandHunk(index, direction) {
-		const { expansionLineCount } = this.getOptionsWithDefaults();
+	expandHunk(index, direction, expansionLineCount = this.getOptionsWithDefaults().expansionLineCount) {
 		const region = { ...this.expandedHunks.get(index) ?? {
 			fromStart: 0,
 			fromEnd: 0
 		} };
 		if (direction === "up" || direction === "both") region.fromStart += expansionLineCount;
 		if (direction === "down" || direction === "both") region.fromEnd += expansionLineCount;
+		if (this.renderCache?.highlighted !== true) this.renderCache = void 0;
 		this.expandedHunks.set(index, region);
 	}
 	getExpandedHunk(hunkIndex) {
@@ -97,8 +97,18 @@ var DiffHunksRenderer = class {
 			arr.push(annotation);
 		}
 	}
+	getUnifiedLineDecoration({ lineType }) {
+		return { gutterLineType: lineType };
+	}
+	getSplitLineDecoration({ side, type }) {
+		if (type !== "change") return { gutterLineType: type };
+		return { gutterLineType: side === "deletions" ? "change-deletion" : "change-addition" };
+	}
+	createAnnotationElement(span) {
+		return createAnnotationElement(span);
+	}
 	getOptionsWithDefaults() {
-		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, themeType = "system", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
+		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, collapsed = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, themeType = "system", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
 		return {
 			diffIndicators,
 			diffStyle,
@@ -106,6 +116,7 @@ var DiffHunksRenderer = class {
 			disableFileHeader,
 			disableLineNumbers,
 			disableVirtualizationBuffers,
+			collapsed,
 			expandUnchanged,
 			collapsedContextThreshold,
 			expansionLineCount,
@@ -214,7 +225,7 @@ var DiffHunksRenderer = class {
 		const { result } = await this.asyncHighlight(diff);
 		return this.processDiffResult(diff, renderRange, result);
 	}
-	createPreElement(split, totalLines, themeStyles, baseThemeType) {
+	createPreElement(split, totalLines, themeStyles, baseThemeType, customProperties) {
 		const { diffIndicators, disableBackground, disableLineNumbers, overflow, themeType } = this.getOptionsWithDefaults();
 		return createPreElement({
 			type: "diff",
@@ -225,7 +236,8 @@ var DiffHunksRenderer = class {
 			themeStyles,
 			split,
 			themeType: baseThemeType ?? themeType,
-			totalLines
+			totalLines,
+			customProperties
 		});
 	}
 	async asyncHighlight(diff) {
@@ -300,30 +312,35 @@ var DiffHunksRenderer = class {
 			}
 		};
 		const trailingRangeSize = calculateTrailingRangeSize(fileDiff);
-		let pendingSplitSpanSize = 0;
-		let pendingSplitMissing;
-		function pushGutterLineNumber(type, lineType, lineNumber, lineIndex) {
-			context.pushToGutter(type, createGutterItem(lineType, lineNumber, lineIndex));
-		}
-		function flushSplitSpan() {
-			if (diffStyle === "unified") return;
-			if (pendingSplitSpanSize <= 0 || pendingSplitMissing == null) {
-				pendingSplitSpanSize = 0;
-				pendingSplitMissing = void 0;
-				return;
-			}
-			if (pendingSplitMissing === "additions") {
-				context.pushToGutter("additions", createGutterGap(void 0, "buffer", pendingSplitSpanSize));
-				additionsContentAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
-			} else {
-				context.pushToGutter("deletions", createGutterGap(void 0, "buffer", pendingSplitSpanSize));
-				deletionsContentAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+		const pendingSplitContext = {
+			size: 0,
+			side: void 0,
+			increment() {
+				this.size += 1;
+			},
+			flush() {
+				if (diffStyle === "unified") return;
+				if (this.size <= 0 || this.side == null) {
+					this.side = void 0;
+					this.size = 0;
+					return;
+				}
+				if (this.side === "additions") {
+					context.pushToGutter("additions", createGutterGap(void 0, "buffer", this.size));
+					additionsContentAST?.push(createEmptyRowBuffer(this.size));
+				} else {
+					context.pushToGutter("deletions", createGutterGap(void 0, "buffer", this.size));
+					deletionsContentAST?.push(createEmptyRowBuffer(this.size));
+				}
+				this.size = 0;
+				this.side = void 0;
 			}
-			pendingSplitSpanSize = 0;
-			pendingSplitMissing = void 0;
-		}
+		};
+		const pushGutterLineNumber = (type, lineType, lineNumber, lineIndex, gutterProperties) => {
+			context.pushToGutter(type, createGutterItem(lineType, lineNumber, lineIndex, gutterProperties));
+		};
 		function pushSeparators(props) {
-			flushSplitSpan();
+			pendingSplitContext.flush();
 			if (diffStyle === "unified") pushSeparator("unified", props, context);
 			else {
 				pushSeparator("deletions", props, context);
@@ -340,7 +357,7 @@ var DiffHunksRenderer = class {
 			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, additionLine, deletionLine, type }) => {
 				const splitLineIndex = deletionLine != null ? deletionLine.splitLineIndex : additionLine.splitLineIndex;
 				const unifiedLineIndex = additionLine != null ? additionLine.unifiedLineIndex : deletionLine.unifiedLineIndex;
-				if (diffStyle === "split" && type !== "change") flushSplitSpan();
+				if (diffStyle === "split" && type !== "change") pendingSplitContext.flush();
 				if (collapsedBefore > 0) pushSeparators({
 					hunkIndex,
 					collapsedLines: collapsedBefore,
@@ -351,26 +368,57 @@ var DiffHunksRenderer = class {
 					isExpandable: !fileDiff.isPartial
 				});
 				const lineIndex = diffStyle === "unified" ? unifiedLineIndex : splitLineIndex;
+				const renderedLineContext = {
+					type,
+					hunkIndex,
+					lineIndex,
+					unifiedLineIndex,
+					splitLineIndex,
+					deletionLine,
+					additionLine
+				};
 				if (diffStyle === "unified") {
-					const deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
-					const additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
+					let deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
+					let additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
 					if (deletionLineContent == null && additionLineContent == null) {
 						const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
 						console.error(errorMessage, { file: fileDiff.name });
 						throw new Error(errorMessage);
 					}
-					pushGutterLineNumber("unified", type === "change" ? additionLine != null ? "change-addition" : "change-deletion" : type, additionLine != null ? additionLine.lineNumber : deletionLine.lineNumber, `${unifiedLineIndex},${splitLineIndex}`);
+					const lineType = type === "change" ? additionLine != null ? "change-addition" : "change-deletion" : type;
+					const lineDecoration = this.getUnifiedLineDecoration({
+						type,
+						lineType,
+						additionLineIndex: additionLine?.lineIndex,
+						deletionLineIndex: deletionLine?.lineIndex
+					});
+					pushGutterLineNumber("unified", lineDecoration.gutterLineType, additionLine != null ? additionLine.lineNumber : deletionLine.lineNumber, `${unifiedLineIndex},${splitLineIndex}`, lineDecoration.gutterProperties);
+					if (additionLineContent != null) additionLineContent = withContentProperties(additionLineContent, lineDecoration.contentProperties);
+					else if (deletionLineContent != null) deletionLineContent = withContentProperties(deletionLineContent, lineDecoration.contentProperties);
 					pushLineWithAnnotation({
 						diffStyle: "unified",
 						type,
 						deletionLine: deletionLineContent,
 						additionLine: additionLineContent,
 						unifiedSpan: this.getAnnotations("unified", deletionLine?.lineNumber, additionLine?.lineNumber, hunkIndex, lineIndex),
+						createAnnotationElement: (span) => this.createAnnotationElement(span),
 						context
 					});
+					const inlineRows = this.getUnifiedInlineRowsForLine?.(renderedLineContext);
+					if (inlineRows != null) pushUnifiedInlineRows(inlineRows, context);
 				} else {
-					const deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
-					const additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
+					let deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
+					let additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
+					const deletionLineDecoration = this.getSplitLineDecoration({
+						side: "deletions",
+						type,
+						lineIndex: deletionLine?.lineIndex
+					});
+					const additionLineDecoration = this.getSplitLineDecoration({
+						side: "additions",
+						type,
+						lineIndex: additionLine?.lineIndex
+					});
 					if (deletionLineContent == null && additionLineContent == null) {
 						const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
 						console.error(errorMessage, { file: fileDiff.name });
@@ -383,22 +431,33 @@ var DiffHunksRenderer = class {
 						}
 					})();
 					if (missingSide != null) {
-						if (pendingSplitMissing != null && pendingSplitMissing !== missingSide) throw new Error("DiffHunksRenderer.processDiffResult: iterateOverDiff, invalid pending splits");
-						pendingSplitMissing = missingSide;
-						pendingSplitSpanSize++;
+						if (pendingSplitContext.side != null && pendingSplitContext.side !== missingSide) throw new Error("DiffHunksRenderer.processDiffResult: iterateOverDiff, invalid pending splits");
+						pendingSplitContext.side = missingSide;
+						pendingSplitContext.increment();
 					}
 					const annotationSpans = this.getAnnotations("split", deletionLine?.lineNumber, additionLine?.lineNumber, hunkIndex, lineIndex);
-					if (annotationSpans != null && pendingSplitSpanSize > 0) flushSplitSpan();
-					if (deletionLine != null) pushGutterLineNumber("deletions", type === "change" ? "change-deletion" : type, deletionLine.lineNumber, `${deletionLine.unifiedLineIndex},${splitLineIndex}`);
-					if (additionLine != null) pushGutterLineNumber("additions", type === "change" ? "change-addition" : type, additionLine.lineNumber, `${additionLine.unifiedLineIndex},${splitLineIndex}`);
+					if (annotationSpans != null && pendingSplitContext.size > 0) pendingSplitContext.flush();
+					if (deletionLine != null) {
+						const deletionLineDecorated = withContentProperties(deletionLineContent, deletionLineDecoration.contentProperties);
+						pushGutterLineNumber("deletions", deletionLineDecoration.gutterLineType, deletionLine.lineNumber, `${deletionLine.unifiedLineIndex},${splitLineIndex}`, deletionLineDecoration.gutterProperties);
+						if (deletionLineDecorated != null) deletionLineContent = deletionLineDecorated;
+					}
+					if (additionLine != null) {
+						const additionLineDecorated = withContentProperties(additionLineContent, additionLineDecoration.contentProperties);
+						pushGutterLineNumber("additions", additionLineDecoration.gutterLineType, additionLine.lineNumber, `${additionLine.unifiedLineIndex},${splitLineIndex}`, additionLineDecoration.gutterProperties);
+						if (additionLineDecorated != null) additionLineContent = additionLineDecorated;
+					}
 					pushLineWithAnnotation({
 						diffStyle: "split",
 						type,
 						additionLine: additionLineContent,
 						deletionLine: deletionLineContent,
 						...annotationSpans,
+						createAnnotationElement: (span) => this.createAnnotationElement(span),
 						context
 					});
+					const inlineRows = this.getSplitInlineRowsForLine?.(renderedLineContext);
+					if (inlineRows != null) pushSplitInlineRows(inlineRows, context, pendingSplitContext);
 				}
 				const noEOFCRDeletion = deletionLine?.noEOFCR ?? false;
 				const noEOFCRAddition = additionLine?.noEOFCR ?? false;
@@ -445,7 +504,7 @@ var DiffHunksRenderer = class {
 				context.incrementRowCount(1);
 			}
 		});
-		if (diffStyle === "split") flushSplitSpan();
+		if (diffStyle === "split") pendingSplitContext.flush();
 		const totalLines = Math.max(getTotalLineCountFromHunks(fileDiff.hunks), fileDiff.additionLines.length ?? 0, fileDiff.deletionLines.length ?? 0);
 		const hasBuffer = renderRange.bufferBefore > 0 || renderRange.bufferAfter > 0;
 		const shouldIncludeAdditions = !unified && fileDiff.type !== "deleted";
@@ -483,6 +542,7 @@ var DiffHunksRenderer = class {
 		return [gutter, createContentColumn(contentAST, result.rowCount)];
 	}
 	renderFullAST(result, children = []) {
+		const containerSize = this.getOptionsWithDefaults().hunkSeparators === "line-info";
 		const unifiedAST = this.renderCodeAST("unified", result);
 		if (unifiedAST != null) {
 			children.push(createHastElement({
@@ -490,6 +550,7 @@ var DiffHunksRenderer = class {
 				children: unifiedAST,
 				properties: {
 					"data-code": "",
+					"data-container-size": containerSize ? "" : void 0,
 					"data-unified": ""
 				}
 			}));
@@ -504,6 +565,7 @@ var DiffHunksRenderer = class {
 			children: deletionsAST,
 			properties: {
 				"data-code": "",
+				"data-container-size": containerSize ? "" : void 0,
 				"data-deletions": ""
 			}
 		}));
@@ -513,6 +575,7 @@ var DiffHunksRenderer = class {
 			children: additionsAST,
 			properties: {
 				"data-code": "",
+				"data-container-size": containerSize ? "" : void 0,
 				"data-additions": ""
 			}
 		}));
@@ -531,6 +594,7 @@ var DiffHunksRenderer = class {
 			children,
 			properties: {
 				"data-code": "",
+				"data-container-size": this.getOptionsWithDefaults().hunkSeparators === "line-info" ? "" : void 0,
 				[`data-${columnType}`]: ""
 			}
 		}));
@@ -575,14 +639,41 @@ function areRenderOptionsEqual(optionsA, optionsB) {
 function getModifiedLinesString(lines) {
 	return `${lines} unmodified line${lines > 1 ? "s" : ""}`;
 }
-function pushLineWithAnnotation({ diffStyle, type, deletionLine, additionLine, unifiedSpan, deletionSpan, additionSpan, context }) {
+function pushUnifiedInlineRows(rows, context) {
+	for (const row of rows) {
+		context.unifiedContentAST.push(row.content);
+		context.pushToGutter("unified", row.gutter);
+		context.incrementRowCount(1);
+	}
+}
+function pushSplitInlineRows(rows, context, pendingSplitContext) {
+	for (const { deletion, addition } of rows) {
+		if (deletion == null && addition == null) continue;
+		const missingSide = deletion != null && addition != null ? void 0 : deletion == null ? "deletions" : "additions";
+		if (missingSide == null || pendingSplitContext.side !== missingSide) pendingSplitContext.flush();
+		if (deletion != null) {
+			context.deletionsContentAST.push(deletion.content);
+			context.pushToGutter("deletions", deletion.gutter);
+		}
+		if (addition != null) {
+			context.additionsContentAST.push(addition.content);
+			context.pushToGutter("additions", addition.gutter);
+		}
+		if (missingSide != null) {
+			pendingSplitContext.side = missingSide;
+			pendingSplitContext.increment();
+		}
+		context.incrementRowCount(1);
+	}
+}
+function pushLineWithAnnotation({ diffStyle, type, deletionLine, additionLine, unifiedSpan, deletionSpan, additionSpan, createAnnotationElement: createAnnotationElement$1, context }) {
 	let hasAnnotationRow = false;
 	if (diffStyle === "unified") {
 		if (additionLine != null) context.unifiedContentAST.push(additionLine);
 		else if (deletionLine != null) context.unifiedContentAST.push(deletionLine);
 		if (unifiedSpan != null) {
 			const lineType = type === "change" ? deletionLine != null ? "change-deletion" : "change-addition" : type;
-			context.unifiedContentAST.push(createAnnotationElement(unifiedSpan));
+			context.unifiedContentAST.push(createAnnotationElement$1(unifiedSpan));
 			context.pushToGutter("unified", createGutterGap(lineType, "annotation", 1));
 			hasAnnotationRow = true;
 		}
@@ -591,13 +682,13 @@ function pushLineWithAnnotation({ diffStyle, type, deletionLine, additionLine, u
 		if (additionLine != null) context.additionsContentAST.push(additionLine);
 		if (deletionSpan != null) {
 			const lineType = type === "change" ? deletionLine != null ? "change-deletion" : "context" : type;
-			context.deletionsContentAST.push(createAnnotationElement(deletionSpan));
+			context.deletionsContentAST.push(createAnnotationElement$1(deletionSpan));
 			context.pushToGutter("deletions", createGutterGap(lineType, "annotation", 1));
 			hasAnnotationRow = true;
 		}
 		if (additionSpan != null) {
 			const lineType = type === "change" ? additionLine != null ? "change-addition" : "context" : type;
-			context.additionsContentAST.push(createAnnotationElement(additionSpan));
+			context.additionsContentAST.push(createAnnotationElement$1(additionSpan));
 			context.pushToGutter("additions", createGutterGap(lineType, "annotation", 1));
 			hasAnnotationRow = true;
 		}
@@ -675,6 +766,16 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 		} : void 0
 	});
 }
+function withContentProperties(lineNode, contentProperties) {
+	if (lineNode == null || lineNode.type !== "element" || contentProperties == null) return lineNode;
+	return {
+		...lineNode,
+		properties: {
+			...lineNode.properties,
+			...contentProperties
+		}
+	};
+}
 function calculateTrailingRangeSize(fileDiff) {
 	const lastHunk = fileDiff.hunks.at(-1);
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;