@openclaw/diffs 2026.8.1-beta.3 → 2026.8.2

package/node_modules/@pierre/diffs/dist/worker/worker.js

@@ -12,7 +12,6 @@ import { normalizeThemeColors } from "@pierre/theming/color";
 		return false;
 	}
 })();
-const SPLIT_WITH_NEWLINES = /(?<=\n)/;
 const DEFAULT_THEMES = {
 	dark: "pierre-dark",
 	light: "pierre-light"
@@ -378,6 +377,8 @@ const EXTENSION_TO_FILE_FORMAT = {
 	tfvars: "tfvars",
 	toml: "toml",
 	ts: "typescript",
+	mts: "typescript",
+	cts: "typescript",
 	tsp: "typespec",
 	tsv: "tsv",
 	tsx: "tsx",
@@ -439,7 +440,12 @@ function replaceCustomExtensions(version, map) {
 //#endregion
 //#region src/utils/cleanLastNewline.ts
 function cleanLastNewline(contents) {
-	return contents.replace(/\n$|\r\n$/, "");
+	let end = contents.length;
+	if (contents.charCodeAt(end - 1) === 10) {
+		end--;
+		if (contents.charCodeAt(end - 1) === 13) end--;
+	}
+	return contents.slice(0, end);
 }
 //#endregion
 //#region src/utils/hast_utils.ts
@@ -612,6 +618,15 @@ function createTransformerWithState(useTokenTransformer = false, useCSSClasses =
 		} : null
 	}];
 	if (useCSSClasses) transformers.push(tokenStyleNormalizer, toClass);
+	if (useTokenTransformer) transformers.push({ line: (node) => {
+		if (node.type === "element" && node.children.length === 0) node.children.push({
+			type: "element",
+			tagName: "br",
+			properties: {},
+			children: []
+		});
+		return node;
+	} });
 	return {
 		state,
 		transformers,
@@ -691,6 +706,15 @@ function getLineNodes(nodes) {
 	throw new Error("getLineNodes: Unable to find children");
 }
 //#endregion
+//#region src/utils/getHunkSideBoundaries.ts
+/** Converts a unified hunk side's start/count into its consumed-file range. */
+function getHunkSideStartBoundary(start, count) {
+	return start - (count === 0 ? 0 : 1);
+}
+function getHunkSideEndBoundary(start, count) {
+	return getHunkSideStartBoundary(start, count) + count;
+}
+//#endregion
 //#region src/utils/virtualDiffLayout.ts
 function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
 	const normalizedRangeSize = Math.max(rangeSize, 0);
@@ -724,8 +748,8 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	if (additionRemaining <= 0 && deletionRemaining <= 0) return 0;
 	if (additionRemaining !== deletionRemaining) throw new Error(`${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
 	return Math.min(additionRemaining, deletionRemaining);
@@ -779,10 +803,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			else if (diffStyle === "split") return breakSplit;
 			else return breakUnified && breakSplit;
 		},
-		shouldSkip(unifiedHeight, splitHeight) {
+		shouldSkip(unifiedCount, splitCount) {
 			if (!state.isWindowedHighlight) return false;
-			const skipUnified = state.unifiedCount + unifiedHeight < startingLine;
-			const skipSplit = state.splitCount + splitHeight < startingLine;
+			const skipUnified = unifiedCount > 0 && state.unifiedCount + unifiedCount <= startingLine;
+			const skipSplit = splitCount > 0 && state.splitCount + splitCount <= startingLine;
 			if (diffStyle === "unified") return skipUnified;
 			else if (diffStyle === "split") return skipSplit;
 			else return skipUnified && skipSplit;
@@ -816,6 +840,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		const hunk = diff.hunks[hunkIndex];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk index");
 		if (state.shouldBreak()) break;
+		const deletionBoundary = getHunkSideStartBoundary(hunk.deletionStart, hunk.deletionCount);
+		const additionBoundary = getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount);
+		const deletionStartIndex = !diff.isPartial && hunk.deletionCount === 0 ? deletionBoundary : hunk.deletionLineIndex;
+		const additionStartIndex = !diff.isPartial && hunk.additionCount === 0 ? additionBoundary : hunk.additionLineIndex;
 		const leadingRegion = getExpandedRegion({
 			isPartial: diff.isPartial,
 			rangeSize: hunk.collapsedBefore,
@@ -845,10 +873,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
 			let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
-			let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
-			let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
-			let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
-			let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
+			let deletionLineIndex = deletionStartIndex - leadingRegion.rangeSize;
+			let additionLineIndex = additionStartIndex - leadingRegion.rangeSize;
+			let deletionLineNumber = deletionBoundary + 1 - leadingRegion.rangeSize;
+			let additionLineNumber = additionBoundary + 1 - leadingRegion.rangeSize;
 			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -874,10 +902,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			})) break hunkIterator;
 			unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
-			deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
-			additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
-			deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
-			additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
+			deletionLineIndex = deletionStartIndex - leadingRegion.fromEnd;
+			additionLineIndex = additionStartIndex - leadingRegion.fromEnd;
+			deletionLineNumber = deletionBoundary + 1 - leadingRegion.fromEnd;
+			additionLineNumber = additionBoundary + 1 - leadingRegion.fromEnd;
 			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -909,10 +937,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
-		let deletionLineIndex = hunk.deletionLineIndex;
-		let additionLineIndex = hunk.additionLineIndex;
-		let deletionLineNumber = hunk.deletionStart;
-		let additionLineNumber = hunk.additionStart;
+		let deletionLineIndex = deletionStartIndex;
+		let additionLineIndex = additionStartIndex;
+		let deletionLineNumber = deletionBoundary + 1;
+		let additionLineNumber = additionBoundary + 1;
 		const lastContent = hunk.hunkContent.at(-1);
 		for (const content of hunk.hunkContent) {
 			if (state.shouldBreak()) break hunkIterator;
@@ -1518,62 +1546,63 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 	};
 }
 //#endregion
-//#region src/utils/iterateOverFile.ts
+//#region src/utils/computeFileOffsets.ts
+const LINE_FEED = 10;
+const CARRIAGE_RETURN = 13;
+const DENSE_LINE_BREAK_BLOCK_SIZE = 4;
+const DENSE_LINE_BREAK_BLOCK_SPAN = 40;
 /**
-* Iterates over lines in a file with optional windowing support.
-*
-* Similar to `iterateOverDiff` but simplified for linear file content.
-* Supports viewport windowing for virtualization scenarios.
-*
-* @param props - Configuration for iteration
-* @param props.lines - Pre-split array of lines (use splitFileContents() to create from string)
-* @param props.startingLine - Optional starting line index (0-based, default: 0)
-* @param props.totalLines - Optional max lines to iterate (default: Infinity)
-* @param props.callback - Callback invoked for each line in the window.
-*                         Return `true` to stop iteration early.
-*
-* @example
-* ```typescript
-* const lines = splitFileContents('line1\nline2\nline3');
-* iterateOverFile({
-*   lines,
-*   startingLine: 0,
-*   totalLines: 10,
-*   callback: ({ lineIndex, lineNumber, content, isLastLine }) => {
-*     console.log(`Line ${lineNumber}: ${content}`);
-*     if (content.includes('stop')) return true; // Stop iteration
-*   }
-* });
-* ```
+* Computes line start offsets for a string.
 */
-function iterateOverFile({ lines, startingLine = 0, totalLines = Infinity, callback }) {
-	const len = Math.min(startingLine + totalLines, lines.length);
-	const lastLineIndex = (() => {
-		const lastLine = lines.at(-1);
-		if (lastLine === "" || lastLine === "\n" || lastLine === "\r\n" || lastLine === "\r") return Math.max(0, lines.length - 2);
-		return lines.length - 1;
-	})();
-	for (let lineIndex = startingLine; lineIndex < len; lineIndex++) {
-		const isLastLine = lineIndex === lastLineIndex;
-		if (callback({
-			lineIndex,
-			lineNumber: lineIndex + 1,
-			content: lines[lineIndex],
-			isLastLine
-		}) === true || isLastLine) break;
+function computeLineOffsets(contents) {
+	const offsets = [0];
+	let carriageReturn = contents.indexOf("\r");
+	let lineFeed = contents.indexOf("\n");
+	let blockStart = 0;
+	let blockBreaks = 0;
+	while (carriageReturn !== -1 || lineFeed !== -1) {
+		let nextOffset;
+		if (carriageReturn !== -1 && (lineFeed === -1 || carriageReturn < lineFeed)) if (lineFeed === carriageReturn + 1) {
+			nextOffset = lineFeed + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+			lineFeed = contents.indexOf("\n", nextOffset);
+		} else {
+			nextOffset = carriageReturn + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+		}
+		else {
+			nextOffset = lineFeed + 1;
+			lineFeed = contents.indexOf("\n", nextOffset);
+		}
+		offsets.push(nextOffset);
+		if (++blockBreaks === DENSE_LINE_BREAK_BLOCK_SIZE) {
+			if (nextOffset - blockStart <= DENSE_LINE_BREAK_BLOCK_SPAN) {
+				for (let i = nextOffset; i < contents.length; i++) {
+					const char = contents.charCodeAt(i);
+					if (char === LINE_FEED || char === CARRIAGE_RETURN) {
+						if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
+						offsets.push(i + 1);
+					}
+				}
+				return offsets;
+			}
+			blockStart = nextOffset;
+			blockBreaks = 0;
+		}
 	}
+	return offsets;
 }
-//#endregion
-//#region src/utils/splitFileContents.ts
 /**
-* Splits file contents into lines using the same logic as diff parsing.
-* - Preserves trailing newlines on each line
-*
-* @param contents - The raw file contents string
-* @returns Array of lines with newlines preserved
+* Splits file contents into lines aligned with {@link computeLineOffsets}.
+* Unlike splitFileContents, a trailing newline produces a final empty line.
 */
-function splitFileContents(contents) {
-	return contents !== "" ? contents.split(SPLIT_WITH_NEWLINES) : [];
+function linesFromFileContents(contents) {
+	const offsets = computeLineOffsets(contents);
+	return Array.from({ length: offsets.length }, (_, i) => {
+		const start = offsets[i];
+		const end = offsets[i + 1] ?? contents.length;
+		return contents.slice(start, end);
+	});
 }
 //#endregion
 //#region src/utils/renderFileWithHighlighter.ts
@@ -1619,7 +1648,7 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 			tokenizeTimeLimit: 0
 		};
 	})();
-	const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
+	const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
 	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
 	if (isWindowedHighlight) code.push(...highlightedLines);
 	return {
@@ -1629,16 +1658,9 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 	};
 }
 function extractWindowedFileContent(lines, startingLine, totalLines) {
-	let windowContent = "";
-	iterateOverFile({
-		lines,
-		startingLine,
-		totalLines,
-		callback({ content }) {
-			windowContent += content;
-		}
-	});
-	return windowContent;
+	if (lines.length === 0) return "";
+	const endLine = Math.min(startingLine + totalLines, lines.length);
+	return lines.slice(startingLine, endLine).join("");
 }
 //#endregion
 //#region src/worker/worker.ts