@pierre/diffs 1.4.0 → 1.4.1

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);
 	}
@@ -238,24 +241,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 +268,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 +382,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 +544,27 @@ 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);
+			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.editSessionAnnotations != null && lineAnnotations != null) {
+		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 +587,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 +613,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 +672,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 +704,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 +714,7 @@ var FileDiff = class {
 		if (!preventEmit) this.emitPostRender();
 		return true;
 	}
+	finalizeRender() {}
 	emitPostRender(unmount = false) {
 		const { fileContainer, options: { onPostRender } } = this;
 		if (unmount) {
@@ -719,7 +730,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 +741,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 +756,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 +801,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 +821,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 +861,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 +897,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 +949,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 +977,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 +987,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 +1013,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 +1334,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 +1425,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) {