@pierre/diffs 1.5.0 → 1.5.2

package/dist/worker/worker.js

@@ -281,6 +281,7 @@ const EXTENSION_TO_FILE_FORMAT = {
 	mli: "ocaml",
 	mll: "ocaml",
 	mly: "ocaml",
+	odin: "odin",
 	pas: "pascal",
 	p: "pascal",
 	pl: "prolog",
@@ -313,6 +314,17 @@ const EXTENSION_TO_FILE_FORMAT = {
 	py: "python",
 	pyw: "python",
 	pyi: "python",
+	BUCK: "python",
+	BUILD: "python",
+	PACKAGE: "python",
+	WORKSPACE: "python",
+	Tiltfile: "python",
+	bazel: "python",
+	bxl: "python",
+	bzl: "python",
+	bzlmod: "python",
+	star: "python",
+	sky: "python",
 	qml: "qml",
 	qmldir: "qmldir",
 	qss: "qss",
@@ -423,16 +435,22 @@ const EXTENSION_TO_FILE_FORMAT = {
 	sty: "tex"
 };
 function getFiletypeFromFileName(fileName) {
+	const format = matchFiletypeFromName(fileName);
+	if (format != null) return format;
+	const baseName = fileName.split(/[/\\]/).pop() ?? fileName;
+	return baseName === fileName ? "text" : matchFiletypeFromName(baseName) ?? "text";
+}
+function matchFiletypeFromName(fileName) {
 	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(fileName)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(fileName) ?? "text";
-	if (EXTENSION_TO_FILE_FORMAT[fileName] != null) return EXTENSION_TO_FILE_FORMAT[fileName];
+	if (Object.hasOwn(EXTENSION_TO_FILE_FORMAT, fileName)) return EXTENSION_TO_FILE_FORMAT[fileName] ?? null;
 	const compoundMatch = fileName.match(/\.([^/\\]+\.[^/\\]+)$/);
 	if (compoundMatch != null) {
 		if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(compoundMatch[1])) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(compoundMatch[1]) ?? "text";
-		if (EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
+		if (Object.hasOwn(EXTENSION_TO_FILE_FORMAT, compoundMatch[1])) return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
 	}
 	const simpleMatch = fileName.match(/\.([^.]+)$/)?.[1] ?? "";
 	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? "text";
-	return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text";
+	return Object.hasOwn(EXTENSION_TO_FILE_FORMAT, simpleMatch) ? EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text" : null;
 }
 function replaceCustomExtensions(version, map) {
 	if (version <= customExtensionsVersion) return false;
@@ -1432,12 +1450,51 @@ function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText,
 		baseThemeType
 	};
 }
+function pushWordLineDecorations(lineDiff, { deletionLineIndex, additionLineIndex, deletionDecorations, additionDecorations }) {
+	let deletionOffset = 0;
+	let additionOffset = 0;
+	let deletionStart = -1;
+	let deletionEnd = 0;
+	let additionStart = -1;
+	let additionEnd = 0;
+	for (const { value, added, removed } of lineDiff) if (removed) {
+		if (deletionStart === -1) deletionStart = deletionOffset;
+		deletionOffset += value.length;
+		deletionEnd = deletionOffset;
+	} else if (added) {
+		if (additionStart === -1) additionStart = additionOffset;
+		additionOffset += value.length;
+		additionEnd = additionOffset;
+	} else {
+		deletionOffset += value.length;
+		additionOffset += value.length;
+	}
+	if (deletionStart !== -1) deletionDecorations.push(createDiffSpanDecoration({
+		line: deletionLineIndex,
+		spanStart: deletionStart,
+		spanLength: deletionEnd - deletionStart
+	}));
+	if (additionStart !== -1) additionDecorations.push(createDiffSpanDecoration({
+		line: additionLineIndex,
+		spanStart: additionStart,
+		spanLength: additionEnd - additionStart
+	}));
+}
 function computeLineDiffDecorations({ deletionLine, additionLine, deletionLineIndex, additionLineIndex, deletionDecorations, additionDecorations, lineDiffType, maxLineDiffLength }) {
 	if (deletionLine == null || additionLine == null || lineDiffType === "none") return;
 	deletionLine = cleanLastNewline(deletionLine);
 	additionLine = cleanLastNewline(additionLine);
 	if (deletionLine.length > maxLineDiffLength || additionLine.length > maxLineDiffLength) return;
 	const lineDiff = lineDiffType === "char" ? diffChars(deletionLine, additionLine) : diffWordsWithSpace(deletionLine, additionLine);
+	if (lineDiffType === "word-line") {
+		pushWordLineDecorations(lineDiff, {
+			deletionLineIndex,
+			additionLineIndex,
+			deletionDecorations,
+			additionDecorations
+		});
+		return;
+	}
 	const deletionSpans = [];
 	const additionSpans = [];
 	const enableJoin = lineDiffType === "word-alt";