@pierre/diffs 1.5.1 → 1.6.0-beta.1

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,9 +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";
@@ -21,9 +25,9 @@ import { adoptEditSessionAnnotations, resolveEditSessionSlotName, writeEditSessi
 import { getOrCreateCodeNode } from "../utils/getOrCreateCodeNode.js";
 import { guardWebKitScrollDuringRebuild } from "../utils/guardWebKitScrollDuringRebuild.js";
 import { upsertHostThemeStyle } from "../utils/hostTheme.js";
-import { isSafari } from "../utils/platform.js";
 import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
+import { isHandledWorkerPoolError } from "../worker/errors.js";
 import "./web-components.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
 import { areFilesEqual } from "../utils/areFilesEqual.js";
@@ -44,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");
@@ -796,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();
@@ -1027,7 +1032,7 @@ var FileDiff = class {
 		this.detachAdditionLines();
 		this.hunksRenderer.beginEditSession(editSessionDiff);
 		const { shouldRefreshDiffsView, lineCountChangeInFlight } = options;
-		if (this.hunksRenderer.updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight)) {
+		if (this.hunksRenderer.updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight, options.changedDocumentLines, options.documentLineCount)) {
 			if (this.refreshViewTimeout != null) {
 				clearTimeout(this.refreshViewTimeout);
 				this.refreshViewTimeout = void 0;
@@ -1174,6 +1179,7 @@ var FileDiff = class {
 		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
 		if (Math.max(fileDiff.additionLines.length, fileDiff.deletionLines.length) > tokenizeMaxLength) return;
 		await workerManager.primeDiffHighlightCache(fileDiff).catch((error) => {
+			if (isHandledWorkerPoolError(error)) return;
 			console.error(error);
 		});
 	}
@@ -1374,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) {
@@ -1445,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 === "") {
@@ -1513,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}`);
@@ -1692,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;