@createiq/htmldiff 1.2.0-beta.1 → 1.2.0-beta.3

package/dist/HtmlDiff.cjs

@@ -1580,7 +1580,7 @@ function preprocessByContent(genesis, cpLatest, meCurrent, gTables, cTables, mTa
 		placeholderToDiff
 	};
 }
-const POSITIONAL_PAIR_SIMILARITY_THRESHOLD = .5;
+const POSITIONAL_PAIR_SIMILARITY_THRESHOLD = .15;
 function positionallyAligned(genesis, cpLatest, meCurrent, gTables, cTables, mTables) {
 	if (gTables.length !== cTables.length || cTables.length !== mTables.length) return false;
 	for (let i = 0; i < gTables.length; i++) {
@@ -2044,6 +2044,16 @@ var HtmlDiff = class HtmlDiff {
 	newText;
 	oldText;
 	tablePreprocessDepth = 0;
+	/**
+	* Tracks currently-open formatting-tag wraps. Each entry pairs the
+	* opening tag (so a later closing tag can find its match) with the
+	* styling info needed to RE-OPEN the wrap if an overlapping
+	* formatting-tag close forces it to split. Without the styling info,
+	* an overlap like `<strong>X</strong>` ↔ `<u>X</u>` produces an
+	* unclosable wrap (the closing tag for the outer wrap arrives while
+	* an inner wrap is still on the stack); see `insertTag`'s closing
+	* handler for the split logic.
+	*/
 	specialTagDiffStack = [];
 	newWords = [];
 	oldWords = [];
@@ -2510,38 +2520,52 @@ var HtmlDiff = class HtmlDiff {
 			if (words.length === 0) break;
 			const indexOfFirstNonTag = words.findIndex((x) => !Utils_default.isTag(x));
 			const indexLastTagInFirstTagBlock = indexOfFirstNonTag === -1 ? words.length - 1 : indexOfFirstNonTag - 1;
-			let specialCaseTagInjection = "";
-			let specialCaseTagInjectionIsBefore = false;
+			let preInject = "";
+			let postInject = "";
 			if (HtmlDiff.SpecialCaseOpeningTagRegex.test(words[0])) {
 				const tagNames = /* @__PURE__ */ new Set();
 				for (const word of words) if (Utils_default.isTag(word)) tagNames.add(Utils_default.getTagName(word));
 				const styledTagNames = Array.from(tagNames).join(" ");
-				this.specialTagDiffStack.push(words[0]);
-				specialCaseTagInjection = `<ins${Utils_default.composeTagAttributes(`mod ${styledTagNames}`, metadata ?? {})}>`;
+				const styledCssClass = `mod ${styledTagNames}`;
+				this.specialTagDiffStack.push({
+					tag: words[0],
+					styledTagNames,
+					cssClass: styledCssClass,
+					metadata
+				});
+				postInject = `<ins${Utils_default.composeTagAttributes(styledCssClass, metadata ?? {})}>`;
 				if (tag === HtmlDiff.DelTag) {
 					words.shift();
 					while (words.length > 0 && HtmlDiff.SpecialCaseOpeningTagRegex.test(words[0])) words.shift();
 				}
 			} else if (HtmlDiff.SpecialCaseClosingTagsSet.has(words[0].toLowerCase())) {
-				const openingTag = this.specialTagDiffStack.length === 0 ? null : this.specialTagDiffStack.pop();
 				let tagIndexToCompare = indexLastTagInFirstTagBlock;
 				if (tag === HtmlDiff.DelTag && indexOfFirstNonTag === -1) {
 					if (words.slice(0, indexLastTagInFirstTagBlock + 1).some((w) => !HtmlDiff.SpecialCaseClosingTagsSet.has(w.toLowerCase()))) tagIndexToCompare = 0;
 				}
-				const openingAndClosingTagsMatch = !!openingTag && Utils_default.getTagName(openingTag) === Utils_default.getTagName(words[tagIndexToCompare]);
-				if (openingTag && openingAndClosingTagsMatch) {
-					specialCaseTagInjection = "</ins>";
-					specialCaseTagInjectionIsBefore = true;
-				} else if (openingTag) this.specialTagDiffStack.push(openingTag);
+				const closingTagName = Utils_default.getTagName(words[tagIndexToCompare]);
+				let matchIdx = -1;
+				for (let i = this.specialTagDiffStack.length - 1; i >= 0; i--) if (Utils_default.getTagName(this.specialTagDiffStack[i].tag) === closingTagName) {
+					matchIdx = i;
+					break;
+				}
+				if (matchIdx >= 0) {
+					const aboveEntries = this.specialTagDiffStack.splice(matchIdx + 1);
+					this.specialTagDiffStack.pop();
+					preInject = "</ins>".repeat(aboveEntries.length + 1);
+					for (const entry of aboveEntries) {
+						postInject += `<ins${Utils_default.composeTagAttributes(entry.cssClass, entry.metadata ?? {})}>`;
+						this.specialTagDiffStack.push(entry);
+					}
+				}
 				if (tag === HtmlDiff.DelTag) {
 					words.shift();
 					while (words.length > 0 && HtmlDiff.SpecialCaseClosingTagsSet.has(words[0].toLowerCase())) words.shift();
 				}
 			}
-			if (words.length === 0 && specialCaseTagInjection.length === 0) break;
+			if (words.length === 0 && preInject.length === 0 && postInject.length === 0) break;
 			const isTagForExtraction = tag === HtmlDiff.DelTag ? (x) => Utils_default.isTag(x) && !HtmlDiff.SpecialCaseOpeningTagRegex.test(x) && !HtmlDiff.SpecialCaseClosingTagsSet.has(x.toLowerCase()) : Utils_default.isTag;
-			if (specialCaseTagInjectionIsBefore) this.content.push(specialCaseTagInjection + this.extractConsecutiveWords(words, isTagForExtraction).join(""));
-			else this.content.push(this.extractConsecutiveWords(words, isTagForExtraction).join("") + specialCaseTagInjection);
+			this.content.push(preInject + this.extractConsecutiveWords(words, isTagForExtraction).join("") + postInject);
 			if (words.length === 0) continue;
 			this.insertTag(tag, cssClass, words, metadata);
 			break;