@pierre/diffs 1.2.5 → 1.3.0-beta.1

package/dist/worker/worker.js

@@ -12,7 +12,6 @@ const DIFFS_DEVELOPMENT_BUILD = (() => {
 		return false;
 	}
 })();
-const SPLIT_WITH_NEWLINES = /(?<=\n)/;
 const DEFAULT_THEMES = {
 	dark: "pierre-dark",
 	light: "pierre-light"
@@ -454,7 +453,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
@@ -631,6 +635,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,
@@ -1542,63 +1555,34 @@ 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;
 /**
-* 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];
+	for (let i = 0; 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;
 }
-
-//#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
@@ -1643,7 +1627,7 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			tokenizeMaxLineLength
 		};
 	})();
-	const highlightedLines = getLineNodes(highlighter$1.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
+	const highlightedLines = getLineNodes(highlighter$1.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 {
@@ -1653,16 +1637,9 @@ function renderFileWithHighlighter(file, highlighter$1, { 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