stream-markdown-parser 0.0.84 → 0.0.85

package/dist/index.js

@@ -11780,6 +11780,16 @@ function applyMath(md, mathOpts) {
 		const s = state;
 		const strict = !!mathOpts?.strictDelimiters;
 		const allowLoading = !s?.env?.__markstreamFinal;
+		const preserveSpacesBeforeLineBreak = (src, start) => {
+			let end = start;
+			while (end < src.length && (src[end] === " " || src[end] === "	")) end++;
+			if (end === start) return start;
+			if (!(src[end] === "\n" || src[end] === "\r" && src[end + 1] === "\n")) return start;
+			const text$1 = src.slice(start, end);
+			const token = s.push("text", "", 0);
+			token.content = text$1;
+			return end;
+		};
 		if (/^\*[^*]+/.test(s.src)) return false;
 		const delimiters = [
 			["$$", "$$"],
@@ -12062,11 +12072,11 @@ function applyMath(md, mathOpts) {
 						token.loading = false;
 						const isBeforeClose = src.slice(endIdx + close.length).startsWith(strongMarker);
 						if (isBeforeClose) s.push("strong_close", "", 0);
-						s.pos = endIdx + close.length;
+						s.pos = preserveSpacesBeforeLineBreak(src, endIdx + close.length);
 						searchPos = s.pos;
 						preMathPos = searchPos;
 						if (!isBeforeClose) s.push("strong_close", "", 0);
-						continue;
+						return true;
 					} else {
 						const token = s.push("math_inline", "math", 0);
 						token.content = normalizeStandaloneBackslashT(content, mathOpts);
@@ -12075,9 +12085,10 @@ function applyMath(md, mathOpts) {
 						token.loading = false;
 					}
 				}
-				searchPos = endIdx + close.length;
+				searchPos = preserveSpacesBeforeLineBreak(src, endIdx + close.length);
 				preMathPos = searchPos;
 				s.pos = searchPos;
+				return true;
 			}
 			if (foundAny) {
 				if (!silent) {
@@ -12539,6 +12550,40 @@ function normalizeLinkAttrs$1(attrs, href, title) {
 function stringifyTokens(tokens) {
 	return tokens.map(tokenToRaw).join("");
 }
+function normalizeStandardHtmlChildren(children) {
+	const normalized = [];
+	const pushText = (rawText) => {
+		const text$1 = String(rawText ?? "");
+		if (!text$1) return;
+		const last = normalized[normalized.length - 1];
+		if (last?.type === "text") {
+			last.content = String(last.content ?? "") + text$1;
+			last.raw = String(last.raw ?? "") + text$1;
+			return;
+		}
+		normalized.push({
+			type: "text",
+			content: text$1,
+			raw: text$1
+		});
+	};
+	for (const child of children) {
+		if (!child) continue;
+		if (child.type === "reference" || child.type === "footnote_reference") {
+			pushText(String(child.raw ?? ""));
+			continue;
+		}
+		if (Array.isArray(child.children)) {
+			normalized.push({
+				...child,
+				children: normalizeStandardHtmlChildren(child.children ?? [])
+			});
+			continue;
+		}
+		normalized.push(child);
+	}
+	return normalized;
+}
 function findMatchingClosing(tokens, startIndex, tag) {
 	let depth = 0;
 	for (let idx = startIndex; idx < tokens.length; idx++) {
@@ -12623,9 +12668,9 @@ function parseHtmlInlineCodeToken(token, tokens, i, parseInlineTokens$1, raw, pP
 		const titleAttr = getAttrValue$1(attrs$1, "title");
 		const title = titleAttr == null ? null : String(titleAttr);
 		const normalizedAttrs = normalizeLinkAttrs$1(attrs$1, href, title);
-		const children$1 = innerTokens.length ? parseInlineTokens$1(innerTokens, raw, pPreToken, options) : [];
+		const normalizedChildren$1 = normalizeStandardHtmlChildren(innerTokens.length ? parseInlineTokens$1(innerTokens, raw, pPreToken, options) : []);
 		const textContent = innerTokens.length ? stringifyTokens(innerTokens) : href || "";
-		if (!children$1.length && textContent) children$1.push({
+		if (!normalizedChildren$1.length && textContent) normalizedChildren$1.push({
 			type: "text",
 			content: textContent,
 			raw: textContent
@@ -12636,7 +12681,7 @@ function parseHtmlInlineCodeToken(token, tokens, i, parseInlineTokens$1, raw, pP
 			title,
 			text: textContent,
 			attrs: normalizedAttrs,
-			children: children$1,
+			children: normalizedChildren$1,
 			loading: !fragment$1.closed,
 			raw: fragment$1.html || code$1
 		}, fragment$1.nextIndex];
@@ -12652,10 +12697,10 @@ function parseHtmlInlineCodeToken(token, tokens, i, parseInlineTokens$1, raw, pP
 	const fragment = collectHtmlFragment(tokens, i, tag);
 	if (tag === "p" || tag === "div") return [{
 		type: "paragraph",
-		children: fragment.innerTokens.length ? parseInlineTokens$1(fragment.innerTokens, raw, pPreToken, options) : [],
+		children: normalizeStandardHtmlChildren(fragment.innerTokens.length ? parseInlineTokens$1(fragment.innerTokens, raw, pPreToken, options) : []),
 		raw: fragment.html
 	}, fragment.nextIndex];
-	const children = fragment.innerTokens.length ? parseInlineTokens$1(fragment.innerTokens, raw, pPreToken, options) : [];
+	const normalizedChildren = normalizeStandardHtmlChildren(fragment.innerTokens.length ? parseInlineTokens$1(fragment.innerTokens, raw, pPreToken, options) : []);
 	let content = fragment.html || code$1;
 	let loading = !fragment.closed;
 	let autoClosed = false;
@@ -12688,7 +12733,7 @@ function parseHtmlInlineCodeToken(token, tokens, i, parseInlineTokens$1, raw, pP
 		tag,
 		attrs,
 		content,
-		children,
+		children: normalizedChildren,
 		raw: content,
 		loading,
 		autoClosed
@@ -12980,7 +13025,7 @@ function parseTextToken(token) {
 const STRONG_PAIR_RE = /\*\*([\s\S]*?)\*\*/;
 const STRIKETHROUGH_RE = /[^~]*~{2,}[^~]+/;
 const HAS_STRONG_RE = /\*\*/;
-const INLINE_REPARSE_MARKER_RE = /\*\*\*|___|\*\*|__|\*|_|~~/;
+const INLINE_REPARSE_MARKER_RE = /[[_*^~]/;
 const ESCAPED_PUNCTUATION_RE = /\\([\\()[\]`$|*_\-!])/g;
 const ESCAPABLE_PUNCTUATION = new Set([
 	"\\",
@@ -13442,10 +13487,10 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 	}
 	function tryReparseCollapsedInlineText(rawContent) {
 		const md = options?.__markdownIt;
-		if (!md || !options?.final) return null;
+		if (!md) return null;
 		if (tokens.length <= 1 || !tokens.some((token) => token?.type === "math_inline")) return null;
 		if (!INLINE_REPARSE_MARKER_RE.test(rawContent)) return null;
-		const reparsed = md.parseInline(rawContent, { __markstreamFinal: true });
+		const reparsed = md.parseInline(rawContent, { __markstreamFinal: !!options?.final });
 		if (!Array.isArray(reparsed) || reparsed.length === 0) return null;
 		const children = (reparsed.find((token) => token?.type === "inline")?.children ?? []).filter((child) => !(child?.type === "text" && String(child.content ?? "") === ""));
 		if (!children.length) return null;
@@ -16744,6 +16789,7 @@ function getMarkdown(msgId = `editor-${Date.now()}`, options = {}) {
 			const token = s.push("reference", "span", 0);
 			token.content = id;
 			token.markup = match[0];
+			token.raw = match[0];
 		}
 		s.pos += match[0].length;
 		return true;