stream-markdown-parser 0.0.92 → 0.0.94

package/dist/index.js

@@ -9347,7 +9347,7 @@ function applyContainers(md) {
 			if (!jsonStr) argsStr = trimmedRest || void 0;
 		}
 		if (silent) return true;
-		const envFinal = !!s.env?.__markstreamFinal;
+		const envFinal = !!s.env.__markstreamFinal;
 		let nextLine = startLine + 1;
 		let found = false;
 		while (nextLine <= endLine) {
@@ -9363,7 +9363,7 @@ function applyContainers(md) {
 		const tokenOpen = s.push("vmr_container_open", "div", 1);
 		tokenOpen.attrSet("class", `vmr-container vmr-container-${name}`);
 		tokenOpen.meta = {
-			...tokenOpen.meta,
+			...tokenOpen.meta ?? {},
 			unclosed: !found && !envFinal
 		};
 		if (argsStr) tokenOpen.attrSet("data-args", argsStr);
@@ -10392,7 +10392,7 @@ function applyFixHtmlInlineTokens(md, options = {}) {
 					type: "html_block",
 					loading: true,
 					tag,
-					content: t.children[0].content + t.children[1].content
+					content: String(t.children[0]?.content ?? "") + String(t.children[1]?.content ?? "")
 				}];
 				continue;
 			} else if (t.children.length === 3 && t.children[0].type === "html_inline" && t.children[2].type === "html_inline") {
@@ -10465,7 +10465,7 @@ function looksLikeCode(line) {
 function applyFixIndentedCodeBlock(md, options = {}) {
 	if (options.enabled === false) return;
 	md.core.ruler.after("inline", "fix_indented_code_block", (state) => {
-		const tokens = state.tokens;
+		const tokens = state.tokens ?? [];
 		for (let i = 0; i < tokens.length; i++) {
 			const token = tokens[i];
 			if (token.type !== "code_block") continue;
@@ -10474,28 +10474,30 @@ function applyFixIndentedCodeBlock(md, options = {}) {
 			const lines = content.split(/\r?\n/).filter((line) => line.trim().length > 0);
 			if (lines.length === 1 && !looksLikeCode(lines[0] ?? "")) {
 				const textContent = lines[0] ?? "";
+				const level = token.level ?? 0;
 				tokens.splice(i, 1, {
 					type: "paragraph_open",
 					tag: "p",
 					nesting: 1,
-					level: token.level
+					level
 				}, {
 					type: "inline",
 					tag: "",
 					nesting: 0,
-					level: token.level,
+					level,
 					content: textContent,
 					children: [{
 						type: "text",
 						content: textContent,
-						level: token.level + 1
+						level: level + 1,
+						raw: textContent
 					}],
 					block: true
 				}, {
 					type: "paragraph_close",
 					tag: "p",
 					nesting: -1,
-					level: token.level
+					level
 				});
 				i += 2;
 			}
@@ -10722,7 +10724,7 @@ function firstIndexOfAny(input, chars) {
 	return first;
 }
 function getHrefFromLinkOpen(token) {
-	const href = token?.attrs?.find((attr) => attr?.[0] === "href")?.[1];
+	const href = token.attrs?.find((attr) => attr?.[0] === "href")?.[1];
 	return typeof href === "string" ? href : "";
 }
 function setHrefOnLinkOpen(token, href) {
@@ -10963,7 +10965,7 @@ function fixLinkToken(tokens) {
 					count += 1;
 				}
 			}
-			replacerTokens.push({
+			const linkToken = {
 				type: "link",
 				loading: false,
 				href,
@@ -10975,7 +10977,8 @@ function fixLinkToken(tokens) {
 					raw: text$1
 				}],
 				raw: String(`[${text$1}](${href})`)
-			});
+			};
+			replacerTokens.push(linkToken);
 			if (emphasisMatch) {
 				const type = emphasisMatch[1].length;
 				pushEmClose(replacerTokens, type);
@@ -11342,10 +11345,50 @@ function mergeBrokenStrongAroundMathInline(tokens) {
 				continue;
 			}
 		}
+		if (t0?.type === "strong_open" && t1?.type === "text" && t2?.type === "strong_close" && t3?.type === "strong_open" && t4?.type === "math_inline" && t5?.type === "strong_close") {
+			const close = findTrailingTextStrongClose(tokens, i + 6);
+			if (close) {
+				out.push(t0);
+				out.push(t1);
+				out.push(t4);
+				for (let j = i + 6; j < close.index; j++) out.push(tokens[j]);
+				if (close.beforeClose) out.push({
+					...tokens[close.index],
+					type: "text",
+					content: close.beforeClose,
+					raw: close.beforeClose
+				});
+				out.push(t5);
+				if (close.afterClose) out.push({
+					...tokens[close.index],
+					type: "text",
+					content: close.afterClose,
+					raw: close.afterClose
+				});
+				i = close.index;
+				continue;
+			}
+		}
 		out.push(t0);
 	}
 	return out;
 }
+function findTrailingTextStrongClose(tokens, startIndex) {
+	for (let i = startIndex; i < tokens.length; i++) {
+		const token = tokens[i];
+		if (token?.type === "strong_open") return null;
+		if (token?.type !== "text") continue;
+		const content = String(token.content ?? "");
+		const closeIdx = content.indexOf("**");
+		if (closeIdx === -1) continue;
+		return {
+			index: i,
+			beforeClose: content.slice(0, closeIdx),
+			afterClose: content.slice(closeIdx + 2)
+		};
+	}
+	return null;
+}
 
 //#endregion
 //#region src/plugins/fixTableTokens.ts
@@ -11353,7 +11396,7 @@ function applyFixTableTokens(md) {
 	md.core.ruler.after("block", "fix_table_tokens", (state) => {
 		const s = state;
 		try {
-			const fixed = fixTableTokens(s.tokens ?? []);
+			const fixed = fixTableTokens(s.tokens ?? [], !!s.env?.__markstreamFinal, s.src ?? "");
 			if (Array.isArray(fixed)) s.tokens = fixed;
 		} catch (e) {
 			console.error("[applyFixTableTokens] failed to fix table tokens", e);
@@ -11459,10 +11502,7 @@ function getPipeRowCells(line, requireTrailingPipe) {
 	if (requireTrailingPipe && !line.endsWith("|")) return null;
 	const cells = line.slice(1).split("|");
 	if (cells.at(-1) === "") cells.pop();
-	return cells.length > 0 && cells.every((cell) => cell.length > 0) ? cells : null;
-}
-function isSingleLineFallbackTable(line) {
-	return getPipeRowCells(line, false) !== null;
+	return cells.length > 0 && cells.every((cell) => cell.trim().length > 0) ? cells : null;
 }
 function hasTrailingPipeHeaderRow(line) {
 	return getPipeRowCells(line, true) !== null;
@@ -11476,6 +11516,16 @@ function isTableSeparatorRow(line) {
 	if (cells.at(-1) === "") cells.pop();
 	return cells.length > 0 && cells.every(isSeparatorCell);
 }
+function isPartialSeparatorTail(cell) {
+	return /^(?:[:：]-*|:?-+:?)?$/.test(cell.trim());
+}
+function isTableSeparatorRowWithPartialTail(line) {
+	if (line === "") return true;
+	if (!line.startsWith("|")) return false;
+	const cells = line.slice(1).split("|");
+	const tail = cells.at(-1) ?? "";
+	return cells.slice(0, -1).every(isSeparatorCell) && isPartialSeparatorTail(tail);
+}
 function isTruncatedSeparatorRow(line) {
 	return line === "|" || line === "|:";
 }
@@ -11483,7 +11533,7 @@ function hasTrailingPipeHeaderRowWithoutColon(line) {
 	const cells = getPipeRowCells(line, true);
 	return cells !== null && cells.every((cell) => !cell.includes(":"));
 }
-function fixTableTokens(tokens) {
+function fixTableTokens(tokens, final = false, source = "") {
 	const fixedTokens = [...tokens];
 	if (tokens.length < 3) return fixedTokens;
 	const i = tokens.length - 2;
@@ -11492,8 +11542,9 @@ function fixTableTokens(tokens) {
 		const tcontent = String(token.content ?? "");
 		const headerContent = tcontent.split("\n")[0] ?? "";
 		const [headerLine = "", separatorLine = "", ...rest] = tcontent.split("\n");
-		if (!tcontent.includes("\n") && isSingleLineFallbackTable(tcontent)) {
-			const body = headerContent.slice(1).split("|").map((i$1) => i$1.trim()).filter(Boolean).flatMap((i$1) => createTh(i$1));
+		const hasTrailingNewlineSeparatorStart = !final && !tcontent.includes("\n") && /\r?\n$/.test(source) && hasTrailingPipeHeaderRow(tcontent);
+		if (!final && (tcontent.includes("\n") && rest.length === 0 && hasTrailingPipeHeaderRow(headerLine) && isTableSeparatorRowWithPartialTail(separatorLine) || hasTrailingNewlineSeparatorStart)) {
+			const body = headerContent.slice(1, -1).split("|").map((i$1) => i$1.trim()).flatMap((i$1) => createTh(i$1));
 			const insert = [
 				...createStart(),
 				...body,
@@ -12179,7 +12230,7 @@ function applyMath(md, mathOpts) {
 				}
 				foundAny = true;
 				if (!silent) {
-					const before = src.slice(s.pos - s.pending.length, index);
+					const before = src.slice(s.pos - (s.pending ?? "").length, index);
 					let toPushBefore = src.slice(0, searchPos) ? src.slice(preMathPos, index) : before;
 					const isStrongPrefix = countUnescapedStrong(toPushBefore) % 2 === 1;
 					if (index !== s.pos && isStrongPrefix) toPushBefore = s.pending + src.slice(s.pos, index);
@@ -12503,7 +12554,8 @@ function parseEmphasisToken(tokens, startIndex, options) {
 	let i = startIndex + 1;
 	const innerTokens = [];
 	while (i < tokens.length && tokens[i].type !== "em_close") {
-		emText += String(tokens[i].content ?? tokens[i]?.text ?? "");
+		const tokenText = tokens[i];
+		emText += String(tokens[i].content ?? tokenText.text ?? "");
 		innerTokens.push(tokens[i]);
 		i++;
 	}
@@ -12712,8 +12764,8 @@ function normalizeStandardHtmlChildren(children) {
 		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;
+			last.content = `${last.content}${text$1}`;
+			last.raw = `${last.raw}${text$1}`;
 			return;
 		}
 		normalized.push({
@@ -12728,10 +12780,10 @@ function normalizeStandardHtmlChildren(children) {
 			pushText(String(child.raw ?? ""));
 			continue;
 		}
-		if (Array.isArray(child.children)) {
+		if ("children" in child && Array.isArray(child.children)) {
 			normalized.push({
 				...child,
-				children: normalizeStandardHtmlChildren(child.children ?? [])
+				children: normalizeStandardHtmlChildren(child.children)
 			});
 			continue;
 		}
@@ -12901,7 +12953,7 @@ function parseImageToken(token, loading = false) {
 	let attrs = token.attrs ?? [];
 	let childWithAttrs = null;
 	if ((!attrs || attrs.length === 0) && Array.isArray(token.children)) for (const child of token.children) {
-		const childAttrs = child?.attrs;
+		const childAttrs = child.attrs;
 		if (Array.isArray(childAttrs) && childAttrs.length > 0) {
 			attrs = childAttrs;
 			childWithAttrs = child;
@@ -13104,10 +13156,11 @@ function parseStrongToken(tokens, startIndex, raw, options) {
 		innerTokens.push(tokens[i]);
 		i++;
 	}
-	children.push(...parseInlineTokens(innerTokens, resolveInnerRaw(raw, strongText), void 0, {
+	const innerOptions = {
 		...options,
 		__insideStrong: true
-	}));
+	};
+	children.push(...parseInlineTokens(innerTokens, resolveInnerRaw(raw, strongText), void 0, innerOptions));
 	return {
 		node: {
 			type: "strong",
@@ -13429,6 +13482,7 @@ function recoverTrailingMarkdownLinkLabel(raw, href) {
 }
 function parseInlineTokens(tokens, raw, pPreToken, options) {
 	if (!tokens || tokens.length === 0) return [];
+	const internalOptions = options;
 	const result = [];
 	let currentTextNode = null;
 	let i = 0;
@@ -13864,7 +13918,7 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		return true;
 	}
 	function tryReparseCollapsedInlineText(rawContent) {
-		const md = options?.__markdownIt;
+		const md = internalOptions?.__markdownIt;
 		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;
@@ -13901,9 +13955,28 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 			result.push(currentTextNode);
 		}
 	}
+	function pushInlineTextContent(content, token) {
+		if (!content) return;
+		const parsed = parseInlineTokens([{
+			...token,
+			type: "text",
+			content,
+			raw: content
+		}], content, pPreToken, options);
+		if (parsed.length === 1 && parsed[0]?.type === "text") {
+			const text$1 = parsed[0];
+			pushText(String(text$1.content ?? ""), String(text$1.raw ?? text$1.content ?? ""));
+			return;
+		}
+		for (const node of parsed) pushNode(node);
+	}
 	function hasEscapedMarkup(token, escapedPrefix) {
 		return String(token.markup ?? "").startsWith(escapedPrefix);
 	}
+	function isMarkdownLinkBeforeLinkifiedUrl(content) {
+		if (!content.endsWith("](")) return false;
+		return tokens[i + 1]?.type === "link_open" && tokens[i + 1]?.markup === "linkify" && tokens[i + 2]?.type === "text" && tokens[i + 3]?.type === "link_close" && tokens[i + 4]?.type === "text" && String(tokens[i + 4]?.content ?? "").startsWith(")");
+	}
 	function stripTrailingMidStateMarker(content, token) {
 		let nextContent = content;
 		const rawTokenContent = String(token.content ?? "");
@@ -14092,10 +14165,11 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 				pushText(String(token.content ?? ""), String(token.content ?? ""));
 				i++;
 				break;
-			default:
-				if (token.type === "link" && token.href != null && options?.validateLink && !options.validateLink(token.href)) {
+			default: {
+				const syntheticLink = token;
+				if (token.type === "link" && syntheticLink.href != null && options?.validateLink && !options.validateLink(String(syntheticLink.href))) {
 					resetCurrentTextNode();
-					const displayText = String(token.text ?? "");
+					const displayText = String(syntheticLink.text ?? "");
 					pushText(displayText, displayText);
 					i++;
 				} else if (recoverOuterImageLinkFromSyntheticLinkToken(token)) i++;
@@ -14106,6 +14180,7 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 					i++;
 				}
 				break;
+			}
 		}
 	}
 	function commitTextNode(content, token, preToken, nextToken) {
@@ -14176,7 +14251,7 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		}
 		if (handleInlineCodeContent(rawContent, token)) return;
 		if (handleInlineImageContent(content)) return;
-		if (tokens[i + 1]?.type !== "link_open" && handleInlineLinkContent(content, token)) return;
+		if ((tokens[i + 1]?.type !== "link_open" || isMarkdownLinkBeforeLinkifiedUrl(content)) && handleInlineLinkContent(content, token)) return;
 		const reparsedNodes = tryReparseCollapsedInlineText(rawContent);
 		if (reparsedNodes) {
 			resetCurrentTextNode();
@@ -14381,7 +14456,8 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		if (outerOpenToken?.type === "text" && String(outerOpenToken.content ?? "").endsWith("[") && hasEscapedMarkup(outerOpenToken, "\\[")) return false;
 		const previous = result[result.length - 1];
 		if (previous?.type !== "image" && previous?.type !== "link") return false;
-		const previousLink = previous?.type === "link" && Array.isArray(previous.children) && previous.children.length === 1 && previous.children[0]?.type === "image" ? result.pop() : null;
+		const previousWithChildren = previous;
+		const previousLink = previous?.type === "link" && Array.isArray(previousWithChildren.children) && previousWithChildren.children.length === 1 && previousWithChildren.children[0]?.type === "image" ? result.pop() : null;
 		const imageNode = previousLink ? previousLink.children[0] : result.pop();
 		if (!imageNode || imageNode.type !== "image") return false;
 		const nextToken = tokens[i + 1];
@@ -14431,11 +14507,18 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 				const last = tokens[i + 4];
 				let index = 4;
 				let loading$1 = true;
-				if (last?.type === "text" && last.content === ")") {
-					index++;
-					loading$1 = false;
-				} else if (last?.type === "text" && last.content === ".") i++;
-				if (textNodeContent) pushText(textNodeContent, textNodeContent);
+				if (last?.type === "text") {
+					const lastContent = String(last.content ?? "");
+					if (lastContent.startsWith(")")) {
+						loading$1 = false;
+						const trailing = lastContent.slice(1);
+						if (trailing) {
+							last.content = trailing;
+							last.raw = trailing;
+						} else index++;
+					} else if (lastContent === ".") i++;
+				}
+				pushInlineTextContent(textNodeContent, _token);
 				const hrefFromToken = String(textToken$1.content ?? "");
 				if (options?.validateLink && !options.validateLink(hrefFromToken)) pushText(text$1, text$1);
 				else pushParsed({
@@ -14458,7 +14541,7 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 			const loading = linkContentEnd === -1;
 			let emphasisMatch = textNodeContent.match(/\*+$/);
 			if (emphasisMatch) textNodeContent = textNodeContent.replace(/\*+$/, "");
-			if (textNodeContent) pushText(textNodeContent, textNodeContent);
+			pushInlineTextContent(textNodeContent, _token);
 			if (!emphasisMatch) emphasisMatch = text$1.match(/^\*+/);
 			if (!requireClosingStrong && emphasisMatch) {
 				const type = emphasisMatch[0].length;
@@ -14977,11 +15060,11 @@ function parseFootnote(tokens, index, options) {
 	let j = index + 1;
 	while (j < tokens.length && tokens[j].type !== "footnote_close") if (tokens[j].type === "paragraph_open") {
 		const contentToken = tokens[j + 1];
-		const children = contentToken.children || [];
+		const children = contentToken.children ? [...contentToken.children] : [];
 		if (tokens[j + 2].type === "footnote_anchor") children.push(tokens[j + 2]);
 		footnoteChildren.push({
 			type: "paragraph",
-			children: parseInlineTokens(contentToken.children || [], String(contentToken.content ?? ""), void 0, options),
+			children: parseInlineTokens(children, String(contentToken.content ?? ""), void 0, options),
 			raw: String(contentToken.content ?? "")
 		});
 		j += 3;
@@ -14998,7 +15081,7 @@ function parseFootnote(tokens, index, options) {
 //#region src/parser/node-parsers/heading-parser.ts
 function parseHeading(tokens, index, options) {
 	const token = tokens[index];
-	const attrs = token?.attrs;
+	const attrs = token.attrs;
 	const attrsRecord = Array.isArray(attrs) && attrs.length ? Object.fromEntries(attrs.filter((pair) => Array.isArray(pair) && pair.length >= 1 && pair[0]).map(([name, value]) => [String(name), value == null || value === "" ? true : String(value)])) : void 0;
 	const levelStr = String(token.tag?.substring(1) ?? "1");
 	const headingLevel = Number.parseInt(levelStr, 10);
@@ -15393,7 +15476,7 @@ function parseBasicBlockToken(tokens, index, options) {
 			const htmlBlockNode = parseHtmlBlock(token);
 			const tagSets = htmlBlockNode.tag ? getHtmlTagSets(options?.customHtmlTags) : null;
 			if (htmlBlockNode.tag && htmlBlockNode.loading && tagSets && !tagSets.allowedTagSet.has(htmlBlockNode.tag)) {
-				const content = String(token?.content ?? "").replace(/\n+$/, "");
+				const content = String(token.content ?? "").replace(/\n+$/, "");
 				return [{
 					type: "paragraph",
 					children: content ? [{
@@ -15410,7 +15493,7 @@ function parseBasicBlockToken(tokens, index, options) {
 				const cursor = Number(options?.__customHtmlBlockCursor ?? 0);
 				const mappedLineStart = Array.isArray(token.map) ? lineToIndex(source, Number(token.map?.[0] ?? 0)) : 0;
 				const fromSource = findNextCustomHtmlBlockFromSource(source, tag, Math.max(clampNonNegative(cursor), clampNonNegative(mappedLineStart)));
-				if (fromSource) options.__customHtmlBlockCursor = fromSource.end;
+				if (fromSource && options) options.__customHtmlBlockCursor = fromSource.end;
 				const rawHtml = String(fromSource?.raw ?? htmlBlockNode.raw ?? "");
 				const openEnd = findTagCloseIndexOutsideQuotes(rawHtml);
 				const openTag = openEnd !== -1 ? rawHtml.slice(0, openEnd + 1) : rawHtml;
@@ -15507,6 +15590,9 @@ function parseParagraph(tokens, index, options) {
 
 //#endregion
 //#region src/parser/index.ts
+function getNodeFields(node) {
+	return node;
+}
 function getCustomHtmlTagSet(options) {
 	const custom = options?.customHtmlTags;
 	if (!Array.isArray(custom) || custom.length === 0) return null;
@@ -15521,11 +15607,11 @@ function buildAllowedHtmlTagSet(options) {
 	return set;
 }
 function stringifyInlineNodeRaw(node) {
-	const raw = node?.raw;
+	const raw = node.raw;
 	if (typeof raw === "string") return raw;
-	const content = node?.content;
+	const content = getNodeFields(node).content;
 	if (typeof content === "string") return content;
-	if (node?.type === "hardbreak") return "<br>";
+	if (node.type === "hardbreak") return "<br>";
 	return "";
 }
 function buildParagraphFromInlineChildren(children) {
@@ -15537,7 +15623,8 @@ function buildParagraphFromInlineChildren(children) {
 }
 function maybePromoteCustomNodeFromParagraph(node, options) {
 	if (node.type !== "paragraph") return null;
-	const children = Array.isArray(node.children) ? node.children : [];
+	const nodeChildren = getNodeFields(node).children;
+	const children = Array.isArray(nodeChildren) ? nodeChildren : [];
 	if (children.length === 0) return null;
 	const customTagSet = getCustomHtmlTagSet(options);
 	if (!customTagSet?.size) return null;
@@ -15546,7 +15633,7 @@ function maybePromoteCustomNodeFromParagraph(node, options) {
 		const child = children[i];
 		if (!customTagSet.has(String(child?.type ?? "").toLowerCase())) continue;
 		const prefixChildren$1 = children.slice(0, i);
-		if (!String(child?.content ?? "").trim()) continue;
+		if (!String(getNodeFields(child).content ?? "").trim()) continue;
 		if (!prefixChildren$1.some((prefixChild) => prefixChild?.type === "hardbreak")) continue;
 		customIndex = i;
 		break;
@@ -15577,15 +15664,15 @@ function parseStandaloneHtmlDocument(markdown) {
 	}];
 }
 function getMergeableNodeRaw(node) {
-	const raw = node?.raw;
+	const raw = node.raw;
 	if (typeof raw === "string") return raw;
-	const content = node?.content;
+	const content = getNodeFields(node).content;
 	if (typeof content === "string") return content;
 	return "";
 }
 function isCloseOnlyHtmlBlockForTag(node, tag) {
 	if (node.type !== "html_block" || !tag) return false;
-	const raw = String(node?.raw ?? node?.content ?? "");
+	const raw = String(node.raw ?? node.content ?? "");
 	return new RegExp(String.raw`^\s*<\s*\/\s*${escapeTagForRegExp(tag)}\s*>\s*$`, "i").test(raw);
 }
 function findNextHtmlBlockFromSource(source, tag, startIndex) {
@@ -15743,7 +15830,8 @@ function shouldStructureGenericHtmlBlockChildren(innerRaw, children) {
 	if (children.some((child) => STRUCTURED_HTML_WRAPPER_BLOCK_TYPES.has(String(child?.type ?? "").toLowerCase()))) return true;
 	if (children.some((child) => {
 		if (child?.type !== "html_block") return false;
-		return Array.isArray(child?.children) && child.children.length > 0;
+		const childFields = getNodeFields(child);
+		return Array.isArray(childFields.children) && childFields.children.length > 0;
 	})) return true;
 	if (!hasStructuredHtmlWrapperMarkers(innerRaw)) return false;
 	if (children.length > 1) return true;
@@ -15753,9 +15841,10 @@ function shouldStructureGenericHtmlBlockChildren(innerRaw, children) {
 function structureGenericHtmlBlockChildren(nodes, md, options, final) {
 	return nodes.map((node) => {
 		if (node?.type !== "html_block") return node;
-		const tag = String(node?.tag ?? "").toLowerCase();
-		if (!tag || tag === "details" || NON_STRUCTURING_HTML_TAGS.has(tag) || Array.isArray(node?.children)) return node;
-		const raw = String(node?.raw ?? node?.content ?? "");
+		const fields = getNodeFields(node);
+		const tag = String(fields.tag ?? "").toLowerCase();
+		if (!tag || tag === "details" || NON_STRUCTURING_HTML_TAGS.has(tag) || Array.isArray(fields.children)) return node;
+		const raw = String(node.raw ?? fields.content ?? "");
 		if (!raw) return node;
 		const openEnd = findTagCloseIndexOutsideQuotes(raw);
 		if (openEnd === -1) return node;
@@ -15850,7 +15939,7 @@ function combineStructuredDetailsHtmlBlocks(nodes, source, md, options, final, s
 		})() : openRaw;
 		const [children] = combineStructuredDetailsHtmlBlocks(selfContained ? [] : closeIndex === -1 ? nodes.slice(i + 1) : nodes.slice(i + 1, closeIndex), source, md, options, final, openStart + openRaw.length);
 		const prefixChildren = buildDetailsPrefixChildren(effectiveOpenRaw, md, buildDetailsChildParseOptions(options, final));
-		const closeRaw = closeIndex === -1 ? "</details>" : String(nodes[closeIndex]?.raw ?? getMergeableNodeRaw(nodes[closeIndex]) ?? "</details>");
+		const closeRaw = closeIndex === -1 ? "</details>" : String(nodes[closeIndex].raw ?? getMergeableNodeRaw(nodes[closeIndex]) ?? "</details>");
 		const explicitClose = selfContained || closeIndex !== -1 && exact?.closed === true;
 		const trimmedCloseRaw = closeRaw.replace(/[\t\r\n ]+$/, "");
 		const closeStart = explicitClose ? (() => {
@@ -15894,7 +15983,7 @@ function mergeSplitTopLevelHtmlBlocks(nodes, final, source) {
 			if (nodePos !== -1) sourceHtmlCursor = nodePos + nodeRaw.length;
 			continue;
 		}
-		const tag = String(node?.tag ?? "").toLowerCase();
+		const tag = String(node.tag ?? "").toLowerCase();
 		if (!tag) continue;
 		if (tag === "details") {
 			if (nodePos !== -1) sourceHtmlCursor = nodePos + nodeRaw.length;
@@ -15903,11 +15992,11 @@ function mergeSplitTopLevelHtmlBlocks(nodes, final, source) {
 		const exact = findNextHtmlBlockFromSource(source, tag, nodePos !== -1 ? nodePos : sourceHtmlCursor);
 		if (!exact) continue;
 		sourceHtmlCursor = exact.end;
-		const currentContent = String(node?.content ?? nodeRaw);
-		const currentRaw = String(node?.raw ?? currentContent);
+		const currentContent = String(node.content ?? nodeRaw);
+		const currentRaw = String(node.raw ?? currentContent);
 		const nextContent = buildHtmlBlockContent(exact.raw, tag, exact.closed);
 		const desiredLoading = !final && !exact.closed;
-		const needsExpansion = currentContent !== nextContent || currentRaw !== exact.raw || Boolean(node?.loading) !== desiredLoading;
+		const needsExpansion = currentContent !== nextContent || currentRaw !== exact.raw || Boolean(node.loading) !== desiredLoading;
 		const exactOpenEnd = findTagCloseIndexOutsideQuotes(exact.raw);
 		const exactOpenTag = exactOpenEnd === -1 ? "" : exact.raw.slice(0, exactOpenEnd + 1);
 		const exactAttrs = exactOpenTag ? parseTagAttrs(exactOpenTag) : [];
@@ -17359,9 +17448,8 @@ function getMarkdown(msgId = `editor-${Date.now()}`, options = {}) {
 	if (Array.isArray(options.plugin)) for (const p of options.plugin) {
 		const pluginItem = p;
 		if (Array.isArray(pluginItem)) {
-			const fn = pluginItem[0];
-			const opts = pluginItem[1];
-			if (typeof fn === "function") md.use(fn, opts);
+			const [fn, ...params] = pluginItem;
+			if (typeof fn === "function") md.use(fn, ...params);
 		} else if (typeof pluginItem === "function") md.use(pluginItem);
 	}
 	if (Array.isArray(options.apply)) for (const fn of options.apply) try {
@@ -17371,9 +17459,8 @@ function getMarkdown(msgId = `editor-${Date.now()}`, options = {}) {
 	}
 	if (_registeredMarkdownPlugins.length) {
 		for (const p of _registeredMarkdownPlugins) if (Array.isArray(p)) {
-			const fn = p[0];
-			const opts = p[1];
-			if (typeof fn === "function") md.use(fn, opts);
+			const [fn, ...params] = p;
+			if (typeof fn === "function") md.use(fn, ...params);
 		} else if (typeof p === "function") md.use(p);
 	}
 	md.use(sub_plugin);