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

package/dist/components/FileDiff.js

@@ -18,6 +18,9 @@ import { upsertHostThemeStyle } from "../utils/hostTheme.js";
 import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
 import "./web-components.js";
+import { awaitWithTimeout } from "../utils/awaitWithTimeout.js";
+import { getDiffFileInput } from "../utils/getDiffFileInput.js";
+import { hydratePartialDiff } from "../utils/hydratePartialDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { ScrollSyncManager } from "../managers/ScrollSyncManager.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
@@ -27,6 +30,9 @@ import { areHunkDataEqual } from "../utils/areHunkDataEqual.js";
 import { getDiffHunksRendererOptions } from "../utils/getDiffHunksRendererOptions.js";
 import { toHtml } from "hast-util-to-html";
 //#region src/components/FileDiff.ts
+function canHydrateDiff(fileDiff) {
+	return fileDiff.isPartial && (fileDiff.type === "change" || fileDiff.type === "rename-changed" || fileDiff.type === "rename-pure");
+}
 let instanceId = -1;
 var FileDiff = class {
 	options;
@@ -68,6 +74,7 @@ var FileDiff = class {
 	additionFile;
 	fileDiff;
 	renderRange;
+	pendingFiles;
 	appliedPreAttributes;
 	lastRenderedHeaderHTML;
 	cachedHeaderHTML;
@@ -75,7 +82,8 @@ var FileDiff = class {
 	mounted = false;
 	enabled = true;
 	editor;
-	fastRefreshTimeout;
+	refreshViewTimeout;
+	deferSetSelection;
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.workerManager = workerManager;
@@ -97,7 +105,7 @@ var FileDiff = class {
 		return new DiffHunksRenderer(this.getHunksRendererOptions(options), this.handleHighlightRender, this.workerManager);
 	}
 	getLineIndex = (lineNumber, side = "additions") => {
-		const fileDiff = this.hunksRenderer.getRenderDiff() ?? this.fileDiff;
+		const fileDiff = this.hunksRenderer.getDiffCache() ?? this.fileDiff;
 		if (fileDiff == null) return;
 		const lastHunk = fileDiff.hunks.at(-1);
 		let targetUnifiedIndex;
@@ -192,7 +200,8 @@ var FileDiff = class {
 		return true;
 	}
 	setSelectedLines(range, options) {
-		this.interactionManager.setSelection(range, options);
+		if (this.refreshViewTimeout != null) this.deferSetSelection = [range, options];
+		else this.interactionManager.setSelection(range, options);
 	}
 	flushManagers() {
 		if (!this.managersDirty || this.pre == null) {
@@ -214,6 +223,7 @@ var FileDiff = class {
 		this.managersDirty = false;
 		this.workerManager?.unsubscribeToThemeChanges(this);
 		this.renderRange = void 0;
+		this.pendingFiles = void 0;
 		if (!this.isContainerManaged) this.fileContainer?.remove();
 		this.fileContainer = void 0;
 		this.mounted = false;
@@ -256,17 +266,21 @@ var FileDiff = class {
 		this.enabled = false;
 		this.editor?.cleanUp();
 		this.editor = void 0;
-		if (this.fastRefreshTimeout != null) {
-			clearTimeout(this.fastRefreshTimeout);
-			this.fastRefreshTimeout = void 0;
+		if (this.refreshViewTimeout != null) {
+			clearTimeout(this.refreshViewTimeout);
+			this.refreshViewTimeout = void 0;
 		}
 	}
 	virtualizedSetup() {
 		this.enabled = true;
 		this.workerManager?.subscribeToThemeChanges(this);
 	}
-	hydrate(props) {
-		const { fileContainer, prerenderedHTML, preventEmit = false, lineAnnotations, oldFile, newFile, fileDiff } = props;
+	hydrate({ fileContainer, prerenderedHTML, preventEmit = false, lineAnnotations, fileDiff, ...fileInputProps }) {
+		if (!this.enabled) throw new Error("FileDiff.hydrate: attempting to call hydrate after cleaned up");
+		if (this.fileContainer != null) throw new Error("FileDiff.hydrate: hydrate can only be called before the instance has rendered or hydrated");
+		const fileInput = getDiffFileInput(fileInputProps, "FileDiff.hydrate");
+		const oldFile = fileInput?.oldFile;
+		const newFile = fileInput?.newFile;
 		this.hydrateElements(fileContainer, prerenderedHTML);
 		if (shouldRenderCode(this.pre, hasDiffContent({
 			fileDiff,
@@ -277,14 +291,16 @@ var FileDiff = class {
 			oldFile,
 			newFile
 		}), this.options.disableFileHeader)) this.render({
-			...props,
+			...fileInputProps,
+			fileContainer,
+			lineAnnotations,
+			fileDiff,
 			preventEmit: true
 		});
 		else this.hydrationSetup({
 			fileDiff,
-			oldFile,
-			newFile,
-			lineAnnotations
+			lineAnnotations,
+			...fileInput
 		});
 		if (!preventEmit) this.emitPostRender();
 	}
@@ -332,7 +348,7 @@ var FileDiff = class {
 		this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
 		this.additionFile = newFile;
 		this.deletionFile = oldFile;
-		this.fileDiff = fileDiff ?? (oldFile != null && newFile != null ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
+		this.fileDiff = fileDiff ?? (oldFile !== void 0 && newFile !== void 0 ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
 		if (this.pre == null) return;
 		this.syncInteractionOptions();
 		this.hunksRenderer.hydrate(this.fileDiff);
@@ -358,30 +374,73 @@ var FileDiff = class {
 	};
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
 		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
+		this.loadFilesIfNecessary();
 		this.rerender();
 	};
-	render({ oldFile, newFile, fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange }) {
+	loadFilesIfNecessary() {
+		const { fileDiff, options: { loadDiffFiles } } = this;
+		if (fileDiff == null || loadDiffFiles == null || !canHydrateDiff(fileDiff) || this.pendingFiles?.fileDiff === fileDiff) return;
+		this.pendingFiles = {
+			fileDiff,
+			promise: this.loadFilesForDiff(fileDiff, loadDiffFiles)
+		};
+	}
+	async loadFilesForDiff(fileDiff, loadDiffFiles) {
+		try {
+			const files = await loadDiffFiles(fileDiff);
+			if (!this.enabled || this.fileDiff !== fileDiff) return;
+			await this.handleFilesLoaded(fileDiff, files);
+		} catch (error) {
+			if (this.options.disableErrorHandling === true) throw error;
+			console.error(error);
+		} finally {
+			if (this.pendingFiles?.fileDiff === fileDiff) this.pendingFiles = void 0;
+		}
+	}
+	async handleFilesLoaded(expectedDiff, files) {
+		if (this.fileDiff !== expectedDiff || !expectedDiff.isPartial) return;
+		hydratePartialDiff("merge", expectedDiff, files);
+		this.setHydratedState(files);
+		await awaitWithTimeout(() => this.primeHighlightCache(expectedDiff));
+		if (!this.enabled || this.fileDiff !== expectedDiff) return;
+		this.rerender();
+	}
+	setHydratedState(files) {
+		this.deletionFile = files.oldFile;
+		this.additionFile = files.newFile;
+		this.workerManager?.cleanUpTasks(this.hunksRenderer);
+		this.hunksRenderer.clearRenderCache();
+	}
+	render({ fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange, ...fileInputProps }) {
+		const fileInput = getDiffFileInput(fileInputProps, "FileDiff.render");
+		const oldFile = fileInput?.oldFile;
+		const newFile = fileInput?.newFile;
 		if (!this.enabled) throw new Error("FileDiff.render: attempting to call render after cleaned up");
-		this.editor?.__postponeBackgroundTokenizeToNextFrame();
-		const { collapsed = false, themeType = "system" } = this.options;
+		if (fileDiff != null && fileDiff.cacheKey === void 0) fileDiff.cacheKey = fileDiff.prevName != null ? fileDiff.prevName + ":" + fileDiff.name : fileDiff.name;
+		this.editor?.__postponeBgTokenizeToNextFrame();
+		const { collapsed = false, themeType = "system", expandUnchanged = false } = this.options;
 		const nextRenderRange = collapsed ? void 0 : renderRange;
 		const themeChanged = this.hasThemeChanged();
-		const filesDidChange = oldFile != null && newFile != null && (!areFilesEqual(oldFile, this.deletionFile) || !areFilesEqual(newFile, this.additionFile));
+		const hasFileInput = fileInput != null;
+		const filesDidChange = hasFileInput && (!areOptionalFilesEqual(oldFile, this.deletionFile) || !areOptionalFilesEqual(newFile, this.additionFile));
 		let diffDidChange = fileDiff != null && fileDiff !== this.fileDiff;
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.lineAnnotations.length > 0) ? lineAnnotations !== this.lineAnnotations : false;
 		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && fileDiff === this.fileDiff || fileDiff == null && !filesDidChange)) return this.applyCachedThemeState(themeType);
+		let nextParsedFileDiff;
+		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { renderRange: previousRenderRange } = this;
 		this.renderRange = nextRenderRange;
 		this.deletionFile = oldFile;
 		this.additionFile = newFile;
 		if (fileDiff != null) this.fileDiff = fileDiff;
-		else if (oldFile != null && newFile != null && filesDidChange) {
+		else if (nextParsedFileDiff != null) {
 			diffDidChange = true;
-			this.fileDiff = parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions);
+			this.fileDiff = nextParsedFileDiff;
 		}
 		if (diffDidChange) this.cachedHeaderHTML = void 0;
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
 		if (this.fileDiff == null) return false;
+		if (expandUnchanged) this.loadFilesIfNecessary();
 		this.hunksRenderer.setOptions(this.getHunksRendererOptions(this.options));
 		this.syncInteractionOptions();
 		this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
@@ -465,7 +524,7 @@ var FileDiff = class {
 	syncRenderViewToEditor() {
 		const editor = this.editor;
 		const fileContainer = this.fileContainer;
-		const fileDiff = this.fileDiff;
+		const fileDiff = this.hunksRenderer.getDiffCache() ?? this.fileDiff;
 		if (editor != null && fileContainer != null && fileDiff != null && !fileDiff.isPartial) this.hunksRenderer.initializeHighlighter().then((highlighter) => {
 			editor.__syncRenderView(highlighter, fileContainer, fileDiff, this.lineAnnotations, this.renderRange);
 		});
@@ -482,32 +541,34 @@ var FileDiff = class {
 	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
 		this.hunksRenderer.applyDocumentChange(textDocument);
-		const renderDiff = this.hunksRenderer.getRenderDiff();
-		if (renderDiff != null) this.fileDiff = renderDiff;
-		this.rerender();
-		this.interactionManager.setSelectionDirty();
+		const fileDiff = this.hunksRenderer.getDiffCache();
+		if (fileDiff != null) {
+			const cacheKey = this.fileDiff?.cacheKey;
+			if (cacheKey != null && fileDiff.cacheKey == null) fileDiff.cacheKey = cacheKey;
+			this.fileDiff = fileDiff;
+		}
 		if (newLineAnnotations !== void 0 && newLineAnnotations !== this.lineAnnotations) {
 			this.setLineAnnotations(newLineAnnotations);
 			this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
 			this.renderAnnotations();
 		}
-	}
-	rerenderFromDocument(textDocument) {
-		this.hunksRenderer.applyDocumentChange(textDocument);
-		const renderDiff = this.hunksRenderer.getRenderDiff();
-		if (renderDiff != null) this.fileDiff = renderDiff;
-		this.hunksRenderer.clearRenderCache();
 		this.rerender();
+		this.interactionManager.setSelectionDirty();
 	}
-	updateRenderCache(dirtyLines, themeType, shouldRefreshView, skipDiffRecompute) {
-		this.hunksRenderer.updateRenderCache(dirtyLines, themeType, skipDiffRecompute);
-		if (shouldRefreshView === true) if (this.options.diffStyle === "split") {
-			if (this.fastRefreshTimeout != null) clearTimeout(this.fastRefreshTimeout);
-			this.fastRefreshTimeout = setTimeout(() => {
-				this.fastRefreshTimeout = void 0;
-				this.fastRefreshDiffView();
-			}, 100);
-		} else this.refreshDiffView();
+	updateRenderCache(dirtyLines, themeType, shouldRefreshView) {
+		this.hunksRenderer.updateRenderCache(dirtyLines, themeType);
+		if (shouldRefreshView) {
+			if (this.refreshViewTimeout != null) clearTimeout(this.refreshViewTimeout);
+			this.refreshViewTimeout = setTimeout(() => {
+				this.refreshViewTimeout = void 0;
+				if (this.options.diffStyle === "split") this.refreshSplitDiffView();
+				else this.refreshUnifiedDiffView();
+				if (this.deferSetSelection != null) {
+					this.interactionManager.setSelection(...this.deferSetSelection);
+					this.deferSetSelection = void 0;
+				}
+			}, 150);
+		}
 	}
 	removeRenderedCode() {
 		this.resizeManager.cleanUp();
@@ -549,12 +610,14 @@ var FileDiff = class {
 		this.placeHolder.style.setProperty("height", `${height}px`);
 		return true;
 	}
-	primeHighlightCache() {
-		const { fileDiff, workerManager } = this;
-		if (fileDiff == null || workerManager == null || isDiffPlainText(fileDiff)) return;
+	async primeHighlightCache(fileDiff = this.fileDiff) {
+		const { workerManager } = this;
+		if (fileDiff == null || workerManager == null || !workerManager.isWorkingPool() || fileDiff.cacheKey == null || isDiffPlainText(fileDiff)) return;
 		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
 		if (Math.max(fileDiff.additionLines.length, fileDiff.deletionLines.length) > tokenizeMaxLength) return;
-		workerManager.primeDiffHighlightCache(fileDiff);
+		await workerManager.primeDiffHighlightCache(fileDiff).catch((error) => {
+			console.error(error);
+		});
 	}
 	cleanChildNodes() {
 		this.resizeManager.cleanUp();
@@ -1006,7 +1069,7 @@ var FileDiff = class {
 			this.renderPartialColumn(columns[1], additionsAST, insertPosition);
 		} else throw new Error("FileDiff.insertPartialHTML: Invalid argument composition");
 	}
-	fastRefreshDiffView() {
+	refreshSplitDiffView() {
 		if (this.options.diffStyle !== "split") return;
 		const hunksResult = this.hunksRenderer.renderDiff(this.fileDiff, this.renderRange);
 		if (hunksResult == null) return;
@@ -1026,22 +1089,23 @@ var FileDiff = class {
 		applyLineType("deletions", columns[0]);
 		applyLineType("additions", columns[1]);
 	}
-	refreshDiffView() {
+	refreshUnifiedDiffView() {
+		if (this.options.diffStyle !== "unified") return;
 		const hunksResult = this.hunksRenderer.renderDiff(this.fileDiff, this.renderRange);
 		if (hunksResult == null) return;
-		const columns = this.getCodeColumns(this.options.diffStyle ?? "split", this.codeUnified, this.codeDeletions, this.codeAdditions);
-		if (columns == null) return;
-		const render = (type, column) => {
-			if (column == null) return;
-			const ast = this.hunksRenderer.renderCodeAST(type, hunksResult);
-			const gutterChildren = getElementChildren(ast?.[0]);
-			const contentChildren = getElementChildren(ast?.[1]);
-			for (const [el, astChildren] of [[column.gutter, gutterChildren], [column.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
-		};
-		if (Array.isArray(columns)) {
-			render("deletions", columns[0]);
-			render("additions", columns[1]);
-		} else render("unified", columns);
+		const columns = this.getCodeColumns("unified", this.codeUnified, this.codeDeletions, this.codeAdditions);
+		if (columns == null || Array.isArray(columns)) return;
+		const ast = this.hunksRenderer.renderCodeAST("unified", hunksResult);
+		const gutterChildren = getElementChildren(ast?.[0]);
+		const contentChildren = getElementChildren(ast?.[1]);
+		for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
+		if (hunksResult.rowCount !== this.lastRowCount) {
+			this.applyRowSpan("unified", columns, hunksResult.rowCount);
+			this.lastRowCount = hunksResult.rowCount;
+		}
+		this.renderSeparators(hunksResult.hunkData);
+		this.managersDirty = true;
+		this.flushManagers();
 		this.syncRenderViewToEditor();
 	}
 	renderPartialColumn(column, ast, insertPosition) {
@@ -1326,6 +1390,10 @@ var FileDiff = class {
 		this.errorWrapper = void 0;
 	}
 };
+function areOptionalFilesEqual(fileA, fileB) {
+	if (fileA == null || fileB == null) return fileA == null && fileB == null;
+	return areFilesEqual(fileA, fileB);
+}
 function hasDiffContent({ fileDiff, oldFile, newFile }) {
 	return fileDiff != null && fileDiff.hunks.length > 0 || oldFile != null || newFile != null;
 }