@pierre/diffs 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/worker/worker-portable.js

@@ -13850,7 +13850,7 @@ function processLine(node, line, state) {
 			"data-line": lineInfo.lineNumber,
 			"data-alt-line": lineInfo.altLineNumber,
 			"data-line-type": lineInfo.type,
-			"data-line-index": lineInfo.lineIndex >= 0 ? lineInfo.lineIndex : undefined
+			"data-line-index": lineInfo.lineIndex
 		}
 	});
 }
@@ -14411,14 +14411,15 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, forcePlainText
 		};
 	}
 	const hunks = [];
-	let lineIndex = 0;
+	let splitLineIndex = 0;
+	let unifiedLineIndex = 0;
 	for (const hunk of diff.hunks) {
-		const result = processLines({
+		const { oldContent, newContent, oldInfo, newInfo, oldDecorations, newDecorations, splitLineIndex: newSplitLineIndex, unifiedLineIndex: newUnifiedLineIndex } = processLines({
 			hunks: [hunk],
-			lineIndex,
+			splitLineIndex,
+			unifiedLineIndex,
 			lineDiffType: options.lineDiffType
 		});
-		const { oldContent, newContent, oldInfo, newInfo, oldDecorations, newDecorations, lineIndex: newLineIndex } = result;
 		const oldFile = {
 			name: diff.prevName ?? diff.name,
 			contents: oldContent
@@ -14438,7 +14439,8 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, forcePlainText
 			options,
 			languageOverride: forcePlainText ? "text" : diff.lang
 		}));
-		lineIndex = newLineIndex;
+		splitLineIndex = newSplitLineIndex;
+		unifiedLineIndex = newUnifiedLineIndex;
 	}
 	const code = (() => {
 		if (hunks.length <= 1) {
@@ -14524,7 +14526,7 @@ function computeLineDiffDecorations({ oldLine, newLine, oldLineIndex, newLineInd
 		spanIndex += span[1].length;
 	}
 }
-function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }) {
+function processLines({ hunks, oldLines, newLines, splitLineIndex = 0, unifiedLineIndex = 0, lineDiffType }) {
 	const oldInfo = {};
 	const newInfo = {};
 	const oldDecorations = [];
@@ -14540,12 +14542,14 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 			oldInfo[oldLineIndex] = {
 				type: "context-expanded",
 				lineNumber: oldLineNumber,
-				lineIndex
+				altLineNumber: newLineNumber,
+				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 			};
 			newInfo[newLineIndex] = {
 				type: "context-expanded",
 				lineNumber: newLineNumber,
-				lineIndex
+				altLineNumber: oldLineNumber,
+				lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 			};
 			oldContent += oldLines[oldLineIndex - 1];
 			newContent += newLines[newLineIndex - 1];
@@ -14553,7 +14557,8 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 			newLineIndex++;
 			oldLineNumber++;
 			newLineNumber++;
-			lineIndex++;
+			splitLineIndex++;
+			unifiedLineIndex++;
 		}
 		oldLineNumber = hunk.deletionStart;
 		newLineNumber = hunk.additionStart;
@@ -14563,12 +14568,14 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 					oldInfo[oldLineIndex] = {
 						type: "context",
 						lineNumber: oldLineNumber,
-						lineIndex
+						altLineNumber: newLineNumber,
+						lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 					};
 					newInfo[newLineIndex] = {
 						type: "context",
 						lineNumber: newLineNumber,
-						lineIndex
+						altLineNumber: oldLineNumber,
+						lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 					};
 					oldContent += line;
 					newContent += line;
@@ -14576,11 +14583,13 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 					newLineIndex++;
 					newLineNumber++;
 					oldLineNumber++;
-					lineIndex++;
+					splitLineIndex++;
+					unifiedLineIndex++;
 				}
 			} else {
 				const len = Math.max(hunkContent.additions.length, hunkContent.deletions.length);
 				let i$2 = 0;
+				let _unifiedLineIndex = unifiedLineIndex;
 				while (i$2 < len) {
 					const oldLine = hunkContent.deletions[i$2];
 					const newLine = hunkContent.additions[i$2];
@@ -14597,7 +14606,7 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 						oldInfo[oldLineIndex] = {
 							type: "change-deletion",
 							lineNumber: oldLineNumber,
-							lineIndex
+							lineIndex: `${_unifiedLineIndex},${splitLineIndex}`
 						};
 						oldContent += oldLine;
 						oldLineIndex++;
@@ -14607,15 +14616,17 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 						newInfo[newLineIndex] = {
 							type: "change-addition",
 							lineNumber: newLineNumber,
-							lineIndex
+							lineIndex: `${_unifiedLineIndex + hunkContent.deletions.length},${splitLineIndex}`
 						};
 						newContent += newLine;
 						newLineIndex++;
 						newLineNumber++;
 					}
-					lineIndex++;
+					splitLineIndex++;
+					_unifiedLineIndex++;
 					i$2++;
 				}
+				unifiedLineIndex += hunkContent.additions.length + hunkContent.deletions.length;
 			}
 		}
 		if (oldLines == null || newLines == null || hunk !== hunks[hunks.length - 1]) continue;
@@ -14629,7 +14640,8 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 				oldInfo[oldLineIndex] = {
 					type: "context-expanded",
 					lineNumber: oldLineNumber,
-					lineIndex
+					altLineNumber: newLineNumber,
+					lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 				};
 				oldContent += oldLine;
 				oldLineIndex++;
@@ -14639,13 +14651,15 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 				newInfo[newLineIndex] = {
 					type: "context-expanded",
 					lineNumber: newLineNumber,
-					lineIndex
+					altLineNumber: oldLineNumber,
+					lineIndex: `${unifiedLineIndex},${splitLineIndex}`
 				};
 				newContent += newLine;
 				newLineIndex++;
 				newLineNumber++;
 			}
-			lineIndex++;
+			splitLineIndex++;
+			unifiedLineIndex++;
 		}
 	}
 	return {
@@ -14655,7 +14669,8 @@ function processLines({ hunks, oldLines, newLines, lineIndex = 0, lineDiffType }
 		newInfo,
 		oldDecorations,
 		newDecorations,
-		lineIndex
+		splitLineIndex,
+		unifiedLineIndex
 	};
 }
 function renderTwoFiles({ oldFile, newFile, oldInfo, newInfo, highlighter: highlighter$1, oldDecorations, newDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES,...options } }) {