@pierre/diffs 1.1.2 → 1.1.3

package/dist/renderers/UnresolvedFileHunksRenderer.d.ts

@@ -1,7 +1,7 @@
-import { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, RenderRange } from "../types.js";
+import { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
-import { DiffHunksRenderer, HunksRenderResult, InlineRow, LineDecoration, RenderedLineContext, SplitLineDecorationProps, UnifiedLineDecorationProps } from "./DiffHunksRenderer.js";
+import { DiffHunksRenderer, HunksRenderResult, LineDecoration, RenderedLineContext, SplitLineDecorationProps, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps } from "./DiffHunksRenderer.js";
 import { MergeConflictDiffAction } from "../utils/parseMergeConflictDiffFromFile.js";
 import { Element } from "hast";
 
@@ -14,31 +14,26 @@ interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {
   mergeConflictActionsType?: MergeConflictActionsType;
 }
 declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {
-  private cachedAdditionLines;
-  private cachedDeletionLines;
-  private conflictActions;
-  private additionMarkerLookup;
-  private deletionMarkerLookup;
+  private pendingConflictActions;
+  private pendingMarkerRows;
+  private injectedRows;
   options: UnresolvedFileHunksRendererOptions;
   constructor(options?: UnresolvedFileHunksRendererOptions, onRenderUpdate?: () => unknown, workerManager?: WorkerPoolManager | undefined);
-  setConflictActions(conflictActions: MergeConflictDiffAction[]): void;
+  setConflictState(conflictActions: (MergeConflictDiffAction | undefined)[], markerRows: MergeConflictMarkerRow[], diff: FileDiffMetadata): void;
+  private syncInjectedRows;
+  private addInjectedRow;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
   protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined): Element;
   protected getUnifiedLineDecoration({
     type,
-    lineType,
-    additionLineIndex,
-    deletionLineIndex
+    lineType
   }: UnifiedLineDecorationProps): LineDecoration;
   protected getSplitLineDecoration({
     side,
-    type,
-    lineIndex
+    type
   }: SplitLineDecorationProps): LineDecoration;
-  protected getUnifiedInlineRowsForLine: (ctx: RenderedLineContext) => InlineRow[] | undefined;
-  private prepareMarkerLookups;
-  private getMergeConflictMarkerTypeAtIndex;
+  protected getUnifiedInjectedRowsForLine: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;
   protected getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults;
 }
 //#endregion

package/dist/renderers/UnresolvedFileHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFileHunksRenderer.d.ts","names":["Element","HASTElement","BaseDiffOptions","BaseDiffOptionsWithDefaults","FileDiffMetadata","RenderRange","MergeConflictDiffAction","WorkerPoolManager","DiffHunksRenderer","HunksRenderResult","InlineRow","LineDecoration","RenderedLineContext","SplitLineDecorationProps","UnifiedLineDecorationProps","BaseUnresolvedOptionsWithDefaults","MergeConflictActionsType","UnresolvedFileHunksRendererOptions","UnresolvedFileHunksRenderer","LAnnotation","Promise","type","lineType","additionLineIndex","deletionLineIndex","side","lineIndex"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.d.ts"],"sourcesContent":["import type { Element as HASTElement } from 'hast';\nimport type { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, RenderRange } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { DiffHunksRenderer, type HunksRenderResult, type InlineRow, type LineDecoration, type RenderedLineContext, type SplitLineDecorationProps, type UnifiedLineDecorationProps } from './DiffHunksRenderer';\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n    mergeConflictActionsType: MergeConflictActionsType;\n}\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n    mergeConflictActionsType?: MergeConflictActionsType;\n}\nexport declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {\n    private cachedAdditionLines;\n    private cachedDeletionLines;\n    private conflictActions;\n    private additionMarkerLookup;\n    private deletionMarkerLookup;\n    options: UnresolvedFileHunksRendererOptions;\n    constructor(options?: UnresolvedFileHunksRendererOptions, onRenderUpdate?: () => unknown, workerManager?: WorkerPoolManager | undefined);\n    setConflictActions(conflictActions: MergeConflictDiffAction[]): void;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined): HASTElement;\n    protected getUnifiedLineDecoration({ type, lineType, additionLineIndex, deletionLineIndex }: UnifiedLineDecorationProps): LineDecoration;\n    protected getSplitLineDecoration({ side, type, lineIndex }: SplitLineDecorationProps): LineDecoration;\n    protected getUnifiedInlineRowsForLine: (ctx: RenderedLineContext) => InlineRow[] | undefined;\n    private prepareMarkerLookups;\n    private getMergeConflictMarkerTypeAtIndex;\n    protected getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults;\n}\nexport {};\n//# sourceMappingURL=UnresolvedFileHunksRenderer.d.ts.map"],"mappings":";;;;;;;;UAKUe,iCAAAA,SAA0CZ;4BACtBa;;AAFiL,KAI1MA,wBAAAA,GAHKD,MAAAA,GAAiC,SAAA,GACbC,QAAAA;AAEzBA,UACYC,kCAAAA,SAA2Cf,eAD/B,CAAA;EACZe,wBAAAA,CAAAA,EACcD,wBAAAA;AAE/B;AAAoGG,cAA/ED,2BAA+EC,CAAAA,cAAAA,SAAAA,CAAAA,SAAlBX,iBAAkBW,CAAAA,WAAAA,CAAAA,CAAAA;EAMvFF,QAAAA,mBAAAA;EACaA,QAAAA,mBAAAA;EAAoFV,QAAAA,eAAAA;EACtED,QAAAA,oBAAAA;EAClBF,QAAAA,oBAAAA;EAA4CC,OAAAA,EAHrDY,kCAGqDZ;EAAcI,WAAAA,CAAAA,OAAAA,CAAAA,EAFtDQ,kCAEsDR,EAAAA,cAAAA,CAAAA,EAAAA,GAAAA,GAAAA,OAAAA,EAAAA,aAAAA,CAAAA,EAF8BF,iBAE9BE,GAAAA,SAAAA;EAC1DL,kBAAAA,CAAAA,eAAAA,EAFkBE,uBAElBF,EAAAA,CAAAA,EAAAA,IAAAA;EAAgCC,UAAAA,CAAAA,IAAAA,CAAAA,EADhCD,gBACgCC,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EADYA,WACZA,CAAAA,EAD0BI,iBAC1BJ,GAAAA,SAAAA;EAAsBI,WAAAA,CAAAA,IAAAA,EAAtDL,gBAAsDK,EAAAA,WAAAA,CAAAA,EAAtBJ,WAAsBI,CAAAA,EAARW,OAAQX,CAAAA,iBAAAA,CAAAA;EAARW,UAAAA,gBAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,UAAAA,EAAAA,MAAAA,EAAAA,WAAAA,EAAAA,MAAAA,EAAAA,aAAAA,EAAAA,OAAAA,GAAAA,MAAAA,GAAAA,SAAAA,CAAAA,EACkEnB,OADlEmB;EACkEnB,UAAAA,wBAAAA,CAAAA;IAAAA,IAAAA;IAAAA,QAAAA;IAAAA,iBAAAA;IAAAA;EAAAA,CAAAA,EACrCa,0BADqCb,CAAAA,EACRU,cADQV;EAC7FoB,UAAAA,sBAAAA,CAAAA;IAAAA,IAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EACuBR,wBADvBQ,CAAAA,EACkDV,cADlDU;EAAMC,UAAAA,2BAAAA,EAAAA,CAAAA,GAAAA,EAEEV,mBAFFU,EAAAA,GAE0BZ,SAF1BY,EAAAA,GAAAA,SAAAA;EAAUC,QAAAA,oBAAAA;EAAmBC,QAAAA,iCAAAA;EAAqBV,UAAAA,sBAAAA,CAAAA,CAAAA,EAKzDC,iCALyDD"}
+{"version":3,"file":"UnresolvedFileHunksRenderer.d.ts","names":["Element","HASTElement","BaseDiffOptions","BaseDiffOptionsWithDefaults","FileDiffMetadata","MergeConflictMarkerRow","RenderRange","MergeConflictDiffAction","WorkerPoolManager","DiffHunksRenderer","HunksRenderResult","LineDecoration","RenderedLineContext","SplitLineDecorationProps","UnifiedInjectedRowPlacement","UnifiedLineDecorationProps","BaseUnresolvedOptionsWithDefaults","MergeConflictActionsType","UnresolvedFileHunksRendererOptions","UnresolvedFileHunksRenderer","LAnnotation","Promise","type","lineType","side"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.d.ts"],"sourcesContent":["import type { Element as HASTElement } from 'hast';\nimport type { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { DiffHunksRenderer, type HunksRenderResult, type LineDecoration, type RenderedLineContext, type SplitLineDecorationProps, type UnifiedInjectedRowPlacement, type UnifiedLineDecorationProps } from './DiffHunksRenderer';\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n    mergeConflictActionsType: MergeConflictActionsType;\n}\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n    mergeConflictActionsType?: MergeConflictActionsType;\n}\nexport declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {\n    private pendingConflictActions;\n    private pendingMarkerRows;\n    private injectedRows;\n    options: UnresolvedFileHunksRendererOptions;\n    constructor(options?: UnresolvedFileHunksRendererOptions, onRenderUpdate?: () => unknown, workerManager?: WorkerPoolManager | undefined);\n    setConflictState(conflictActions: (MergeConflictDiffAction | undefined)[], markerRows: MergeConflictMarkerRow[], diff: FileDiffMetadata): void;\n    private syncInjectedRows;\n    private addInjectedRow;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined): HASTElement;\n    protected getUnifiedLineDecoration({ type, lineType }: UnifiedLineDecorationProps): LineDecoration;\n    protected getSplitLineDecoration({ side, type }: SplitLineDecorationProps): LineDecoration;\n    protected getUnifiedInjectedRowsForLine: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;\n    protected getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults;\n}\nexport {};\n//# sourceMappingURL=UnresolvedFileHunksRenderer.d.ts.map"],"mappings":";;;;;;;;UAKUgB,iCAAAA,SAA0Cb;4BACtBc;;AAFmM,KAI5NA,wBAAAA,GAHKD,MAAAA,GAAiC,SAAA,GACbC,QAAAA;AAEzBA,UACYC,kCAAAA,SAA2ChB,eAD/B,CAAA;EACZgB,wBAAAA,CAAAA,EACcD,wBAAAA;AAE/B;AAAoGG,cAA/ED,2BAA+EC,CAAAA,cAAAA,SAAAA,CAAAA,SAAlBX,iBAAkBW,CAAAA,WAAAA,CAAAA,CAAAA;EAIvFF,QAAAA,sBAAAA;EACaA,QAAAA,iBAAAA;EAAoFV,QAAAA,YAAAA;EACvED,OAAAA,EAF1BW,kCAE0BX;EAAoDF,WAAAA,CAAAA,OAAAA,CAAAA,EADjEa,kCACiEb,EAAAA,cAAAA,CAAAA,EAAAA,GAAAA,GAAAA,OAAAA,EAAAA,aAAAA,CAAAA,EADmBG,iBACnBH,GAAAA,SAAAA;EAAgCD,gBAAAA,CAAAA,eAAAA,EAAAA,CAApFG,uBAAoFH,GAAAA,SAAAA,CAAAA,EAAAA,EAAAA,UAAAA,EAAhCC,sBAAgCD,EAAAA,EAAAA,IAAAA,EAAAA,gBAAAA,CAAAA,EAAAA,IAAAA;EAGrGA,QAAAA,gBAAAA;EAA4CE,QAAAA,cAAAA;EAAcI,UAAAA,CAAAA,IAAAA,CAAAA,EAA1DN,gBAA0DM,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAAdJ,WAAcI,CAAAA,EAAAA,iBAAAA,GAAAA,SAAAA;EAC1DN,WAAAA,CAAAA,IAAAA,EAAAA,gBAAAA,EAAAA,WAAAA,CAAAA,EAAgCE,WAAhCF,CAAAA,EAA8CiB,OAA9CjB,CAAsDM,iBAAtDN,CAAAA;EAAgCE,UAAAA,gBAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,UAAAA,EAAAA,MAAAA,EAAAA,WAAAA,EAAAA,MAAAA,EAAAA,aAAAA,EAAAA,OAAAA,GAAAA,MAAAA,GAAAA,SAAAA,CAAAA,EACgFL,OADhFK;EAAsBI,UAAAA,wBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAEjBK,0BAFiBL,CAAAA,EAEYC,cAFZD;EAARW,UAAAA,sBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAGfR,wBAHeQ,CAAAA,EAGYV,cAHZU;EACkEpB,UAAAA,6BAAAA,EAAAA,CAAAA,GAAAA,EAGnFW,mBAHmFX,EAAAA,GAG3Da,2BAH2Db,GAAAA,SAAAA;EAC7FqB,UAAAA,sBAAAA,CAAAA,CAAAA,EAGDN,iCAHCM"}

package/dist/renderers/UnresolvedFileHunksRenderer.js

@@ -5,96 +5,96 @@ import { getMergeConflictActionSlotName } from "../utils/getMergeConflictActionS
 import { getMergeConflictActionAnchor } from "../utils/parseMergeConflictDiffFromFile.js";
 
 //#region src/renderers/UnresolvedFileHunksRenderer.ts
-const START_MARKER = /^<{7,}(?:\s.*)?$/;
-const BASE_MARKER = /^\|{7,}(?:\s.*)?$/;
-const SEPARATOR_MARKER = /^={7,}(?:\s.*)?$/;
-const END_MARKER = /^>{7,}(?:\s.*)?$/;
 var UnresolvedFileHunksRenderer = class extends DiffHunksRenderer {
-	cachedAdditionLines;
-	cachedDeletionLines;
-	conflictActions = /* @__PURE__ */ new Map();
-	additionMarkerLookup = [];
-	deletionMarkerLookup = [];
+	pendingConflictActions = [];
+	pendingMarkerRows = [];
+	injectedRows = /* @__PURE__ */ new Map();
 	options;
 	constructor(options = { theme: DEFAULT_THEMES }, onRenderUpdate, workerManager) {
 		super(void 0, onRenderUpdate, workerManager);
 		this.options = options;
 	}
-	setConflictActions(conflictActions) {
-		this.conflictActions.clear();
+	setConflictState(conflictActions, markerRows, diff) {
+		this.pendingConflictActions = conflictActions;
+		this.pendingMarkerRows = markerRows;
+		this.syncInjectedRows(conflictActions, markerRows, diff);
+	}
+	syncInjectedRows(conflictActions, markerRows, diff) {
+		this.injectedRows.clear();
 		for (const action of conflictActions) {
-			const anchor = getMergeConflictActionAnchor(action);
-			if (anchor == null) continue;
+			const anchor = action != null ? getMergeConflictActionAnchor(action, diff) : void 0;
+			if (action == null || anchor == null) continue;
 			const row = {
-				side: anchor.side,
-				lineNumber: anchor.lineNumber,
+				type: "actions",
+				hunkIndex: anchor.hunkIndex,
+				lineIndex: anchor.lineIndex,
 				conflictIndex: action.conflictIndex
 			};
-			const key = `${row.side}:${row.lineNumber}`;
-			const rows = this.conflictActions.get(key);
-			if (rows == null) this.conflictActions.set(key, [row]);
-			else rows.push(row);
+			this.addInjectedRow(row);
 		}
+		for (const row of markerRows) this.addInjectedRow(row);
+	}
+	addInjectedRow(row) {
+		const key = `${row.hunkIndex}:${row.lineIndex}`;
+		const rows = this.injectedRows.get(key);
+		if (rows == null) this.injectedRows.set(key, [row]);
+		else rows.push(row);
 	}
 	renderDiff(diff, renderRange = DEFAULT_RENDER_RANGE) {
-		if (diff != null) this.prepareMarkerLookups(diff);
+		if (diff != null) this.syncInjectedRows(this.pendingConflictActions, this.pendingMarkerRows, diff);
 		return super.renderDiff(diff, renderRange);
 	}
 	async asyncRender(diff, renderRange = DEFAULT_RENDER_RANGE) {
-		this.prepareMarkerLookups(diff);
+		this.syncInjectedRows(this.pendingConflictActions, this.pendingMarkerRows, diff);
 		return super.asyncRender(diff, renderRange);
 	}
 	createPreElement(split, totalLines, themeStyles, baseThemeType) {
 		return super.createPreElement(split, totalLines, themeStyles, baseThemeType, { "data-has-merge-conflict": "" });
 	}
-	getUnifiedLineDecoration({ type, lineType, additionLineIndex, deletionLineIndex }) {
-		const mergeConflictType = type === "change" ? lineType === "change-deletion" ? "current" : "incoming" : this.getMergeConflictMarkerTypeAtIndex("additions", additionLineIndex) ?? this.getMergeConflictMarkerTypeAtIndex("deletions", deletionLineIndex);
+	getUnifiedLineDecoration({ type, lineType }) {
+		const mergeConflictType = type === "change" ? lineType === "change-deletion" ? "current" : "incoming" : void 0;
 		return {
 			gutterLineType: type === "change" ? "context" : lineType,
 			gutterProperties: getMergeConflictGutterProperties(mergeConflictType),
 			contentProperties: getMergeConflictContentProperties(type, mergeConflictType)
 		};
 	}
-	getSplitLineDecoration({ side, type, lineIndex }) {
-		const mergeConflictType = type === "change" ? side === "deletions" ? "current" : "incoming" : this.getMergeConflictMarkerTypeAtIndex(side, lineIndex);
+	getSplitLineDecoration({ side, type }) {
+		const mergeConflictType = type === "change" ? side === "deletions" ? "current" : "incoming" : void 0;
 		return {
 			gutterLineType: type === "change" ? "context" : type,
 			gutterProperties: getMergeConflictGutterProperties(mergeConflictType),
 			contentProperties: getMergeConflictContentProperties(type, mergeConflictType)
 		};
 	}
-	getUnifiedInlineRowsForLine = (ctx) => {
-		const side = getUnifiedRenderedSide(ctx);
-		const lineNumber = side === "deletions" ? ctx.deletionLine?.lineNumber : ctx.additionLine?.lineNumber;
-		if (lineNumber == null) return;
-		const rows = this.conflictActions.get(`${side}:${lineNumber}`);
+	getUnifiedInjectedRowsForLine = (ctx) => {
+		const rows = this.injectedRows.get(`${ctx.hunkIndex}:${ctx.lineIndex}`);
 		if (rows == null || rows.length === 0) return;
 		const { mergeConflictActionsType } = this.getOptionsWithDefaults();
-		return rows.map((row) => ({
-			content: createMergeConflictActionsRowElement({
-				row,
-				includeDefaultActions: mergeConflictActionsType === "default",
-				includeSlot: true
-			}),
-			gutter: createMergeConflictGutterGap()
-		}));
-	};
-	prepareMarkerLookups(diff) {
-		if (this.cachedAdditionLines !== diff.additionLines) {
-			this.cachedAdditionLines = diff.additionLines;
-			this.additionMarkerLookup = buildMarkerLookup(diff.additionLines);
-		}
-		if (this.cachedDeletionLines !== diff.deletionLines) {
-			this.cachedDeletionLines = diff.deletionLines;
-			this.deletionMarkerLookup = buildMarkerLookup(diff.deletionLines);
+		const before = [];
+		const after = [];
+		for (const row of rows) {
+			if (row.type === "actions") {
+				before.push({
+					content: createMergeConflictActionsRowElement({
+						row,
+						includeDefaultActions: mergeConflictActionsType === "default",
+						includeSlot: true
+					}),
+					gutter: createMergeConflictGutterGap("action")
+				});
+				continue;
+			}
+			(row.type === "marker-end" ? after : before).push({
+				content: createMergeConflictMarkerRowElement(row),
+				gutter: createMergeConflictGutterGap("marker", row.type)
+			});
 		}
-	}
-	getMergeConflictMarkerTypeAtIndex(side, lineIndex) {
-		if (lineIndex == null) return;
-		const value = (side === "additions" ? this.additionMarkerLookup : this.deletionMarkerLookup)[lineIndex];
-		if (value == null) return;
-		return value === "none" ? void 0 : value;
-	}
+		return {
+			before: before.length > 0 ? before : void 0,
+			after: after.length > 0 ? after : void 0
+		};
+	};
 	getOptionsWithDefaults() {
 		const options = super.getOptionsWithDefaults();
 		options.diffStyle = "unified";
@@ -117,26 +117,9 @@ function getMergeConflictContentProperties(type, mergeConflictType) {
 	}
 	if (mergeConflictType === "marker-start" || mergeConflictType === "marker-base" || mergeConflictType === "marker-separator" || mergeConflictType === "marker-end") return { "data-merge-conflict": mergeConflictType };
 }
-function getMergeConflictMarkerType(line) {
-	if (line == null) return;
-	const trimmed = line.replace(/(?:\r\n|\n|\r)$/, "");
-	if (START_MARKER.test(trimmed)) return "marker-start";
-	if (BASE_MARKER.test(trimmed)) return "marker-base";
-	if (SEPARATOR_MARKER.test(trimmed)) return "marker-separator";
-	if (END_MARKER.test(trimmed)) return "marker-end";
-}
-function buildMarkerLookup(lines) {
-	const markerLookup = new Array(lines.length);
-	for (let index = 0; index < lines.length; index++) markerLookup[index] = getMergeConflictMarkerType(lines[index]) ?? "none";
-	return markerLookup;
-}
-function getUnifiedRenderedSide(ctx) {
-	if (ctx.type === "change" && ctx.deletionLine != null && ctx.additionLine == null) return "deletions";
-	return "additions";
-}
-function createMergeConflictGutterGap() {
+function createMergeConflictGutterGap(type, markerType) {
 	const gap = createGutterGap(void 0, "annotation", 1);
-	gap.properties["data-gutter-buffer"] = "merge-conflict-action";
+	gap.properties["data-gutter-buffer"] = type === "action" ? "merge-conflict-action" : `merge-conflict-${markerType ?? "marker"}`;
 	return gap;
 }
 function createMergeConflictActionsRowElement({ row, includeDefaultActions, includeSlot }) {
@@ -145,8 +128,8 @@ function createMergeConflictActionsRowElement({ row, includeDefaultActions, incl
 		tagName: "slot",
 		properties: {
 			name: getMergeConflictActionSlotName({
-				side: row.side,
-				lineNumber: row.lineNumber,
+				hunkIndex: row.hunkIndex,
+				lineIndex: row.lineIndex,
 				conflictIndex: row.conflictIndex
 			}),
 			"data-merge-conflict-action-slot": ""
@@ -162,6 +145,16 @@ function createMergeConflictActionsRowElement({ row, includeDefaultActions, incl
 		})]
 	});
 }
+function createMergeConflictMarkerRowElement(row) {
+	return createHastElement({
+		tagName: "div",
+		properties: {
+			"data-merge-conflict": row.type,
+			"data-merge-conflict-marker-row": ""
+		},
+		children: [createTextNodeElement(row.lineText.replace(/(?:\r\n|\n|\r)$/, ""))]
+	});
+}
 function createMergeConflictActionsContent(conflictIndex) {
 	return [
 		createMergeConflictActionButton({

package/dist/renderers/UnresolvedFileHunksRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFileHunksRenderer.js","names":["markerLookup: MergeConflictMarkerLookup[]","contentChildren: HASTElement[]"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.ts"],"sourcesContent":["import type { Element as HASTElement, Properties } from 'hast';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport type {\n  BaseDiffOptions,\n  BaseDiffOptionsWithDefaults,\n  DiffLineAnnotation,\n  FileDiffMetadata,\n  MergeConflictResolution,\n  RenderRange,\n} from '../types';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  createGutterGap,\n  createHastElement,\n  createTextNodeElement,\n} from '../utils/hast_utils';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n  type InlineRow,\n  type LineDecoration,\n  type RenderedLineContext,\n  type SplitLineDecorationProps,\n  type UnifiedLineDecorationProps,\n} from './DiffHunksRenderer';\n\ntype MergeConflictMarkerType =\n  | 'marker-start'\n  | 'marker-base'\n  | 'marker-separator'\n  | 'marker-end'\n  | 'current'\n  | 'incoming';\ntype MergeConflictMarkerLookup = MergeConflictMarkerType | 'none';\n\ninterface MergeConflictActionRowData {\n  side: DiffLineAnnotation<undefined>['side'];\n  lineNumber: number;\n  conflictIndex: number;\n}\n\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n  mergeConflictActionsType: MergeConflictActionsType;\n}\n\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\n\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n  mergeConflictActionsType?: MergeConflictActionsType;\n}\n\nconst START_MARKER = /^<{7,}(?:\\s.*)?$/;\nconst BASE_MARKER = /^\\|{7,}(?:\\s.*)?$/;\nconst SEPARATOR_MARKER = /^={7,}(?:\\s.*)?$/;\nconst END_MARKER = /^>{7,}(?:\\s.*)?$/;\n\nexport class UnresolvedFileHunksRenderer<\n  LAnnotation = undefined,\n> extends DiffHunksRenderer<LAnnotation> {\n  private cachedAdditionLines: string[] | undefined;\n  private cachedDeletionLines: string[] | undefined;\n  private conflictActions = new Map<string, MergeConflictActionRowData[]>();\n  private additionMarkerLookup: MergeConflictMarkerLookup[] = [];\n  private deletionMarkerLookup: MergeConflictMarkerLookup[] = [];\n  public override options: UnresolvedFileHunksRendererOptions;\n\n  constructor(\n    options: UnresolvedFileHunksRendererOptions = {\n      theme: DEFAULT_THEMES,\n    },\n    onRenderUpdate?: () => unknown,\n    workerManager?: WorkerPoolManager | undefined\n  ) {\n    super(undefined, onRenderUpdate, workerManager);\n    this.options = options;\n  }\n\n  public setConflictActions(conflictActions: MergeConflictDiffAction[]): void {\n    this.conflictActions.clear();\n    for (const action of conflictActions) {\n      const anchor = getMergeConflictActionAnchor(action);\n      if (anchor == null) {\n        continue;\n      }\n      const row = {\n        side: anchor.side,\n        lineNumber: anchor.lineNumber,\n        conflictIndex: action.conflictIndex,\n      };\n      const key = `${row.side}:${row.lineNumber}`;\n      const rows = this.conflictActions.get(key);\n      if (rows == null) {\n        this.conflictActions.set(key, [row]);\n      } else {\n        rows.push(row);\n      }\n    }\n  }\n\n  public override renderDiff(\n    diff?: FileDiffMetadata | undefined,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): HunksRenderResult | undefined {\n    if (diff != null) {\n      this.prepareMarkerLookups(diff);\n    }\n    return super.renderDiff(diff, renderRange);\n  }\n\n  public override async asyncRender(\n    diff: FileDiffMetadata,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<HunksRenderResult> {\n    this.prepareMarkerLookups(diff);\n    return super.asyncRender(diff, renderRange);\n  }\n\n  protected override createPreElement(\n    split: boolean,\n    totalLines: number,\n    themeStyles: string,\n    baseThemeType: 'light' | 'dark' | undefined\n  ): HASTElement {\n    return super.createPreElement(\n      split,\n      totalLines,\n      themeStyles,\n      baseThemeType,\n      { 'data-has-merge-conflict': '' }\n    );\n  }\n\n  protected override getUnifiedLineDecoration({\n    type,\n    lineType,\n    additionLineIndex,\n    deletionLineIndex,\n  }: UnifiedLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? lineType === 'change-deletion'\n          ? 'current'\n          : 'incoming'\n        : (this.getMergeConflictMarkerTypeAtIndex(\n            'additions',\n            additionLineIndex\n          ) ??\n          this.getMergeConflictMarkerTypeAtIndex(\n            'deletions',\n            deletionLineIndex\n          ));\n    return {\n      gutterLineType: type === 'change' ? 'context' : lineType,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getSplitLineDecoration({\n    side,\n    type,\n    lineIndex,\n  }: SplitLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? side === 'deletions'\n          ? 'current'\n          : 'incoming'\n        : this.getMergeConflictMarkerTypeAtIndex(side, lineIndex);\n    return {\n      gutterLineType: type === 'change' ? 'context' : type,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getUnifiedInlineRowsForLine = (\n    ctx: RenderedLineContext\n  ): InlineRow[] | undefined => {\n    const side = getUnifiedRenderedSide(ctx);\n    const lineNumber =\n      side === 'deletions'\n        ? ctx.deletionLine?.lineNumber\n        : ctx.additionLine?.lineNumber;\n    if (lineNumber == null) {\n      return undefined;\n    }\n    const rows = this.conflictActions.get(`${side}:${lineNumber}`);\n    if (rows == null || rows.length === 0) {\n      return undefined;\n    }\n    const { mergeConflictActionsType } = this.getOptionsWithDefaults();\n    return rows.map((row) => ({\n      content: createMergeConflictActionsRowElement({\n        row,\n        includeDefaultActions: mergeConflictActionsType === 'default',\n        includeSlot: true,\n      }),\n      gutter: createMergeConflictGutterGap(),\n    }));\n  };\n\n  private prepareMarkerLookups(diff: FileDiffMetadata): void {\n    if (this.cachedAdditionLines !== diff.additionLines) {\n      this.cachedAdditionLines = diff.additionLines;\n      this.additionMarkerLookup = buildMarkerLookup(diff.additionLines);\n    }\n    if (this.cachedDeletionLines !== diff.deletionLines) {\n      this.cachedDeletionLines = diff.deletionLines;\n      this.deletionMarkerLookup = buildMarkerLookup(diff.deletionLines);\n    }\n  }\n\n  private getMergeConflictMarkerTypeAtIndex(\n    side: 'additions' | 'deletions',\n    lineIndex: number | undefined\n  ): MergeConflictMarkerType | undefined {\n    if (lineIndex == null) {\n      return undefined;\n    }\n    const value = (\n      side === 'additions'\n        ? this.additionMarkerLookup\n        : this.deletionMarkerLookup\n    )[lineIndex];\n    if (value == null) {\n      return undefined;\n    }\n    return value === 'none' ? undefined : value;\n  }\n\n  protected override getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults {\n    const options = super.getOptionsWithDefaults();\n    options.diffStyle = 'unified';\n    options.lineDiffType = 'none';\n    // NOTE(amadeus): Aint nobody got time for a spread\n    (options as BaseUnresolvedOptionsWithDefaults).mergeConflictActionsType =\n      this.options.mergeConflictActionsType ?? 'default';\n    return options as BaseUnresolvedOptionsWithDefaults;\n  }\n}\n\nfunction getMergeConflictGutterProperties(\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  return mergeConflictType != null\n    ? { 'data-merge-conflict': mergeConflictType }\n    : undefined;\n}\n\nfunction getMergeConflictContentProperties(\n  type: 'change' | 'context' | 'context-expanded',\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  if (mergeConflictType == null) {\n    return undefined;\n  }\n  if (type === 'change') {\n    if (mergeConflictType === 'current' || mergeConflictType === 'incoming') {\n      return {\n        'data-line-type': 'context',\n        'data-merge-conflict': mergeConflictType,\n      };\n    }\n    return undefined;\n  }\n  if (\n    mergeConflictType === 'marker-start' ||\n    mergeConflictType === 'marker-base' ||\n    mergeConflictType === 'marker-separator' ||\n    mergeConflictType === 'marker-end'\n  ) {\n    return { 'data-merge-conflict': mergeConflictType };\n  }\n  return undefined;\n}\n\nfunction getMergeConflictMarkerType(\n  line: string | undefined\n): MergeConflictMarkerType | undefined {\n  if (line == null) {\n    return undefined;\n  }\n  const trimmed = line.replace(/(?:\\r\\n|\\n|\\r)$/, '');\n  if (START_MARKER.test(trimmed)) return 'marker-start';\n  if (BASE_MARKER.test(trimmed)) return 'marker-base';\n  if (SEPARATOR_MARKER.test(trimmed)) return 'marker-separator';\n  if (END_MARKER.test(trimmed)) return 'marker-end';\n  return undefined;\n}\n\nfunction buildMarkerLookup(lines: string[]): MergeConflictMarkerLookup[] {\n  const markerLookup: MergeConflictMarkerLookup[] = new Array(lines.length);\n  for (let index = 0; index < lines.length; index++) {\n    markerLookup[index] = getMergeConflictMarkerType(lines[index]) ?? 'none';\n  }\n  return markerLookup;\n}\n\nfunction getUnifiedRenderedSide(\n  ctx: RenderedLineContext\n): DiffLineAnnotation<undefined>['side'] {\n  if (\n    ctx.type === 'change' &&\n    ctx.deletionLine != null &&\n    ctx.additionLine == null\n  ) {\n    return 'deletions';\n  }\n  return 'additions';\n}\n\nfunction createMergeConflictGutterGap(): HASTElement {\n  const gap = createGutterGap(undefined, 'annotation', 1);\n  gap.properties['data-gutter-buffer'] = 'merge-conflict-action';\n  return gap;\n}\n\ninterface CreateMergeConflictActionsRowElementProps {\n  row: MergeConflictActionRowData;\n  includeDefaultActions: boolean;\n  includeSlot: boolean;\n}\n\nfunction createMergeConflictActionsRowElement({\n  row,\n  includeDefaultActions,\n  includeSlot,\n}: CreateMergeConflictActionsRowElementProps): HASTElement {\n  const contentChildren: HASTElement[] = includeDefaultActions\n    ? createMergeConflictActionsContent(row.conflictIndex)\n    : [];\n  if (includeSlot) {\n    contentChildren.push(\n      createHastElement({\n        tagName: 'slot',\n        properties: {\n          name: getMergeConflictActionSlotName({\n            side: row.side,\n            lineNumber: row.lineNumber,\n            conflictIndex: row.conflictIndex,\n          }),\n          'data-merge-conflict-action-slot': '',\n        },\n      })\n    );\n  }\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict-actions': '',\n    },\n    children: [\n      createHastElement({\n        tagName: 'div',\n        properties: { 'data-merge-conflict-actions-content': '' },\n        children: contentChildren,\n      }),\n    ],\n  });\n}\n\nfunction createMergeConflictActionsContent(\n  conflictIndex: number\n): HASTElement[] {\n  return [\n    createMergeConflictActionButton({\n      resolution: 'current',\n      label: 'Accept current change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'incoming',\n      label: 'Accept incoming change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'both',\n      label: 'Accept both',\n      conflictIndex,\n    }),\n  ];\n}\n\ninterface CreateMergeConflictActionButtonProps {\n  resolution: MergeConflictResolution;\n  label: string;\n  conflictIndex: number;\n}\n\nfunction createMergeConflictActionButton({\n  resolution,\n  label,\n  conflictIndex,\n}: CreateMergeConflictActionButtonProps): HASTElement {\n  return createHastElement({\n    tagName: 'button',\n    properties: {\n      type: 'button',\n      'data-merge-conflict-action': resolution,\n      'data-merge-conflict-conflict-index': `${conflictIndex}`,\n    },\n    children: [createTextNodeElement(label)],\n  });\n}\n\nfunction createMergeConflictActionSeparator(): HASTElement {\n  return createHastElement({\n    tagName: 'span',\n    properties: { 'data-merge-conflict-action-separator': '' },\n    children: [createTextNodeElement('|')],\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFileHunksRenderer.js","names":["row: MergeConflictInjectedRowData","before: InjectedRow[]","after: InjectedRow[]","contentChildren: HASTElement[]"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.ts"],"sourcesContent":["import type { Element as HASTElement, Properties } from 'hast';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport type {\n  BaseDiffOptions,\n  BaseDiffOptionsWithDefaults,\n  FileDiffMetadata,\n  MergeConflictMarkerRow,\n  MergeConflictResolution,\n  RenderRange,\n} from '../types';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  createGutterGap,\n  createHastElement,\n  createTextNodeElement,\n} from '../utils/hast_utils';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n  type InjectedRow,\n  type LineDecoration,\n  type RenderedLineContext,\n  type SplitLineDecorationProps,\n  type UnifiedInjectedRowPlacement,\n  type UnifiedLineDecorationProps,\n} from './DiffHunksRenderer';\n\ntype MergeConflictMarkerType =\n  | 'marker-start'\n  | 'marker-base'\n  | 'marker-separator'\n  | 'marker-end'\n  | 'current'\n  | 'incoming';\n\ninterface MergeConflictActionRowData {\n  hunkIndex: number;\n  lineIndex: number;\n  conflictIndex: number;\n}\n\ninterface MergeConflictMarkerInjectedRow extends MergeConflictMarkerRow {\n  type: Extract<\n    MergeConflictMarkerRow['type'],\n    'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end'\n  >;\n  lineText: string;\n  lineIndex: number;\n}\n\n// NOTE(amadeus): Don't love this, should probably rework into an\n// interface/extender\ntype MergeConflictInjectedRowData =\n  | ({ type: 'actions' } & MergeConflictActionRowData)\n  | MergeConflictMarkerInjectedRow;\n\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n  mergeConflictActionsType: MergeConflictActionsType;\n}\n\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\n\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n  mergeConflictActionsType?: MergeConflictActionsType;\n}\n\nexport class UnresolvedFileHunksRenderer<\n  LAnnotation = undefined,\n> extends DiffHunksRenderer<LAnnotation> {\n  private pendingConflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private pendingMarkerRows: MergeConflictMarkerRow[] = [];\n  private injectedRows = new Map<string, MergeConflictInjectedRowData[]>();\n  public override options: UnresolvedFileHunksRendererOptions;\n\n  constructor(\n    options: UnresolvedFileHunksRendererOptions = {\n      theme: DEFAULT_THEMES,\n    },\n    onRenderUpdate?: () => unknown,\n    workerManager?: WorkerPoolManager | undefined\n  ) {\n    super(undefined, onRenderUpdate, workerManager);\n    this.options = options;\n  }\n\n  // SELF_REVIEW: I don't love how this is hooked up with `renderDiff` right\n  // now, so we definitely need to figure out what the fuck we are gonna do\n  // about it...\n  // I think at the very least we should keep it like annotations, and just\n  // sorta assume there's a disconnect there\n  public setConflictState(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.pendingConflictActions = conflictActions;\n    this.pendingMarkerRows = markerRows;\n    this.syncInjectedRows(conflictActions, markerRows, diff);\n  }\n\n  private syncInjectedRows(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.injectedRows.clear();\n    for (const action of conflictActions) {\n      const anchor =\n        action != null ? getMergeConflictActionAnchor(action, diff) : undefined;\n      if (action == null || anchor == null) {\n        continue;\n      }\n      const row: MergeConflictInjectedRowData = {\n        type: 'actions',\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      };\n      this.addInjectedRow(row);\n    }\n\n    for (const row of markerRows) {\n      this.addInjectedRow(row);\n    }\n  }\n\n  private addInjectedRow(row: MergeConflictInjectedRowData): void {\n    const key = `${row.hunkIndex}:${row.lineIndex}`;\n    const rows = this.injectedRows.get(key);\n    if (rows == null) {\n      this.injectedRows.set(key, [row]);\n    } else {\n      rows.push(row);\n    }\n  }\n\n  public override renderDiff(\n    diff?: FileDiffMetadata | undefined,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): HunksRenderResult | undefined {\n    if (diff != null) {\n      this.syncInjectedRows(\n        this.pendingConflictActions,\n        this.pendingMarkerRows,\n        diff\n      );\n    }\n    return super.renderDiff(diff, renderRange);\n  }\n\n  public override async asyncRender(\n    diff: FileDiffMetadata,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<HunksRenderResult> {\n    this.syncInjectedRows(\n      this.pendingConflictActions,\n      this.pendingMarkerRows,\n      diff\n    );\n    return super.asyncRender(diff, renderRange);\n  }\n\n  protected override createPreElement(\n    split: boolean,\n    totalLines: number,\n    themeStyles: string,\n    baseThemeType: 'light' | 'dark' | undefined\n  ): HASTElement {\n    return super.createPreElement(\n      split,\n      totalLines,\n      themeStyles,\n      baseThemeType,\n      { 'data-has-merge-conflict': '' }\n    );\n  }\n\n  protected override getUnifiedLineDecoration({\n    type,\n    lineType,\n  }: UnifiedLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? lineType === 'change-deletion'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : lineType,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getSplitLineDecoration({\n    side,\n    type,\n  }: SplitLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? side === 'deletions'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : type,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getUnifiedInjectedRowsForLine = (\n    ctx: RenderedLineContext\n  ): UnifiedInjectedRowPlacement | undefined => {\n    const rows = this.injectedRows.get(`${ctx.hunkIndex}:${ctx.lineIndex}`);\n    if (rows == null || rows.length === 0) {\n      return undefined;\n    }\n    const { mergeConflictActionsType } = this.getOptionsWithDefaults();\n    const before: InjectedRow[] = [];\n    const after: InjectedRow[] = [];\n    for (const row of rows) {\n      if (row.type === 'actions') {\n        before.push({\n          content: createMergeConflictActionsRowElement({\n            row,\n            includeDefaultActions: mergeConflictActionsType === 'default',\n            includeSlot: true,\n          }),\n          gutter: createMergeConflictGutterGap('action'),\n        });\n        continue;\n      }\n      const target = row.type === 'marker-end' ? after : before;\n      target.push({\n        content: createMergeConflictMarkerRowElement(row),\n        gutter: createMergeConflictGutterGap('marker', row.type),\n      });\n    }\n    return {\n      before: before.length > 0 ? before : undefined,\n      after: after.length > 0 ? after : undefined,\n    };\n  };\n\n  protected override getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults {\n    const options = super.getOptionsWithDefaults();\n    options.diffStyle = 'unified';\n    options.lineDiffType = 'none';\n    // NOTE(amadeus): Aint nobody got time for a spread\n    (options as BaseUnresolvedOptionsWithDefaults).mergeConflictActionsType =\n      this.options.mergeConflictActionsType ?? 'default';\n    return options as BaseUnresolvedOptionsWithDefaults;\n  }\n}\n\nfunction getMergeConflictGutterProperties(\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  return mergeConflictType != null\n    ? { 'data-merge-conflict': mergeConflictType }\n    : undefined;\n}\n\nfunction getMergeConflictContentProperties(\n  type: 'change' | 'context' | 'context-expanded',\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  if (mergeConflictType == null) {\n    return undefined;\n  }\n  if (type === 'change') {\n    if (mergeConflictType === 'current' || mergeConflictType === 'incoming') {\n      return {\n        'data-line-type': 'context',\n        'data-merge-conflict': mergeConflictType,\n      };\n    }\n    return undefined;\n  }\n  if (\n    mergeConflictType === 'marker-start' ||\n    mergeConflictType === 'marker-base' ||\n    mergeConflictType === 'marker-separator' ||\n    mergeConflictType === 'marker-end'\n  ) {\n    return { 'data-merge-conflict': mergeConflictType };\n  }\n  return undefined;\n}\n\nfunction createMergeConflictGutterGap(\n  type: 'action' | 'marker',\n  markerType?: MergeConflictMarkerInjectedRow['type']\n): HASTElement {\n  const gap = createGutterGap(undefined, 'annotation', 1);\n  gap.properties['data-gutter-buffer'] =\n    type === 'action'\n      ? 'merge-conflict-action'\n      : `merge-conflict-${markerType ?? 'marker'}`;\n  return gap;\n}\n\ninterface CreateMergeConflictActionsRowElementProps {\n  row: MergeConflictActionRowData;\n  includeDefaultActions: boolean;\n  includeSlot: boolean;\n}\n\nfunction createMergeConflictActionsRowElement({\n  row,\n  includeDefaultActions,\n  includeSlot,\n}: CreateMergeConflictActionsRowElementProps): HASTElement {\n  const contentChildren: HASTElement[] = includeDefaultActions\n    ? createMergeConflictActionsContent(row.conflictIndex)\n    : [];\n  if (includeSlot) {\n    contentChildren.push(\n      createHastElement({\n        tagName: 'slot',\n        properties: {\n          name: getMergeConflictActionSlotName({\n            hunkIndex: row.hunkIndex,\n            lineIndex: row.lineIndex,\n            conflictIndex: row.conflictIndex,\n          }),\n          'data-merge-conflict-action-slot': '',\n        },\n      })\n    );\n  }\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict-actions': '',\n    },\n    children: [\n      createHastElement({\n        tagName: 'div',\n        properties: { 'data-merge-conflict-actions-content': '' },\n        children: contentChildren,\n      }),\n    ],\n  });\n}\n\nfunction createMergeConflictMarkerRowElement(\n  row: MergeConflictMarkerInjectedRow\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict': row.type,\n      'data-merge-conflict-marker-row': '',\n    },\n    children: [\n      createTextNodeElement(row.lineText.replace(/(?:\\r\\n|\\n|\\r)$/, '')),\n    ],\n  });\n}\n\nfunction createMergeConflictActionsContent(\n  conflictIndex: number\n): HASTElement[] {\n  return [\n    createMergeConflictActionButton({\n      resolution: 'current',\n      label: 'Accept current change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'incoming',\n      label: 'Accept incoming change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'both',\n      label: 'Accept both',\n      conflictIndex,\n    }),\n  ];\n}\n\ninterface CreateMergeConflictActionButtonProps {\n  resolution: MergeConflictResolution;\n  label: string;\n  conflictIndex: number;\n}\n\nfunction createMergeConflictActionButton({\n  resolution,\n  label,\n  conflictIndex,\n}: CreateMergeConflictActionButtonProps): HASTElement {\n  return createHastElement({\n    tagName: 'button',\n    properties: {\n      type: 'button',\n      'data-merge-conflict-action': resolution,\n      'data-merge-conflict-conflict-index': `${conflictIndex}`,\n    },\n    children: [createTextNodeElement(label)],\n  });\n}\n\nfunction createMergeConflictActionSeparator(): HASTElement {\n  return createHastElement({\n    tagName: 'span',\n    properties: { 'data-merge-conflict-action-separator': '' },\n    children: [createTextNodeElement('|')],\n  });\n}\n"],"mappings":"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"}

package/dist/ssr/index.d.ts

@@ -1,6 +1,6 @@
-import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ContextContent, CustomPreProperties, DecorationItem, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
+import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
 import { PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, preloadDiffHTML, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadUnresolvedFile, preloadUnresolvedFileHTML } from "./preloadDiffs.js";
 import { PreloadFileOptions, PreloadedFileResult, preloadFile } from "./preloadFile.js";
 import { PreloadPatchFileOptions, preloadPatchFile } from "./preloadPatchFile.js";
 import { renderHTML } from "./renderHTML.js";
-export { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ContextContent, CustomPreProperties, DecorationItem, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadFileOptions, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadPatchFileOptions, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, PreloadedFileResult, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs, preloadDiffHTML, preloadFile, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadPatchFile, preloadUnresolvedFile, preloadUnresolvedFileHTML, renderHTML };
+export { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadFileOptions, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadPatchFileOptions, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, PreloadedFileResult, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs, preloadDiffHTML, preloadFile, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadPatchFile, preloadUnresolvedFile, preloadUnresolvedFileHTML, renderHTML };

package/dist/ssr/preloadDiffs.d.ts

@@ -1,5 +1,5 @@
 import { DiffLineAnnotation, FileContents, FileDiffMetadata } from "../types.js";
-import { UnresolvedFileHunksRendererOptions } from "../renderers/UnresolvedFileHunksRenderer.js";
+import { UnresolvedFileOptions } from "../components/UnresolvedFile.js";
 import { FileDiffOptions } from "../components/FileDiff.js";
 
 //#region src/ssr/preloadDiffs.d.ts
@@ -52,7 +52,7 @@ declare function preloadFileDiff<LAnnotation = undefined>({
 }: PreloadFileDiffOptions<LAnnotation>): Promise<PreloadFileDiffResult<LAnnotation>>;
 interface PreloadUnresolvedFileOptions<LAnnotation> {
   file: FileContents;
-  options?: UnresolvedFileHunksRendererOptions;
+  options?: Omit<UnresolvedFileOptions<LAnnotation>, 'onMergeConflictAction' | 'onMergeConflictResolve' | 'onPostRender'>;
   annotations?: DiffLineAnnotation<LAnnotation>[];
 }
 interface PreloadUnresolvedFileResult<LAnnotation> extends PreloadUnresolvedFileOptions<LAnnotation> {

package/dist/ssr/preloadDiffs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preloadDiffs.d.ts","names":["FileDiffOptions","UnresolvedFileHunksRendererOptions","DiffLineAnnotation","FileContents","FileDiffMetadata","PreloadDiffOptions","LAnnotation","preloadDiffHTML","fileDiff","oldFile","newFile","options","annotations","Promise","preloadUnresolvedFileHTML","file","PreloadUnresolvedFileOptions","PreloadMultiFileDiffOptions","PreloadMultiFileDiffResult","preloadMultiFileDiff","PreloadFileDiffOptions","PreloadFileDiffResult","preloadFileDiff","PreloadUnresolvedFileResult","preloadUnresolvedFile","PreloadPatchDiffOptions","PreloadPatchDiffResult","preloadPatchDiff","patch"],"sources":["../../src/ssr/preloadDiffs.d.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport { type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { DiffLineAnnotation, FileContents, FileDiffMetadata } from '../types';\nexport interface PreloadDiffOptions<LAnnotation> {\n    fileDiff?: FileDiffMetadata;\n    oldFile?: FileContents;\n    newFile?: FileContents;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport declare function preloadDiffHTML<LAnnotation = undefined>({ fileDiff, oldFile, newFile, options, annotations }: PreloadDiffOptions<LAnnotation>): Promise<string>;\nexport declare function preloadUnresolvedFileHTML<LAnnotation = undefined>({ file, options, annotations }: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string>;\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n    oldFile: FileContents;\n    newFile: FileContents;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadMultiFileDiffResult<LAnnotation> extends PreloadMultiFileDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadMultiFileDiff<LAnnotation = undefined>({ oldFile, newFile, options, annotations }: PreloadMultiFileDiffOptions<LAnnotation>): Promise<PreloadMultiFileDiffResult<LAnnotation>>;\nexport interface PreloadFileDiffOptions<LAnnotation> {\n    fileDiff: FileDiffMetadata;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadFileDiffResult<LAnnotation> extends PreloadFileDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadFileDiff<LAnnotation = undefined>({ fileDiff, options, annotations }: PreloadFileDiffOptions<LAnnotation>): Promise<PreloadFileDiffResult<LAnnotation>>;\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n    file: FileContents;\n    options?: UnresolvedFileHunksRendererOptions;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadUnresolvedFileResult<LAnnotation> extends PreloadUnresolvedFileOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadUnresolvedFile<LAnnotation = undefined>({ file, options, annotations }: PreloadUnresolvedFileOptions<LAnnotation>): Promise<PreloadUnresolvedFileResult<LAnnotation>>;\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n    patch: string;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadPatchDiffResult<LAnnotation> extends PreloadPatchDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadPatchDiff<LAnnotation = undefined>({ patch, options, annotations }: PreloadPatchDiffOptions<LAnnotation>): Promise<PreloadPatchDiffResult<LAnnotation>>;\n//# sourceMappingURL=preloadDiffs.d.ts.map"],"mappings":";;;;;UAGiBK;aACFD;EADEC,OAAAA,CAAAA,EAEHF,YAFqB;EACpBC,OAAAA,CAAAA,EAEDD,YAFCC;EACDD,OAAAA,CAAAA,EAEAH,eAFAG,CAEgBG,WAFhBH,CAAAA;EACAA,WAAAA,CAAAA,EAEID,kBAFJC,CAEuBG,WAFvBH,CAAAA,EAAAA;;AACAH,iBAGUO,eAHVP,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAGyGK,kBAHzGL,CAG4HM,WAH5HN,CAAAA,CAAAA,EAG2Ia,OAH3Ib,CAAAA,MAAAA,CAAAA;AACuBM,iBAGbQ,yBAHaR,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAGsEU,4BAHtEV,CAGmGA,WAHnGA,CAAAA,CAAAA,EAGkHO,OAHlHP,CAAAA,MAAAA,CAAAA;AAAnBJ,UAIDe,2BAJCf,CAAAA,WAAAA,CAAAA,CAAAA;EAAkB,OAAA,EAKvBC,YALuB;EAEZI,OAAAA,EAIXJ,YAJ0B;EAA4BK,OAAAA,CAAAA,EAKrDR,eALqDQ,CAKrCF,WALqCE,CAAAA;EAAUC,WAAAA,CAAAA,EAM3DP,kBAN2DO,CAMxCH,WANwCG,CAAAA,EAAAA;;AAAkBE,UAQ9EO,0BAR8EP,CAAAA,WAAAA,CAAAA,SAQ9BM,2BAR8BN,CAQFL,WAREK,CAAAA,CAAAA;EAASC,eAAAA,EAAAA,MAAAA;;AAAeP,iBAW/Fc,oBAX+Fd,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAWLY,2BAXKZ,CAWuBC,WAXvBD,CAAAA,CAAAA,EAWsCQ,OAXtCR,CAW8Ca,0BAX9Cb,CAWyEC,WAXzED,CAAAA,CAAAA;AAAkCQ,UAYxIO,sBAZwIP,CAAAA,WAAAA,CAAAA,CAAAA;EAAO,QAAA,EAalJT,gBAbkJ;EACxIU,OAAAA,CAAAA,EAaVd,eAbUc,CAaMR,WAbmBA,CAAAA;EAA4BS,WAAAA,CAAAA,EAc3Db,kBAd2Da,CAcxCT,WAdwCS,CAAAA,EAAAA;;AAAeH,UAgB3ES,qBAhB2ET,CAAAA,WAAAA,CAAAA,SAgBhCQ,sBAhBgCR,CAgBTN,WAhBSM,CAAAA,CAAAA;EAA4CN,eAAAA,EAAAA,MAAAA;;AAAeO,iBAmB/HS,eAnB+HT,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAmBlDO,sBAnBkDP,CAmB3BP,WAnB2BO,CAAAA,CAAAA,EAmBZA,OAnBYA,CAmBJQ,qBAnBIR,CAmBkBP,WAnBlBO,CAAAA,CAAAA;AAAO,UAoB7IG,4BApB6I,CAAA,WAAA,CAAA,CAAA;EAC7IC,IAAAA,EAoBPd,YApBOc;EACJd,OAAAA,CAAAA,EAoBCF,kCApBDE;EACAA,WAAAA,CAAAA,EAoBKD,kBApBLC,CAoBwBG,WApBxBH,CAAAA,EAAAA;;AACCH,UAqBGuB,2BArBHvB,CAAAA,WAAAA,CAAAA,SAqBoDgB,4BArBpDhB,CAqBiFM,WArBjFN,CAAAA,CAAAA;EACuBM,eAAAA,EAAAA,MAAAA;;AAAD,iBAuBZkB,qBAvBY,CAAA,cAAA,SAAA,CAAA,CAAA;EAAA,IAAA;EAAA,OAAA;EAAA;AAAA,CAAA,EAuBmER,4BAvBnE,CAuBgGV,WAvBhG,CAAA,CAAA,EAuB+GO,OAvB/G,CAuBuHU,2BAvBvH,CAuBmJjB,WAvBnJ,CAAA,CAAA;AAEnBY,UAsBAO,uBAtB0BnB,CAAAA,WAAAA,CAAAA,CAAAA;EAGnBa,KAAAA,EAAAA,MAAAA;EAAgDV,OAAAA,CAAAA,EAqB1DT,eArB0DS,CAqB1CH,WArB0CG,CAAAA;EAASC,WAAAA,CAAAA,EAsB/DR,kBAtB+DQ,CAsB5CJ,WAtB4CI,CAAAA,EAAAA;;AAAkBE,UAwBlFc,sBAxBkFd,CAAAA,WAAAA,CAAAA,SAwBtCa,uBAxBsCb,CAwBdN,WAxBcM,CAAAA,CAAAA;EAA2CN,eAAAA,EAAAA,MAAAA;;AAAkDA,iBA2BxKqB,gBA3BwKrB,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,KAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EA2B7FmB,uBA3B6FnB,CA2BrEA,WA3BqEA,CAAAA,CAAAA,EA2BtDO,OA3BsDP,CA2B9CoB,sBA3B8CpB,CA2BvBA,WA3BuBA,CAAAA,CAAAA"}
+{"version":3,"file":"preloadDiffs.d.ts","names":["FileDiffOptions","UnresolvedFileOptions","DiffLineAnnotation","FileContents","FileDiffMetadata","PreloadDiffOptions","LAnnotation","preloadDiffHTML","fileDiff","oldFile","newFile","options","annotations","Promise","preloadUnresolvedFileHTML","file","PreloadUnresolvedFileOptions","PreloadMultiFileDiffOptions","PreloadMultiFileDiffResult","preloadMultiFileDiff","PreloadFileDiffOptions","PreloadFileDiffResult","preloadFileDiff","Omit","PreloadUnresolvedFileResult","preloadUnresolvedFile","PreloadPatchDiffOptions","PreloadPatchDiffResult","preloadPatchDiff","patch"],"sources":["../../src/ssr/preloadDiffs.d.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport { type UnresolvedFileOptions } from '../components/UnresolvedFile';\nimport type { DiffLineAnnotation, FileContents, FileDiffMetadata } from '../types';\nexport interface PreloadDiffOptions<LAnnotation> {\n    fileDiff?: FileDiffMetadata;\n    oldFile?: FileContents;\n    newFile?: FileContents;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport declare function preloadDiffHTML<LAnnotation = undefined>({ fileDiff, oldFile, newFile, options, annotations }: PreloadDiffOptions<LAnnotation>): Promise<string>;\nexport declare function preloadUnresolvedFileHTML<LAnnotation = undefined>({ file, options, annotations }: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string>;\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n    oldFile: FileContents;\n    newFile: FileContents;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadMultiFileDiffResult<LAnnotation> extends PreloadMultiFileDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadMultiFileDiff<LAnnotation = undefined>({ oldFile, newFile, options, annotations }: PreloadMultiFileDiffOptions<LAnnotation>): Promise<PreloadMultiFileDiffResult<LAnnotation>>;\nexport interface PreloadFileDiffOptions<LAnnotation> {\n    fileDiff: FileDiffMetadata;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadFileDiffResult<LAnnotation> extends PreloadFileDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadFileDiff<LAnnotation = undefined>({ fileDiff, options, annotations }: PreloadFileDiffOptions<LAnnotation>): Promise<PreloadFileDiffResult<LAnnotation>>;\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n    file: FileContents;\n    options?: Omit<UnresolvedFileOptions<LAnnotation>, 'onMergeConflictAction' | 'onMergeConflictResolve' | 'onPostRender'>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadUnresolvedFileResult<LAnnotation> extends PreloadUnresolvedFileOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadUnresolvedFile<LAnnotation = undefined>({ file, options, annotations }: PreloadUnresolvedFileOptions<LAnnotation>): Promise<PreloadUnresolvedFileResult<LAnnotation>>;\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n    patch: string;\n    options?: FileDiffOptions<LAnnotation>;\n    annotations?: DiffLineAnnotation<LAnnotation>[];\n}\nexport interface PreloadPatchDiffResult<LAnnotation> extends PreloadPatchDiffOptions<LAnnotation> {\n    prerenderedHTML: string;\n}\nexport declare function preloadPatchDiff<LAnnotation = undefined>({ patch, options, annotations }: PreloadPatchDiffOptions<LAnnotation>): Promise<PreloadPatchDiffResult<LAnnotation>>;\n//# sourceMappingURL=preloadDiffs.d.ts.map"],"mappings":";;;;;UAGiBK;aACFD;EADEC,OAAAA,CAAAA,EAEHF,YAFqB;EACpBC,OAAAA,CAAAA,EAEDD,YAFCC;EACDD,OAAAA,CAAAA,EAEAH,eAFAG,CAEgBG,WAFhBH,CAAAA;EACAA,WAAAA,CAAAA,EAEID,kBAFJC,CAEuBG,WAFvBH,CAAAA,EAAAA;;AACAH,iBAGUO,eAHVP,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAGyGK,kBAHzGL,CAG4HM,WAH5HN,CAAAA,CAAAA,EAG2Ia,OAH3Ib,CAAAA,MAAAA,CAAAA;AACuBM,iBAGbQ,yBAHaR,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAGsEU,4BAHtEV,CAGmGA,WAHnGA,CAAAA,CAAAA,EAGkHO,OAHlHP,CAAAA,MAAAA,CAAAA;AAAnBJ,UAIDe,2BAJCf,CAAAA,WAAAA,CAAAA,CAAAA;EAAkB,OAAA,EAKvBC,YALuB;EAEZI,OAAAA,EAIXJ,YAJ0B;EAA4BK,OAAAA,CAAAA,EAKrDR,eALqDQ,CAKrCF,WALqCE,CAAAA;EAAUC,WAAAA,CAAAA,EAM3DP,kBAN2DO,CAMxCH,WANwCG,CAAAA,EAAAA;;AAAkBE,UAQ9EO,0BAR8EP,CAAAA,WAAAA,CAAAA,SAQ9BM,2BAR8BN,CAQFL,WAREK,CAAAA,CAAAA;EAASC,eAAAA,EAAAA,MAAAA;;AAAeP,iBAW/Fc,oBAX+Fd,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAWLY,2BAXKZ,CAWuBC,WAXvBD,CAAAA,CAAAA,EAWsCQ,OAXtCR,CAW8Ca,0BAX9Cb,CAWyEC,WAXzED,CAAAA,CAAAA;AAAkCQ,UAYxIO,sBAZwIP,CAAAA,WAAAA,CAAAA,CAAAA;EAAO,QAAA,EAalJT,gBAbkJ;EACxIU,OAAAA,CAAAA,EAaVd,eAbUc,CAaMR,WAbmBA,CAAAA;EAA4BS,WAAAA,CAAAA,EAc3Db,kBAd2Da,CAcxCT,WAdwCS,CAAAA,EAAAA;;AAAeH,UAgB3ES,qBAhB2ET,CAAAA,WAAAA,CAAAA,SAgBhCQ,sBAhBgCR,CAgBTN,WAhBSM,CAAAA,CAAAA;EAA4CN,eAAAA,EAAAA,MAAAA;;AAAeO,iBAmB/HS,eAnB+HT,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAmBlDO,sBAnBkDP,CAmB3BP,WAnB2BO,CAAAA,CAAAA,EAmBZA,OAnBYA,CAmBJQ,qBAnBIR,CAmBkBP,WAnBlBO,CAAAA,CAAAA;AAAO,UAoB7IG,4BApB6I,CAAA,WAAA,CAAA,CAAA;EAC7IC,IAAAA,EAoBPd,YApBOc;EACJd,OAAAA,CAAAA,EAoBCoB,IApBDpB,CAoBMF,qBApBNE,CAoB4BG,WApB5BH,CAAAA,EAAAA,uBAAAA,GAAAA,wBAAAA,GAAAA,cAAAA,CAAAA;EACAA,WAAAA,CAAAA,EAoBKD,kBApBLC,CAoBwBG,WApBxBH,CAAAA,EAAAA;;AACCH,UAqBGwB,2BArBHxB,CAAAA,WAAAA,CAAAA,SAqBoDgB,4BArBpDhB,CAqBiFM,WArBjFN,CAAAA,CAAAA;EACuBM,eAAAA,EAAAA,MAAAA;;AAAD,iBAuBZmB,qBAvBY,CAAA,cAAA,SAAA,CAAA,CAAA;EAAA,IAAA;EAAA,OAAA;EAAA;AAAA,CAAA,EAuBmET,4BAvBnE,CAuBgGV,WAvBhG,CAAA,CAAA,EAuB+GO,OAvB/G,CAuBuHW,2BAvBvH,CAuBmJlB,WAvBnJ,CAAA,CAAA;AAEnBY,UAsBAQ,uBAtB0BpB,CAAAA,WAAAA,CAAAA,CAAAA;EAGnBa,KAAAA,EAAAA,MAAAA;EAAgDV,OAAAA,CAAAA,EAqB1DT,eArB0DS,CAqB1CH,WArB0CG,CAAAA;EAASC,WAAAA,CAAAA,EAsB/DR,kBAtB+DQ,CAsB5CJ,WAtB4CI,CAAAA,EAAAA;;AAAkBE,UAwBlFe,sBAxBkFf,CAAAA,WAAAA,CAAAA,SAwBtCc,uBAxBsCd,CAwBdN,WAxBcM,CAAAA,CAAAA;EAA2CN,eAAAA,EAAAA,MAAAA;;AAAkDA,iBA2BxKsB,gBA3BwKtB,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,KAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EA2B7FoB,uBA3B6FpB,CA2BrEA,WA3BqEA,CAAAA,CAAAA,EA2BtDO,OA3BsDP,CA2B9CqB,sBA3B8CrB,CA2BvBA,WA3BuBA,CAAAA,CAAAA"}

package/dist/ssr/preloadDiffs.js

@@ -2,6 +2,7 @@ import { DiffHunksRenderer } from "../renderers/DiffHunksRenderer.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRenderer } from "../renderers/UnresolvedFileHunksRenderer.js";
+import { getUnresolvedDiffHunksRendererOptions } from "../components/UnresolvedFile.js";
 import { createStyleElement } from "../utils/createStyleElement.js";
 import { getSingularPatch } from "../utils/getSingularPatch.js";
 import { renderHTML } from "./renderHTML.js";
@@ -15,10 +16,10 @@ async function preloadDiffHTML({ fileDiff, oldFile, newFile, options, annotation
 	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS));
 }
 async function preloadUnresolvedFileHTML({ file, options, annotations }) {
-	const { fileDiff, actions } = parseMergeConflictDiffFromFile(file);
-	const renderer = new UnresolvedFileHunksRenderer(options);
+	const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
+	const renderer = new UnresolvedFileHunksRenderer(getUnresolvedDiffHunksRendererOptions(options));
 	if (annotations != null && annotations.length > 0) renderer.setLineAnnotations(annotations);
-	renderer.setConflictActions(actions);
+	renderer.setConflictState(actions, markerRows, fileDiff);
 	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS));
 }
 async function preloadMultiFileDiff({ oldFile, newFile, options, annotations }) {

package/dist/ssr/preloadDiffs.js.map

@@ -1 +1 @@
-{"version":3,"file":"preloadDiffs.js","names":[],"sources":["../../src/ssr/preloadDiffs.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n} from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  BaseDiffOptions,\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n} from '../types';\nimport { createStyleElement } from '../utils/createStyleElement';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport { parseDiffFromFile } from '../utils/parseDiffFromFile';\nimport { parseMergeConflictDiffFromFile } from '../utils/parseMergeConflictDiffFromFile';\nimport { renderHTML } from './renderHTML';\n\nexport interface PreloadDiffOptions<LAnnotation> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport async function preloadDiffHTML<LAnnotation = undefined>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadDiffOptions<LAnnotation>): Promise<string> {\n  if (fileDiff == null && oldFile != null && newFile != null) {\n    fileDiff = parseDiffFromFile(oldFile, newFile);\n  }\n  if (fileDiff == null) {\n    throw new Error(\n      'preloadFileDiff: You must pass at least a fileDiff prop or oldFile/newFile props'\n    );\n  }\n  const renderer = new DiffHunksRenderer<LAnnotation>(\n    getHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport async function preloadUnresolvedFileHTML<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string> {\n  const { fileDiff, actions } = parseMergeConflictDiffFromFile(file);\n  const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(options);\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  renderer.setConflictActions(actions);\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n  oldFile: FileContents;\n  newFile: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadMultiFileDiffResult<\n  LAnnotation,\n> extends PreloadMultiFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadMultiFileDiff<LAnnotation = undefined>({\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadMultiFileDiffOptions<LAnnotation>): Promise<\n  PreloadMultiFileDiffResult<LAnnotation>\n> {\n  return {\n    newFile,\n    oldFile,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      oldFile,\n      newFile,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadFileDiffOptions<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadFileDiffResult<\n  LAnnotation,\n> extends PreloadFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadFileDiff<LAnnotation = undefined>({\n  fileDiff,\n  options,\n  annotations,\n}: PreloadFileDiffOptions<LAnnotation>): Promise<\n  PreloadFileDiffResult<LAnnotation>\n> {\n  return {\n    fileDiff,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileHunksRendererOptions;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadUnresolvedFileResult<\n  LAnnotation,\n> extends PreloadUnresolvedFileOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadUnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<\n  PreloadUnresolvedFileResult<LAnnotation>\n> {\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: await preloadUnresolvedFileHTML({\n      file,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n  patch: string;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadPatchDiffResult<\n  LAnnotation,\n> extends PreloadPatchDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadPatchDiff<LAnnotation = undefined>({\n  patch,\n  options,\n  annotations,\n}: PreloadPatchDiffOptions<LAnnotation>): Promise<\n  PreloadPatchDiffResult<LAnnotation>\n> {\n  const fileDiff = getSingularPatch(patch);\n  return {\n    patch,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nfunction processHunkResult<LAnnotation>(\n  hunkResult: HunksRenderResult,\n  renderer:\n    | DiffHunksRenderer<LAnnotation>\n    | UnresolvedFileHunksRenderer<LAnnotation>,\n  unsafeCSS: string | undefined\n) {\n  const children = [createStyleElement(hunkResult.css, true)];\n  if (unsafeCSS != null) {\n    children.push(createStyleElement(unsafeCSS));\n  }\n  if (hunkResult.headerElement != null) {\n    children.push(hunkResult.headerElement);\n  }\n  const code = renderer.renderFullAST(hunkResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n  return children;\n}\n\nfunction getHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): BaseDiffOptions {\n  return {\n    ...options,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n  };\n}\n"],"mappings":";;;;;;;;;AA6BA,eAAsB,gBAAyC,EAC7D,UACA,SACA,SACA,SACA,eACmD;AACnD,KAAI,YAAY,QAAQ,WAAW,QAAQ,WAAW,KACpD,YAAW,kBAAkB,SAAS,QAAQ;AAEhD,KAAI,YAAY,KACd,OAAM,IAAI,MACR,mFACD;CAEH,MAAM,WAAW,IAAI,kBACnB,wBAAwB,QAAQ,CACjC;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAGH,eAAsB,0BAAmD,EACvE,MACA,SACA,eAC6D;CAC7D,MAAM,EAAE,UAAU,YAAY,+BAA+B,KAAK;CAClE,MAAM,WAAW,IAAI,4BAAyC,QAAQ;AACtE,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,UAAS,mBAAmB,QAAQ;AACpC,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAgBH,eAAsB,qBAA8C,EAClE,SACA,SACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,gBAAyC,EAC7D,UACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,sBAA+C,EACnE,MACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,0BAA0B;GAC/C;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,iBAA0C,EAC9D,OACA,SACA,eAGA;AAEA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC,UANa,iBAAiB,MAAM;GAOpC;GACA;GACD,CAAC;EACH;;AAGH,SAAS,kBACP,YACA,UAGA,WACA;CACA,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAC3D,KAAI,aAAa,KACf,UAAS,KAAK,mBAAmB,UAAU,CAAC;AAE9C,KAAI,WAAW,iBAAiB,KAC9B,UAAS,KAAK,WAAW,cAAc;CAEzC,MAAM,OAAO,SAAS,cAAc,WAAW;AAC/C,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AACnB,QAAO;;AAGT,SAAS,wBACP,SACiB;AACjB,QAAO;EACL,GAAG;EACH,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EAChB"}
+{"version":3,"file":"preloadDiffs.js","names":[],"sources":["../../src/ssr/preloadDiffs.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport {\n  getUnresolvedDiffHunksRendererOptions,\n  type UnresolvedFileOptions,\n} from '../components/UnresolvedFile';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n} from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  BaseDiffOptions,\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n} from '../types';\nimport { createStyleElement } from '../utils/createStyleElement';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport { parseDiffFromFile } from '../utils/parseDiffFromFile';\nimport { parseMergeConflictDiffFromFile } from '../utils/parseMergeConflictDiffFromFile';\nimport { renderHTML } from './renderHTML';\n\nexport interface PreloadDiffOptions<LAnnotation> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport async function preloadDiffHTML<LAnnotation = undefined>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadDiffOptions<LAnnotation>): Promise<string> {\n  if (fileDiff == null && oldFile != null && newFile != null) {\n    fileDiff = parseDiffFromFile(oldFile, newFile);\n  }\n  if (fileDiff == null) {\n    throw new Error(\n      'preloadFileDiff: You must pass at least a fileDiff prop or oldFile/newFile props'\n    );\n  }\n  const renderer = new DiffHunksRenderer<LAnnotation>(\n    getHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport async function preloadUnresolvedFileHTML<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string> {\n  const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n    file,\n    options?.maxContextLines\n  );\n  const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n    getUnresolvedDiffHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  renderer.setConflictState(actions, markerRows, fileDiff);\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n  oldFile: FileContents;\n  newFile: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadMultiFileDiffResult<\n  LAnnotation,\n> extends PreloadMultiFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadMultiFileDiff<LAnnotation = undefined>({\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadMultiFileDiffOptions<LAnnotation>): Promise<\n  PreloadMultiFileDiffResult<LAnnotation>\n> {\n  return {\n    newFile,\n    oldFile,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      oldFile,\n      newFile,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadFileDiffOptions<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadFileDiffResult<\n  LAnnotation,\n> extends PreloadFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadFileDiff<LAnnotation = undefined>({\n  fileDiff,\n  options,\n  annotations,\n}: PreloadFileDiffOptions<LAnnotation>): Promise<\n  PreloadFileDiffResult<LAnnotation>\n> {\n  return {\n    fileDiff,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n  file: FileContents;\n  options?: Omit<\n    UnresolvedFileOptions<LAnnotation>,\n    'onMergeConflictAction' | 'onMergeConflictResolve' | 'onPostRender'\n  >;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadUnresolvedFileResult<\n  LAnnotation,\n> extends PreloadUnresolvedFileOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadUnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<\n  PreloadUnresolvedFileResult<LAnnotation>\n> {\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: await preloadUnresolvedFileHTML({\n      file,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n  patch: string;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadPatchDiffResult<\n  LAnnotation,\n> extends PreloadPatchDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadPatchDiff<LAnnotation = undefined>({\n  patch,\n  options,\n  annotations,\n}: PreloadPatchDiffOptions<LAnnotation>): Promise<\n  PreloadPatchDiffResult<LAnnotation>\n> {\n  const fileDiff = getSingularPatch(patch);\n  return {\n    patch,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nfunction processHunkResult<LAnnotation>(\n  hunkResult: HunksRenderResult,\n  renderer:\n    | DiffHunksRenderer<LAnnotation>\n    | UnresolvedFileHunksRenderer<LAnnotation>,\n  unsafeCSS: string | undefined\n) {\n  const children = [createStyleElement(hunkResult.css, true)];\n  if (unsafeCSS != null) {\n    children.push(createStyleElement(unsafeCSS));\n  }\n  if (hunkResult.headerElement != null) {\n    children.push(hunkResult.headerElement);\n  }\n  const code = renderer.renderFullAST(hunkResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n  return children;\n}\n\nfunction getHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): BaseDiffOptions {\n  return {\n    ...options,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n  };\n}\n"],"mappings":";;;;;;;;;;AA8BA,eAAsB,gBAAyC,EAC7D,UACA,SACA,SACA,SACA,eACmD;AACnD,KAAI,YAAY,QAAQ,WAAW,QAAQ,WAAW,KACpD,YAAW,kBAAkB,SAAS,QAAQ;AAEhD,KAAI,YAAY,KACd,OAAM,IAAI,MACR,mFACD;CAEH,MAAM,WAAW,IAAI,kBACnB,wBAAwB,QAAQ,CACjC;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAGH,eAAsB,0BAAmD,EACvE,MACA,SACA,eAC6D;CAC7D,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,gBACV;CACD,MAAM,WAAW,IAAI,4BACnB,sCAAsC,QAAQ,CAC/C;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,UAAS,iBAAiB,SAAS,YAAY,SAAS;AACxD,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAgBH,eAAsB,qBAA8C,EAClE,SACA,SACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,gBAAyC,EAC7D,UACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACD,CAAC;EACH;;AAkBH,eAAsB,sBAA+C,EACnE,MACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,0BAA0B;GAC/C;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,iBAA0C,EAC9D,OACA,SACA,eAGA;AAEA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC,UANa,iBAAiB,MAAM;GAOpC;GACA;GACD,CAAC;EACH;;AAGH,SAAS,kBACP,YACA,UAGA,WACA;CACA,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAC3D,KAAI,aAAa,KACf,UAAS,KAAK,mBAAmB,UAAU,CAAC;AAE9C,KAAI,WAAW,iBAAiB,KAC9B,UAAS,KAAK,WAAW,cAAc;CAEzC,MAAM,OAAO,SAAS,cAAc,WAAW;AAC/C,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AACnB,QAAO;;AAGT,SAAS,wBACP,SACiB;AACjB,QAAO;EACL,GAAG;EACH,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EAChB"}