@pierre/diffs 1.4.0 → 1.4.2

package/dist/components/FileDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/components/FileDiff.ts"],"mappings":"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"}
+{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/components/FileDiff.ts"],"mappings":"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"}

package/dist/components/FileDiff.js

@@ -1,4 +1,6 @@
 import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_RENDER_RANGE, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
+import { getThemes } from "../utils/getThemes.js";
+import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
@@ -109,9 +111,7 @@ var FileDiff = class {
 	deletionFile;
 	additionFile;
 	fileDiff;
-	editSessionDiff;
-	editSessionAnnotations;
-	outgoingSessionDiff;
+	editSession;
 	renderedDiff;
 	renderRange;
 	pendingFiles;
@@ -143,6 +143,9 @@ var FileDiff = class {
 	handleHighlightRender = () => {
 		this.rerender();
 	};
+	getTheme() {
+		return this.workerManager?.getDiffRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
+	}
 	getHunksRendererOptions(options) {
 		return getDiffHunksRendererOptions(options);
 	}
@@ -181,17 +184,18 @@ var FileDiff = class {
 				}
 				continue;
 			}
-			for (const content of hunk.hunkContent) if (content.type === "context") if (lineNumber < currentLineNumber + content.lines) {
-				const difference = lineNumber - currentLineNumber;
-				targetSplitIndex = splitIndex + difference;
-				targetUnifiedIndex = unifiedIndex + difference;
-				break hunkIterator;
+			for (const content of hunk.hunkContent) if (content.type === "context") {
+				if (lineNumber < currentLineNumber + content.lines) {
+					const difference = lineNumber - currentLineNumber;
+					targetSplitIndex = splitIndex + difference;
+					targetUnifiedIndex = unifiedIndex + difference;
+					break hunkIterator;
+				} else {
+					currentLineNumber += content.lines;
+					splitIndex += content.lines;
+					unifiedIndex += content.lines;
+				}
 			} else {
-				currentLineNumber += content.lines;
-				splitIndex += content.lines;
-				unifiedIndex += content.lines;
-			}
-			else {
 				const sideCount = side === "deletions" ? content.deletions : content.additions;
 				if (lineNumber < currentLineNumber + sideCount) {
 					const indexDifference = lineNumber - currentLineNumber;
@@ -238,24 +242,24 @@ var FileDiff = class {
 		return true;
 	}
 	hasThemeChanged() {
-		return this.appliedThemeCSS != null && !areThemesEqual(this.appliedThemeCSS.theme, this.options.theme ?? DEFAULT_THEMES);
+		return this.appliedThemeCSS != null && !areThemesEqual(this.appliedThemeCSS.theme, this.getTheme());
 	}
 	getHoveredLine = () => {
 		return this.interactionManager.getHoveredLine();
 	};
 	getAnnotationSlotName = (annotation) => {
-		return resolveEditSessionSlotName(this.editSessionAnnotations, annotation, getLineAnnotationName);
+		return resolveEditSessionSlotName(this.editSession?.annotations, annotation, getLineAnnotationName);
 	};
 	getLatestAnnotations() {
-		return this.editSessionAnnotations?.current ?? this.lineAnnotations;
+		return this.editSession?.annotations?.current ?? this.lineAnnotations;
 	}
 	isNewAnnotations(lineAnnotations) {
-		const { editSessionAnnotations: session, lineAnnotations: externalAnnotations } = this;
-		if (lineAnnotations === externalAnnotations) return false;
+		const session = this.editSession?.annotations;
+		if (lineAnnotations === this.lineAnnotations) return false;
 		return session == null || lineAnnotations !== session.provided && lineAnnotations !== session.current;
 	}
 	setLineAnnotations(lineAnnotations) {
-		const { editSessionAnnotations: sessionAnnotations } = this;
+		const sessionAnnotations = this.editSession?.annotations;
 		if (sessionAnnotations == null) {
 			this.lineAnnotations = lineAnnotations;
 			return;
@@ -265,7 +269,7 @@ var FileDiff = class {
 		writeEditSessionAnnotations(sessionAnnotations, lineAnnotations, getLineAnnotationName);
 	}
 	syncEditSessionAnnotationsFromEditor(lineAnnotations) {
-		const { editSessionAnnotations: session } = this;
+		const session = this.editSession?.annotations;
 		if (session == null || lineAnnotations === session.current) return false;
 		session.current = lineAnnotations;
 		this.hunksRenderer.setLineAnnotations(lineAnnotations);
@@ -379,9 +383,7 @@ var FileDiff = class {
 			this.hunksRenderer.cleanUp();
 			this.workerManager = void 0;
 			this.fileDiff = void 0;
-			this.editSessionDiff = void 0;
-			this.editSessionAnnotations = void 0;
-			this.outgoingSessionDiff = void 0;
+			this.editSession = void 0;
 			this.renderedDiff = void 0;
 			this.deletionFile = void 0;
 			this.additionFile = void 0;
@@ -543,28 +545,29 @@ var FileDiff = class {
 		if (expectedDiff.isPartial) throw new Error("FileDiff.startHydratedEditSession: diffs cannot be partial for editing");
 		if (this.fileDiff !== expectedDiff) return false;
 		const { editor } = this;
-		if (this.outgoingSessionDiff != null) {
+		if (this.editSession?.outgoingDiff != null) {
 			this.installEditSession(expectedDiff);
 			return true;
 		}
-		if (editor == null || this.editSessionDiff != null) return false;
+		if (editor == null || this.editSession != null) return false;
 		this.installEditSession(expectedDiff, editor.__getDocumentContents(getAdditionFile(expectedDiff)), editor.__getDocumentSessionState());
 		return true;
 	}
 	updateExternalDiff(incomingExternalDiff, lineAnnotations) {
 		if (areDiffTargetsEqual(this.fileDiff, incomingExternalDiff)) return false;
-		const editSessionDiff = this.outgoingSessionDiff ?? this.editSessionDiff;
+		const outgoingDiff = this.editSession?.outgoingDiff ?? this.editSession?.diff;
 		this.fileDiff = incomingExternalDiff;
-		this.outgoingSessionDiff = void 0;
-		if (editSessionDiff != null) {
-			this.outgoingSessionDiff = editSessionDiff;
+		if (outgoingDiff != null) {
 			if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
 			else this.installEditSession(incomingExternalDiff);
-		} else if (this.editor != null) if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
-		else this.installEditSession(incomingExternalDiff, this.editor.__getDocumentContents(getAdditionFile(incomingExternalDiff)), this.editor.__getDocumentSessionState());
-		if (this.editSessionAnnotations != null && lineAnnotations != null) {
+			if (this.editSession != null) this.editSession.outgoingDiff = outgoingDiff;
+		} else if (this.editor != null) {
+			if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
+			else this.installEditSession(incomingExternalDiff, this.editor.__getDocumentContents(getAdditionFile(incomingExternalDiff)), this.editor.__getDocumentSessionState());
+		}
+		if (this.editSession?.annotations != null && lineAnnotations != null) {
 			this.lineAnnotations = lineAnnotations;
-			this.editSessionAnnotations = adoptEditSessionAnnotations(lineAnnotations, getLineAnnotationName, this.editSessionAnnotations);
+			this.editSession.annotations = adoptEditSessionAnnotations(lineAnnotations, getLineAnnotationName, this.editSession.annotations);
 		}
 		return true;
 	}
@@ -587,7 +590,11 @@ var FileDiff = class {
 			sessionDiff.editSessionDirty = true;
 			recomputeDiffRenderLineCounts(sessionDiff);
 		}
-		this.editSessionDiff = sessionDiff;
+		this.editSession = {
+			diff: sessionDiff,
+			annotations: this.editSession?.annotations ?? adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName),
+			outgoingDiff: this.editSession?.outgoingDiff
+		};
 		this.hunksRenderer.beginEditSession(sessionDiff, usesExternalDocument && !restoreRetainedSession ? externalDiff : void 0);
 	}
 	setHydratedState(files) {
@@ -609,7 +616,11 @@ var FileDiff = class {
 		const filesDidChange = hasFileInput && (!areOptionalFilesEqual(oldFile, this.deletionFile) || !areOptionalFilesEqual(newFile, this.additionFile));
 		let diffDidChange = fileDiff != null && !areDiffTargetsEqual(fileDiff, this.fileDiff);
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.getLatestAnnotations().length > 0) ? this.isNewAnnotations(lineAnnotations) : false;
-		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && !diffDidChange || fileDiff == null && !filesDidChange)) return this.applyCachedThemeState(themeType);
+		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && !diffDidChange || fileDiff == null && !filesDidChange)) {
+			const rendered = this.applyCachedThemeState(themeType);
+			if (rendered) this.finalizeRender();
+			return rendered;
+		}
 		let nextParsedFileDiff;
 		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { renderRange: previousRenderRange } = this;
@@ -664,6 +675,7 @@ var FileDiff = class {
 				console.error(error);
 				if (error instanceof Error) this.applyErrorToDOM(error, fileContainer);
 			}
+			this.finalizeRender();
 			if (!preventEmit) this.emitPostRender();
 			return true;
 		}
@@ -695,6 +707,7 @@ var FileDiff = class {
 			this.renderGutterUtility();
 			this.managersDirty = true;
 			if (!deferManagers) this.flushManagers();
+			this.finalizeRender();
 			if (this.editor != null) this.syncRenderViewToEditor();
 		} catch (error) {
 			if (disableErrorHandling) throw error;
@@ -704,6 +717,7 @@ var FileDiff = class {
 		if (!preventEmit) this.emitPostRender();
 		return true;
 	}
+	finalizeRender() {}
 	emitPostRender(unmount = false) {
 		const { fileContainer, options: { onPostRender } } = this;
 		if (unmount) {
@@ -719,7 +733,7 @@ var FileDiff = class {
 		onPostRender?.(fileContainer, this, phase);
 	}
 	getLatestDiff(fileDiff = this.fileDiff) {
-		return this.editSessionDiff ?? fileDiff;
+		return this.editSession?.diff ?? fileDiff;
 	}
 	getRenderedDiff() {
 		return this.renderedDiff;
@@ -730,12 +744,12 @@ var FileDiff = class {
 		const renderRange = this.computeEditorRenderRange(this.renderRange);
 		const fileDiff = this.getLatestDiff();
 		if (editor == null || fileContainer == null || fileDiff == null || fileDiff.isPartial) return;
-		this.hunksRenderer.initializeHighlighter().then((highlighter) => {
+		const sync = (highlighter) => {
 			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestDiff() !== fileDiff) return;
-			const { outgoingSessionDiff: replacement, fileDiff: externalDiff } = this;
+			const replacement = this.editSession?.outgoingDiff;
+			const externalDiff = this.fileDiff;
 			const externalDocument = replacement != null && externalDiff != null && replacement !== fileDiff;
 			const resetHistory = externalDocument ? shouldResetUndoState(replacement, externalDiff) : false;
-			if (externalDocument) this.outgoingSessionDiff = void 0;
 			editor.__syncRenderView({
 				highlighter,
 				fileContainer,
@@ -745,7 +759,19 @@ var FileDiff = class {
 				externalDocument,
 				resetHistory
 			});
+		};
+		const theme = this.getTheme();
+		const lang = fileDiff.lang ?? getFiletypeFromFileName(fileDiff.name);
+		const highlighter = getHighlighterIfLoaded({
+			theme,
+			lang
 		});
+		if (highlighter != null) sync(highlighter);
+		else getSharedHighlighter({
+			themes: getThemes(theme),
+			langs: ["text", lang],
+			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
+		}).then(sync);
 	}
 	computeEditorRenderRange(renderRange) {
 		const fileDiff = this.getLatestDiff();
@@ -778,9 +804,16 @@ var FileDiff = class {
 			totalLines: lastLineNumber - firstLineNumber + 1
 		};
 	}
-	emitEditChange(event) {
+	/** @internal The editor applied or edited past the pending external replacement. */
+	__acknowledgeDocumentUpdate() {
+		if (this.editSession != null) this.editSession.outgoingDiff = void 0;
+	}
+	/** @internal Settle annotations locally. */
+	__acceptEditorChange(event) {
 		const { lineAnnotations } = event;
 		if (lineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(lineAnnotations);
+	}
+	emitEditChange(event) {
 		const { onEditChange } = this.options;
 		onEditChange?.(event);
 	}
@@ -791,10 +824,10 @@ var FileDiff = class {
 	* When `clone` is true, the returned lines and hunks are copied.
 	*/
 	__captureDocumentSessionState(clone = true) {
-		let { outgoingSessionDiff, fileDiff, editSessionDiff: sessionDiff } = this;
-		if (outgoingSessionDiff != null && fileDiff != null) {
-			if (!fileDiff.isPartial && shouldResetUndoState(outgoingSessionDiff, fileDiff)) return;
-			sessionDiff = outgoingSessionDiff;
+		let { fileDiff, editSession: { diff: sessionDiff, outgoingDiff } = {} } = this;
+		if (outgoingDiff != null && fileDiff != null) {
+			if (!fileDiff.isPartial && shouldResetUndoState(outgoingDiff, fileDiff)) return;
+			sessionDiff = outgoingDiff;
 		}
 		if (sessionDiff == null || sessionDiff.isPartial) return;
 		return {
@@ -831,16 +864,16 @@ var FileDiff = class {
 		this.resumeEditorRendering(editor);
 	}
 	resumeEditorRendering(editor) {
-		this.editSessionAnnotations ??= adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName);
-		const { fileDiff: externalDiff, outgoingSessionDiff: pendingReplacement } = this;
-		if (pendingReplacement != null && externalDiff != null && !externalDiff.isPartial && this.editSessionDiff === pendingReplacement) this.installEditSession(externalDiff);
-		const initialExternalDiff = this.editSessionDiff == null && externalDiff != null && !externalDiff.isPartial ? externalDiff : void 0;
+		const { fileDiff: externalDiff } = this;
+		const pendingReplacement = this.editSession?.outgoingDiff;
+		if (pendingReplacement != null && externalDiff != null && !externalDiff.isPartial && this.editSession?.diff === pendingReplacement) this.installEditSession(externalDiff);
+		const initialExternalDiff = this.editSession == null && externalDiff != null && !externalDiff.isPartial ? externalDiff : void 0;
 		if (initialExternalDiff != null) this.installEditSession(initialExternalDiff, editor.__getDocumentContents(getAdditionFile(initialExternalDiff)), editor.__getDocumentSessionState());
-		else this.hunksRenderer.beginEditSession(this.editSessionDiff);
+		else if (this.editSession != null) this.hunksRenderer.beginEditSession(this.editSession.diff);
 		this.editor = editor;
 		if (this.fileDiff?.isPartial === true) this.loadFilesIfNecessary();
+		const editSessionDiff = this.editSession?.diff;
 		if (this.hunksRenderer.editorRenderReady()) {
-			const { editSessionDiff } = this;
 			if (editSessionDiff != null && this.hunksRenderer.diffCache === editSessionDiff) this.renderedDiff = editSessionDiff;
 			this.syncRenderViewToEditor();
 		} else this.rerender();
@@ -867,8 +900,9 @@ var FileDiff = class {
 		this.settleEditSession(mode === "install", editor);
 	}
 	settleEditSession(installResult, editor) {
-		const { editSessionDiff, editSessionAnnotations, fileDiff: externalDiff, lineAnnotations: externalAnnotations } = this;
-		if (editSessionDiff == null || externalDiff == null) return;
+		const { editSession, fileDiff: externalDiff, lineAnnotations: externalAnnotations } = this;
+		if (editSession == null || externalDiff == null) return;
+		const { diff: editSessionDiff, annotations: editSessionAnnotations } = editSession;
 		if (this.editor != null) throw new Error("FileDiff.__completeEditSession: detach the editor before completing the session");
 		this.hunksRenderer.endEditSession();
 		this.finalizeEditSessionHunks();
@@ -918,9 +952,7 @@ var FileDiff = class {
 			}
 			if (sessionAnnotationsCurrent != null) this.lineAnnotations = sessionAnnotationsCurrent;
 		}
-		this.editSessionDiff = void 0;
-		this.editSessionAnnotations = void 0;
-		this.outgoingSessionDiff = void 0;
+		this.editSession = void 0;
 		if (installResult && this.fileContainer != null) this.rerender();
 		if (failed) throw failure;
 	}
@@ -948,7 +980,7 @@ var FileDiff = class {
 		return true;
 	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
-		const { editSessionDiff } = this;
+		const editSessionDiff = this.editSession?.diff;
 		if (editSessionDiff == null) throw new Error("FileDiff.applyDocumentChange: requires an active edit session");
 		this.detachAdditionLines();
 		this.hunksRenderer.beginEditSession(editSessionDiff);
@@ -958,7 +990,7 @@ var FileDiff = class {
 		this.interactionManager.setSelectionDirty();
 	}
 	updateRenderCache(dirtyLines, themeType, options = {}) {
-		const { editSessionDiff } = this;
+		const editSessionDiff = this.editSession?.diff;
 		if (editSessionDiff == null) throw new Error("FileDiff.updateRenderCache: requires an active edit session");
 		this.detachAdditionLines();
 		this.hunksRenderer.beginEditSession(editSessionDiff);
@@ -984,7 +1016,8 @@ var FileDiff = class {
 		}
 	}
 	detachAdditionLines() {
-		const { editSessionDiff, fileDiff } = this;
+		const editSessionDiff = this.editSession?.diff;
+		const { fileDiff } = this;
 		if (editSessionDiff != null && (editSessionDiff.additionLines === fileDiff?.additionLines || editSessionDiff.additionLines === editSessionDiff.deletionLines)) editSessionDiff.additionLines = [...editSessionDiff.additionLines];
 	}
 	isLineRenderable(lineNumber) {
@@ -1304,8 +1337,8 @@ var FileDiff = class {
 		this.cleanupErrorWrapper();
 		this.placeHolder?.remove();
 		this.placeHolder = void 0;
-		const { headerCache: { fileDiff: cachedHeaderDiff, html: cachedHeaderHTML, lastRenderedHTML }, editSessionDiff } = this;
-		const headerHTML = (fileDiff !== editSessionDiff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? toHtml(headerAST);
+		const { headerCache: { fileDiff: cachedHeaderDiff, html: cachedHeaderHTML, lastRenderedHTML } } = this;
+		const headerHTML = (fileDiff !== this.editSession?.diff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? toHtml(headerAST);
 		this.headerCache.html = headerHTML;
 		this.headerCache.fileDiff = fileDiff;
 		if (headerHTML !== lastRenderedHTML) {
@@ -1395,7 +1428,7 @@ var FileDiff = class {
 	applyThemeState(container, themeStyles, themeType, baseThemeType) {
 		const shadowRoot = container.shadowRoot ?? container.attachShadow({ mode: "open" });
 		const effectiveThemeType = baseThemeType ?? themeType;
-		const currentTheme = this.options.theme ?? DEFAULT_THEMES;
+		const currentTheme = this.getTheme();
 		const theme = typeof currentTheme === "string" ? currentTheme : { ...currentTheme };
 		const scrollbarGutter = getMeasuredScrollbarGutter(shadowRoot);
 		if (this.themeCSSStyle?.parentNode === shadowRoot && this.appliedThemeCSS?.themeStyles === themeStyles && this.appliedThemeCSS.themeType === effectiveThemeType && this.appliedThemeCSS.scrollbarGutter === scrollbarGutter) {