stream-markdown-parser 0.0.79 → 0.0.81

package/dist/index.js

@@ -6489,7 +6489,7 @@ const DEFAULT_RENDERER_OPTIONS = {
 	xhtmlOut: false,
 	breaks: false
 };
-const hasOwn = Object.prototype.hasOwnProperty;
+const hasOwn$1 = Object.prototype.hasOwnProperty;
 const defaultRules = {
 	code_inline(tokens, idx) {
 		return renderCodeInlineToken(tokens[idx]);
@@ -6889,16 +6889,16 @@ var Renderer = class {
 			if (!merged) merged = { ...base$1 };
 			return merged;
 		};
-		if (hasOwn.call(overrides, "highlight") && overrides.highlight !== base$1.highlight) ensureMerged().highlight = overrides.highlight;
-		if (hasOwn.call(overrides, "langPrefix")) {
+		if (hasOwn$1.call(overrides, "highlight") && overrides.highlight !== base$1.highlight) ensureMerged().highlight = overrides.highlight;
+		if (hasOwn$1.call(overrides, "langPrefix")) {
 			const value = overrides.langPrefix;
 			if (value !== base$1.langPrefix) ensureMerged().langPrefix = value;
 		}
-		if (hasOwn.call(overrides, "xhtmlOut")) {
+		if (hasOwn$1.call(overrides, "xhtmlOut")) {
 			const value = overrides.xhtmlOut;
 			if (value !== base$1.xhtmlOut) ensureMerged().xhtmlOut = value;
 		}
-		if (hasOwn.call(overrides, "breaks")) {
+		if (hasOwn$1.call(overrides, "breaks")) {
 			const value = overrides.breaks;
 			if (value !== base$1.breaks) ensureMerged().breaks = value;
 		}
@@ -8733,10 +8733,10 @@ const config = {
 	commonmark: commonmark_default
 };
 function hasExplicitChunkOverride(presetOptions, userOptions, keys) {
-	const hasOwn$1 = (obj, key) => !!obj && Object.prototype.hasOwnProperty.call(obj, key) && obj[key] !== void 0;
+	const hasOwn$1$1 = (obj, key) => !!obj && Object.prototype.hasOwnProperty.call(obj, key) && obj[key] !== void 0;
 	for (let i = 0; i < keys.length; i++) {
 		const key = keys[i];
-		if (hasOwn$1(userOptions, key) || hasOwn$1(presetOptions, key)) return true;
+		if (hasOwn$1$1(userOptions, key) || hasOwn$1$1(presetOptions, key)) return true;
 	}
 	return false;
 }
@@ -9602,6 +9602,124 @@ function isUnsafeHtmlUrl(value) {
 	return false;
 }
 
+//#endregion
+//#region src/htmlTagUtils.ts
+function escapeTagForRegExp(tag) {
+	return tag.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findTagCloseIndexOutsideQuotes(input) {
+	let inSingle = false;
+	let inDouble = false;
+	for (let i = 0; i < input.length; i++) {
+		const ch = input[i];
+		if (ch === "\\") {
+			i++;
+			continue;
+		}
+		if (!inDouble && ch === "'") {
+			inSingle = !inSingle;
+			continue;
+		}
+		if (!inSingle && ch === "\"") {
+			inDouble = !inDouble;
+			continue;
+		}
+		if (!inSingle && !inDouble && ch === ">") return i;
+	}
+	return -1;
+}
+function parseTagAttrs(openTag) {
+	const attrs = [];
+	const attrRegex = /\s([\w:-]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'>]+)))?/g;
+	let match;
+	while ((match = attrRegex.exec(openTag)) !== null) {
+		const attrName = match[1];
+		if (!attrName) continue;
+		const attrValue = match[2] || match[3] || match[4] || "";
+		attrs.push([attrName, attrValue]);
+	}
+	return attrs;
+}
+
+//#endregion
+//#region src/customHtmlTags.ts
+const HTML_LIKE_TAG_NAME_RE = /^[a-z][a-z0-9_-]*$/;
+function isHtmlLikeTagName(tag) {
+	return HTML_LIKE_TAG_NAME_RE.test(String(tag ?? "").trim().toLowerCase());
+}
+function normalizeCustomHtmlTagName(value) {
+	const raw = String(value ?? "").trim();
+	if (!raw) return "";
+	if (!raw.startsWith("<")) return isHtmlLikeTagName(raw) ? raw.toLowerCase() : "";
+	let index = 1;
+	while (index < raw.length && /\s/.test(raw[index])) index++;
+	if (raw[index] === "/") {
+		index++;
+		while (index < raw.length && /\s/.test(raw[index])) index++;
+	}
+	const start = index;
+	while (index < raw.length && /[\w-]/.test(raw[index])) index++;
+	const normalized = raw.slice(start, index).toLowerCase();
+	const next = raw[index] ?? "";
+	if (next && !/[\s/>]/.test(next)) return "";
+	return isHtmlLikeTagName(normalized) ? normalized : "";
+}
+function normalizeCustomHtmlTags(tags) {
+	if (!tags || tags.length === 0) return [];
+	const seen = /* @__PURE__ */ new Set();
+	const normalized = [];
+	for (const tag of tags) {
+		const value = normalizeCustomHtmlTagName(tag);
+		if (!value || seen.has(value)) continue;
+		seen.add(value);
+		normalized.push(value);
+	}
+	return normalized;
+}
+function mergeCustomHtmlTags(...lists) {
+	const seen = /* @__PURE__ */ new Set();
+	const normalized = [];
+	for (const list$1 of lists) for (const tag of normalizeCustomHtmlTags(list$1)) {
+		if (seen.has(tag)) continue;
+		seen.add(tag);
+		normalized.push(tag);
+	}
+	return normalized;
+}
+function resolveCustomHtmlTags(tags) {
+	const normalized = normalizeCustomHtmlTags(tags);
+	return {
+		key: normalized.join(","),
+		tags: normalized
+	};
+}
+function getHtmlTagFromContent(html) {
+	return normalizeCustomHtmlTagName(html);
+}
+function hasCompleteHtmlTagContent(html, tag) {
+	const raw = String(html ?? "");
+	const normalizedTag = normalizeCustomHtmlTagName(tag);
+	if (!normalizedTag) return false;
+	const escaped = escapeTagForRegExp(normalizedTag);
+	const openMatch = raw.match(new RegExp(String.raw`^\s*<\s*${escaped}(?:\s[^>]*)?(\s*\/)?>`, "i"));
+	if (!openMatch) return false;
+	if (openMatch[1]) return true;
+	return new RegExp(String.raw`<\s*\/\s*${escaped}\s*>`, "i").test(raw);
+}
+function shouldRenderUnknownHtmlTagAsText(html, tag) {
+	const normalizedTag = normalizeCustomHtmlTagName(tag);
+	return Boolean(normalizedTag) && !STANDARD_HTML_TAGS.has(normalizedTag) && !hasCompleteHtmlTagContent(html, normalizedTag);
+}
+function stripCustomHtmlWrapper(html, tag) {
+	const raw = String(html ?? "");
+	const normalizedTag = normalizeCustomHtmlTagName(tag);
+	if (!normalizedTag) return raw;
+	const escaped = escapeTagForRegExp(normalizedTag);
+	const openRe = new RegExp(String.raw`^\s*<\s*${escaped}(?:\s[^>]*)?>\s*`, "i");
+	const closeRe = new RegExp(String.raw`\s*<\s*\/\s*${escaped}\s*>\s*$`, "i");
+	return raw.replace(openRe, "").replace(closeRe, "");
+}
+
 //#endregion
 //#region src/plugins/fixHtmlInline.ts
 const VOID_TAGS = VOID_HTML_TAGS;
@@ -9621,9 +9739,6 @@ function isHtmlInlineClosingTag(content) {
 function isSelfClosingHtmlInline(content, tag) {
 	return VOID_TAGS.has(tag) || /\/\s*>\s*$/.test(content);
 }
-function escapeRegex$2(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function findMatchingCloseChildIndex(children, tag) {
 	let depth = 0;
 	for (let index = 0; index < children.length; index++) {
@@ -9657,7 +9772,7 @@ function getTrailingOpenDepth(children, tag) {
 	return depth;
 }
 function findMatchingCloseRangeInHtml(content, tag, startIndex = 0) {
-	const tokenRe = new RegExp(String.raw`<\s*(\/?)\s*${escapeRegex$2(tag)}(?=[\s>/])[^>]*>`, "gi");
+	const tokenRe = new RegExp(String.raw`<\s*(\/?)\s*${escapeTagForRegExp(tag)}(?=[\s>/])[^>]*>`, "gi");
 	tokenRe.lastIndex = Math.max(0, startIndex);
 	let depth = 0;
 	let match;
@@ -9678,7 +9793,7 @@ function findMatchingCloseRangeInHtml(content, tag, startIndex = 0) {
 	return null;
 }
 function getTrailingCustomTagDepthInHtml(content, tag) {
-	const tokenRe = new RegExp(String.raw`<\s*(\/?)\s*${escapeRegex$2(tag)}(?=[\s>/])[^>]*>`, "gi");
+	const tokenRe = new RegExp(String.raw`<\s*(\/?)\s*${escapeTagForRegExp(tag)}(?=[\s>/])[^>]*>`, "gi");
 	let depth = 0;
 	let match;
 	while ((match = tokenRe.exec(content)) !== null) {
@@ -9693,23 +9808,6 @@ function getTrailingCustomTagDepthInHtml(content, tag) {
 	}
 	return depth;
 }
-function findTagCloseIndexOutsideQuotes$3(html) {
-	let inSingle = false;
-	let inDouble = false;
-	for (let i = 0; i < html.length; i++) {
-		const ch = html[i];
-		if (ch === "\"" && !inSingle) {
-			inDouble = !inDouble;
-			continue;
-		}
-		if (ch === "'" && !inDouble) {
-			inSingle = !inSingle;
-			continue;
-		}
-		if (ch === ">" && !inSingle && !inDouble) return i;
-	}
-	return -1;
-}
 function tokenToRaw$1(token) {
 	const shape = token;
 	return String(shape.raw ?? shape.content ?? shape.markup ?? "");
@@ -9737,7 +9835,7 @@ function findFirstIncompleteTag(content, tagSet) {
 		if (idx < 0) continue;
 		const tag = (m[1] ?? "").toLowerCase();
 		if (!isCommonHtmlTagOrPrefix(tag, tagSet)) continue;
-		if (findTagCloseIndexOutsideQuotes$3(content.slice(idx)) !== -1) continue;
+		if (findTagCloseIndexOutsideQuotes(content.slice(idx)) !== -1) continue;
 		if (!first || idx < first.index) first = {
 			index: idx,
 			tag,
@@ -9749,7 +9847,7 @@ function findFirstIncompleteTag(content, tagSet) {
 		if (idx < 0) continue;
 		const tag = (m[1] ?? "").toLowerCase();
 		if (!isCommonHtmlTagOrPrefix(tag, tagSet)) continue;
-		if (findTagCloseIndexOutsideQuotes$3(content.slice(idx)) !== -1) continue;
+		if (findTagCloseIndexOutsideQuotes(content.slice(idx)) !== -1) continue;
 		if (!first || idx < first.index) first = {
 			index: idx,
 			tag,
@@ -9815,7 +9913,7 @@ function fixStreamingHtmlInlineChildren(children, tagSet) {
 				cursor = lt + 1;
 				continue;
 			}
-			const closeIdx = findTagCloseIndexOutsideQuotes$3(sub);
+			const closeIdx = findTagCloseIndexOutsideQuotes(sub);
 			if (closeIdx === -1) {
 				pushTextPart("<", baseToken);
 				cursor = lt + 1;
@@ -9853,7 +9951,7 @@ function fixStreamingHtmlInlineChildren(children, tagSet) {
 		if (pending) {
 			pending.buffer += tokenToRaw$1(child);
 			pendingAtEnd = pending.buffer;
-			const closeIdx = findTagCloseIndexOutsideQuotes$3(pending.buffer);
+			const closeIdx = findTagCloseIndexOutsideQuotes(pending.buffer);
 			if (closeIdx === -1) continue;
 			const tagChunk = pending.buffer.slice(0, closeIdx + 1);
 			const afterChunk = pending.buffer.slice(closeIdx + 1);
@@ -9871,7 +9969,7 @@ function fixStreamingHtmlInlineChildren(children, tagSet) {
 		if (child.type === "html_inline") {
 			const content = tokenToRaw$1(child);
 			const tagName = (content.match(TAG_NAME_AT_START_RE)?.[1] ?? "").toLowerCase();
-			if (tagName && tagSet.has(tagName) && findTagCloseIndexOutsideQuotes$3(content) === -1) {
+			if (tagName && tagSet.has(tagName) && findTagCloseIndexOutsideQuotes(content) === -1) {
 				pending = {
 					tag: tagName,
 					buffer: content,
@@ -9910,11 +10008,8 @@ function applyFixHtmlInlineTokens(md, options = {}) {
 	]);
 	const customTagSet = /* @__PURE__ */ new Set();
 	if (options.customHtmlTags?.length) for (const t of options.customHtmlTags) {
-		const raw = String(t ?? "").trim();
-		if (!raw) continue;
-		const m = raw.match(/^[<\s/]*([A-Z][\w-]*)/i);
-		if (!m) continue;
-		const name = m[1].toLowerCase();
+		const name = normalizeCustomHtmlTagName(t);
+		if (!name) continue;
 		customTagSet.add(name);
 		autoCloseInlineTagSet.add(name);
 	}
@@ -9977,7 +10072,7 @@ function applyFixHtmlInlineTokens(md, options = {}) {
 					if (chunk) {
 						const openToken = toks[openIndex];
 						const mergedContent = `${String(openToken.content || "")}\n${chunk}`;
-						const openEnd = findTagCloseIndexOutsideQuotes$3(mergedContent);
+						const openEnd = findTagCloseIndexOutsideQuotes(mergedContent);
 						const closeRange = openEnd === -1 ? null : findMatchingCloseRangeInHtml(mergedContent, openTag, openEnd + 1);
 						if (closeRange) {
 							const before = mergedContent.slice(0, closeRange.end);
@@ -10176,7 +10271,7 @@ function applyFixHtmlInlineTokens(md, options = {}) {
 				}
 				if (customTagSet.has(tag)) {
 					const raw$2 = String(t.content ?? "");
-					const openEnd = findTagCloseIndexOutsideQuotes$3(raw$2);
+					const openEnd = findTagCloseIndexOutsideQuotes(raw$2);
 					const closeRange = openEnd === -1 ? null : findMatchingCloseRangeInHtml(raw$2, tag, openEnd + 1);
 					t.loading = !!closeRange ? false : t.loading !== void 0 ? t.loading : true;
 					const endTagIndex$1 = closeRange?.start ?? -1;
@@ -12340,17 +12435,11 @@ function isClosingTag(html) {
 function isSelfClosing(tag, html) {
 	return /\/\s*>\s*$/.test(html) || VOID_HTML_TAGS.has(tag);
 }
-function normalizeCustomTag$1(t) {
-	const raw = String(t ?? "").trim();
-	if (!raw) return "";
-	const m = raw.match(/^[<\s/]*([A-Z][\w-]*)/i);
-	return m ? m[1].toLowerCase() : "";
-}
 function getTagSets(customTags) {
 	if (!customTags || customTags.length === 0) return getEmptyTagSets();
 	const cached = TAG_SET_CACHE.get(customTags);
 	if (cached) return cached;
-	const normalized = customTags.map(normalizeCustomTag$1).filter(Boolean);
+	const normalized = customTags.map(normalizeCustomHtmlTagName).filter(Boolean);
 	if (!normalized.length) {
 		const entry$1 = getEmptyTagSets();
 		TAG_SET_CACHE.set(customTags, entry$1);
@@ -12368,18 +12457,6 @@ function tokenToRaw(token) {
 	const raw = shape.raw ?? shape.content ?? shape.markup ?? "";
 	return String(raw ?? "");
 }
-function parseTagAttrs$1(openTag) {
-	const attrs = [];
-	const attrRegex = /\s([\w:-]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'>]+)))?/g;
-	let match;
-	while ((match = attrRegex.exec(openTag)) !== null) {
-		const attrName = match[1];
-		if (!attrName) continue;
-		const attrValue = match[2] || match[3] || match[4] || "";
-		attrs.push([attrName, attrValue]);
-	}
-	return attrs;
-}
 function getAttrValue$1(attrs, name) {
 	const lowerName = name.toLowerCase();
 	for (let i = attrs.length - 1; i >= 0; i--) {
@@ -12474,7 +12551,7 @@ function parseHtmlInlineCodeToken(token, tokens, i, parseInlineTokens$1, raw, pP
 	}, i + 1];
 	if (tag === "a") {
 		const fragment$1 = collectHtmlFragment(tokens, i, tag);
-		const attrs$1 = parseTagAttrs$1(code$1);
+		const attrs$1 = parseTagAttrs(code$1);
 		const innerTokens = fragment$1.innerTokens;
 		const href = String(getAttrValue$1(attrs$1, "href") ?? "");
 		const titleAttr = getAttrValue$1(attrs$1, "title");
@@ -12914,6 +12991,30 @@ function decodeVisibleTextFromRaw(rawText) {
 	}
 	return output;
 }
+function getRawIndexForVisibleIndex(rawText, visibleIndex) {
+	let outputIndex = 0;
+	for (let rawIndex = 0; rawIndex < rawText.length; rawIndex++) {
+		const char = rawText[rawIndex];
+		const nextChar = rawText[rawIndex + 1];
+		if (char === "\\" && nextChar && ESCAPABLE_PUNCTUATION.has(nextChar)) {
+			if (outputIndex === visibleIndex) return rawIndex + 1;
+			outputIndex++;
+			rawIndex++;
+			continue;
+		}
+		if (outputIndex === visibleIndex) return rawIndex;
+		outputIndex++;
+	}
+	return -1;
+}
+function isEscapedVisibleChar(rawText, visibleIndex, expectedChar) {
+	const rawIndex = getRawIndexForVisibleIndex(rawText, visibleIndex);
+	if (rawIndex === -1) return false;
+	if (expectedChar && rawText[rawIndex] !== expectedChar) return false;
+	let slashCount = 0;
+	for (let i = rawIndex - 1; i >= 0 && rawText[i] === "\\"; i--) slashCount++;
+	return slashCount % 2 === 1;
+}
 const WORD_CHAR_RE = /[\p{L}\p{N}]/u;
 const WORD_ONLY_RE = /^[\p{L}\p{N}]+$/u;
 function isWordChar(ch) {
@@ -13359,9 +13460,11 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 				handleLinkOpen(token);
 				break;
 			case "image":
-				resetCurrentTextNode();
-				pushNode(parseImageToken(token));
-				i++;
+				if (!recoverOuterImageLinkStartFromImageToken(token)) {
+					resetCurrentTextNode();
+					pushNode(parseImageToken(token));
+					i++;
+				}
 				break;
 			case "strong_open": {
 				resetCurrentTextNode();
@@ -13506,7 +13609,9 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 					const displayText = String(token.text ?? "");
 					pushText(displayText, displayText);
 					i++;
-				} else if (recoverMarkdownLinkFromTrailingText(token)) i++;
+				} else if (recoverOuterImageLinkFromSyntheticLinkToken(token)) i++;
+				else if (recoverMarkdownImageFromTrailingBang(token)) i++;
+				else if (recoverMarkdownLinkFromTrailingText(token)) i++;
 				else {
 					pushToken(token);
 					i++;
@@ -13567,6 +13672,8 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 			i++;
 			return;
 		}
+		if (recoverOuterImageLinkFromRawText(content)) return;
+		if (recoverOuterImageLinkMidStateFromText(content)) return;
 		if (!(content.includes("*") || content.includes("_") || content.includes("~") || content.includes("`") || content.includes("[") || content.includes("!") || content.includes("$") || content.includes("|") || content.includes("("))) {
 			commitTextNode(content, token, tokens[i - 1], nextToken);
 			i++;
@@ -13574,12 +13681,12 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		}
 		if (handleCheckboxLike(content)) return;
 		const preToken = tokens[i - 1];
-		if (content === "[" && !nextToken?.markup?.includes("*") || content === "]" && !preToken?.markup?.includes("*")) {
+		if (content === "[" && !nextToken?.markup?.includes("*") && !hasEscapedMarkup(token, "\\[") || content === "]" && !preToken?.markup?.includes("*") && !hasEscapedMarkup(token, "\\]")) {
 			i++;
 			return;
 		}
 		if (handleInlineCodeContent(rawContent, token)) return;
-		if (handleInlineImageContent(content, token)) return;
+		if (handleInlineImageContent(content)) return;
 		if (tokens[i + 1]?.type !== "link_open" && handleInlineLinkContent(content, token)) return;
 		const reparsedNodes = tryReparseCollapsedInlineText(rawContent);
 		if (reparsedNodes) {
@@ -13593,6 +13700,13 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		i++;
 	}
 	function handleLinkOpen(token) {
+		if (shouldTreatLinkOpenAsTextInEscapedOuterImageTail()) {
+			const { node: node$1, nextIndex: nextIndex$1 } = parseLinkToken(tokens, i, options);
+			const text$1 = String(node$1.text || node$1.href || "");
+			pushText(text$1, text$1);
+			i = nextIndex$1;
+			return;
+		}
 		resetCurrentTextNode();
 		const { node, nextIndex } = parseLinkToken(tokens, i, options);
 		i = nextIndex;
@@ -13662,6 +13776,149 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		});
 		return true;
 	}
+	function recoverMarkdownImageFromTrailingBang(token) {
+		if (token.type !== "link") return false;
+		const previous = result[result.length - 1];
+		const previousToken = tokens[i - 1];
+		if (!previous || previous.type !== "text" || previousToken?.type !== "text") return false;
+		const previousContent = String(previous.content ?? "");
+		const previousTokenContent = String(previousToken.content ?? "");
+		if (!previousContent.endsWith("!") || !previousTokenContent.endsWith("!")) return false;
+		if (hasEscapedMarkup(previousToken, "\\!")) return false;
+		const before = previousContent.slice(0, -1);
+		if (before) {
+			previous.content = before;
+			previous.raw = before;
+			currentTextNode = previous;
+		} else {
+			result.pop();
+			currentTextNode = null;
+		}
+		const linkToken = token;
+		const alt = String(linkToken.text ?? linkToken.children?.map((child) => String(child?.content ?? child?.raw ?? "")).join("") ?? "");
+		const href = String(linkToken.href ?? "");
+		const title = linkToken.title == null || linkToken.title === "" ? null : String(linkToken.title);
+		pushParsed({
+			type: "image",
+			src: href,
+			alt,
+			title,
+			raw: String(`![${alt}](${href}${title ? ` "${title}"` : ""})`),
+			loading: Boolean(linkToken.loading)
+		});
+		return true;
+	}
+	function buildLoadingOuterImageLinkNode(imageNode, href = "", title = null) {
+		const text$1 = String(imageNode.alt ?? imageNode.raw ?? "");
+		return {
+			type: "link",
+			href,
+			title,
+			text: text$1,
+			children: [imageNode],
+			raw: String(`[${text$1}](${href}${title ? ` "${title}"` : ""})`),
+			loading: true
+		};
+	}
+	function buildLoadingImageNodeFromRaw(raw$1) {
+		const normalizedRaw = raw$1.startsWith("![") ? raw$1 : `![${raw$1}`;
+		const innerRaw = normalizedRaw.slice(2);
+		const closeIdx = innerRaw.indexOf("](");
+		return {
+			type: "image",
+			src: "",
+			alt: closeIdx === -1 ? innerRaw.replace(/\]$/, "") : innerRaw.slice(0, closeIdx),
+			title: null,
+			raw: normalizedRaw,
+			loading: true
+		};
+	}
+	function recoverOuterImageLinkFromRawText(content) {
+		const outerStart = content.indexOf("[![");
+		if (outerStart === -1) return false;
+		if (typeof raw === "string" && tokens.length === 1 && isEscapedVisibleChar(raw, outerStart, "[")) return false;
+		const before = content.slice(0, outerStart);
+		if (before) pushText(before, before);
+		pushParsed(buildLoadingOuterImageLinkNode(buildLoadingImageNodeFromRaw(content.slice(outerStart + 1))));
+		i++;
+		return true;
+	}
+	function recoverOuterImageLinkStartFromImageToken(token) {
+		if (options?.final) return false;
+		const previousToken = tokens[i - 1];
+		if (previousToken?.type !== "text") return false;
+		if (!String(previousToken.content ?? "").endsWith("[")) return false;
+		if (hasEscapedMarkup(previousToken, "\\[")) return false;
+		const previous = result[result.length - 1];
+		if (previous?.type === "text" && previous.content.endsWith("[")) {
+			const before = previous.content.slice(0, -1);
+			if (before) {
+				previous.content = before;
+				previous.raw = before;
+				currentTextNode = previous;
+			} else {
+				result.pop();
+				currentTextNode = null;
+			}
+		}
+		pushParsed(buildLoadingOuterImageLinkNode(parseImageToken(token)));
+		i++;
+		return true;
+	}
+	function recoverOuterImageLinkFromSyntheticLinkToken(token) {
+		if (token.type !== "link") return false;
+		const linkToken = token;
+		const raw$1 = String(linkToken.raw ?? "");
+		const text$1 = String(linkToken.text ?? "");
+		if (!raw$1.startsWith("[![") && !text$1.startsWith("![")) return false;
+		const imageTitle = linkToken.title == null || linkToken.title === "" ? null : String(linkToken.title);
+		pushParsed(buildLoadingOuterImageLinkNode({
+			type: "image",
+			src: String(linkToken.href ?? ""),
+			alt: text$1.replace(/^!\[/, "").replace(/\]$/, ""),
+			title: imageTitle,
+			raw: raw$1.startsWith("[![") ? raw$1.slice(1) : raw$1,
+			loading: true
+		}));
+		return true;
+	}
+	function recoverOuterImageLinkMidStateFromText(content) {
+		if (!content.startsWith("](")) return false;
+		const outerOpenToken = tokens[i - 2];
+		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 imageNode = previousLink ? previousLink.children[0] : result.pop();
+		if (!imageNode || imageNode.type !== "image") return false;
+		const nextToken = tokens[i + 1];
+		let href = String(previousLink?.href ?? "");
+		let title = previousLink?.title == null ? null : String(previousLink.title);
+		let loading = true;
+		if (nextToken?.type === "link_open") {
+			const { node, nextIndex } = parseLinkToken(tokens, i + 1, options);
+			href = node.href;
+			title = node.title;
+			loading = true;
+			i = nextIndex;
+		} else {
+			href = content.slice(2);
+			if (href.includes("\"")) {
+				const parts = href.split("\"");
+				href = String(parts[0] ?? "").trim();
+				title = parts[1] == null ? null : String(parts[1]).trim();
+			}
+			i++;
+		}
+		const linkNode = buildLoadingOuterImageLinkNode(imageNode, href, title);
+		linkNode.loading = loading;
+		pushParsed(linkNode);
+		return true;
+	}
+	function shouldTreatLinkOpenAsTextInEscapedOuterImageTail() {
+		const outerOpenToken = tokens[i - 3];
+		return tokens[i - 2]?.type === "image" && tokens[i - 1]?.type === "text" && String(tokens[i - 1].content ?? "") === "](" && outerOpenToken?.type === "text" && String(outerOpenToken.content ?? "").endsWith("[") && hasEscapedMarkup(outerOpenToken, "\\[");
+	}
 	function handleInlineLinkContent(content, _token) {
 		const linkStart = content.indexOf("[");
 		if (linkStart === -1) return false;
@@ -13808,19 +14065,21 @@ function parseInlineTokens(tokens, raw, pPreToken, options) {
 		}
 		return false;
 	}
-	function handleInlineImageContent(content, token) {
+	function handleInlineImageContent(content) {
 		const imageStart = content.indexOf("![");
 		if (imageStart === -1) return false;
 		const textNodeContent = content.slice(0, imageStart);
-		if (!currentTextNode) currentTextNode = {
+		if (textNodeContent && !currentTextNode) currentTextNode = {
 			type: "text",
 			content: textNodeContent,
 			raw: textNodeContent
 		};
-		else currentTextNode.content += textNodeContent;
-		result.push(currentTextNode);
-		currentTextNode = null;
-		pushParsed(parseImageToken(token, true));
+		else if (textNodeContent && currentTextNode) currentTextNode.content += textNodeContent;
+		if (currentTextNode) {
+			result.push(currentTextNode);
+			currentTextNode = null;
+		}
+		pushParsed(buildLoadingImageNodeFromRaw(content.slice(imageStart)));
 		i++;
 		return true;
 	}
@@ -14264,27 +14523,6 @@ function parseHeading(tokens, index, options) {
 
 //#endregion
 //#region src/parser/node-parsers/html-block-parser.ts
-function findTagCloseIndexOutsideQuotes$2(input) {
-	let inSingle = false;
-	let inDouble = false;
-	for (let i = 0; i < input.length; i++) {
-		const ch = input[i];
-		if (ch === "\\") {
-			i++;
-			continue;
-		}
-		if (!inDouble && ch === "'") {
-			inSingle = !inSingle;
-			continue;
-		}
-		if (!inSingle && ch === "\"") {
-			inDouble = !inDouble;
-			continue;
-		}
-		if (!inSingle && !inDouble && ch === ">") return i;
-	}
-	return -1;
-}
 function findMatchingCloseTagEnd(rawHtml, tag, startIndex) {
 	const lowerTag = tag.toLowerCase();
 	const openTagRe = new RegExp(String.raw`^<\s*${lowerTag}(?=\s|>|/)`, "i");
@@ -14296,7 +14534,7 @@ function findMatchingCloseTagEnd(rawHtml, tag, startIndex) {
 		if (lt === -1) return -1;
 		const slice = rawHtml.slice(lt);
 		if (closeTagRe.test(slice)) {
-			const endRel = findTagCloseIndexOutsideQuotes$2(slice);
+			const endRel = findTagCloseIndexOutsideQuotes(slice);
 			if (endRel === -1) return -1;
 			if (depth === 0) return lt + endRel + 1;
 			depth--;
@@ -14304,7 +14542,7 @@ function findMatchingCloseTagEnd(rawHtml, tag, startIndex) {
 			continue;
 		}
 		if (openTagRe.test(slice)) {
-			const endRel = findTagCloseIndexOutsideQuotes$2(slice);
+			const endRel = findTagCloseIndexOutsideQuotes(slice);
 			if (endRel === -1) return -1;
 			const rawTag = slice.slice(0, endRel + 1);
 			if (!/\/\s*>$/.test(rawTag)) depth++;
@@ -14315,18 +14553,6 @@ function findMatchingCloseTagEnd(rawHtml, tag, startIndex) {
 	}
 	return -1;
 }
-function parseTagAttrs(openTag) {
-	const attrs = [];
-	const attrRegex = /\s([\w:-]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'>]+)))?/g;
-	let match;
-	while ((match = attrRegex.exec(openTag)) !== null) {
-		const attrName = match[1];
-		if (!attrName) continue;
-		const attrValue = match[2] || match[3] || match[4] || "";
-		attrs.push([attrName, attrValue]);
-	}
-	return attrs;
-}
 function parseHtmlBlock(token) {
 	const raw = String(token.content ?? "");
 	if (/^\s*<!--/.test(raw) || /^\s*<!/.test(raw) || /^\s*<\?/.test(raw)) return {
@@ -14344,7 +14570,7 @@ function parseHtmlBlock(token) {
 		tag: "",
 		loading: false
 	};
-	const openEnd = findTagCloseIndexOutsideQuotes$2(raw);
+	const openEnd = findTagCloseIndexOutsideQuotes(raw);
 	const openTag = openEnd === -1 ? raw : raw.slice(0, openEnd + 1);
 	const selfClosing = openEnd !== -1 && /\/\s*>$/.test(openTag);
 	const isVoid = VOID_HTML_TAGS.has(tag);
@@ -14463,17 +14689,11 @@ function getEmptyHtmlTagSets() {
 	};
 	return emptyHtmlTagSets;
 }
-function normalizeCustomTag(t) {
-	const raw = String(t ?? "").trim();
-	if (!raw) return "";
-	const m = raw.match(/^[<\s/]*([A-Z][\w-]*)/i);
-	return m ? m[1].toLowerCase() : "";
-}
 function getHtmlTagSets(customTags) {
 	if (!customTags || customTags.length === 0) return getEmptyHtmlTagSets();
 	const cached = HTML_TAG_SET_CACHE.get(customTags);
 	if (cached) return cached;
-	const normalized = customTags.map(normalizeCustomTag).filter(Boolean);
+	const normalized = customTags.map(normalizeCustomHtmlTagName).filter(Boolean);
 	if (!normalized.length) {
 		const entry$1 = getEmptyHtmlTagSets();
 		HTML_TAG_SET_CACHE.set(customTags, entry$1);
@@ -14551,27 +14771,6 @@ function parseVmrContainer(tokens, index, options) {
 		raw
 	}, hasCloseToken ? j + 1 : j];
 }
-function findTagCloseIndexOutsideQuotes$1(input) {
-	let inSingle = false;
-	let inDouble = false;
-	for (let i = 0; i < input.length; i++) {
-		const ch = input[i];
-		if (ch === "\\") {
-			i++;
-			continue;
-		}
-		if (!inDouble && ch === "'") {
-			inSingle = !inSingle;
-			continue;
-		}
-		if (!inSingle && ch === "\"") {
-			inDouble = !inDouble;
-			continue;
-		}
-		if (!inSingle && !inDouble && ch === ">") return i;
-	}
-	return -1;
-}
 function stripWrapperNewlines(s) {
 	return s.replace(/^\r?\n/, "").replace(/\r?\n$/, "");
 }
@@ -14580,14 +14779,11 @@ function stripTrailingPartialClosingTag(inner, tag) {
 	const re = new RegExp(String.raw`[\t ]*<\s*\/\s*${tag}[^>]*$`, "i");
 	return inner.replace(re, "");
 }
-function escapeRegex$1(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function findMatchingCloseTagRange(rawHtml, tag, startIndex) {
 	if (!rawHtml || !tag) return null;
 	const lowerTag = tag.toLowerCase();
-	const openTagRe = new RegExp(String.raw`^<\s*${escapeRegex$1(lowerTag)}(?=\s|>|/)`, "i");
-	const closeTagRe = new RegExp(String.raw`^<\s*\/\s*${escapeRegex$1(lowerTag)}(?=\s|>)`, "i");
+	const openTagRe = new RegExp(String.raw`^<\s*${escapeTagForRegExp(lowerTag)}(?=\s|>|/)`, "i");
+	const closeTagRe = new RegExp(String.raw`^<\s*\/\s*${escapeTagForRegExp(lowerTag)}(?=\s|>)`, "i");
 	let depth = 0;
 	let index = Math.max(0, startIndex);
 	while (index < rawHtml.length) {
@@ -14595,7 +14791,7 @@ function findMatchingCloseTagRange(rawHtml, tag, startIndex) {
 		if (lt === -1) break;
 		const slice = rawHtml.slice(lt);
 		if (closeTagRe.test(slice)) {
-			const endRel = findTagCloseIndexOutsideQuotes$1(slice);
+			const endRel = findTagCloseIndexOutsideQuotes(slice);
 			if (endRel === -1) return null;
 			if (depth === 0) return {
 				start: lt,
@@ -14606,7 +14802,7 @@ function findMatchingCloseTagRange(rawHtml, tag, startIndex) {
 			continue;
 		}
 		if (openTagRe.test(slice)) {
-			const endRel = findTagCloseIndexOutsideQuotes$1(slice);
+			const endRel = findTagCloseIndexOutsideQuotes(slice);
 			if (endRel === -1) return null;
 			const raw = slice.slice(0, endRel + 1);
 			if (!/\/\s*>$/.test(raw)) depth++;
@@ -14626,7 +14822,7 @@ function findNextCustomHtmlBlockFromSource(source, tag, startIndex) {
 	if (!openMatch || openMatch.index == null) return null;
 	const openStart = openMatch.index;
 	const openSlice = source.slice(openStart);
-	const openEndRel = findTagCloseIndexOutsideQuotes$1(openSlice);
+	const openEndRel = findTagCloseIndexOutsideQuotes(openSlice);
 	if (openEndRel === -1) return null;
 	const openEnd = openStart + openEndRel;
 	if (/\/\s*>\s*$/.test(openSlice.slice(0, openEndRel + 1))) {
@@ -14667,7 +14863,7 @@ function findNextCustomHtmlBlockFromSource(source, tag, startIndex) {
 			continue;
 		}
 		if (isOpenAt(lt)) {
-			const rel = findTagCloseIndexOutsideQuotes$1(source.slice(lt));
+			const rel = findTagCloseIndexOutsideQuotes(source.slice(lt));
 			if (rel === -1) return null;
 			depth++;
 			i = lt + rel + 1;
@@ -14723,7 +14919,7 @@ function parseBasicBlockToken(tokens, index, options) {
 				const fromSource = findNextCustomHtmlBlockFromSource(source, tag, Math.max(clampNonNegative(cursor), clampNonNegative(mappedLineStart)));
 				if (fromSource) options.__customHtmlBlockCursor = fromSource.end;
 				const rawHtml = String(fromSource?.raw ?? htmlBlockNode.raw ?? "");
-				const openEnd = findTagCloseIndexOutsideQuotes$1(rawHtml);
+				const openEnd = findTagCloseIndexOutsideQuotes(rawHtml);
 				const openTag = openEnd !== -1 ? rawHtml.slice(0, openEnd + 1) : rawHtml;
 				const selfClosing = openEnd !== -1 && /\/\s*>\s*$/.test(openTag);
 				const closeRange = openEnd === -1 ? null : findMatchingCloseTagRange(rawHtml, tag, openEnd + 1);
@@ -14818,26 +15014,17 @@ function parseParagraph(tokens, index, options) {
 
 //#endregion
 //#region src/parser/index.ts
-function normalizeTagName(t) {
-	const raw = String(t ?? "").trim();
-	if (!raw) return "";
-	const m = raw.match(/^[<\s/]*([A-Z][\w-]*)/i);
-	return m ? m[1].toLowerCase() : "";
-}
 function getCustomHtmlTagSet(options) {
 	const custom = options?.customHtmlTags;
 	if (!Array.isArray(custom) || custom.length === 0) return null;
-	const normalized = custom.map(normalizeTagName).filter(Boolean);
+	const normalized = normalizeCustomHtmlTags(custom);
 	return normalized.length ? new Set(normalized) : null;
 }
 function buildAllowedHtmlTagSet(options) {
 	const custom = options?.customHtmlTags;
 	if (!Array.isArray(custom) || custom.length === 0) return STANDARD_HTML_TAGS;
 	const set = new Set(STANDARD_HTML_TAGS);
-	for (const t of custom) {
-		const name = normalizeTagName(t);
-		if (name) set.add(name);
-	}
+	for (const name of normalizeCustomHtmlTags(custom)) if (name) set.add(name);
 	return set;
 }
 function stringifyInlineNodeRaw(node) {
@@ -14896,30 +15083,6 @@ function parseStandaloneHtmlDocument(markdown) {
 		loading: false
 	}];
 }
-function escapeRegex(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function findTagCloseIndexOutsideQuotes(input) {
-	let inSingle = false;
-	let inDouble = false;
-	for (let i = 0; i < input.length; i++) {
-		const ch = input[i];
-		if (ch === "\\") {
-			i++;
-			continue;
-		}
-		if (!inDouble && ch === "'") {
-			inSingle = !inSingle;
-			continue;
-		}
-		if (!inSingle && ch === "\"") {
-			inDouble = !inDouble;
-			continue;
-		}
-		if (!inSingle && !inDouble && ch === ">") return i;
-	}
-	return -1;
-}
 function getMergeableNodeRaw(node) {
 	const raw = node?.raw;
 	if (typeof raw === "string") return raw;
@@ -14927,41 +15090,15 @@ function getMergeableNodeRaw(node) {
 	if (typeof content === "string") return content;
 	return "";
 }
-const SOURCE_EXACT_HTML_BLOCK_TAGS = new Set([
-	"article",
-	"aside",
-	"blockquote",
-	"div",
-	"figcaption",
-	"figure",
-	"footer",
-	"h1",
-	"h2",
-	"h3",
-	"h4",
-	"h5",
-	"h6",
-	"header",
-	"li",
-	"main",
-	"nav",
-	"ol",
-	"p",
-	"pre",
-	"section",
-	"summary",
-	"table",
-	"tbody",
-	"td",
-	"th",
-	"thead",
-	"tr",
-	"ul"
-]);
+function isCloseOnlyHtmlBlockForTag(node, tag) {
+	if (node.type !== "html_block" || !tag) return false;
+	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) {
 	if (!source || !tag) return null;
 	const lowerTag = tag.toLowerCase();
-	const openRe = new RegExp(String.raw`<\s*${escapeRegex(lowerTag)}(?=\s|>|/)`, "gi");
+	const openRe = new RegExp(String.raw`<\s*${escapeTagForRegExp(lowerTag)}(?=\s|>|/)`, "gi");
 	openRe.lastIndex = Math.max(0, startIndex);
 	const openMatch = openRe.exec(source);
 	if (!openMatch || openMatch.index == null) return null;
@@ -14980,11 +15117,11 @@ function findNextHtmlBlockFromSource(source, tag, startIndex) {
 	let index = openEnd + 1;
 	const isOpenAt = (pos) => {
 		const slice = source.slice(pos);
-		return new RegExp(String.raw`^<\s*${escapeRegex(lowerTag)}(?=\s|>|/)`, "i").test(slice);
+		return new RegExp(String.raw`^<\s*${escapeTagForRegExp(lowerTag)}(?=\s|>|/)`, "i").test(slice);
 	};
 	const isCloseAt = (pos) => {
 		const slice = source.slice(pos);
-		return new RegExp(String.raw`^<\s*\/\s*${escapeRegex(lowerTag)}(?=\s|>)`, "i").test(slice);
+		return new RegExp(String.raw`^<\s*\/\s*${escapeTagForRegExp(lowerTag)}(?=\s|>)`, "i").test(slice);
 	};
 	while (index < source.length) {
 		const lt = source.indexOf("<", index);
@@ -15070,7 +15207,7 @@ function isDetailsCloseHtmlBlock(node) {
 	return /^\s*<\/details\b/i.test(raw);
 }
 function findLastClosingTagStart(raw, tag) {
-	const closeRe = new RegExp(String.raw`<\s*\/\s*${escapeRegex(tag)}(?=\s|>)`, "gi");
+	const closeRe = new RegExp(String.raw`<\s*\/\s*${escapeTagForRegExp(tag)}(?=\s|>)`, "gi");
 	let last = -1;
 	let match;
 	while ((match = closeRe.exec(raw)) !== null) last = match.index;
@@ -15150,35 +15287,43 @@ function combineStructuredDetailsHtmlBlocks(nodes, source, md, options, final, s
 				break;
 			}
 		}
-		const [children] = combineStructuredDetailsHtmlBlocks(closeIndex === -1 ? nodes.slice(i + 1) : nodes.slice(i + 1, closeIndex), source, md, options, final, openStart + openRaw.length);
-		const prefixChildren = buildDetailsPrefixChildren(openRaw, md, buildDetailsChildParseOptions(options, final));
 		const exact = findNextHtmlBlockFromSource(source, "details", openStart);
+		const selfContained = closeIndex === -1 && exact?.closed === true;
+		const effectiveOpenRaw = selfContained ? (() => {
+			const ct = findLastClosingTagStart(openRaw, "details");
+			return ct !== -1 ? openRaw.slice(0, ct) : openRaw;
+		})() : 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 explicitClose = closeIndex !== -1 && exact?.closed === true;
+		const explicitClose = selfContained || closeIndex !== -1 && exact?.closed === true;
 		const trimmedCloseRaw = closeRaw.replace(/[\t\r\n ]+$/, "");
 		const closeStart = explicitClose ? (() => {
-			const closeOffset = exact.raw.lastIndexOf(trimmedCloseRaw);
+			const closeOffset = (exact?.raw ?? "").lastIndexOf(trimmedCloseRaw);
 			return closeOffset === -1 ? source.length : openStart + closeOffset;
 		})() : source.length;
-		const middleSource = source.slice(openStart + openRaw.length, closeStart === -1 ? source.length : closeStart);
+		const openTagEndIndex = findTagCloseIndexOutsideQuotes(openRaw);
+		const middleSourceStart = selfContained && openTagEndIndex !== -1 ? openStart + openTagEndIndex + 1 : openStart + openRaw.length;
+		const middleSource = source.slice(middleSourceStart, closeStart === -1 ? source.length : closeStart);
 		const middleTokens = md.parse(middleSource, { __markstreamFinal: final });
 		const renderedMiddle = md.renderer.render(middleTokens, md.options, { __markstreamFinal: final });
 		const closeMarkupEnd = closeStart + trimmedCloseRaw.length;
 		const closeSliceEnd = explicitClose ? Math.max(closeStart + closeRaw.length, extendHtmlBlockCloseToLineEnding(source, closeMarkupEnd)) : source.length;
 		const renderedCloseRaw = explicitClose ? source.slice(closeStart, closeSliceEnd) : closeRaw;
 		const mergedRaw = explicitClose ? source.slice(openStart, closeSliceEnd) : source.slice(openStart);
+		const contentPrefix = selfContained && openTagEndIndex !== -1 ? openRaw.slice(0, openTagEndIndex + 1) : openRaw;
 		merged.push({
 			...node,
 			tag: "details",
-			attrs: parseTagAttrs(openRaw.slice(0, findTagCloseIndexOutsideQuotes(openRaw) + 1)),
+			attrs: parseTagAttrs(openRaw.slice(0, openTagEndIndex + 1)),
 			raw: mergedRaw,
-			content: `${openRaw}${renderedMiddle}${renderedCloseRaw}`,
+			content: `${contentPrefix}${renderedMiddle}${renderedCloseRaw}`,
 			children: [...prefixChildren, ...children],
 			loading: !final && !explicitClose
 		});
 		cursor = explicitClose ? closeSliceEnd : source.length;
-		if (closeIndex === -1) break;
-		i = closeIndex;
+		if (closeIndex === -1 && !selfContained) break;
+		if (closeIndex !== -1) i = closeIndex;
 	}
 	return [merged, cursor];
 }
@@ -15188,14 +15333,22 @@ function mergeSplitTopLevelHtmlBlocks(nodes, final, source) {
 	let sourceHtmlCursor = 0;
 	for (let i = 0; i < merged.length; i++) {
 		const node = merged[i];
-		if (node?.type !== "html_block") continue;
+		const nodeRaw = getMergeableNodeRaw(node);
+		const nodePos = nodeRaw ? source.indexOf(nodeRaw, sourceHtmlCursor) : -1;
+		if (node?.type !== "html_block") {
+			if (nodePos !== -1) sourceHtmlCursor = nodePos + nodeRaw.length;
+			continue;
+		}
 		const tag = String(node?.tag ?? "").toLowerCase();
 		if (!tag) continue;
-		if (!SOURCE_EXACT_HTML_BLOCK_TAGS.has(tag)) continue;
-		const exact = findNextHtmlBlockFromSource(source, tag, sourceHtmlCursor);
+		if (tag === "details") {
+			if (nodePos !== -1) sourceHtmlCursor = nodePos + nodeRaw.length;
+			continue;
+		}
+		const exact = findNextHtmlBlockFromSource(source, tag, nodePos !== -1 ? nodePos : sourceHtmlCursor);
 		if (!exact) continue;
 		sourceHtmlCursor = exact.end;
-		const currentContent = String(node?.content ?? getMergeableNodeRaw(node));
+		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;
@@ -15204,10 +15357,14 @@ function mergeSplitTopLevelHtmlBlocks(nodes, final, source) {
 		node.raw = exact.raw;
 		node.loading = desiredLoading;
 		if (!needsExpansion) continue;
-		let tailCursor = findApproximateConsumedPrefixEnd(exact.raw, currentContent);
+		let tailCursor = findApproximateConsumedPrefixEnd(exact.raw, currentRaw);
 		if (tailCursor === -1) tailCursor = 0;
 		const j = i + 1;
 		while (j < merged.length) {
+			if (exact.closed && isCloseOnlyHtmlBlockForTag(merged[j], tag)) {
+				merged.splice(j, 1);
+				continue;
+			}
 			const nextRaw = getMergeableNodeRaw(merged[j]);
 			if (!nextRaw) break;
 			const nextPos = exact.raw.indexOf(nextRaw, tailCursor);
@@ -15386,7 +15543,7 @@ function ensureBlankLineBeforeInlineMultilineCustomHtmlBlocks(markdown, tags) {
 		}
 		return false;
 	};
-	const findTagCloseIndexOutsideQuotes$4 = (input) => {
+	const findTagCloseIndexOutsideQuotes$1 = (input) => {
 		let inSingle = false;
 		let inDouble = false;
 		for (let i = 0; i < input.length; i++) {
@@ -15435,7 +15592,7 @@ function ensureBlankLineBeforeInlineMultilineCustomHtmlBlocks(markdown, tags) {
 				i++;
 				continue;
 			}
-			const closeIdxRel = findTagCloseIndexOutsideQuotes$4(line.slice(i));
+			const closeIdxRel = findTagCloseIndexOutsideQuotes$1(line.slice(i));
 			if (closeIdxRel === -1) {
 				hasRenderablePrefix = true;
 				i++;
@@ -15539,7 +15696,7 @@ function normalizeCustomHtmlOpeningTagSameLine(markdown, tags) {
 		while (i < s.length && isIndentWs(s[i])) i++;
 		return s.slice(i);
 	};
-	const findTagCloseIndexOutsideQuotes$4 = (input) => {
+	const findTagCloseIndexOutsideQuotes$1 = (input) => {
 		let inSingle = false;
 		let inDouble = false;
 		for (let i = 0; i < input.length; i++) {
@@ -15611,7 +15768,7 @@ function normalizeCustomHtmlOpeningTagSameLine(markdown, tags) {
 		if (i === nameStart) return line;
 		const tagName = line.slice(nameStart, i).toLowerCase();
 		if (!tagSet.has(tagName)) return line;
-		const gtRel = findTagCloseIndexOutsideQuotes$4(line.slice(i));
+		const gtRel = findTagCloseIndexOutsideQuotes$1(line.slice(i));
 		if (gtRel === -1) return line;
 		const gt = i + gtRel;
 		if (hasClosingTagOnLine(line, gt + 1, tagName)) return line;
@@ -16004,9 +16161,7 @@ function parseMarkdownToStructure(markdown, md, options = {}) {
 		else if (/\n[[(]\n*$/.test(safeMarkdown)) safeMarkdown = safeMarkdown.replace(/(\n\[|\n\()+\n*$/g, "\n");
 	}
 	if (options.customHtmlTags?.length && safeMarkdown.includes("<")) {
-		const tags = options.customHtmlTags.map((t) => String(t ?? "").trim()).filter(Boolean).map((t) => {
-			return (t.match(/^[<\s/]*([A-Z][\w-]*)/i)?.[1] ?? "").toLowerCase();
-		}).filter(Boolean);
+		const tags = normalizeCustomHtmlTags(options.customHtmlTags);
 		if (tags.length) {
 			safeMarkdown = ensureBlankLineBeforeInlineMultilineCustomHtmlBlocks(safeMarkdown, tags);
 			safeMarkdown = normalizeCustomHtmlOpeningTagSameLine(safeMarkdown, tags);
@@ -16164,6 +16319,160 @@ function processTokens(tokens, options) {
 	return result;
 }
 
+//#endregion
+//#region src/htmlRenderUtils.ts
+const CUSTOM_TAG_REGEX = /<([a-z][a-z0-9-]*)\b[^>]*>/gi;
+function hasOwn(obj, key) {
+	return Object.prototype.hasOwnProperty.call(obj, key);
+}
+function isCustomHtmlComponentTag(tagName, customComponents) {
+	const lowerTag = tagName.toLowerCase();
+	if (EXTENDED_STANDARD_HTML_TAGS.has(lowerTag)) return false;
+	return hasOwn(customComponents, lowerTag) || hasOwn(customComponents, tagName);
+}
+function sanitizeHtmlAttrs(attrs) {
+	const clean = {};
+	for (const [key, value] of Object.entries(attrs)) {
+		const lowerKey = key.toLowerCase();
+		if (DANGEROUS_HTML_ATTRS.has(lowerKey)) continue;
+		if (URL_HTML_ATTRS.has(lowerKey) && value && isUnsafeHtmlUrl(value)) continue;
+		clean[key] = value;
+	}
+	return clean;
+}
+function convertHtmlPropValue(value, key) {
+	const lowerKey = key.toLowerCase();
+	if ([
+		"checked",
+		"disabled",
+		"readonly",
+		"required",
+		"autofocus",
+		"multiple",
+		"hidden"
+	].includes(lowerKey)) return value === "true" || value === "" || value === key;
+	if ([
+		"value",
+		"min",
+		"max",
+		"step",
+		"width",
+		"height",
+		"size",
+		"maxlength"
+	].includes(lowerKey)) {
+		const num = Number(value);
+		if (value !== "" && !Number.isNaN(num)) return num;
+	}
+	return value;
+}
+function convertHtmlAttrsToProps(attrs) {
+	const result = {};
+	for (const [key, value] of Object.entries(attrs)) result[key] = convertHtmlPropValue(value, key);
+	return result;
+}
+function isMeaningfulText(text$1) {
+	return text$1.trim().length > 0;
+}
+function tokenizeHtml(html) {
+	const tokens = [];
+	let pos = 0;
+	while (pos < html.length) {
+		if (html.startsWith("<!--", pos)) {
+			const commentEnd = html.indexOf("-->", pos);
+			if (commentEnd !== -1) {
+				pos = commentEnd + 3;
+				continue;
+			}
+			break;
+		}
+		const tagStart = html.indexOf("<", pos);
+		if (tagStart === -1) {
+			if (pos < html.length) {
+				const remainingText = html.slice(pos);
+				if (isMeaningfulText(remainingText)) tokens.push({
+					type: "text",
+					content: remainingText
+				});
+			}
+			break;
+		}
+		if (tagStart > pos) {
+			const textContent = html.slice(pos, tagStart);
+			if (isMeaningfulText(textContent)) tokens.push({
+				type: "text",
+				content: textContent
+			});
+		}
+		if (html.startsWith("![CDATA[", tagStart + 1)) {
+			const cdataEnd = html.indexOf("]]>", tagStart);
+			if (cdataEnd !== -1) {
+				tokens.push({
+					type: "text",
+					content: html.slice(tagStart, cdataEnd + 3)
+				});
+				pos = cdataEnd + 3;
+				continue;
+			}
+			break;
+		}
+		if (html.startsWith("!", tagStart + 1)) {
+			const specialEnd = html.indexOf(">", tagStart);
+			if (specialEnd !== -1) {
+				pos = specialEnd + 1;
+				continue;
+			}
+			break;
+		}
+		const tagEnd = html.indexOf(">", tagStart);
+		if (tagEnd === -1) break;
+		const tagContent = html.slice(tagStart + 1, tagEnd).trim();
+		const isClosingTag$1 = tagContent.startsWith("/");
+		const isSelfClosing$1 = tagContent.endsWith("/");
+		if (isClosingTag$1) {
+			const tagName = tagContent.slice(1).trim();
+			tokens.push({
+				type: "tag_close",
+				tagName
+			});
+		} else {
+			const spaceIndex = tagContent.indexOf(" ");
+			let tagName;
+			let attrsStr = "";
+			if (spaceIndex === -1) tagName = isSelfClosing$1 ? tagContent.slice(0, -1).trim() : tagContent.trim();
+			else {
+				tagName = tagContent.slice(0, spaceIndex).trim();
+				attrsStr = tagContent.slice(spaceIndex + 1);
+			}
+			const attrs = {};
+			if (attrsStr) {
+				const attrRegex = /([^\s=]+)(?:=(?:"([^"]*)"|'([^']*)'|(\S*)))?/g;
+				let attrMatch;
+				while ((attrMatch = attrRegex.exec(attrsStr)) !== null) {
+					const name = attrMatch[1];
+					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
+					if (name && !name.endsWith("/")) attrs[name] = value;
+				}
+			}
+			tokens.push({
+				type: isSelfClosing$1 || VOID_HTML_TAGS.has(tagName.toLowerCase()) ? "self_closing" : "tag_open",
+				tagName,
+				attrs
+			});
+		}
+		pos = tagEnd + 1;
+	}
+	return tokens;
+}
+function hasCustomHtmlComponents(content, customComponents) {
+	if (!content || !content.includes("<")) return false;
+	if (!customComponents || Object.keys(customComponents).length === 0) return false;
+	CUSTOM_TAG_REGEX.lastIndex = 0;
+	let match;
+	while ((match = CUSTOM_TAG_REGEX.exec(content)) !== null) if (isCustomHtmlComponentTag(match[1], customComponents)) return true;
+	return false;
+}
+
 //#endregion
 //#region src/index.ts
 const _registeredMarkdownPlugins = [];
@@ -16304,5 +16613,5 @@ function getMarkdown(msgId = `editor-${Date.now()}`, options = {}) {
 }
 
 //#endregion
-export { BLOCKED_HTML_TAGS, BLOCKED_HTML_TAG_NAMES, BLOCK_HTML_TAG_NAMES, DANGEROUS_HTML_ATTRS, DANGEROUS_HTML_ATTR_NAMES, ESCAPED_TEX_BRACE_COMMANDS, EXTENDED_STANDARD_HTML_TAGS, EXTENDED_STANDARD_HTML_TAG_NAMES, INLINE_HTML_TAG_NAMES, KATEX_COMMANDS, STANDARD_BLOCK_HTML_TAGS, STANDARD_HTML_TAGS, SVG_HTML_TAG_NAMES, TEX_BRACE_COMMANDS, URL_HTML_ATTRS, URL_HTML_ATTR_NAMES, VOID_HTML_TAGS, VOID_HTML_TAG_NAMES, applyContainers, applyMath, clearRegisteredMarkdownPlugins, findMatchingClose, getMarkdown, isMathLike, isUnsafeHtmlUrl, normalizeStandaloneBackslashT, parseFenceToken, parseInlineTokens, parseMarkdownToStructure, processTokens, registerMarkdownPlugin, setDefaultMathOptions, stripHtmlControlAndWhitespace };
+export { BLOCKED_HTML_TAGS, BLOCKED_HTML_TAG_NAMES, BLOCK_HTML_TAG_NAMES, DANGEROUS_HTML_ATTRS, DANGEROUS_HTML_ATTR_NAMES, ESCAPED_TEX_BRACE_COMMANDS, EXTENDED_STANDARD_HTML_TAGS, EXTENDED_STANDARD_HTML_TAG_NAMES, INLINE_HTML_TAG_NAMES, KATEX_COMMANDS, STANDARD_BLOCK_HTML_TAGS, STANDARD_HTML_TAGS, SVG_HTML_TAG_NAMES, TEX_BRACE_COMMANDS, URL_HTML_ATTRS, URL_HTML_ATTR_NAMES, VOID_HTML_TAGS, VOID_HTML_TAG_NAMES, applyContainers, applyMath, clearRegisteredMarkdownPlugins, convertHtmlAttrsToProps, convertHtmlPropValue, findMatchingClose, getHtmlTagFromContent, getMarkdown, hasCompleteHtmlTagContent, hasCustomHtmlComponents, isCustomHtmlComponentTag, isHtmlLikeTagName, isMathLike, isUnsafeHtmlUrl, mergeCustomHtmlTags, normalizeCustomHtmlTagName, normalizeCustomHtmlTags, normalizeStandaloneBackslashT, parseFenceToken, parseInlineTokens, parseMarkdownToStructure, processTokens, registerMarkdownPlugin, resolveCustomHtmlTags, sanitizeHtmlAttrs, setDefaultMathOptions, shouldRenderUnknownHtmlTagAsText, stripCustomHtmlWrapper, stripHtmlControlAndWhitespace, tokenizeHtml };
 //# sourceMappingURL=index.js.map