@pierre/diffs 1.4.0 → 1.4.2

package/dist/components/File.d.ts

@@ -4,9 +4,9 @@ import { TextDocument } from "../editor/textDocument.js";
 import { GetHoveredLineResult, InteractionManager, InteractionManagerBaseOptions, SelectionWriteOptions } from "../managers/InteractionManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
+import "../worker/index.js";
 import { FileRenderer } from "../renderers/FileRenderer.js";
 import { Editor } from "../editor/editor.js";
-
 //#region src/components/File.d.ts
 interface FileRenderProps<LAnnotation> {
   file: FileContents;
@@ -108,9 +108,7 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   protected lineAnnotations: LineAnnotation<LAnnotation>[];
   protected managersDirty: boolean;
   file: FileContents | undefined;
-  private editSessionFile;
-  private editSessionAnnotations;
-  private outgoingSessionFile;
+  private editSession;
   protected renderedFile: FileContents | undefined;
   protected renderRange: RenderRange | undefined;
   protected enabled: boolean;
@@ -119,6 +117,7 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   getAnnotationSlotName: (annotation: LineAnnotation<LAnnotation> | DiffLineAnnotation<LAnnotation>) => string;
   private handleHighlightRender;
   rerender(): void;
+  private getTheme;
   protected getLatestFile(file?: FileContents | undefined): FileContents | undefined;
   protected getRenderedFile(): FileContents | undefined;
   protected getLatestAnnotations(): LineAnnotation<LAnnotation>[];
@@ -146,13 +145,14 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   virtualizedSetup(): void;
   hydrate(props: FileHydrateProps<LAnnotation>): void;
   protected hydrateElements(fileContainer: HTMLElement, prerenderedHTML: string | undefined): void;
-  protected hydrationSetup({
-    file,
-    lineAnnotations
-  }: HydrationSetup<LAnnotation>): void;
+  protected hydrationSetup({ file, lineAnnotations }: HydrationSetup<LAnnotation>): void;
   getOrCreateLineCache(file?: FileContents | undefined): string[];
   protected updateBuffers(renderRange: RenderRange): void;
   private syncRenderViewToEditor;
+  /** @internal The editor applied or edited past the pending external replacement. */
+  __acknowledgeDocumentUpdate(): void;
+  /** @internal Settle annotations */
+  __acceptEditorChange(event: EditorChangeEvent<'file', LAnnotation, Caret>): void;
   emitEditChange(event: EditorChangeEvent<'file', LAnnotation, Caret>): void;
   /** @internal Plain files have no component-owned diff session state. */
   __captureDocumentSessionState(): undefined;
@@ -181,16 +181,8 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', options?: {
     lineCountChangeInFlight?: boolean;
   }): void;
-  render({
-    file,
-    fileContainer,
-    forceRender,
-    preventEmit,
-    containerWrapper,
-    deferManagers,
-    lineAnnotations,
-    renderRange
-  }: FileRenderProps<LAnnotation>): boolean;
+  render({ file, fileContainer, forceRender, preventEmit, containerWrapper, deferManagers, lineAnnotations, renderRange }: FileRenderProps<LAnnotation>): boolean;
+  protected finalizeRender(): void;
   private emitPostRender;
   private removeRenderedCode;
   private clearAuxiliaryNodes;

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

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

package/dist/components/File.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 { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
 import { areFileTargetsEqual } from "../utils/areFileTargetsEqual.js";
@@ -34,11 +36,6 @@ function createEditSessionFile(file) {
 	delete editSessionFile.cacheKey;
 	return editSessionFile;
 }
-function shouldResetUndoState(previousFile, nextFile) {
-	const previousLanguage = previousFile.lang ?? getFiletypeFromFileName(previousFile.name);
-	const nextLanguage = nextFile.lang ?? getFiletypeFromFileName(nextFile.name);
-	return previousFile.name !== nextFile.name || previousLanguage !== nextLanguage;
-}
 let instanceId = -1;
 var File = class {
 	options;
@@ -78,9 +75,7 @@ var File = class {
 	lineAnnotations = [];
 	managersDirty = false;
 	file;
-	editSessionFile;
-	editSessionAnnotations;
-	outgoingSessionFile;
+	editSession;
 	renderedFile;
 	renderRange;
 	enabled = true;
@@ -95,7 +90,7 @@ var File = class {
 		this.workerManager?.subscribeToThemeChanges(this);
 	}
 	getAnnotationSlotName = (annotation) => {
-		return resolveEditSessionSlotName(this.editSessionAnnotations, annotation, getLineAnnotationName);
+		return resolveEditSessionSlotName(this.editSession?.annotations, annotation, getLineAnnotationName);
 	};
 	handleHighlightRender = () => {
 		this.rerender();
@@ -108,40 +103,44 @@ var File = class {
 			renderRange: this.renderRange
 		});
 	}
+	getTheme() {
+		return this.workerManager?.getFileRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
+	}
 	getLatestFile(file = this.file) {
-		return this.editSessionFile ?? file;
+		return this.editSession?.file ?? file;
 	}
 	getRenderedFile() {
 		return this.renderedFile;
 	}
 	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;
 	}
 	updateExternalFile(incomingFile, lineAnnotations) {
 		if (areFileTargetsEqual(this.file, incomingFile)) return false;
-		const previousEditSessionFile = this.outgoingSessionFile ?? this.editSessionFile;
+		const hadSession = this.editSession != null;
 		this.file = incomingFile;
-		this.outgoingSessionFile = void 0;
-		if (previousEditSessionFile != null || this.editor != null) {
-			this.outgoingSessionFile = previousEditSessionFile;
-			this.installEditSession(incomingFile, previousEditSessionFile == null ? this.editor?.__getDocumentContents(incomingFile) : void 0);
-		} else this.editSessionFile = void 0;
-		if (this.editSessionAnnotations != null && lineAnnotations != null) {
+		if (hadSession || this.editor != null) this.installEditSession(incomingFile, hadSession ? void 0 : this.editor?.__getDocumentContents(incomingFile), true);
+		else this.editSession = void 0;
+		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;
 	}
-	installEditSession(externalFile, retainedDocument) {
+	installEditSession(externalFile, retainedDocument, hostReplacement = false) {
 		const usesExternalDocument = retainedDocument == null || retainedDocument.name === externalFile.name && retainedDocument.lang === externalFile.lang && retainedDocument.contents === externalFile.contents;
-		const editSessionFile = createEditSessionFile(retainedDocument ?? externalFile);
-		this.editSessionFile = editSessionFile;
-		this.fileRenderer.beginEditSession(editSessionFile, usesExternalDocument ? externalFile : void 0);
+		const file = createEditSessionFile(retainedDocument ?? externalFile);
+		this.editSession = {
+			file,
+			externalReplacement: hostReplacement && usesExternalDocument,
+			annotations: this.editSession?.annotations ?? adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName)
+		};
+		this.fileRenderer.beginEditSession(file, usesExternalDocument ? externalFile : void 0);
 	}
 	onThemeChange() {
 		this.fileRenderer.clearRenderCache();
@@ -175,13 +174,13 @@ var File = 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();
 	};
 	setLineAnnotations(lineAnnotations) {
-		const { editSessionAnnotations: sessionAnnotations } = this;
+		const sessionAnnotations = this.editSession?.annotations;
 		if (sessionAnnotations == null) {
 			this.lineAnnotations = lineAnnotations;
 			return;
@@ -191,7 +190,7 @@ var File = 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.fileRenderer.setLineAnnotations(lineAnnotations);
@@ -280,9 +279,7 @@ var File = class {
 			this.fileRenderer.cleanUp();
 			this.workerManager = void 0;
 			this.file = void 0;
-			this.editSessionFile = void 0;
-			this.editSessionAnnotations = void 0;
-			this.outgoingSessionFile = void 0;
+			this.editSession = void 0;
 			this.renderedFile = void 0;
 		}
 		this.enabled = false;
@@ -369,26 +366,40 @@ var File = class {
 		const lineAnnotations = this.getLatestAnnotations();
 		const file = this.getLatestFile();
 		if (editor == null || fileContainer == null || file == null) return;
-		this.fileRenderer.initializeHighlighter().then((highlighter) => {
+		const syncEditor = (highlighter) => {
 			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestFile() !== file) return;
-			const { outgoingSessionFile: replacement, file: externalFile } = this;
-			const externalDocument = replacement != null && externalFile != null && replacement !== file;
-			const resetHistory = externalDocument ? shouldResetUndoState(replacement, externalFile) : false;
-			if (externalDocument) this.outgoingSessionFile = void 0;
 			editor.__syncRenderView({
 				highlighter,
 				fileContainer,
 				file,
 				lineAnnotations,
 				renderRange,
-				externalDocument,
-				resetHistory
+				externalDocument: this.editSession?.externalReplacement === true
 			});
+		};
+		const theme = this.getTheme();
+		const lang = file.lang ?? getFiletypeFromFileName(file.name);
+		const highlighter = getHighlighterIfLoaded({
+			theme,
+			lang
 		});
-	}
-	emitEditChange(event) {
+		if (highlighter != null) syncEditor(highlighter);
+		else getSharedHighlighter({
+			themes: getThemes(theme),
+			langs: Array.from(/* @__PURE__ */ new Set(["text", lang])),
+			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
+		}).then(syncEditor);
+	}
+	/** @internal The editor applied or edited past the pending external replacement. */
+	__acknowledgeDocumentUpdate() {
+		if (this.editSession != null) this.editSession.externalReplacement = false;
+	}
+	/** @internal Settle annotations */
+	__acceptEditorChange(event) {
 		const { lineAnnotations } = event;
 		if (lineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(lineAnnotations);
+	}
+	emitEditChange(event) {
 		const { onEditChange } = this.options;
 		onEditChange?.(event);
 	}
@@ -416,11 +427,11 @@ var File = class {
 		this.resumeEditorRendering(editor);
 	}
 	resumeEditorRendering(editor) {
-		this.editSessionAnnotations ??= adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName);
-		if (this.editSessionFile == null && this.file != null) this.installEditSession(this.file, editor.__getDocumentContents(this.file));
-		else this.fileRenderer.beginEditSession(this.editSessionFile);
+		if (this.editSession != null) this.fileRenderer.beginEditSession(this.editSession.file);
+		else if (this.file != null) this.installEditSession(this.file, editor.__getDocumentContents(this.file));
+		const editSessionFile = this.editSession?.file;
 		if (this.fileRenderer.editorRenderReady()) {
-			if (this.fileRenderer.fileCache === this.editSessionFile) this.renderedFile = this.editSessionFile;
+			if (this.fileRenderer.fileCache === editSessionFile) this.renderedFile = editSessionFile;
 			this.syncRenderViewToEditor();
 		} else this.rerender();
 	}
@@ -442,8 +453,9 @@ var File = class {
 		this.settleEditSession(mode === "install", editor);
 	}
 	settleEditSession(installResult, editor) {
-		const { editSessionFile, editSessionAnnotations, file: externalFile, lineAnnotations: externalAnnotations } = this;
-		if (editSessionFile == null || externalFile == null) return;
+		const { editSession, file: externalFile, lineAnnotations: externalAnnotations } = this;
+		if (editSession == null || externalFile == null) return;
+		const { file: editSessionFile, annotations: editSessionAnnotations } = editSession;
 		if (this.editor != null) throw new Error("File.__completeEditSession: detach the editor before completing the session");
 		const sessionAnnotationsCurrent = editSessionAnnotations?.current;
 		let acceptedFile;
@@ -473,9 +485,7 @@ var File = class {
 			this.file = acceptedFile;
 			if (sessionAnnotationsCurrent != null) this.lineAnnotations = sessionAnnotationsCurrent;
 		}
-		this.editSessionFile = void 0;
-		this.editSessionAnnotations = void 0;
-		this.outgoingSessionFile = void 0;
+		this.editSession = void 0;
 		const { renderedFile, file: settledFile } = this;
 		this.fileRenderer.endEditSession(settledFile);
 		if (renderedFile != null && settledFile != null && renderedFile !== settledFile && areFileTargetsEqual(renderedFile, settledFile)) this.renderedFile = settledFile;
@@ -483,14 +493,14 @@ var File = class {
 		if (failed) throw failure;
 	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
-		const { editSessionFile } = this;
+		const editSessionFile = this.editSession?.file;
 		if (editSessionFile == null) throw new Error("File.applyDocumentChange: requires an active edit session");
 		this.fileRenderer.beginEditSession(editSessionFile);
 		this.fileRenderer.applyDocumentChange(textDocument);
 		if (newLineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(newLineAnnotations);
 	}
 	updateRenderCache(dirtyLines, themeType, options) {
-		const { editSessionFile } = this;
+		const editSessionFile = this.editSession?.file;
 		if (editSessionFile == null) throw new Error("File.updateRenderCache: requires an active edit session");
 		this.fileRenderer.beginEditSession(editSessionFile);
 		this.fileRenderer.updateRenderCache(dirtyLines, themeType, options?.lineCountChangeInFlight);
@@ -506,7 +516,11 @@ var File = class {
 		const didFileChange = !areFileTargetsEqual(this.file, file);
 		if (didFileChange) this.updateExternalFile(file, lineAnnotations);
 		const latestFile = this.getLatestFile(file) ?? file;
-		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) return this.applyCachedThemeState(themeType);
+		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) {
+			const rendered = this.applyCachedThemeState(themeType);
+			if (rendered) this.finalizeRender();
+			return rendered;
+		}
 		this.renderRange = nextRenderRange;
 		if (didFileChange) this.cachedHeaderHTML = void 0;
 		this.fileRenderer.setOptions(getFileRendererOptions(this.options));
@@ -538,6 +552,7 @@ var File = class {
 				console.error(error);
 				if (error instanceof Error) this.applyErrorToDOM(error, fileContainer);
 			}
+			this.finalizeRender();
 			if (!preventEmit) this.emitPostRender();
 			return true;
 		}
@@ -560,6 +575,7 @@ var File = class {
 			this.renderGutterUtility();
 			this.managersDirty = true;
 			if (!deferManagers) this.flushManagers();
+			this.finalizeRender();
 			if (this.editor != null) this.syncRenderViewToEditor();
 		} catch (error) {
 			if (disableErrorHandling) throw error;
@@ -569,6 +585,7 @@ var File = class {
 		if (!preventEmit) this.emitPostRender();
 		return true;
 	}
+	finalizeRender() {}
 	emitPostRender(unmount = false) {
 		const { fileContainer, options: { onPostRender } } = this;
 		if (unmount) {
@@ -738,7 +755,7 @@ var File = 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) {