@pierre/diffs 1.1.0-beta.5 → 1.1.0-beta.7

package/dist/worker/worker-portable.js

@@ -11746,7 +11746,7 @@ function attachResolvedThemes(themes, highlighter$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/base.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/base.js
 var Diff = class {
 	diff(oldStr, newStr, options = {}) {
 		let callback;
@@ -11970,7 +11970,7 @@ var Diff = class {
 };
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/character.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/character.js
 var CharacterDiff = class extends Diff {};
 const characterDiff = new CharacterDiff();
 function diffChars(oldStr, newStr, options) {
@@ -11978,7 +11978,7 @@ function diffChars(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/string.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/string.js
 function longestCommonPrefix(str1, str2) {
 	let i$2;
 	for (i$2 = 0; i$2 < str1.length && i$2 < str2.length; i$2++) {
@@ -12087,8 +12087,8 @@ function leadingWs(string) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/word.js
-const extendedWordChars = "a-zA-Z0-9_\\u{C0}-\\u{FF}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}";
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/word.js
+const extendedWordChars = "a-zA-Z0-9_\\u{AD}\\u{C0}-\\u{D6}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}";
 const tokenizeIncludingWhitespace = new RegExp(`[${extendedWordChars}]+|\\s+|[^${extendedWordChars}]`, "ug");
 var WordDiff = class extends Diff {
 	equals(left, right, options) {
@@ -12105,7 +12105,15 @@ var WordDiff = class extends Diff {
 			if (segmenter.resolvedOptions().granularity != "word") {
 				throw new Error("The segmenter passed must have a granularity of \"word\"");
 			}
-			parts = Array.from(segmenter.segment(value), (segment) => segment.segment);
+			parts = [];
+			for (const segmentObj of Array.from(segmenter.segment(value))) {
+				const segment = segmentObj.segment;
+				if (parts.length && /\s/.test(parts[parts.length - 1]) && /\s/.test(segment)) {
+					parts[parts.length - 1] += segment;
+				} else {
+					parts.push(segment);
+				}
+			}
 		} else {
 			parts = value.match(tokenizeIncludingWhitespace) || [];
 		}
@@ -12233,7 +12241,7 @@ function diffWordsWithSpace(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/params.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/params.js
 function generateOptions(options, defaults) {
 	if (typeof options === "function") {
 		defaults.callback = options;
@@ -12249,7 +12257,7 @@ function generateOptions(options, defaults) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/line.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/line.js
 var LineDiff = class extends Diff {
 	constructor() {
 		super(...arguments);
@@ -12302,7 +12310,7 @@ function tokenize(value, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/sentence.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/sentence.js
 function isSentenceEndPunct(char) {
 	return char == "." || char == "!" || char == "?";
 }
@@ -12335,7 +12343,7 @@ function diffSentences(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/css.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/css.js
 var CssDiff = class extends Diff {
 	tokenize(value) {
 		return value.split(/([{}:;,]|\s+)/);
@@ -12347,7 +12355,7 @@ function diffCss(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/json.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/json.js
 var JsonDiff = class extends Diff {
 	constructor() {
 		super(...arguments);
@@ -12421,7 +12429,7 @@ function canonicalize(obj, stack, replacementStack, replacer, key$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/array.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/array.js
 var ArrayDiff = class extends Diff {
 	tokenize(value) {
 		return value.slice();
@@ -12439,7 +12447,7 @@ function diffArrays(oldArr, newArr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/line-endings.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/line-endings.js
 function unixToWin(patch) {
 	if (Array.isArray(patch)) {
 		return patch.map((p$1) => unixToWin(p$1));
@@ -12479,7 +12487,7 @@ function isWin(patch) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/parse.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/parse.js
 /**
 * Parses a patch into structured data, in the same structure returned by `structuredPatch`.
 *
@@ -12496,9 +12504,9 @@ function parsePatch(uniDiff) {
 			if (/^(---|\+\+\+|@@)\s/.test(line)) {
 				break;
 			}
-			const header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(line);
-			if (header) {
-				index.index = header[1];
+			const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
+			if (headerMatch) {
+				index.index = line.substring(headerMatch[0].length).trim();
 			}
 			i$2++;
 		}
@@ -12519,14 +12527,14 @@ function parsePatch(uniDiff) {
 		}
 	}
 	function parseFileHeader(index) {
-		const fileHeader = /^(---|\+\+\+)\s+(.*)\r?$/.exec(diffstr[i$2]);
-		if (fileHeader) {
-			const data = fileHeader[2].split("	", 2), header = (data[1] || "").trim();
+		const fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i$2]);
+		if (fileHeaderMatch) {
+			const prefix = fileHeaderMatch[1], data = diffstr[i$2].substring(3).trim().split("	", 2), header = (data[1] || "").trim();
 			let fileName = data[0].replace(/\\\\/g, "\\");
-			if (/^".*"$/.test(fileName)) {
+			if (fileName.startsWith("\"") && fileName.endsWith("\"")) {
 				fileName = fileName.substr(1, fileName.length - 2);
 			}
-			if (fileHeader[1] === "---") {
+			if (prefix === "---") {
 				index.oldFileName = fileName;
 				index.oldHeader = header;
 			} else {
@@ -12590,7 +12598,7 @@ function parsePatch(uniDiff) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/distance-iterator.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/distance-iterator.js
 function distance_iterator_default(start, minLine, maxLine) {
 	let wantForward = true, backwardExhausted = false, forwardExhausted = false, localOffset = 1;
 	return function iterator() {
@@ -12620,7 +12628,7 @@ function distance_iterator_default(start, minLine, maxLine) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/apply.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/apply.js
 /**
 * attempts to apply a unified diff patch.
 *
@@ -12839,7 +12847,7 @@ function applyPatches(uniDiff, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/reverse.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/reverse.js
 function reversePatch(structuredPatch$1) {
 	if (Array.isArray(structuredPatch$1)) {
 		return structuredPatch$1.map((patch) => reversePatch(patch)).reverse();
@@ -12870,7 +12878,22 @@ function reversePatch(structuredPatch$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/create.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/create.js
+const INCLUDE_HEADERS = {
+	includeIndex: true,
+	includeUnderline: true,
+	includeFileHeaders: true
+};
+const FILE_HEADERS_ONLY = {
+	includeIndex: false,
+	includeUnderline: false,
+	includeFileHeaders: true
+};
+const OMIT_HEADERS = {
+	includeIndex: false,
+	includeUnderline: false,
+	includeFileHeaders: false
+};
 function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
 	let optionsObj;
 	if (!options) {
@@ -12984,17 +13007,27 @@ function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, ne
 * creates a unified diff patch.
 * @param patch either a single structured patch object (as returned by `structuredPatch`) or an array of them (as returned by `parsePatch`)
 */
-function formatPatch(patch) {
+function formatPatch(patch, headerOptions) {
+	if (!headerOptions) {
+		headerOptions = INCLUDE_HEADERS;
+	}
 	if (Array.isArray(patch)) {
-		return patch.map(formatPatch).join("\n");
+		if (patch.length > 1 && !headerOptions.includeFileHeaders) {
+			throw new Error("Cannot omit file headers on a multi-file patch. " + "(The result would be unparseable; how would a tool trying to apply " + "the patch know which changes are to which file?)");
+		}
+		return patch.map((p$1) => formatPatch(p$1, headerOptions)).join("\n");
 	}
 	const ret = [];
-	if (patch.oldFileName == patch.newFileName) {
+	if (headerOptions.includeIndex && patch.oldFileName == patch.newFileName) {
 		ret.push("Index: " + patch.oldFileName);
 	}
-	ret.push("===================================================================");
-	ret.push("--- " + patch.oldFileName + (typeof patch.oldHeader === "undefined" ? "" : "	" + patch.oldHeader));
-	ret.push("+++ " + patch.newFileName + (typeof patch.newHeader === "undefined" ? "" : "	" + patch.newHeader));
+	if (headerOptions.includeUnderline) {
+		ret.push("===================================================================");
+	}
+	if (headerOptions.includeFileHeaders) {
+		ret.push("--- " + patch.oldFileName + (typeof patch.oldHeader === "undefined" ? "" : "	" + patch.oldHeader));
+		ret.push("+++ " + patch.newFileName + (typeof patch.newHeader === "undefined" ? "" : "	" + patch.newHeader));
+	}
 	for (let i$2 = 0; i$2 < patch.hunks.length; i$2++) {
 		const hunk = patch.hunks[i$2];
 		if (hunk.oldLines === 0) {
@@ -13019,14 +13052,14 @@ function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader
 		if (!patchObj) {
 			return;
 		}
-		return formatPatch(patchObj);
+		return formatPatch(patchObj, options === null || options === void 0 ? void 0 : options.headerOptions);
 	} else {
 		const { callback } = options;
 		structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, Object.assign(Object.assign({}, options), { callback: (patchObj) => {
 			if (!patchObj) {
 				callback(undefined);
 			} else {
-				callback(formatPatch(patchObj));
+				callback(formatPatch(patchObj, options.headerOptions));
 			}
 		} }));
 	}
@@ -13049,7 +13082,7 @@ function splitLines(text$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/convert/dmp.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/convert/dmp.js
 /**
 * converts a list of change objects to the format returned by Google's [diff-match-patch](https://github.com/google/diff-match-patch) library
 */
@@ -13071,7 +13104,7 @@ function convertChangesToDMP(changes) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/convert/xml.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/convert/xml.js
 /**
 * converts a list of change objects to a serialized XML format
 */