@pierre/diffs 1.5.2 → 1.6.0-beta.1

package/dist/components/FileDiff.js

@@ -1,10 +1,13 @@
 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 { HighlighterDisposedError } from "../highlighter/highlighterType.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";
 import { isSafari } from "../utils/platform.js";
+import { resolvePreferredHighlighter } from "../utils/resolvePreferredHighlighter.js";
+import { hastToHtml } from "../utils/hastToHtml.js";
 import { InteractionManager, pluckInteractionOptions } from "../managers/InteractionManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
@@ -45,7 +48,6 @@ import { DiffHunksRenderer } from "../renderers/DiffHunksRenderer.js";
 import { areDiffLineAnnotationsEqual } from "../utils/areDiffLineAnnotationsEqual.js";
 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");
@@ -797,8 +799,10 @@ var FileDiff = class {
 		else getSharedHighlighter({
 			themes: getThemes(theme),
 			langs: ["text", lang],
-			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
-		}).then(sync);
+			preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
+		}).then(sync).catch((error) => {
+			if (!(error instanceof HighlighterDisposedError)) console.error(error);
+		});
 	}
 	computeEditorRenderRange(renderRange) {
 		const fileDiff = this.getLatestDiff();
@@ -1376,7 +1380,7 @@ var FileDiff = class {
 		this.placeHolder?.remove();
 		this.placeHolder = void 0;
 		const { headerCache: { fileDiff: cachedHeaderDiff, html: cachedHeaderHTML, lastRenderedHTML } } = this;
-		const headerHTML = (fileDiff !== this.editSession?.diff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? toHtml(headerAST);
+		const headerHTML = (fileDiff !== this.editSession?.diff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? hastToHtml(headerAST);
 		this.headerCache.html = headerHTML;
 		this.headerCache.fileDiff = fileDiff;
 		if (headerHTML !== lastRenderedHTML) {
@@ -1447,6 +1451,7 @@ var FileDiff = class {
 	}
 	injectUnsafeCSS() {
 		const { unsafeCSS } = this.options;
+		this.pre?.toggleAttribute("data-custom-styles", Boolean(unsafeCSS));
 		const shadowRoot = this.fileContainer?.shadowRoot;
 		if (shadowRoot == null) return;
 		if (unsafeCSS == null || unsafeCSS === "") {
@@ -1515,8 +1520,8 @@ var FileDiff = class {
 		const gutterChildren = getElementChildren(ast[0]);
 		const contentChildren = getElementChildren(ast[1]);
 		if (gutterChildren == null || contentChildren == null) return false;
-		columns.gutter.innerHTML = toHtml(gutterChildren);
-		columns.content.innerHTML = toHtml(contentChildren);
+		columns.gutter.innerHTML = hastToHtml(gutterChildren);
+		columns.content.innerHTML = hastToHtml(contentChildren);
 		if (rowCount !== this.lastRowCount) {
 			columns.gutter.style.setProperty("grid-row", `span ${rowCount}`);
 			columns.content.style.setProperty("grid-row", `span ${rowCount}`);
@@ -1694,7 +1699,7 @@ var FileDiff = class {
 		const gutterChildren = getElementChildren(ast?.[0]);
 		const contentChildren = getElementChildren(ast?.[1]);
 		const applyColumns = () => {
-			for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
+			for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = hastToHtml(astChildren);
 			if (hunksResult.rowCount !== this.lastRowCount) {
 				this.applyRowSpan("unified", columns, hunksResult.rowCount);
 				this.lastRowCount = hunksResult.rowCount;