pi-exec-command 0.3.7

package/node_modules/@pierre/diffs/dist/utils/parseMergeConflictDiffFromFile.js

@@ -0,0 +1,503 @@
+import { getHunkSideEndBoundary, getHunkSideStartBoundary } from "./getHunkSideBoundaries.js";
+//#region src/utils/parseMergeConflictDiffFromFile.ts
+function getMergeConflictActionAnchor(action, fileDiff) {
+	const hunk = fileDiff.hunks[action.hunkIndex];
+	if (hunk == null) return;
+	return {
+		hunkIndex: action.hunkIndex,
+		lineIndex: getUnifiedLineStartForContent(hunk, action.startContentIndex)
+	};
+}
+function parseMergeConflictDiffFromFile(file, maxContextLines = 6) {
+	maxContextLines = Math.max(maxContextLines, 1);
+	const s = {
+		deletionLines: [],
+		additionLines: [],
+		conflictStack: [],
+		conflictBuilders: [],
+		actions: [],
+		hunks: [],
+		nextConflictIndex: 0,
+		splitLineCount: 0,
+		unifiedLineCount: 0,
+		lastHunkEnd: 0,
+		activeHunk: void 0,
+		maxContextLines,
+		maxContextLines2: maxContextLines * 2
+	};
+	const contents = file.contents;
+	const contentLength = contents.length;
+	if (contentLength > 0) {
+		let lineStart = 0;
+		let lineIndex = 0;
+		let newlinePos = contents.indexOf("\n", lineStart);
+		while (newlinePos !== -1) {
+			processLine(s, contents.slice(lineStart, newlinePos + 1), lineIndex);
+			lineStart = newlinePos + 1;
+			lineIndex++;
+			newlinePos = contents.indexOf("\n", lineStart);
+		}
+		if (lineStart < contentLength) processLine(s, contents.slice(lineStart), lineIndex);
+	}
+	if (s.conflictStack.length > 0) throw new Error("parseMergeConflictDiffFromFile: unfinished merge conflict marker stack");
+	if (s.activeHunk != null && s.activeHunk.hunkContent.length > 0) {
+		flushBufferedContext(s, s.activeHunk, "trailing");
+		finalizeActiveHunk(s);
+	}
+	for (let conflictIndex = 0; conflictIndex < s.conflictBuilders.length; conflictIndex++) {
+		const builder = s.conflictBuilders[conflictIndex];
+		if (builder == null || !builder.completed) throw new Error(`parseMergeConflictDiffFromFile: failed to build merge conflict action ${conflictIndex}`);
+	}
+	if (s.hunks.length > 0 && s.additionLines.length > 0 && s.deletionLines.length > 0) {
+		const lastHunk = s.hunks[s.hunks.length - 1];
+		const collapsedAfter = Math.max(s.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount), 0);
+		s.splitLineCount += collapsedAfter;
+		s.unifiedLineCount += collapsedAfter;
+	}
+	const currentContents = s.deletionLines.join("");
+	const incomingContents = s.additionLines.join("");
+	const currentFile = createResolvedConflictFile(file, "current", currentContents);
+	const incomingFile = createResolvedConflictFile(file, "incoming", incomingContents);
+	let type = "change";
+	if (incomingContents === "") type = "deleted";
+	else if (currentContents === "") type = "new";
+	const fileDiff = {
+		name: file.name,
+		prevName: void 0,
+		type,
+		hunks: s.hunks,
+		splitLineCount: s.splitLineCount,
+		unifiedLineCount: s.unifiedLineCount,
+		isPartial: false,
+		deletionLines: s.deletionLines,
+		additionLines: s.additionLines,
+		cacheKey: file.cacheKey != null ? `${file.cacheKey}:merge-conflict-diff` : void 0
+	};
+	return {
+		fileDiff,
+		currentFile,
+		incomingFile,
+		actions: s.actions,
+		markerRows: buildMergeConflictMarkerRows(fileDiff, s.actions)
+	};
+}
+function processLine(s, line, index) {
+	const frame = s.conflictStack[s.conflictStack.length - 1];
+	if (frame == null) {
+		if (line.length >= 7 && line.charCodeAt(0) === 60 && getMergeConflictMarkerType(line) === "start") {
+			handleStartMarker(s, line, index);
+			return;
+		}
+		emitContextLine(s, line);
+		return;
+	}
+	const markerType = getMergeConflictMarkerType(line);
+	if (markerType === "start") {
+		handleStartMarker(s, line, index);
+		return;
+	}
+	if (markerType === "base") {
+		frame.stage = "base";
+		frame.baseMarkerLineIndex = index;
+		frame.markerLines.base = line;
+		return;
+	}
+	if (markerType === "separator") {
+		frame.stage = "incoming";
+		frame.separatorLineIndex = index;
+		frame.markerLines.separator = line;
+		return;
+	}
+	if (markerType === "end") {
+		const completedFrame = s.conflictStack.pop();
+		if (completedFrame == null) throw new Error("parseMergeConflictDiffFromFile: encountered end marker before start marker");
+		finalizeConflict(s, completedFrame, index, line);
+		return;
+	}
+	if (frame.stage === "current") emitChangeLine(s, "deletion", line, frame.conflictIndex, "current");
+	else if (frame.stage === "base") emitContextLine(s, line, frame.conflictIndex);
+	else emitChangeLine(s, "addition", line, frame.conflictIndex, "incoming");
+}
+function ensureActiveHunk(s) {
+	s.activeHunk ??= createHunkBuilder(s.additionLines.length + 1, s.deletionLines.length + 1);
+	return s.activeHunk;
+}
+function assignConflictContent(s, conflictIndex, role, contentIndex) {
+	const builder = s.conflictBuilders[conflictIndex];
+	if (builder == null) throw new Error(`parseMergeConflictDiffFromFile: failed to locate conflict action ${conflictIndex}`);
+	const action = builder.action;
+	const hunkIndex = s.hunks.length;
+	if (action.hunkIndex < 0) action.hunkIndex = hunkIndex;
+	else if (action.hunkIndex !== hunkIndex) throw new Error(`parseMergeConflictDiffFromFile: conflict ${conflictIndex} spans multiple hunks and cannot be anchored`);
+	if (action.startContentIndex < 0) action.startContentIndex = contentIndex;
+	action.endContentIndex = contentIndex;
+	action.endMarkerContentIndex = contentIndex;
+	if (role === "current") {
+		action.currentContentIndex ??= contentIndex;
+		return;
+	}
+	if (role === "base") {
+		action.baseContentIndex ??= contentIndex;
+		return;
+	}
+	action.incomingContentIndex = contentIndex;
+}
+function appendChangeLine(hunk, lineType, additionLineIndex, deletionLineIndex) {
+	const hunkContent = hunk.hunkContent;
+	const lastContent = hunkContent[hunkContent.length - 1];
+	if (lastContent?.type === "change") {
+		if (lineType === "addition") lastContent.additions++;
+		else lastContent.deletions++;
+		return hunkContent.length - 1;
+	}
+	hunkContent.push({
+		type: "change",
+		additions: lineType === "addition" ? 1 : 0,
+		deletions: lineType === "deletion" ? 1 : 0,
+		additionLineIndex,
+		deletionLineIndex
+	});
+	return hunkContent.length - 1;
+}
+function flushBufferedContext(s, hunk, mode) {
+	let count = hunk.contextBufferCount;
+	let addStart = hunk.contextBufferAdditionStart;
+	let delStart = hunk.contextBufferDeletionStart;
+	if (mode === "leading" && count > s.maxContextLines) {
+		const difference = count - s.maxContextLines;
+		addStart += difference;
+		delStart += difference;
+		count = s.maxContextLines;
+		hunk.additionStart += difference;
+		hunk.deletionStart += difference;
+		hunk.additionLineIndex += difference;
+		hunk.deletionLineIndex += difference;
+	}
+	if (mode === "trailing" && count > s.maxContextLines) count = s.maxContextLines;
+	if (count === 0) {
+		hunk.contextBufferCount = 0;
+		hunk.contextBufferBaseConflicts = void 0;
+		return;
+	}
+	const hunkContent = hunk.hunkContent;
+	const lastContent = hunkContent[hunkContent.length - 1];
+	let contentIndex;
+	if (lastContent?.type === "context") {
+		lastContent.lines += count;
+		contentIndex = hunkContent.length - 1;
+	} else {
+		hunkContent.push({
+			type: "context",
+			lines: count,
+			additionLineIndex: addStart,
+			deletionLineIndex: delStart
+		});
+		contentIndex = hunkContent.length - 1;
+	}
+	hunk.additionCount += count;
+	hunk.deletionCount += count;
+	const baseConflicts = hunk.contextBufferBaseConflicts;
+	if (baseConflicts != null) {
+		const bufferStartOffset = addStart - hunk.contextBufferAdditionStart;
+		for (const [offset, conflictIndex] of baseConflicts) if (offset >= bufferStartOffset && offset < bufferStartOffset + count) assignConflictContent(s, conflictIndex, "base", contentIndex);
+	}
+	hunk.contextBufferCount = 0;
+	hunk.contextBufferBaseConflicts = void 0;
+}
+function finalizeActiveHunk(s) {
+	if (s.activeHunk == null) return;
+	const hunk = s.activeHunk;
+	s.activeHunk = void 0;
+	if (hunk.hunkContent.length === 0) return;
+	let hunkSplitLineCount = 0;
+	let hunkUnifiedLineCount = 0;
+	for (const content of hunk.hunkContent) if (content.type === "context") {
+		hunkSplitLineCount += content.lines;
+		hunkUnifiedLineCount += content.lines;
+	} else {
+		hunkSplitLineCount += Math.max(content.additions, content.deletions);
+		hunkUnifiedLineCount += content.additions + content.deletions;
+	}
+	const additionStart = hunk.additionCount === 0 ? hunk.additionStart - 1 : hunk.additionStart;
+	const deletionStart = hunk.deletionCount === 0 ? hunk.deletionStart - 1 : hunk.deletionStart;
+	const collapsedBefore = Math.max(getHunkSideStartBoundary(additionStart, hunk.additionCount) - s.lastHunkEnd, 0);
+	const finalizedHunk = {
+		collapsedBefore,
+		additionStart,
+		additionCount: hunk.additionCount,
+		additionLines: hunk.additionLines,
+		additionLineIndex: hunk.additionLineIndex,
+		deletionStart,
+		deletionCount: hunk.deletionCount,
+		deletionLines: hunk.deletionLines,
+		deletionLineIndex: hunk.deletionLineIndex,
+		hunkContent: hunk.hunkContent,
+		hunkContext: void 0,
+		hunkSpecs: `@@ -${formatHunkRange(deletionStart, hunk.deletionCount)} +${formatHunkRange(additionStart, hunk.additionCount)} @@\n`,
+		splitLineStart: s.splitLineCount + collapsedBefore,
+		splitLineCount: hunkSplitLineCount,
+		unifiedLineStart: s.unifiedLineCount + collapsedBefore,
+		unifiedLineCount: hunkUnifiedLineCount,
+		noEOFCRAdditions: false,
+		noEOFCRDeletions: false
+	};
+	s.hunks.push(finalizedHunk);
+	s.splitLineCount += collapsedBefore + hunkSplitLineCount;
+	s.unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;
+	s.lastHunkEnd = getHunkSideEndBoundary(additionStart, hunk.additionCount);
+}
+function splitHunkWithBufferedContext(s) {
+	if (s.activeHunk == null) return;
+	const hunk = s.activeHunk;
+	const count = hunk.contextBufferCount;
+	const omittedContextLineCount = count - s.maxContextLines2;
+	const nextAddStart = hunk.contextBufferAdditionStart + count - s.maxContextLines;
+	const nextDelStart = hunk.contextBufferDeletionStart + count - s.maxContextLines;
+	let nextBaseConflicts;
+	if (hunk.contextBufferBaseConflicts != null) {
+		const tailOffset = count - s.maxContextLines;
+		for (const [offset, ci] of hunk.contextBufferBaseConflicts) if (offset >= tailOffset) {
+			nextBaseConflicts ??= /* @__PURE__ */ new Map();
+			nextBaseConflicts.set(offset - tailOffset, ci);
+		}
+	}
+	flushBufferedContext(s, hunk, "trailing");
+	const emittedAdditionCount = hunk.additionCount;
+	const emittedDeletionCount = hunk.deletionCount;
+	finalizeActiveHunk(s);
+	s.activeHunk = createHunkBuilder(hunk.additionStart + emittedAdditionCount + omittedContextLineCount, hunk.deletionStart + emittedDeletionCount + omittedContextLineCount);
+	s.activeHunk.contextBufferAdditionStart = nextAddStart;
+	s.activeHunk.contextBufferDeletionStart = nextDelStart;
+	s.activeHunk.contextBufferCount = s.maxContextLines;
+	s.activeHunk.contextBufferBaseConflicts = nextBaseConflicts;
+}
+function emitContextLine(s, line, baseConflictIndex = -1) {
+	const hunk = ensureActiveHunk(s);
+	if (hunk.contextBufferCount === 0) {
+		hunk.contextBufferAdditionStart = s.additionLines.length;
+		hunk.contextBufferDeletionStart = s.deletionLines.length;
+	}
+	s.additionLines.push(line);
+	s.deletionLines.push(line);
+	if (baseConflictIndex >= 0) {
+		hunk.contextBufferBaseConflicts ??= /* @__PURE__ */ new Map();
+		hunk.contextBufferBaseConflicts.set(hunk.contextBufferCount, baseConflictIndex);
+	}
+	hunk.contextBufferCount++;
+}
+function emitChangeLine(s, lineType, line, conflictIndex, role) {
+	let hunk = ensureActiveHunk(s);
+	if (hunk.hunkContent.length > 0 && hunk.contextBufferCount > s.maxContextLines2) {
+		splitHunkWithBufferedContext(s);
+		hunk = s.activeHunk;
+	}
+	flushBufferedContext(s, hunk, hunk.hunkContent.length === 0 ? "leading" : "before-change");
+	const additionLineIndex = s.additionLines.length;
+	const deletionLineIndex = s.deletionLines.length;
+	if (lineType === "addition") s.additionLines.push(line);
+	else s.deletionLines.push(line);
+	const contentIndex = appendChangeLine(hunk, lineType, additionLineIndex, deletionLineIndex);
+	if (lineType === "addition") {
+		hunk.additionCount++;
+		hunk.additionLines++;
+	} else {
+		hunk.deletionCount++;
+		hunk.deletionLines++;
+	}
+	assignConflictContent(s, conflictIndex, role, contentIndex);
+}
+function finalizeConflict(s, frame, endLineIndex, endMarkerLine) {
+	if (frame.separatorLineIndex == null || frame.markerLines.separator == null) throw new Error(`parseMergeConflictDiffFromFile: conflict ${frame.conflictIndex} is missing a separator marker`);
+	const builder = s.conflictBuilders[frame.conflictIndex];
+	if (builder == null) throw new Error(`parseMergeConflictDiffFromFile: failed to finalize conflict ${frame.conflictIndex}`);
+	const action = builder.action;
+	action.markerLines.separator = frame.markerLines.separator;
+	action.markerLines.end = endMarkerLine;
+	if (frame.markerLines.base != null) action.markerLines.base = frame.markerLines.base;
+	action.conflict = {
+		conflictIndex: frame.conflictIndex,
+		startLineIndex: frame.startLineIndex,
+		startLineNumber: frame.startLineIndex + 1,
+		separatorLineIndex: frame.separatorLineIndex,
+		separatorLineNumber: frame.separatorLineIndex + 1,
+		endLineIndex,
+		endLineNumber: endLineIndex + 1,
+		baseMarkerLineIndex: frame.baseMarkerLineIndex,
+		baseMarkerLineNumber: frame.baseMarkerLineIndex != null ? frame.baseMarkerLineIndex + 1 : void 0
+	};
+	const fallbackContentIndex = action.currentContentIndex ?? action.incomingContentIndex;
+	action.currentContentIndex ??= fallbackContentIndex;
+	action.incomingContentIndex ??= fallbackContentIndex;
+	if (action.startContentIndex < 0 && fallbackContentIndex != null) action.startContentIndex = fallbackContentIndex;
+	if (action.endContentIndex < 0 && fallbackContentIndex != null) action.endContentIndex = fallbackContentIndex;
+	if (action.endMarkerContentIndex < 0 && fallbackContentIndex != null) action.endMarkerContentIndex = fallbackContentIndex;
+	if (action.hunkIndex < 0 || action.startContentIndex < 0 || action.endContentIndex < 0 || action.endMarkerContentIndex < 0) throw new Error(`parseMergeConflictDiffFromFile: failed to anchor merge conflict ${frame.conflictIndex}`);
+	s.actions[action.conflictIndex] = action;
+	builder.completed = true;
+}
+function handleStartMarker(s, line, lineIndex) {
+	const conflictIndex = s.nextConflictIndex;
+	s.nextConflictIndex++;
+	s.conflictStack.push({
+		conflictIndex,
+		stage: "current",
+		startLineIndex: lineIndex,
+		markerLines: { start: line }
+	});
+	s.conflictBuilders[conflictIndex] = {
+		completed: false,
+		action: {
+			conflict: {
+				conflictIndex,
+				startLineIndex: lineIndex,
+				startLineNumber: lineIndex + 1,
+				separatorLineIndex: lineIndex,
+				separatorLineNumber: lineIndex + 1,
+				endLineIndex: lineIndex,
+				endLineNumber: lineIndex + 1,
+				baseMarkerLineIndex: void 0,
+				baseMarkerLineNumber: void 0
+			},
+			conflictIndex,
+			hunkIndex: -1,
+			startContentIndex: -1,
+			endContentIndex: -1,
+			endMarkerContentIndex: -1,
+			markerLines: {
+				start: line,
+				separator: "",
+				end: ""
+			}
+		}
+	};
+}
+function createHunkBuilder(additionStart, deletionStart) {
+	return {
+		additionStart,
+		deletionStart,
+		additionCount: 0,
+		deletionCount: 0,
+		additionLines: 0,
+		deletionLines: 0,
+		additionLineIndex: Math.max(additionStart - 1, 0),
+		deletionLineIndex: Math.max(deletionStart - 1, 0),
+		hunkContent: [],
+		contextBufferAdditionStart: Math.max(additionStart - 1, 0),
+		contextBufferDeletionStart: Math.max(deletionStart - 1, 0),
+		contextBufferCount: 0,
+		contextBufferBaseConflicts: void 0
+	};
+}
+function formatHunkRange(start, count) {
+	return count === 1 ? `${start}` : `${start},${count}`;
+}
+function getMergeConflictMarkerType(line) {
+	if (line.length < 7) return;
+	const markerCode = line.charCodeAt(0);
+	if (markerCode !== 60 && markerCode !== 62 && markerCode !== 61 && markerCode !== 124) return;
+	const lineEnd = getLineContentEndIndex(line);
+	if (lineEnd < 7) return;
+	let markerLength = 1;
+	while (markerLength < lineEnd && line.charCodeAt(markerLength) === markerCode) markerLength++;
+	if (markerLength < 7) return;
+	if (markerCode === 61) return markerLength === lineEnd ? "separator" : void 0;
+	if (markerLength !== lineEnd && !isWhitespaceCode(line.charCodeAt(markerLength))) return;
+	if (markerCode === 60) return "start";
+	if (markerCode === 62) return "end";
+	return "base";
+}
+function getLineContentEndIndex(line) {
+	let end = line.length;
+	if (end > 0 && line.charCodeAt(end - 1) === 10) end--;
+	if (end > 0 && line.charCodeAt(end - 1) === 13) end--;
+	return end;
+}
+function isWhitespaceCode(code) {
+	return code === 9 || code === 10 || code === 11 || code === 12 || code === 13 || code === 32;
+}
+function createResolvedConflictFile(file, side, contents) {
+	return {
+		...file,
+		contents,
+		cacheKey: file.cacheKey != null ? `${file.cacheKey}:merge-conflict-${side}` : void 0
+	};
+}
+function buildMergeConflictMarkerRows(fileDiff, actions) {
+	const markerRows = [];
+	const hunkLineStartCache = new Array(fileDiff.hunks.length);
+	const getLineStart = (hunkIndex, contentIndex) => {
+		const hunk = fileDiff.hunks[hunkIndex];
+		if (hunk == null) return 0;
+		let starts = hunkLineStartCache[hunkIndex];
+		if (starts == null) {
+			starts = new Array(hunk.hunkContent.length + 1);
+			let lineIndex = hunk.unifiedLineStart;
+			starts[0] = lineIndex;
+			for (let index = 0; index < hunk.hunkContent.length; index++) {
+				const content = hunk.hunkContent[index];
+				lineIndex += content.type === "context" ? content.lines : content.deletions + content.additions;
+				starts[index + 1] = lineIndex;
+			}
+			hunkLineStartCache[hunkIndex] = starts;
+		}
+		return starts[Math.max(contentIndex, 0)] ?? hunk.unifiedLineStart;
+	};
+	const getLineEnd = (hunkIndex, contentIndex) => {
+		const lineStart = getLineStart(hunkIndex, contentIndex);
+		const lineEndExclusive = hunkLineStartCache[hunkIndex]?.[Math.max(contentIndex + 1, 0)] ?? getLineStart(hunkIndex, contentIndex + 1);
+		return Math.max(lineStart, lineEndExclusive - 1);
+	};
+	for (const action of actions) {
+		if (action == null) continue;
+		const hunk = fileDiff.hunks[action.hunkIndex];
+		if (hunk == null) continue;
+		const actionLineIndex = getLineStart(action.hunkIndex, action.startContentIndex);
+		markerRows.push(createMergeConflictMarkerRow(action, "marker-start", action.startContentIndex, action.markerLines.start, actionLineIndex));
+		if (action.baseContentIndex != null) {
+			const currentContentIndex = action.currentContentIndex;
+			const incomingContentIndex = action.incomingContentIndex;
+			if (currentContentIndex == null || incomingContentIndex == null) continue;
+			const baseMarkerLine = action.markerLines.base;
+			if (baseMarkerLine == null) continue;
+			const currentChange = hunk.hunkContent[currentContentIndex];
+			const baseContext = hunk.hunkContent[action.baseContentIndex];
+			const incomingChange = hunk.hunkContent[incomingContentIndex];
+			if (currentChange?.type !== "change" || baseContext?.type !== "context" || incomingChange?.type !== "change") continue;
+			const currentStart = getLineStart(action.hunkIndex, currentContentIndex);
+			const incomingStart = getLineStart(action.hunkIndex, incomingContentIndex);
+			markerRows.push(createMergeConflictMarkerRow(action, "marker-base", action.baseContentIndex, baseMarkerLine, currentStart + currentChange.deletions));
+			markerRows.push(createMergeConflictMarkerRow(action, "marker-separator", action.baseContentIndex, action.markerLines.separator, incomingStart), createMergeConflictMarkerRow(action, "marker-end", action.endMarkerContentIndex, action.markerLines.end, getLineEnd(action.hunkIndex, action.endMarkerContentIndex)));
+			continue;
+		}
+		const currentContentIndex = action.currentContentIndex;
+		if (currentContentIndex == null) continue;
+		const content = hunk.hunkContent[currentContentIndex];
+		if (content?.type !== "change") continue;
+		const contentStart = getLineStart(action.hunkIndex, currentContentIndex);
+		const separatorLineIndex = content.deletions > 0 ? contentStart + content.deletions : actionLineIndex;
+		markerRows.push(createMergeConflictMarkerRow(action, "marker-separator", currentContentIndex, action.markerLines.separator, separatorLineIndex), createMergeConflictMarkerRow(action, "marker-end", action.endMarkerContentIndex, action.markerLines.end, getLineEnd(action.hunkIndex, action.endMarkerContentIndex)));
+	}
+	return markerRows;
+}
+function createMergeConflictMarkerRow(action, type, contentIndex, lineText, lineIndex) {
+	return {
+		type,
+		hunkIndex: action.hunkIndex,
+		contentIndex,
+		conflictIndex: action.conflictIndex,
+		lineText,
+		lineIndex
+	};
+}
+function getUnifiedLineStartForContent(hunk, contentIndex) {
+	let lineIndex = hunk.unifiedLineStart;
+	for (let index = 0; index < contentIndex; index++) {
+		const content = hunk.hunkContent[index];
+		lineIndex += content.type === "context" ? content.lines : content.deletions + content.additions;
+	}
+	return lineIndex;
+}
+//#endregion
+export { buildMergeConflictMarkerRows, getMergeConflictActionAnchor, parseMergeConflictDiffFromFile };
+
+//# sourceMappingURL=parseMergeConflictDiffFromFile.js.map

package/node_modules/@pierre/diffs/dist/utils/parseMergeConflictDiffFromFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMergeConflictDiffFromFile.js","names":[],"sources":["../../src/utils/parseMergeConflictDiffFromFile.ts"],"sourcesContent":["// Parses a file containing git merge conflict markers (<<<<<<< / ======= / >>>>>>>)\n// into a synthetic unified diff. The core idea: treat the conflict file as though\n// \"current\" lines are deletions and \"incoming\" lines are additions. Lines outside\n// conflicts (and optional \"base\" sections from diff3) become shared context.\n//\n// The result is a standard FileDiffMetadata with hunks — identical in shape to what\n// you'd get from parsing a real unified diff — plus a parallel array of\n// MergeConflictDiffActions that anchor each conflict region to positions within the\n// hunk structure. Downstream consumers (e.g. the merge conflict UI) use these\n// anchors to overlay conflict markers onto the diff view.\n//\n// Architecture note: all helper functions are module-level (not closures inside the\n// main function) and receive a shared ParseState object by reference. This avoids\n// per-call scope-chain traversal on the hot path (~20K lines), where every line\n// triggers 2-3 helper calls.\n//\n// ---\n// NOTE: This file was nearly entirely written and optimized by AI. It has a\n// verification harness that any future changes (human or AI) should be validated\n// against:\n//\n//   Snapshot tests (from packages/diffs/):\n//     bun test parseMergeConflictDiffFromFile\n//\n//   Performance benchmark (checksum must match 31314920):\n//     moonx diffs:benchmark-parse-merge-conflict\n//\n// If you encounter a bug:\n//   1. Add a new test case in test/parseMergeConflictDiffFromFile.test.ts with\n//      input that reproduces the failure. Use toMatchSnapshot() so the expected\n//      output is captured automatically once fixed.\n//   2. Run `bun test parseMergeConflictDiffFromFile` from packages/diffs/ to\n//      confirm the new test fails.\n//   3. Use an AI agent with extended/high thinking to fix the logic — the\n//      snapshot tests and benchmark provide a tight feedback loop. The agent\n//      should iterate until all snapshots pass AND the benchmark checksum\n//      matches. Update snapshots with `bun test test/parseMergeConflictDiffFromFile.test.ts -u`\n//      only after verifying the new output is correct.\n// ---\n\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  Hunk,\n  MergeConflictMarkerRow,\n  MergeConflictMarkerRowType,\n  MergeConflictRegion,\n  ProcessFileConflictData,\n} from '../types';\nimport {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\n\nexport interface ParseMergeConflictDiffFromFileResult {\n  fileDiff: FileDiffMetadata;\n  currentFile: FileContents;\n  incomingFile: FileContents;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\nexport interface MergeConflictDiffAction extends ProcessFileConflictData {\n  // Kept for callback consumers that still need the original unresolved-region\n  // source-line coordinates alongside structural hunk-content anchors.\n  conflict: MergeConflictRegion;\n  conflictIndex: number;\n  markerLines: {\n    start: string;\n    base?: string;\n    separator: string;\n    end: string;\n  };\n}\n\ninterface GetMergeConflictActionAnchorReturn {\n  hunkIndex: number;\n  lineIndex: number;\n}\n\n// Which section of a conflict we're currently inside while scanning lines.\n// Progresses: current → (optional) base → incoming.\ntype MergeConflictStage = 'current' | 'base' | 'incoming';\ntype MergeConflictSide = MergeConflictStage;\ntype MergeConflictMarkerType = 'start' | 'base' | 'separator' | 'end';\n\n// Controls how buffered context lines are trimmed when flushed to hunkContent:\n//   'leading'       — first flush of a hunk; trim excess from the start\n//   'before-change' — flush between changes; emit all buffered lines\n//   'trailing'      — last flush of a hunk; trim excess from the end\ntype ContextFlushMode = 'before-change' | 'leading' | 'trailing';\n\n// Mutable accumulator for building a single Hunk. Tracks line counts, the\n// hunkContent array (sequence of context/change groups), and a \"context buffer\"\n// that defers writing context lines until we know whether they're leading,\n// trailing, or mid-hunk context.\n//\n// The context buffer avoids eagerly committing context lines to hunkContent.\n// When a change line arrives, we flush the buffer — trimming to maxContextLines\n// if it's the leading or trailing edge of a hunk, or splitting into two hunks\n// if the gap between changes exceeds maxContextLines * 2.\ninterface HunkBuilder {\n  additionStart: number;\n  deletionStart: number;\n  additionCount: number;\n  deletionCount: number;\n  additionLines: number;\n  deletionLines: number;\n  additionLineIndex: number;\n  deletionLineIndex: number;\n  hunkContent: Hunk['hunkContent'];\n  // Context buffer: instead of storing per-line index arrays, we track the\n  // starting indices and a count. Since context lines always push to both\n  // additionLines and deletionLines consecutively, indices can be derived.\n  contextBufferAdditionStart: number;\n  contextBufferDeletionStart: number;\n  contextBufferCount: number;\n  // Sparse map of buffer-offset → conflictIndex for base-section context lines.\n  // Empty for most buffers since base lines are rare.\n  contextBufferBaseConflicts: Map<number, number> | undefined;\n}\n\n// Tracks an in-progress conflict as we scan through its lines. Pushed onto\n// conflictStack when we hit a <<<<<<< marker, and popped + finalized when we\n// hit the matching >>>>>>> marker. The `stage` field tells processLine which\n// section we're in so it knows whether to emit deletions, context, or additions.\ninterface ConflictFrame {\n  conflictIndex: number;\n  stage: MergeConflictStage;\n  startLineIndex: number;\n  baseMarkerLineIndex?: number;\n  separatorLineIndex?: number;\n  markerLines: {\n    start: string;\n    base?: string;\n    separator?: string;\n  };\n}\n\ninterface ConflictActionBuilder {\n  action: MergeConflictDiffAction;\n  completed: boolean;\n}\n\n// Bundles all mutable state shared across parse helper functions, replacing\n// closure-captured variables with a single object passed by reference.\n//\n// The two key arrays — deletionLines and additionLines — are the synthetic\n// \"before\" and \"after\" file contents. Context lines are pushed to both arrays\n// (identical on both sides). Current-side conflict lines go only into\n// deletionLines; incoming-side lines go only into additionLines. After parsing,\n// joining each array produces the resolved file for that side.\ninterface ParseState {\n  // \"Before\" file lines (context + current-side conflict content).\n  deletionLines: string[];\n  // \"After\" file lines (context + incoming-side conflict content).\n  additionLines: string[];\n  // Stack of open conflict regions (supports nested conflicts, though rare).\n  conflictStack: ConflictFrame[];\n  // Parallel to actions[]; accumulates content indices during parsing.\n  conflictBuilders: ConflictActionBuilder[];\n  // Final output: one action per conflict, indexed by conflictIndex.\n  actions: (MergeConflictDiffAction | undefined)[];\n  // Finalized hunks, appended as context gaps cause hunk splits.\n  hunks: Hunk[];\n  nextConflictIndex: number;\n  // Running line totals used to compute hunk splitLineStart/unifiedLineStart.\n  splitLineCount: number;\n  unifiedLineCount: number;\n  // 1-based line number where the previous hunk ended (for collapsedBefore).\n  lastHunkEnd: number;\n  // The hunk currently being built; undefined between hunks.\n  activeHunk: HunkBuilder | undefined;\n  maxContextLines: number;\n  // Cached maxContextLines * 2 (the threshold for splitting a hunk).\n  maxContextLines2: number;\n}\n\nexport function getMergeConflictActionAnchor(\n  action: MergeConflictDiffAction,\n  fileDiff: FileDiffMetadata\n): GetMergeConflictActionAnchorReturn | undefined {\n  const hunk = fileDiff.hunks[action.hunkIndex];\n  if (hunk == null) {\n    return undefined;\n  }\n  return {\n    hunkIndex: action.hunkIndex,\n    lineIndex: getUnifiedLineStartForContent(hunk, action.startContentIndex),\n  };\n}\n\n// Main entry point. Walks every line of the conflict file exactly once,\n// dispatching each line through processLine which routes it to the appropriate\n// emitter (context or change). After the loop, finalizes the last hunk,\n// validates all conflicts were closed, and assembles the result.\n//\n// The three phases are:\n//   1. Line-by-line scan  — builds hunks and conflict actions incrementally\n//   2. Post-loop cleanup  — flushes trailing context, finalizes last hunk\n//   3. Result assembly    — joins line arrays, builds marker rows for the UI\nexport function parseMergeConflictDiffFromFile(\n  file: FileContents,\n  maxContextLines: number = 6\n): ParseMergeConflictDiffFromFileResult {\n  // Never allow maxContextLines to drop below 1 or else things break.\n  maxContextLines = Math.max(maxContextLines, 1);\n\n  const s: ParseState = {\n    deletionLines: [],\n    additionLines: [],\n    conflictStack: [],\n    conflictBuilders: [],\n    actions: [],\n    hunks: [],\n    nextConflictIndex: 0,\n    splitLineCount: 0,\n    unifiedLineCount: 0,\n    lastHunkEnd: 0,\n    activeHunk: undefined,\n    maxContextLines,\n    maxContextLines2: maxContextLines * 2,\n  };\n\n  // Phase 1: Line-by-line scan. We inline the indexOf loop here (rather than\n  // calling a helper with a callback) to avoid creating a closure on the hot\n  // path. Each line is sliced and dispatched to processLine.\n  const contents = file.contents;\n  const contentLength = contents.length;\n  if (contentLength > 0) {\n    let lineStart = 0;\n    let lineIndex = 0;\n    let newlinePos = contents.indexOf('\\n', lineStart);\n    while (newlinePos !== -1) {\n      processLine(s, contents.slice(lineStart, newlinePos + 1), lineIndex);\n      lineStart = newlinePos + 1;\n      lineIndex++;\n      newlinePos = contents.indexOf('\\n', lineStart);\n    }\n    if (lineStart < contentLength) {\n      processLine(s, contents.slice(lineStart), lineIndex);\n    }\n  }\n\n  // Phase 2: Post-loop cleanup. Any unclosed conflict is an error. If the\n  // last hunk has buffered context lines, flush them as trailing context and\n  // finalize the hunk.\n  if (s.conflictStack.length > 0) {\n    throw new Error(\n      'parseMergeConflictDiffFromFile: unfinished merge conflict marker stack'\n    );\n  }\n\n  if (s.activeHunk != null && s.activeHunk.hunkContent.length > 0) {\n    flushBufferedContext(s, s.activeHunk, 'trailing');\n    finalizeActiveHunk(s);\n  }\n\n  for (\n    let conflictIndex = 0;\n    conflictIndex < s.conflictBuilders.length;\n    conflictIndex++\n  ) {\n    const builder = s.conflictBuilders[conflictIndex];\n    if (builder == null || !builder.completed) {\n      throw new Error(\n        `parseMergeConflictDiffFromFile: failed to build merge conflict action ${conflictIndex}`\n      );\n    }\n  }\n\n  // Phase 3: Result assembly. Account for any collapsed lines after the last\n  // hunk, then join the line arrays to produce resolved file contents.\n  if (\n    s.hunks.length > 0 &&\n    s.additionLines.length > 0 &&\n    s.deletionLines.length > 0\n  ) {\n    const lastHunk = s.hunks[s.hunks.length - 1];\n    const collapsedAfter = Math.max(\n      s.additionLines.length -\n        getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount),\n      0\n    );\n    s.splitLineCount += collapsedAfter;\n    s.unifiedLineCount += collapsedAfter;\n  }\n\n  const currentContents = s.deletionLines.join('');\n  const incomingContents = s.additionLines.join('');\n  const currentFile = createResolvedConflictFile(\n    file,\n    'current',\n    currentContents\n  );\n  const incomingFile = createResolvedConflictFile(\n    file,\n    'incoming',\n    incomingContents\n  );\n\n  let type: FileDiffMetadata['type'] = 'change';\n  if (incomingContents === '') {\n    type = 'deleted';\n  } else if (currentContents === '') {\n    type = 'new';\n  }\n\n  const fileDiff: FileDiffMetadata = {\n    name: file.name,\n    prevName: undefined,\n    type,\n    hunks: s.hunks,\n    splitLineCount: s.splitLineCount,\n    unifiedLineCount: s.unifiedLineCount,\n    isPartial: false,\n    deletionLines: s.deletionLines,\n    additionLines: s.additionLines,\n    cacheKey:\n      file.cacheKey != null\n        ? `${file.cacheKey}:merge-conflict-diff`\n        : undefined,\n  };\n\n  return {\n    fileDiff,\n    currentFile,\n    incomingFile,\n    actions: s.actions,\n    markerRows: buildMergeConflictMarkerRows(fileDiff, s.actions),\n  };\n}\n\n// ---------------------------------------------------------------------------\n// Module-level parse helpers. Each receives ParseState by reference rather\n// than capturing variables via closure. The call graph from the hot path is:\n//\n//   processLine\n//     ├─ emitContextLine    → ensureActiveHunk\n//     ├─ emitChangeLine     → ensureActiveHunk, splitHunkWithBufferedContext,\n//     │                       flushBufferedContext, appendChangeLine,\n//     │                       assignConflictContent\n//     ├─ handleStartMarker\n//     └─ finalizeConflict\n// ---------------------------------------------------------------------------\n\n// Routes a single source line to the right emitter based on whether we're\n// inside a conflict and, if so, which section (current/base/incoming).\n// Outside conflicts, only the start marker (<<<<<<< / charCode 60) can\n// change state, so we skip the full marker check for non-'<' lines.\nfunction processLine(s: ParseState, line: string, index: number): void {\n  const frame = s.conflictStack[s.conflictStack.length - 1];\n\n  // Outside any conflict: only start markers (<<<<<<<) can transition state.\n  // Skip the full marker check for lines that can't be start markers.\n  if (frame == null) {\n    if (\n      line.length >= 7 &&\n      line.charCodeAt(0) === 60 &&\n      getMergeConflictMarkerType(line) === 'start'\n    ) {\n      handleStartMarker(s, line, index);\n      return;\n    }\n    emitContextLine(s, line);\n    return;\n  }\n\n  // Inside a conflict: all marker types must be checked.\n  const markerType = getMergeConflictMarkerType(line);\n\n  if (markerType === 'start') {\n    handleStartMarker(s, line, index);\n    return;\n  }\n\n  if (markerType === 'base') {\n    frame.stage = 'base';\n    frame.baseMarkerLineIndex = index;\n    frame.markerLines.base = line;\n    return;\n  }\n\n  if (markerType === 'separator') {\n    frame.stage = 'incoming';\n    frame.separatorLineIndex = index;\n    frame.markerLines.separator = line;\n    return;\n  }\n\n  if (markerType === 'end') {\n    const completedFrame = s.conflictStack.pop();\n    if (completedFrame == null) {\n      throw new Error(\n        'parseMergeConflictDiffFromFile: encountered end marker before start marker'\n      );\n    }\n    finalizeConflict(s, completedFrame, index, line);\n    return;\n  }\n\n  if (frame.stage === 'current') {\n    emitChangeLine(s, 'deletion', line, frame.conflictIndex, 'current');\n  } else if (frame.stage === 'base') {\n    emitContextLine(s, line, frame.conflictIndex);\n  } else {\n    emitChangeLine(s, 'addition', line, frame.conflictIndex, 'incoming');\n  }\n}\n\n// Lazily creates the active HunkBuilder if one doesn't exist yet. The hunk's\n// start positions are derived from the current length of the line arrays\n// (1-based, matching unified diff conventions).\nfunction ensureActiveHunk(s: ParseState): HunkBuilder {\n  s.activeHunk ??= createHunkBuilder(\n    s.additionLines.length + 1,\n    s.deletionLines.length + 1\n  );\n  return s.activeHunk;\n}\n\n// \"Anchors\" a conflict to its position in the hunk's content array. Each\n// conflict needs to know which hunk it lives in (hunkIndex) and which content\n// entries correspond to its current/base/incoming sections. This is called\n// every time we emit a change or context line that belongs to a conflict, and\n// it incrementally widens the start/end content range.\nfunction assignConflictContent(\n  s: ParseState,\n  conflictIndex: number,\n  role: MergeConflictSide,\n  contentIndex: number\n): void {\n  const builder = s.conflictBuilders[conflictIndex];\n  if (builder == null) {\n    throw new Error(\n      `parseMergeConflictDiffFromFile: failed to locate conflict action ${conflictIndex}`\n    );\n  }\n\n  const action = builder.action;\n  const hunkIndex = s.hunks.length;\n  if (action.hunkIndex < 0) {\n    action.hunkIndex = hunkIndex;\n  } else if (action.hunkIndex !== hunkIndex) {\n    throw new Error(\n      `parseMergeConflictDiffFromFile: conflict ${conflictIndex} spans multiple hunks and cannot be anchored`\n    );\n  }\n\n  if (action.startContentIndex < 0) {\n    action.startContentIndex = contentIndex;\n  }\n  action.endContentIndex = contentIndex;\n  action.endMarkerContentIndex = contentIndex;\n\n  if (role === 'current') {\n    action.currentContentIndex ??= contentIndex;\n    return;\n  }\n  if (role === 'base') {\n    action.baseContentIndex ??= contentIndex;\n    return;\n  }\n  action.incomingContentIndex = contentIndex;\n}\n\n// Appends a change line to the hunk's content array. If the previous entry is\n// already a 'change' group, we just bump its addition/deletion count instead\n// of creating a new entry — this keeps hunkContent compact. Returns the\n// content index so the caller can anchor the conflict to it.\nfunction appendChangeLine(\n  hunk: HunkBuilder,\n  lineType: 'addition' | 'deletion',\n  additionLineIndex: number,\n  deletionLineIndex: number\n): number {\n  const hunkContent = hunk.hunkContent;\n  const lastContent = hunkContent[hunkContent.length - 1];\n  if (lastContent?.type === 'change') {\n    if (lineType === 'addition') {\n      lastContent.additions++;\n    } else {\n      lastContent.deletions++;\n    }\n    return hunkContent.length - 1;\n  }\n  hunkContent.push({\n    type: 'change',\n    additions: lineType === 'addition' ? 1 : 0,\n    deletions: lineType === 'deletion' ? 1 : 0,\n    additionLineIndex,\n    deletionLineIndex,\n  });\n  return hunkContent.length - 1;\n}\n\n// Drains the hunk's context buffer into hunkContent, applying mode-dependent\n// trimming. The buffer accumulates context lines without committing them,\n// because we don't know yet whether they'll be leading context (trim start),\n// trailing context (trim end), or mid-hunk context (keep all). The mode tells\n// us which case we're in:\n//\n//   'leading'       — first change in a new hunk; drop lines beyond\n//                     maxContextLines from the front, and shift the hunk's\n//                     start position forward accordingly.\n//   'trailing'      — last flush before hunk finalization; keep at most\n//                     maxContextLines from the front of the buffer.\n//   'before-change' — mid-hunk context between two changes; emit everything.\nfunction flushBufferedContext(\n  s: ParseState,\n  hunk: HunkBuilder,\n  mode: ContextFlushMode\n): void {\n  let count = hunk.contextBufferCount;\n  let addStart = hunk.contextBufferAdditionStart;\n  let delStart = hunk.contextBufferDeletionStart;\n\n  if (mode === 'leading' && count > s.maxContextLines) {\n    const difference = count - s.maxContextLines;\n    addStart += difference;\n    delStart += difference;\n    count = s.maxContextLines;\n    hunk.additionStart += difference;\n    hunk.deletionStart += difference;\n    hunk.additionLineIndex += difference;\n    hunk.deletionLineIndex += difference;\n  }\n\n  if (mode === 'trailing' && count > s.maxContextLines) {\n    count = s.maxContextLines;\n  }\n\n  if (count === 0) {\n    hunk.contextBufferCount = 0;\n    hunk.contextBufferBaseConflicts = undefined;\n    return;\n  }\n\n  // Bulk-append context: coalesce with previous context entry or create new\n  // one. This avoids a per-line loop — significant when maxContextLines is\n  // large.\n  const hunkContent = hunk.hunkContent;\n  const lastContent = hunkContent[hunkContent.length - 1];\n  let contentIndex: number;\n  if (lastContent?.type === 'context') {\n    lastContent.lines += count;\n    contentIndex = hunkContent.length - 1;\n  } else {\n    hunkContent.push({\n      type: 'context',\n      lines: count,\n      additionLineIndex: addStart,\n      deletionLineIndex: delStart,\n    });\n    contentIndex = hunkContent.length - 1;\n  }\n  hunk.additionCount += count;\n  hunk.deletionCount += count;\n\n  // Assign base-section conflict anchors (rare — only when base lines exist)\n  const baseConflicts = hunk.contextBufferBaseConflicts;\n  if (baseConflicts != null) {\n    const bufferStartOffset = addStart - hunk.contextBufferAdditionStart;\n    for (const [offset, conflictIndex] of baseConflicts) {\n      if (offset >= bufferStartOffset && offset < bufferStartOffset + count) {\n        assignConflictContent(s, conflictIndex, 'base', contentIndex);\n      }\n    }\n  }\n  hunk.contextBufferCount = 0;\n  hunk.contextBufferBaseConflicts = undefined;\n}\n\n// Converts the mutable HunkBuilder into an immutable Hunk and pushes it onto\n// s.hunks. Computes line counts for split and unified view, the collapsed-\n// before gap (lines between the previous hunk and this one), and the hunk\n// header string (e.g. \"@@ -1,5 +1,7 @@\").\nfunction finalizeActiveHunk(s: ParseState): void {\n  if (s.activeHunk == null) {\n    return;\n  }\n\n  const hunk = s.activeHunk;\n  s.activeHunk = undefined;\n  if (hunk.hunkContent.length === 0) {\n    return;\n  }\n\n  let hunkSplitLineCount = 0;\n  let hunkUnifiedLineCount = 0;\n  for (const content of hunk.hunkContent) {\n    if (content.type === 'context') {\n      hunkSplitLineCount += content.lines;\n      hunkUnifiedLineCount += content.lines;\n    } else {\n      hunkSplitLineCount += Math.max(content.additions, content.deletions);\n      hunkUnifiedLineCount += content.additions + content.deletions;\n    }\n  }\n\n  // While building, each side's start is \"next line to consume\" (1-based). A\n  // side that finished with zero lines must shift down to the unified `N,0`\n  // convention (start names the line the hunk applies after), which is what\n  // hunk headers, getHunkSideStartBoundary, and downstream boundary math all\n  // assume — e.g. a whole-file deletion emits `+0,0`, not `+1,0`.\n  const additionStart =\n    hunk.additionCount === 0 ? hunk.additionStart - 1 : hunk.additionStart;\n  const deletionStart =\n    hunk.deletionCount === 0 ? hunk.deletionStart - 1 : hunk.deletionStart;\n\n  const collapsedBefore = Math.max(\n    getHunkSideStartBoundary(additionStart, hunk.additionCount) - s.lastHunkEnd,\n    0\n  );\n  const finalizedHunk: Hunk = {\n    collapsedBefore,\n    additionStart,\n    additionCount: hunk.additionCount,\n    additionLines: hunk.additionLines,\n    additionLineIndex: hunk.additionLineIndex,\n    deletionStart,\n    deletionCount: hunk.deletionCount,\n    deletionLines: hunk.deletionLines,\n    deletionLineIndex: hunk.deletionLineIndex,\n    hunkContent: hunk.hunkContent,\n    hunkContext: undefined,\n    hunkSpecs: `@@ -${formatHunkRange(deletionStart, hunk.deletionCount)} +${formatHunkRange(additionStart, hunk.additionCount)} @@\\n`,\n    splitLineStart: s.splitLineCount + collapsedBefore,\n    splitLineCount: hunkSplitLineCount,\n    unifiedLineStart: s.unifiedLineCount + collapsedBefore,\n    unifiedLineCount: hunkUnifiedLineCount,\n    noEOFCRAdditions: false,\n    noEOFCRDeletions: false,\n  };\n\n  s.hunks.push(finalizedHunk);\n  s.splitLineCount += collapsedBefore + hunkSplitLineCount;\n  s.unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;\n  s.lastHunkEnd = getHunkSideEndBoundary(additionStart, hunk.additionCount);\n}\n\n// Called when the context buffer between two changes exceeds maxContextLines*2.\n// This means there's a big enough gap to warrant splitting into separate hunks\n// (just like `diff -U` does). The procedure:\n//   1. Flush the first maxContextLines of the buffer as trailing context\n//   2. Finalize the current hunk\n//   3. Start a new hunk pre-seeded with the last maxContextLines as leading context\n// The middle portion of the buffer (between the two maxContextLines slices) is\n// the \"collapsed\" region — lines omitted from the diff view.\nfunction splitHunkWithBufferedContext(s: ParseState): void {\n  if (s.activeHunk == null) {\n    return;\n  }\n\n  const hunk = s.activeHunk;\n  const count = hunk.contextBufferCount;\n  const omittedContextLineCount = count - s.maxContextLines2;\n\n  // Save trailing context start indices for the next hunk.\n  const nextAddStart =\n    hunk.contextBufferAdditionStart + count - s.maxContextLines;\n  const nextDelStart =\n    hunk.contextBufferDeletionStart + count - s.maxContextLines;\n\n  // Extract base conflicts that fall within the trailing portion.\n  let nextBaseConflicts: Map<number, number> | undefined;\n  if (hunk.contextBufferBaseConflicts != null) {\n    const tailOffset = count - s.maxContextLines;\n    for (const [offset, ci] of hunk.contextBufferBaseConflicts) {\n      if (offset >= tailOffset) {\n        nextBaseConflicts ??= new Map();\n        nextBaseConflicts.set(offset - tailOffset, ci);\n      }\n    }\n  }\n\n  flushBufferedContext(s, hunk, 'trailing');\n  const emittedAdditionCount = hunk.additionCount;\n  const emittedDeletionCount = hunk.deletionCount;\n  finalizeActiveHunk(s);\n\n  s.activeHunk = createHunkBuilder(\n    hunk.additionStart + emittedAdditionCount + omittedContextLineCount,\n    hunk.deletionStart + emittedDeletionCount + omittedContextLineCount\n  );\n  s.activeHunk.contextBufferAdditionStart = nextAddStart;\n  s.activeHunk.contextBufferDeletionStart = nextDelStart;\n  s.activeHunk.contextBufferCount = s.maxContextLines;\n  s.activeHunk.contextBufferBaseConflicts = nextBaseConflicts;\n}\n\n// Adds a context line (identical on both sides of the diff). The line is pushed\n// to both additionLines and deletionLines, then buffered in the hunk's context\n// buffer rather than committed to hunkContent immediately. This deferred write\n// is what enables the leading/trailing trim logic in flushBufferedContext.\n//\n// For base-section lines inside a diff3 conflict, pass the conflict index so\n// the buffer can record the association; when the buffer is flushed, those\n// lines get anchored to the conflict via assignConflictContent.\nfunction emitContextLine(\n  s: ParseState,\n  line: string,\n  baseConflictIndex: number = -1\n): void {\n  const hunk = ensureActiveHunk(s);\n  // Reset buffer start on first line after a flush/creation.\n  if (hunk.contextBufferCount === 0) {\n    hunk.contextBufferAdditionStart = s.additionLines.length;\n    hunk.contextBufferDeletionStart = s.deletionLines.length;\n  }\n  s.additionLines.push(line);\n  s.deletionLines.push(line);\n  if (baseConflictIndex >= 0) {\n    hunk.contextBufferBaseConflicts ??= new Map();\n    hunk.contextBufferBaseConflicts.set(\n      hunk.contextBufferCount,\n      baseConflictIndex\n    );\n  }\n  hunk.contextBufferCount++;\n}\n\n// Adds a change line (addition or deletion) to the current hunk. This is the\n// main \"work\" function on the hot path and orchestrates several steps:\n//   1. If there's a large context gap since the last change, split the hunk\n//   2. Flush any buffered context lines (leading trim on first change, or\n//      pass-through for mid-hunk context)\n//   3. Push the line to the appropriate line array (additions or deletions)\n//   4. Append/coalesce the change into hunkContent\n//   5. Anchor the conflict action to the content index\nfunction emitChangeLine(\n  s: ParseState,\n  lineType: 'addition' | 'deletion',\n  line: string,\n  conflictIndex: number,\n  role: MergeConflictSide\n): void {\n  let hunk = ensureActiveHunk(s);\n  // If the context gap since the last change exceeds 2x maxContextLines,\n  // split into two hunks: trailing context for the old, leading for the new.\n  if (\n    hunk.hunkContent.length > 0 &&\n    hunk.contextBufferCount > s.maxContextLines2\n  ) {\n    splitHunkWithBufferedContext(s);\n    hunk = s.activeHunk!;\n  }\n\n  flushBufferedContext(\n    s,\n    hunk,\n    hunk.hunkContent.length === 0 ? 'leading' : 'before-change'\n  );\n\n  const additionLineIndex = s.additionLines.length;\n  const deletionLineIndex = s.deletionLines.length;\n  if (lineType === 'addition') {\n    s.additionLines.push(line);\n  } else {\n    s.deletionLines.push(line);\n  }\n\n  const contentIndex = appendChangeLine(\n    hunk,\n    lineType,\n    additionLineIndex,\n    deletionLineIndex\n  );\n\n  if (lineType === 'addition') {\n    hunk.additionCount++;\n    hunk.additionLines++;\n  } else {\n    hunk.deletionCount++;\n    hunk.deletionLines++;\n  }\n  assignConflictContent(s, conflictIndex, role, contentIndex);\n}\n\n// Called when we hit a >>>>>>> end marker. Takes the completed ConflictFrame\n// and writes the final source-line coordinates and marker text into the\n// conflict action. Also handles empty-side conflicts: if one side had no\n// content lines, we fall back to the other side's content index so the action\n// always has valid anchors. This is what makes conflicts like \"add vs nothing\"\n// or \"nothing vs add\" representable.\nfunction finalizeConflict(\n  s: ParseState,\n  frame: ConflictFrame,\n  endLineIndex: number,\n  endMarkerLine: string\n): void {\n  if (frame.separatorLineIndex == null || frame.markerLines.separator == null) {\n    throw new Error(\n      `parseMergeConflictDiffFromFile: conflict ${frame.conflictIndex} is missing a separator marker`\n    );\n  }\n\n  const builder = s.conflictBuilders[frame.conflictIndex];\n  if (builder == null) {\n    throw new Error(\n      `parseMergeConflictDiffFromFile: failed to finalize conflict ${frame.conflictIndex}`\n    );\n  }\n\n  const action = builder.action;\n  action.markerLines.separator = frame.markerLines.separator;\n  action.markerLines.end = endMarkerLine;\n  if (frame.markerLines.base != null) {\n    action.markerLines.base = frame.markerLines.base;\n  }\n\n  action.conflict = {\n    conflictIndex: frame.conflictIndex,\n    startLineIndex: frame.startLineIndex,\n    startLineNumber: frame.startLineIndex + 1,\n    separatorLineIndex: frame.separatorLineIndex,\n    separatorLineNumber: frame.separatorLineIndex + 1,\n    endLineIndex,\n    endLineNumber: endLineIndex + 1,\n    baseMarkerLineIndex: frame.baseMarkerLineIndex,\n    baseMarkerLineNumber:\n      frame.baseMarkerLineIndex != null\n        ? frame.baseMarkerLineIndex + 1\n        : undefined,\n  };\n\n  // If one side of the conflict was empty (e.g. \"add vs nothing\"), its content\n  // index will be undefined. Use the other side as a fallback so the action\n  // always has a valid anchor for the UI to render.\n  const fallbackContentIndex =\n    action.currentContentIndex ?? action.incomingContentIndex;\n  action.currentContentIndex ??= fallbackContentIndex;\n  action.incomingContentIndex ??= fallbackContentIndex;\n  if (action.startContentIndex < 0 && fallbackContentIndex != null) {\n    action.startContentIndex = fallbackContentIndex;\n  }\n  if (action.endContentIndex < 0 && fallbackContentIndex != null) {\n    action.endContentIndex = fallbackContentIndex;\n  }\n  if (action.endMarkerContentIndex < 0 && fallbackContentIndex != null) {\n    action.endMarkerContentIndex = fallbackContentIndex;\n  }\n\n  if (\n    action.hunkIndex < 0 ||\n    action.startContentIndex < 0 ||\n    action.endContentIndex < 0 ||\n    action.endMarkerContentIndex < 0\n  ) {\n    throw new Error(\n      `parseMergeConflictDiffFromFile: failed to anchor merge conflict ${frame.conflictIndex}`\n    );\n  }\n\n  s.actions[action.conflictIndex] = action;\n  builder.completed = true;\n}\n\n// Pushes a new ConflictFrame onto the stack and creates a placeholder\n// ConflictActionBuilder. The builder starts with sentinel values (-1 for\n// indices) that get filled in as we encounter content lines and markers.\n// The frame tracks which section we're scanning (current → base → incoming);\n// the builder accumulates the final action that downstream consumers use.\nfunction handleStartMarker(\n  s: ParseState,\n  line: string,\n  lineIndex: number\n): void {\n  const conflictIndex = s.nextConflictIndex;\n  s.nextConflictIndex++;\n  s.conflictStack.push({\n    conflictIndex,\n    stage: 'current',\n    startLineIndex: lineIndex,\n    markerLines: { start: line },\n  });\n  s.conflictBuilders[conflictIndex] = {\n    completed: false,\n    action: {\n      conflict: {\n        conflictIndex,\n        startLineIndex: lineIndex,\n        startLineNumber: lineIndex + 1,\n        separatorLineIndex: lineIndex,\n        separatorLineNumber: lineIndex + 1,\n        endLineIndex: lineIndex,\n        endLineNumber: lineIndex + 1,\n        baseMarkerLineIndex: undefined,\n        baseMarkerLineNumber: undefined,\n      },\n      conflictIndex,\n      hunkIndex: -1,\n      startContentIndex: -1,\n      endContentIndex: -1,\n      endMarkerContentIndex: -1,\n      markerLines: {\n        start: line,\n        separator: '',\n        end: '',\n      },\n    },\n  };\n}\n\nfunction createHunkBuilder(\n  additionStart: number,\n  deletionStart: number\n): HunkBuilder {\n  return {\n    additionStart,\n    deletionStart,\n    additionCount: 0,\n    deletionCount: 0,\n    additionLines: 0,\n    deletionLines: 0,\n    additionLineIndex: Math.max(additionStart - 1, 0),\n    deletionLineIndex: Math.max(deletionStart - 1, 0),\n    hunkContent: [],\n    contextBufferAdditionStart: Math.max(additionStart - 1, 0),\n    contextBufferDeletionStart: Math.max(deletionStart - 1, 0),\n    contextBufferCount: 0,\n    contextBufferBaseConflicts: undefined,\n  };\n}\n\nfunction formatHunkRange(start: number, count: number): string {\n  return count === 1 ? `${start}` : `${start},${count}`;\n}\n\n// Detects whether a line is a merge conflict marker by inspecting the first\n// character and counting consecutive repetitions. Git conflict markers are\n// 7+ repeated characters:\n//   '<' (60)  = start   (<<<<<<< current)\n//   '|' (124) = base    (||||||| base)\n//   '=' (61)  = separator (=======)\n//   '>' (62)  = end     (>>>>>>> incoming)\n// The separator must be exactly '=======' with no trailing text; other markers\n// allow an optional space + label (e.g. \"<<<<<<< HEAD\").\nfunction getMergeConflictMarkerType(\n  line: string\n): MergeConflictMarkerType | undefined {\n  if (line.length < 7) {\n    return undefined;\n  }\n\n  const markerCode = line.charCodeAt(0);\n  if (\n    markerCode !== 60 &&\n    markerCode !== 62 &&\n    markerCode !== 61 &&\n    markerCode !== 124\n  ) {\n    return undefined;\n  }\n\n  const lineEnd = getLineContentEndIndex(line);\n  if (lineEnd < 7) {\n    return undefined;\n  }\n\n  let markerLength = 1;\n  while (\n    markerLength < lineEnd &&\n    line.charCodeAt(markerLength) === markerCode\n  ) {\n    markerLength++;\n  }\n\n  if (markerLength < 7) {\n    return undefined;\n  }\n\n  if (markerCode === 61) {\n    return markerLength === lineEnd ? 'separator' : undefined;\n  }\n\n  if (\n    markerLength !== lineEnd &&\n    !isWhitespaceCode(line.charCodeAt(markerLength))\n  ) {\n    return undefined;\n  }\n\n  if (markerCode === 60) {\n    return 'start';\n  }\n  if (markerCode === 62) {\n    return 'end';\n  }\n  return 'base';\n}\n\nfunction getLineContentEndIndex(line: string): number {\n  let end = line.length;\n  if (end > 0 && line.charCodeAt(end - 1) === 10) {\n    end--;\n  }\n  if (end > 0 && line.charCodeAt(end - 1) === 13) {\n    end--;\n  }\n  return end;\n}\n\nfunction isWhitespaceCode(code: number): boolean {\n  return (\n    code === 9 ||\n    code === 10 ||\n    code === 11 ||\n    code === 12 ||\n    code === 13 ||\n    code === 32\n  );\n}\n\nfunction createResolvedConflictFile(\n  file: FileContents,\n  side: 'current' | 'incoming',\n  contents: string\n): FileContents {\n  return {\n    ...file,\n    contents,\n    cacheKey:\n      file.cacheKey != null\n        ? `${file.cacheKey}:merge-conflict-${side}`\n        : undefined,\n  };\n}\n\n// Builds the marker row array that tells the UI where to render conflict\n// decorations (start/base/separator/end lines) in the diff view. Each marker\n// row maps a conflict marker to a specific line index in unified view.\n//\n// This is a post-processing step over the finalized hunks and actions. It\n// caches cumulative line-start positions per hunk to avoid recomputing them\n// for every marker.\nexport function buildMergeConflictMarkerRows(\n  fileDiff: FileDiffMetadata,\n  actions: (MergeConflictDiffAction | undefined)[]\n): MergeConflictMarkerRow[] {\n  const markerRows: MergeConflictMarkerRow[] = [];\n  const hunkLineStartCache: (number[] | undefined)[] = new Array(\n    fileDiff.hunks.length\n  );\n\n  const getLineStart = (hunkIndex: number, contentIndex: number): number => {\n    const hunk = fileDiff.hunks[hunkIndex];\n    if (hunk == null) {\n      return 0;\n    }\n    let starts = hunkLineStartCache[hunkIndex];\n    if (starts == null) {\n      starts = new Array<number>(hunk.hunkContent.length + 1);\n      let lineIndex = hunk.unifiedLineStart;\n      starts[0] = lineIndex;\n      for (let index = 0; index < hunk.hunkContent.length; index++) {\n        const content = hunk.hunkContent[index];\n        lineIndex +=\n          content.type === 'context'\n            ? content.lines\n            : content.deletions + content.additions;\n        starts[index + 1] = lineIndex;\n      }\n      hunkLineStartCache[hunkIndex] = starts;\n    }\n    return starts[Math.max(contentIndex, 0)] ?? hunk.unifiedLineStart;\n  };\n\n  const getLineEnd = (hunkIndex: number, contentIndex: number): number => {\n    const lineStart = getLineStart(hunkIndex, contentIndex);\n    const starts = hunkLineStartCache[hunkIndex];\n    const lineEndExclusive =\n      starts?.[Math.max(contentIndex + 1, 0)] ??\n      getLineStart(hunkIndex, contentIndex + 1);\n    return Math.max(lineStart, lineEndExclusive - 1);\n  };\n\n  for (const action of actions) {\n    if (action == null) {\n      continue;\n    }\n\n    const hunk = fileDiff.hunks[action.hunkIndex];\n    if (hunk == null) {\n      continue;\n    }\n\n    const actionLineIndex = getLineStart(\n      action.hunkIndex,\n      action.startContentIndex\n    );\n    markerRows.push(\n      createMergeConflictMarkerRow(\n        action,\n        'marker-start',\n        action.startContentIndex,\n        action.markerLines.start,\n        actionLineIndex\n      )\n    );\n\n    if (action.baseContentIndex != null) {\n      const currentContentIndex = action.currentContentIndex;\n      const incomingContentIndex = action.incomingContentIndex;\n      if (currentContentIndex == null || incomingContentIndex == null) {\n        continue;\n      }\n\n      const baseMarkerLine = action.markerLines.base;\n      if (baseMarkerLine == null) {\n        continue;\n      }\n\n      const currentChange = hunk.hunkContent[currentContentIndex];\n      const baseContext = hunk.hunkContent[action.baseContentIndex];\n      const incomingChange = hunk.hunkContent[incomingContentIndex];\n      if (\n        currentChange?.type !== 'change' ||\n        baseContext?.type !== 'context' ||\n        incomingChange?.type !== 'change'\n      ) {\n        continue;\n      }\n\n      const currentStart = getLineStart(action.hunkIndex, currentContentIndex);\n      const incomingStart = getLineStart(\n        action.hunkIndex,\n        incomingContentIndex\n      );\n      markerRows.push(\n        createMergeConflictMarkerRow(\n          action,\n          'marker-base',\n          action.baseContentIndex,\n          baseMarkerLine,\n          currentStart + currentChange.deletions\n        )\n      );\n\n      markerRows.push(\n        createMergeConflictMarkerRow(\n          action,\n          'marker-separator',\n          action.baseContentIndex,\n          action.markerLines.separator,\n          incomingStart\n        ),\n        createMergeConflictMarkerRow(\n          action,\n          'marker-end',\n          action.endMarkerContentIndex,\n          action.markerLines.end,\n          getLineEnd(action.hunkIndex, action.endMarkerContentIndex)\n        )\n      );\n      continue;\n    }\n\n    const currentContentIndex = action.currentContentIndex;\n    if (currentContentIndex == null) {\n      continue;\n    }\n    const content = hunk.hunkContent[currentContentIndex];\n    if (content?.type !== 'change') {\n      continue;\n    }\n\n    const contentStart = getLineStart(action.hunkIndex, currentContentIndex);\n    const separatorLineIndex =\n      content.deletions > 0\n        ? contentStart + content.deletions\n        : actionLineIndex;\n\n    markerRows.push(\n      createMergeConflictMarkerRow(\n        action,\n        'marker-separator',\n        currentContentIndex,\n        action.markerLines.separator,\n        separatorLineIndex\n      ),\n      createMergeConflictMarkerRow(\n        action,\n        'marker-end',\n        action.endMarkerContentIndex,\n        action.markerLines.end,\n        getLineEnd(action.hunkIndex, action.endMarkerContentIndex)\n      )\n    );\n  }\n\n  return markerRows;\n}\n\nfunction createMergeConflictMarkerRow(\n  action: MergeConflictDiffAction,\n  type: MergeConflictMarkerRowType,\n  contentIndex: number,\n  lineText: string,\n  lineIndex: number\n): MergeConflictMarkerRow {\n  return {\n    type,\n    hunkIndex: action.hunkIndex,\n    contentIndex,\n    conflictIndex: action.conflictIndex,\n    lineText,\n    lineIndex,\n  };\n}\n\nfunction getUnifiedLineStartForContent(\n  hunk: Hunk,\n  contentIndex: number\n): number {\n  let lineIndex = hunk.unifiedLineStart;\n  for (let index = 0; index < contentIndex; index++) {\n    const content = hunk.hunkContent[index];\n    lineIndex +=\n      content.type === 'context'\n        ? content.lines\n        : content.deletions + content.additions;\n  }\n  return lineIndex;\n}\n"],"mappings":"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"}

package/node_modules/@pierre/diffs/dist/utils/parsePatchFiles.d.ts

@@ -0,0 +1,24 @@
+import { FileContents, FileDiffMetadata, ParsedPatch } from "../types.js";
+
+//#region src/utils/parsePatchFiles.d.ts
+declare function processPatch(data: string, cacheKeyPrefix?: string, throwOnError?: boolean): ParsedPatch;
+interface ProcessFileOptions {
+  cacheKey?: string;
+  isGitDiff?: boolean;
+  oldFile?: FileContents;
+  newFile?: FileContents;
+  throwOnError?: boolean;
+}
+declare function processFile(fileDiffString: string, options?: ProcessFileOptions): FileDiffMetadata | undefined;
+/**
+ * Parses a patch file string into an array of parsed patches.
+ *
+ * @param data - The raw patch file content (supports multi-commit patches)
+ * @param cacheKeyPrefix - Optional prefix for generating cache keys. When provided,
+ *   each file in the patch will get a cache key in the format `prefix-patchIndex-fileIndex`.
+ *   This enables caching of rendered diff results in the worker pool.
+ */
+declare function parsePatchFiles(data: string, cacheKeyPrefix?: string, throwOnError?: boolean): ParsedPatch[];
+//#endregion
+export { parsePatchFiles, processFile, processPatch };
+//# sourceMappingURL=parsePatchFiles.d.ts.map

package/node_modules/@pierre/diffs/dist/utils/parsePatchFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parsePatchFiles.d.ts","names":[],"sources":["../../src/utils/parsePatchFiles.ts"],"mappings":";;;iBAiCgB,YAAA,CACd,IAAA,UACA,cAAA,WACA,YAAA,aACC,WAAW;AAAA,UAqEJ,kBAAA;EACR,QAAA;EACA,SAAA;EACA,OAAA,GAAU,YAAA;EACV,OAAA,GAAU,YAAY;EACtB,YAAA;AAAA;AAAA,iBAGc,WAAA,CACd,cAAA,UACA,OAAA,GAAU,kBAAA,GACT,gBAAgB;;;AAhFL;AAMb;;;;;iBAmjBe,eAAA,CACd,IAAA,UACA,cAAA,WACA,YAAA,aACC,WAAW"}